>Number:         32037
>Category:       pkg
>Synopsis:       [Maintainer] hylafax update to Version 4.2.2 , also resolves PR pkg/31352
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Nov 10 13:30:00 +0000 2005
>Originator:     Andreas Hallmann
>Release:        NetBSD 1.6.2_STABLE
>Organization:
	
>Environment:
System: NetBSD nda 1.6.2_STABLE NetBSD 1.6.2_STABLE (AHAv8#2) #11: Mon May 23 09:22:03 CEST 2005 toor@nda:/mounts/netbsd/src/sys/arch/sparc/compile/AHAv8#2 sparc
Architecture: sparc
Machine: sparc
>Description:
hylafax 4.2.1 was broken for 64bit architectures
>How-To-Repeat:
>Fix:
Apply patch below
remove all patches of the b'series i.e.: patch-b*

diff --exclude CVS -Nur comms/hylafax/Makefile comms/hylafax-devel/Makefile
--- comms/hylafax/Makefile	Thu Nov 10 12:13:00 2005
+++ comms/hylafax-devel/Makefile	Thu Nov 10 12:43:30 2005
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.43.4.1 2005/10/30 22:56:09 salo Exp $
+# $NetBSD: Makefile,v 1.43 2005/04/11 21:45:07 tv Exp $
 
-DISTNAME=	hylafax-4.2.1
-PKGREVISION=	1
+VERS=		4.2.2
+PKGNAME=	hylafax-${VERS}
+DISTNAME=	hylafax-${VERS}
 CATEGORIES=	comms
-MASTER_SITES=	ftp://ftp.hylafax.org/source/ \
-		ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/
+MASTER_SITES_BETA=	ftp://ftp.hylafax.org/source/BETA/
+MASTER_SITES_RELEASE=   ftp://ftp.hylafax.org/source/ \
+                ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/
+MASTER_SITES=   ${MASTER_SITES_RELEASE}
 
-MAINTAINER=	hallmanns@surfeu.de
+MAINTAINER=	hallmann@ahatec.de
 HOMEPAGE=	http://www.hylafax.org/
 COMMENT=	Telecommunication and fax server system
 
@@ -14,7 +17,7 @@
 
 DIST_SUBDIR=	hylafax
 
-CONFLICTS=	mgetty-[0-9]*
+CONFLICTS=	hylafax-devel[0-9]* mgetty-[0-9]*
 
 USE_PKGINSTALL=		yes
 USE_LANGUAGES=		c c++
diff --exclude CVS -Nur comms/hylafax/PLIST comms/hylafax-devel/PLIST
--- comms/hylafax/PLIST	Thu Nov 10 12:13:05 2005
+++ comms/hylafax-devel/PLIST	Wed Oct 12 12:09:23 2005
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/05/02 20:33:58 reed Exp $
+@comment $NetBSD$
 bin/faxalter
 bin/faxcover
 bin/faxmail
@@ -20,6 +20,7 @@
 libexec/hylafax/mkcover
 libexec/hylafax/notify
 libexec/hylafax/notify-4.1
+libexec/hylafax/notify.awk
 libexec/hylafax/pcl2fax
 libexec/hylafax/pdf2fax.gs
 libexec/hylafax/pollrcvd
@@ -44,7 +45,7 @@
 man/cat1/sendpage.0
 man/cat1/sgi2fax.0
 man/cat1/textfmt.0
-man/cat5/cid.0
+man/cat5/callid.0
 man/cat5/destctrls.0
 man/cat5/dialrules.0
 man/cat5/doneq.0
@@ -144,6 +145,7 @@
 share/hylafax/config_template/class2
 share/hylafax/config_template/class2.0
 share/hylafax/config_template/class2.1
+share/hylafax/config_template/conexant-1.0
 share/hylafax/config_template/davicom-2
 share/hylafax/config_template/digi
 share/hylafax/config_template/digi-2
diff --exclude CVS -Nur comms/hylafax/distinfo comms/hylafax-devel/distinfo
--- comms/hylafax/distinfo	Thu Nov 10 11:12:39 2005
+++ comms/hylafax-devel/distinfo	Wed Oct 12 10:17:46 2005
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14.6.1 2005/10/30 22:56:09 salo Exp $
+$NetBSD: distinfo,v 1.14 2005/02/23 16:05:30 agc Exp $
 
-SHA1 (hylafax/hylafax-4.2.1.tar.gz) = 7686daa4db84a90695cff6eba2f873ef59659e0e
-RMD160 (hylafax/hylafax-4.2.1.tar.gz) = 49634ac9048b428bd4cebae0a0a72c7e3047bcfc
-Size (hylafax/hylafax-4.2.1.tar.gz) = 1412035 bytes
+SHA1 (hylafax/hylafax-4.2.2.tar.gz) = 6f635298d491fec95379a337e9f4c2d922913d1c
+RMD160 (hylafax/hylafax-4.2.2.tar.gz) = a50505b77b65352f580dbe86a1525a356a46f116
+Size (hylafax/hylafax-4.2.2.tar.gz) = 1438894 bytes
 SHA1 (patch-aa) = 94de7c7fb55c9c95c6a774fb732e2d47ec818152
 SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d
 SHA1 (patch-ac) = 6f89cc0c9e7a0e789c23b0dfc604376e457091b7
@@ -12,13 +12,12 @@
 SHA1 (patch-ag) = e1a38918cadf1d1cca7765ee2c050e99dfed0b7f
 SHA1 (patch-ah) = 084a99cfe21d7090fca33d9e068036e19707f441
 SHA1 (patch-ai) = d45bb9e224b18999489314aa1c1c74fc62a77328
+SHA1 (patch-aj) = 4fb211cbe98c3b0919b2f54959320b11da92d1a7
+SHA1 (patch-ak) = 56c027115b470819a85974c0e70d3ab649fec744
 SHA1 (patch-al) = edac7c7af07556f7321ba7ede1eeca55e618b8cc
 SHA1 (patch-am) = b004485310a2257630561a42b3f08896604ce986
 SHA1 (patch-an) = 535f9454e473d7bb26a256aec3158cffdb3d0399
 SHA1 (patch-ao) = 73da088c0dbc13a0dcb8d6abaa36804f34638c51
 SHA1 (patch-ap) = f9d6a2796535e7200419d6e24203b9995e5cfb39
-SHA1 (patch-ba) = d675d4ef737e0e0ec06c3c668bc094980f2e018d
-SHA1 (patch-bb) = 7b035593390cbcbebfc2cc311695c52cc6a8177f
-SHA1 (patch-bc) = 6810f1ead317173d0cc0dead389f55a279d5738a
-SHA1 (patch-bd) = f3c52d9372831d1f75389fcd1a7cf67fe44079aa
-SHA1 (patch-be) = 73e0f40182665a8d0c9007230ddfcc4c6a4477d2
+SHA1 (patch-ar) = d5f331cf4be711c33073a348304eb053d41ab0b3
+SHA1 (patch-as) = 57c85bfd08738efdb91ec63f5d5e5c36c79fd3a3
diff --exclude CVS -Nur comms/hylafax/patches/patch-ba comms/hylafax-devel/patches/patch-ba
--- comms/hylafax/patches/patch-ba	Sun Oct 30 23:56:09 2005
+++ comms/hylafax-devel/patches/patch-ba	Thu Jan  1 01:00:00 1970
@@ -1,20 +0,0 @@
-$NetBSD: patch-ba,v 1.1.2.1 2005/10/30 22:56:09 salo Exp $
-
---- util/faxcron.sh.in.orig	2005-10-30 19:13:07.000000000 +0000
-+++ util//faxcron.sh.in
-@@ -69,9 +69,12 @@ TEE=tee
- UPDATE="date +'%D %H:%M' >$LAST"
- 
- # security
--TMPDIR=/tmp/.faxcron.sh$$
--rm -rf $TMPDIR
--mkdir $TMPDIR || exit 1
-+TMPDIR=`(mktemp -d /tmp/.faxcron.XXXXXX) 2>/dev/null`
-+if test X$TMPDIR = X; then
-+    TMPDIR=/tmp/.faxcron$$
-+fi
-+@RM@ -fr $TMPDIR
-+(umask 077 ; mkdir $TMPDIR) || exit 1
- 
- JUNK=$TMPDIR/faxjunk$$         # temp file used multiple times
- AWKTMP=$TMPDIR/faxawk$$                # temp file for awk program
diff --exclude CVS -Nur comms/hylafax/patches/patch-bb comms/hylafax-devel/patches/patch-bb
--- comms/hylafax/patches/patch-bb	Sun Oct 30 23:56:09 2005
+++ comms/hylafax-devel/patches/patch-bb	Thu Jan  1 01:00:00 1970
@@ -1,28 +0,0 @@
-$NetBSD: patch-bb,v 1.1.2.1 2005/10/30 22:56:09 salo Exp $
-
---- util/recvstats.sh.in.orig	2005-10-30 19:15:58.000000000 +0000
-+++ util/recvstats.sh.in
-@@ -142,14 +142,15 @@ esac
- #
- # Generate an awk program to process the statistics file.
- #
--tmpAwk=/tmp/xferfax$$
--trap "rm -f $tmpAwk; exit 1" 0 1 2 15
--
--# security
--rm -rf $tmpAwk
--${NOCLOBBER_ON}
--> $tmpAwk || exit 1
--${NOCLOBBER_OFF}
-+TMPDIR=`(mktemp -d /tmp/.recvstats.XXXXXX) 2>/dev/null`
-+if test X$TMPDIR = X; then
-+    TMPDIR=/tmp/.recvstats$$
-+fi
-+
-+@RM@ -fr $TMPDIR
-+(umask 077 ; mkdir $TMPDIR) || exit 1
-+tmpAwk=$TMPDIR/xferfax$$
-+trap "@RM@ -f $tmpAwk; @RM@ -fr $TMPDIR; exit 1" 0 1 2 15
- 
- ($CAT<<'EOF'
- #
diff --exclude CVS -Nur comms/hylafax/patches/patch-bc comms/hylafax-devel/patches/patch-bc
--- comms/hylafax/patches/patch-bc	Sun Oct 30 23:56:09 2005
+++ comms/hylafax-devel/patches/patch-bc	Thu Jan  1 01:00:00 1970
@@ -1,21 +0,0 @@
-$NetBSD: patch-bc,v 1.1.2.1 2005/10/30 22:56:09 salo Exp $
-
---- util/xferfaxstats.sh.in.orig	2005-10-30 19:24:06.000000000 +0000
-+++ util/xferfaxstats.sh.in
-@@ -169,8 +169,14 @@ esac
- #
- # Generate an awk program to process the statistics file.
- #
--tmpAwk=/tmp/xferfax$$
--trap "rm -f $tmpAwk; exit 1" 0 1 2 15
-+TMPDIR=`(mktemp -d /tmp/.xferfaxstats.XXXXXX) 2>/dev/null`
-+if test X$TMPDIR = X; then
-+    TMPDIR=/tmp/.xferfaxstats$$
-+fi
-+@RM@ -fr $TMPDIR
-+(umask 077 ; mkdir $TMPDIR) || exit 1
-+tmpAwk=$TMPDIR/xferfax$$
-+trap "@RM@ -fr $TMPDIR; exit 1" 0 1 2 15
- 
- ($CAT<<'EOF'
- #
diff --exclude CVS -Nur comms/hylafax/patches/patch-bd comms/hylafax-devel/patches/patch-bd
--- comms/hylafax/patches/patch-bd	Sun Oct 30 23:56:09 2005
+++ comms/hylafax-devel/patches/patch-bd	Thu Jan  1 01:00:00 1970
@@ -1,38 +0,0 @@
-$NetBSD: patch-bd,v 1.1.2.1 2005/10/30 22:56:09 salo Exp $
-
---- util/Transport.c++.orig	2005-10-30 19:41:36.000000000 +0000
-+++ util/Transport.c++
-@@ -27,7 +27,9 @@
- #include "Transport.h"
- #include "FaxClient.h"
- #include "InetTransport.h"
-+#if CONFIG_UNIXTRANSPORT
- #include "UnixTransport.h"
-+#endif
- #include "Sys.h"
- 
- #include <errno.h>
-@@ -50,17 +52,23 @@ Transport::getTransport(FaxClient& clien
- 	 * An unqualified destination; look for
- 	 * the best available transport facility.
- 	 */
-+#if CONFIG_UNIXTRANPSORT
- 	if (UnixTransport::isA(FAX_DEFUNIX)) {
- 	    client.setHost(FAX_DEFUNIX);
- 	    return *new UnixTransport(client);
- 	} else {
-+#endif
- 	    client.setHost(FAX_DEFHOST);
- 	    return *new InetTransport(client);
-+#if CONFIG_UNIXTRANPSORT
- 	}
-+#endif
-     } else {
-+#if CONFIG_UNIXTRANPSORT
- 	if (UnixTransport::isA(address))
- 	    return *new UnixTransport(client);
- 	else
-+#endif
- 	    return *new InetTransport(client);
-     }
- }
diff --exclude CVS -Nur comms/hylafax/patches/patch-be comms/hylafax-devel/patches/patch-be
--- comms/hylafax/patches/patch-be	Sun Oct 30 23:56:09 2005
+++ comms/hylafax-devel/patches/patch-be	Thu Jan  1 01:00:00 1970
@@ -1,19 +0,0 @@
-$NetBSD: patch-be,v 1.1.2.1 2005/10/30 22:56:09 salo Exp $
-
---- util/UnixTransport.c++.orig	2005-10-30 19:44:31.000000000 +0000
-+++ util/UnixTransport.c++
-@@ -31,13 +31,13 @@
- UnixTransport::UnixTransport(FaxClient& c) : Transport(c) {}
- UnixTransport::~UnixTransport() {}
- 
-+#if CONFIG_UNIXTRANPSORT
- bool
- UnixTransport::isA(const char* address)
- {
-      return Sys::isSocketFile(address);
- }
- 
--#if CONFIG_UNIXTRANSPORT
- #include "Socket.h"
- 
- extern "C" {