Update hylfax to 4.1.7. Changes since 4.1.5:

    * added new edit-faxcover script
    * added various enhancements to faxsetup
    * default libtiff v3.6 compatibility
    * added NOTIFY_FAXMASTER and ENCODING parameters for FaxDispatch
    * added 2D-MMR support for Class 2 modems that support it
    * added RingTimeout, ModemRingResponse, CIDNumberAnswerLength, and
      CIDNameAnswerLength modem config parameters
    * support for MultiTech MT5634ZDXb and MT5634ZBA-DID
    * added subaddressing specification capability to sendfax
    * numerous bugfixes (several significant) and build cleanups
    * fixes the PageChop feature that broken in 4.1.6

Also fixed some cosmetic NetBSD issues with faxadmodem

19 files changed, 234 insertions, 182 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index b2a19ac055b..9097f38dae8 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2003/06/27 12:18:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.32 2003/09/23 21:39:46 abs Exp $
 #
 
-DISTNAME=	hylafax-4.1.5
+DISTNAME=	hylafax-4.1.7
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/ \
 		ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo
index af57fc52a84..92d735f178b 100644
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.7 2003/06/27 12:18:11 hubertf Exp $
+$NetBSD: distinfo,v 1.8 2003/09/23 21:39:47 abs Exp $
 
-SHA1 (hylafax/hylafax-4.1.5.tar.gz) = fa60a8a51921d42aa36732b5c9ee62d5b0f18dab
-Size (hylafax/hylafax-4.1.5.tar.gz) = 1276511 bytes
-SHA1 (patch-aa) = 74271a248f82daa1d340b83e70eaf679387b4eb0
-SHA1 (patch-ab) = d4cd3bdebfdd9cb13bd9a4feb5115bb918cb2a12
-SHA1 (patch-ac) = a796fe8b5f19cc3fe7f6c9e1f3342670f79014ab
-SHA1 (patch-ad) = f7a05f020bc6e97a8908b1fc938460ac333a029a
-SHA1 (patch-ae) = e86ae3b1be041a28a4ac5996a915b1d8ae5955f3
-SHA1 (patch-af) = e1e09b2914e4071807ca83f134134bd5cf42519d
-SHA1 (patch-ag) = 75c7c633587a952d7f62e7f450a816b8e6ad298b
-SHA1 (patch-ah) = fbd4d348186e866099d2abb0fd001ec1e9b5a1e0
-SHA1 (patch-ai) = fe653990da25219f22bb6a4cb89b2f1cc47152c3
-SHA1 (patch-aj) = 86520589dc1be4517e0c0f0b349b04a04bed41d9
-SHA1 (patch-ak) = f72d797419ce1c9d50d03f2c5e5db16a0b30e5cb
-SHA1 (patch-al) = e8a7576143b51781fc2aa985e761a19c0e756d13
-SHA1 (patch-am) = 0eb61a129610c59f01282926fa4b3448fa2567ec
-SHA1 (patch-an) = 82b110b055cd768947c60fdae41e478f303c51ae
-SHA1 (patch-aq) = 04add689446223f5b3541f1100d063b38f6ede0e
-SHA1 (patch-as) = 0b169ee8ba8385112e88a7335ff74bd3c0825e69
-SHA1 (patch-at) = 2833cfe9bc94b1fb99cbb6c3015093f274f7f69f
+SHA1 (hylafax/hylafax-4.1.7.tar.gz) = 9193f634d6879d77f0c8c00c65183c974eda90b1
+Size (hylafax/hylafax-4.1.7.tar.gz) = 1285766 bytes
+SHA1 (patch-aa) = 94de7c7fb55c9c95c6a774fb732e2d47ec818152
+SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d
+SHA1 (patch-ac) = 3f7173b784df070b6103d808287e5fb21ebe1d16
+SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72
+SHA1 (patch-ae) = 3215a2ce492e9be88a1a2d4d45570057b582b8c1
+SHA1 (patch-af) = efa0af45eaa8eeee354bdecfe7e9ea8db2b0ffcb
+SHA1 (patch-ag) = e1a38918cadf1d1cca7765ee2c050e99dfed0b7f
+SHA1 (patch-ah) = 3641a5cdb3a4ab44d25c0bbaa4e7609f7f8d162b
+SHA1 (patch-ai) = 13109c7579c851f899ce2867840b6b278ec14bb0
+SHA1 (patch-aj) = 500fbe6c105fc243ceee5bc669fac5f460c29c1d
+SHA1 (patch-ak) = 9c3116cb97564530cd000793d1f5ac4b333e9d18
+SHA1 (patch-al) = 59ec6238d19e979d443a5925eefe4a873e18ea5e
+SHA1 (patch-am) = b004485310a2257630561a42b3f08896604ce986
+SHA1 (patch-an) = 248947a7fcca4cb1d7417b71990a731324408fb8
+SHA1 (patch-ao) = 2ff605159f2d95b8e5e4eee30c85c5b48ade66fd
+SHA1 (patch-ap) = 66dba8fb2252e2feb032dedc04df4f705411a813
+SHA1 (patch-aq) = 53501db9369da6410faeaa11e8c4e910019f1d11
diff --git a/comms/hylafax/patches/patch-aa b/comms/hylafax/patches/patch-aa
index eecf2b76094..9117740e803 100644
--- a/comms/hylafax/patches/patch-aa
+++ b/comms/hylafax/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2001/04/23 15:06:12 abs Exp $
+$NetBSD: patch-aa,v 1.8 2003/09/23 21:39:47 abs Exp $
 
---- Makefile.in.orig	Sun Sep  3 04:39:31 2000
+--- Makefile.in.orig	Mon Apr 14 03:44:42 2003
 +++ Makefile.in
-@@ -223,22 +223,13 @@
+@@ -237,22 +237,13 @@ makeClientDirs::
  makeServerDirs::
  	-${INSTALL} -u ${SYSUSER} -g ${SYSGROUP} -m ${DIRMODE} \
  	    -idb hylafax.sw.server -dir ${SBIN};
@@ -26,4 +26,4 @@ $NetBSD: patch-aa,v 1.7 2001/04/23 15:06:12 abs Exp $
 +	${INSTALL} -m 444 -F ${PREFIX}/share/doc/hylafax -idb hylafax.sw.server \
  	    -src ${SRCDIR}/COPYRIGHT -O COPYRIGHT
  	@if [ "@REGEX@" = yes ]; then \
- 	    ${ECHO} "= "regex; cd regex; ${MAKE} install; \
+ 	    ${ECHO} "= "regex; cd regex; ${MAKE} install  ||  exit 1; \
diff --git a/comms/hylafax/patches/patch-ab b/comms/hylafax/patches/patch-ab
index 36bc8889918..42a7de53dc8 100644
--- a/comms/hylafax/patches/patch-ab
+++ b/comms/hylafax/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2001/04/23 15:06:12 abs Exp $
+$NetBSD: patch-ab,v 1.5 2003/09/23 21:39:47 abs Exp $
 
---- config.h.in.orig	Thu Sep  2 11:16:20 1999
+--- config.h.in.orig	Mon Mar 19 06:48:23 2001
 +++ config.h.in
 @@ -58,6 +58,7 @@
   * NB: The Unix-domain support is unfinished.
diff --git a/comms/hylafax/patches/patch-ac b/comms/hylafax/patches/patch-ac
index 0e26e6844c8..b22a89ef03f 100644
--- a/comms/hylafax/patches/patch-ac
+++ b/comms/hylafax/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2001/07/08 13:32:15 bad Exp $
+$NetBSD: patch-ac,v 1.6 2003/09/23 21:39:47 abs Exp $
 
---- config/Makefile.in.orig	Mon Jun  4 07:40:04 2001
-+++ config/Makefile.in	Sun Jul  8 00:48:02 2001
-@@ -102,6 +102,7 @@
+--- config/Makefile.in.orig	Tue Aug 27 23:56:42 2002
++++ config/Makefile.in
+@@ -116,6 +116,7 @@ targets: ${TARGETS}
  PUTSERVER=${INSTALL} -idb ${PRODUCT}.sw.server
  
  install: default ${CONFIGFILES}
diff --git a/comms/hylafax/patches/patch-ad b/comms/hylafax/patches/patch-ad
index 0df61a135bf..da93d1f73f0 100644
--- a/comms/hylafax/patches/patch-ad
+++ b/comms/hylafax/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2001/04/23 15:06:13 abs Exp $
+$NetBSD: patch-ad,v 1.5 2003/09/23 21:39:47 abs Exp $
 
---- config/skel.orig	Mon Feb  5 06:32:56 2001
+--- config/skel.orig	Sun Apr  7 21:29:27 2002
 +++ config/skel
-@@ -41,8 +41,8 @@
+@@ -41,8 +41,8 @@ ServerTracing:		1		# log server-related 
  SessionTracing:		11		# log server-related operations
  RecvFileMode:		0600		# recvd facsimile are not public
  LogFileMode:		0600		# private log files
diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae
index 1090367e14b..ed255ff0331 100644
--- a/comms/hylafax/patches/patch-ae
+++ b/comms/hylafax/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
+$NetBSD: patch-ae,v 1.7 2003/09/23 21:39:48 abs Exp $
 
---- configure.orig	Tue Oct  1 16:05:55 2002
+--- configure.orig	Fri May 23 04:28:51 2003
 +++ configure
 @@ -37,23 +37,23 @@
  #
@@ -35,10 +35,10 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  SYSGID=
  DSO=auto
  GETTY=auto
-@@ -72,8 +72,8 @@ DPS=no
- GS=no
+@@ -73,8 +73,8 @@ GS=no
  IMP=no
  UTMP=auto
+ OPTIMIZER="-O"
 -LIBTIFF="-L/usr/local/lib -ltiff"
 -TIFFINC=/usr/local/include
 +LIBTIFF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltiff -ljpeg -lz -lm"
@@ -46,7 +46,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  TIFFBIN=
  LIBZ=
  ZLIBINC=
-@@ -81,8 +81,8 @@ REGEX=yes
+@@ -82,8 +82,8 @@ REGEX=yes
  LIBREGEX='-L${DEPTH}/regex -lregex'
  REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
  DBLIB=no
@@ -57,7 +57,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  FAXD=
  LIBFAXSERVER='libfaxserver.${DSO}'
  LIBUTIL='${UTIL}/libfaxutil.${DSO}'
-@@ -216,6 +216,7 @@ PKG_EMAIL
+@@ -218,6 +218,7 @@ PKG_EMAIL
  PKG_VENDOR
  PORT
  PORTFUNCS
@@ -65,7 +65,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  PROTOTYPES
  PSPACKAGE	PS
  PWDCMD
-@@ -279,7 +280,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd	
+@@ -281,7 +282,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd	
  test -d /usr/ucb && PATH=$PATH:/usr/ucb			# Sun and others
  test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin	# BSDi
  test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc	# Sun and others
@@ -74,7 +74,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  PATH=$PATH:$OPATH
  
  POSIXLY_CORRECT=1; export POSIXLY_CORRECT		# disable GNU extensions
-@@ -3020,13 +3021,7 @@ main()
+@@ -3042,13 +3043,7 @@ main()
          printf("old include files: version %u\n", ZLIB_VERSION);
          exit(-1);
      }
@@ -88,7 +88,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  }
  EOF
  capture cat t.c
-@@ -3088,7 +3083,7 @@ Note "Checking TIFF support."
+@@ -3110,7 +3105,7 @@ Note "Checking TIFF support."
  # Location of TIFF binaries
  #
  if [ -z "$TIFFBIN" ]; then
@@ -97,7 +97,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
      for i in $DIRS; do
          test -x $i/tiff2ps && { TIFFBIN=$i; break; }
      done
-@@ -3672,7 +3667,7 @@ fi
+@@ -3694,7 +3689,7 @@ fi
  if [ -z "$PATH_VGETTY" ]; then
      PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_VGETTY" ]; then
@@ -106,7 +106,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  	Note "WARNING, no vgetty program found to handle a voice call, using $PATH_VGETTY."
      else
  	Note "Looks like $PATH_VGETTY is the program to exec for a voice call."
-@@ -3685,7 +3680,7 @@ fi
+@@ -3707,7 +3702,7 @@ fi
  if [ -z "$PATH_EGETTY" ]; then
      PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_EGETTY" ]; then
@@ -115,7 +115,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  	Note "WARNING, no egetty program found, using $PATH_EGETTY."
      else
  	Note "Looks like $PATH_EGETTY is the program to exec for an extern call."
-@@ -3756,6 +3751,7 @@ PickRIP()
+@@ -3778,6 +3773,7 @@ PickRIP()
  {
      if [ -z "$PATH_GSRIP" ]; then
  	GSLOCS="
@@ -123,7 +123,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  	    /usr/local/bin/gs
  	    /usr/contrib/bin/gs
  	    /usr/gnu/bin/gs
-@@ -3803,7 +3799,7 @@ fax software to operate correctly.  See 
+@@ -3825,7 +3821,7 @@ fax software to operate correctly.  See 
  on building Ghostscript with the necessary TIFF driver.
  
  EOF
@@ -132,7 +132,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  	PATH_GSRIP=$PATH_PSRIP
      fi
  }
-@@ -3870,9 +3866,9 @@ if [ -z "$PATH_AFM" ]; then
+@@ -3892,9 +3888,9 @@ if [ -z "$PATH_AFM" ]; then
      else
          DIR_AFMS="
  	    /usr/lib/afm
@@ -145,7 +145,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  	    /usr/share/ghostscript/fonts
  	    /usr/gnu/lib/ghostscript/fonts
  	    /opt/gnu/lib/ghostscript/fonts
-@@ -3892,7 +3888,7 @@ if [ -z "$PATH_AFM" ]; then
+@@ -3914,7 +3910,7 @@ if [ -z "$PATH_AFM" ]; then
  fi
  if [ -z "$PATH_AFM" ]; then
      # put it where ghostscript normally puts things
@@ -154,7 +154,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
      Note "WARNING, could not locate a directory with font metric information,"
      Note "guessing that font metric information goes in $PATH_AFM."
  else
-@@ -3911,6 +3907,7 @@ fi
+@@ -3933,6 +3929,7 @@ fi
  #
  if [ -z "$DIR_MAN" ]; then
      MANPATH="
@@ -162,7 +162,7 @@ $NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
  	$MANPATH
  	/usr/local/man
  	/usr/contrib/man
-@@ -3920,7 +3917,7 @@ if [ -z "$DIR_MAN" ]; then
+@@ -3942,7 +3939,7 @@ if [ -z "$DIR_MAN" ]; then
      for i in $MANPATH; do
  	test -d $i && { DIR_MAN=$i; break; }
      done
diff --git a/comms/hylafax/patches/patch-af b/comms/hylafax/patches/patch-af
index c6605a1e5f0..4c1086f3286 100644
--- a/comms/hylafax/patches/patch-af
+++ b/comms/hylafax/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2001/07/08 13:32:15 bad Exp $
+$NetBSD: patch-af,v 1.6 2003/09/23 21:39:48 abs Exp $
 
---- defs.in.orig	Thu Mar  8 07:44:17 2001
-+++ defs.in	Sun Jul  8 00:48:02 2001
-@@ -44,6 +44,7 @@
+--- defs.in.orig	Tue Apr 29 04:32:19 2003
++++ defs.in
+@@ -44,6 +44,7 @@ SHELL		= @SCRIPT_SH@
  # to insufficient; you are better off rerunning the
  # configure script so that all uses are set correctly.
  #
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.5 2001/07/08 13:32:15 bad Exp $
  SPOOL		= @SPOOL@
  SBIN		= @SBIN@
  BIN		= @BIN@
-@@ -257,7 +258,7 @@
+@@ -260,7 +261,7 @@ LDFLAGS		= ${LDOPTS} ${LDLIBS}
  LDOPTS		= ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
  LDLIBS		= ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
  
diff --git a/comms/hylafax/patches/patch-ag b/comms/hylafax/patches/patch-ag
index 848c6b2221a..99a1ca7be67 100644
--- a/comms/hylafax/patches/patch-ag
+++ b/comms/hylafax/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2001/04/23 15:06:14 abs Exp $
+$NetBSD: patch-ag,v 1.5 2003/09/23 21:39:48 abs Exp $
 
 --- etc/Makefile.in.orig	Tue Feb  6 04:54:06 2001
 +++ etc/Makefile.in
-@@ -85,14 +85,16 @@
+@@ -85,14 +85,16 @@ install: default
  		-src ${SRCDIR}/faxsetup.$$i -O faxsetup.$$i; \
  	done
  	${PUTSERVER} -F ${SBIN} -m 755 -src probemodem.sh -O probemodem
diff --git a/comms/hylafax/patches/patch-ah b/comms/hylafax/patches/patch-ah
index 4e05f10ec6c..091bfaf5324 100644
--- a/comms/hylafax/patches/patch-ah
+++ b/comms/hylafax/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.4 2001/04/23 15:06:15 abs Exp $
+$NetBSD: patch-ah,v 1.5 2003/09/23 21:39:48 abs Exp $
 
---- etc/faxaddmodem.sh.in.orig	Tue Feb  6 04:54:06 2001
+--- etc/faxaddmodem.sh.in.orig	Fri May 30 00:30:11 2003
 +++ etc/faxaddmodem.sh.in
 @@ -46,6 +46,7 @@
  SPOOL=@SPOOL@
@@ -10,17 +10,43 @@ $NetBSD: patch-ah,v 1.4 2001/04/23 15:06:15 abs Exp $
  while [ x"$1" != x"" ] ; do
      case $1 in
      -s)	    SPEED=$2; shift;;
-@@ -112,10 +113,11 @@
+@@ -112,10 +113,10 @@ OUT=$TMPDIR/addmodem$$         # temp fi
  SVR4UULCKN=$LIBEXEC/lockname	# SVR4 UUCP lock name construction program
  ONDELAY=$LIBEXEC/ondelay	# prgm to open devices blocking on carrier
  CAT="$CAT -u"			# something to do unbuffered reads and writes
 -FAX=fax				# identity of the fax user
 +FAX=@FAXUID@			# identity of the fax user
-+FAXGID=@FAXGID@
  GROUP=/etc/group		# where to go for group entries
- PROTOGID=$FAXGID		# group who's gid we use for FAX user
+ PROTOGID=@FAXGID@		# group who's gid we use for FAX user
 -defPROTOGID=10			# use this gid if PROTOGID doesn't exist
 +defPROTOGID=117			# use this gid if PROTOGID doesn't exist
  MODEMCONFIG=$SPOOL/config	# location of prototype modem config files
  RMCMD="$RM -f"			# forced removal
  
+@@ -809,7 +810,7 @@ SendToModem()
+     COMMAND=$*
+     sleep 1					# wait for previous kill
+     case $TARGET in
+-    *-linux*)	;;
++    *-linux*|*-netbsd*)	;;
+     *)	onDev $STTY 0; sleep 1	;;		# reset the modem (hopefully)
+     esac
+ 						# start listening for output
+@@ -1129,7 +1130,7 @@ if [ "$RESULT" = "OK" ]; then
+     done;
+     MODEMCLASSES=`echo $MODEMCLASSES | $SED -e 's/3/2.0/g' -e 's/4/1.0/g' -e 's/5/2.1/g' -e 's/ $//g'`
+     SUPPORT=`echo $SUPPORT | $SED -e 's/3/2.0/g' -e 's/4/1.0/g' -e 's/5/2.1/g'`.
+-    if [ "`echo $SUPPORT | $GREP \" \"`" = "" ]; then echo $SUPPORT; fi
++    if [ "`echo $SUPPORT | $GREP \ `" = "" ]; then echo $SUPPORT; fi
+     case "$MODEMCLASSES" in
+     "")			giveup;;
+     "1")		ModemType=Class1; configureClass1Modem;;
+@@ -1140,7 +1141,7 @@ if [ "$RESULT" = "OK" ]; then
+     *)
+ 	DEFAULTCLASS=`echo $MODEMCLASSES | $SED 's/\([^ ]*\).*/\1/g'`
+ 	x=""
+-	while [ "`echo \" $MODEMCLASSES \" | $GREP \" $x \"`" = "" ]; do
++	while [ "`echo \ $MODEMCLASSES\  | $GREP \ $x\ `" = "" ]; do
+ 	    echo $SUPPORT
+ 	    prompt "How should it be configured [$DEFAULTCLASS]?"
+ 	    read x
diff --git a/comms/hylafax/patches/patch-ai b/comms/hylafax/patches/patch-ai
index 3f012084b7f..b179d69dae8 100644
--- a/comms/hylafax/patches/patch-ai
+++ b/comms/hylafax/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.7 2001/07/16 13:30:38 wiz Exp $
+$NetBSD: patch-ai,v 1.8 2003/09/23 21:39:48 abs Exp $
 
---- etc/faxsetup.sh.in.orig	Thu Jun 14 07:36:16 2001
+--- etc/faxsetup.sh.in.orig	Tue May  6 21:41:17 2003
 +++ etc/faxsetup.sh.in
 @@ -41,7 +41,9 @@
  # This script interactively prepares and verifies 
@@ -13,7 +13,7 @@ $NetBSD: patch-ai,v 1.7 2001/07/16 13:30:38 wiz Exp $
  test -d /usr/ucb  && PATH=$PATH:/usr/ucb		# Sun and others
  test -d /usr/bsd  && PATH=$PATH:/usr/bsd		# Silicon Graphics
  test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc	# Sun and others
-@@ -59,13 +61,14 @@
+@@ -59,13 +61,14 @@ FUSER=@FUSER@			# fuser command to dump 
  GREP=@GREP@			# grep command for use below
  LN=@LN@				# ln command for use below
  LN_S=@LN_S@			# ln option for creating a symbolic link
@@ -29,7 +29,7 @@ $NetBSD: patch-ai,v 1.7 2001/07/16 13:30:38 wiz Exp $
  SERVICES=/etc/services		# location of services database
  INETDCONF=/usr/etc/inetd.conf	# default location of inetd configuration file
  ALIASES=/usr/lib/aliases	# default location of mail aliases database file
-@@ -143,6 +146,7 @@
+@@ -143,6 +146,7 @@ LIBDATA		DIR_LIBDATA
  LIBEXEC		DIR_LIBEXEC
  LN
  MANDIR		DIR_MAN
@@ -37,7 +37,7 @@ $NetBSD: patch-ai,v 1.7 2001/07/16 13:30:38 wiz Exp $
  MKFIFO
  MV
  PATH
-@@ -748,6 +752,61 @@
+@@ -757,6 +761,61 @@ if [ "$euid" != "root" ]; then
      boom
  fi
  
@@ -99,7 +99,7 @@ $NetBSD: patch-ai,v 1.7 2001/07/16 13:30:38 wiz Exp $
  onClient && Note "Checking system for proper client configuration."
  onServer && Note "Checking system for proper server configuration."
  
-@@ -2083,12 +2142,7 @@
+@@ -2199,12 +2258,7 @@ if onServer; then
  
      findproc()
      {
diff --git a/comms/hylafax/patches/patch-aj b/comms/hylafax/patches/patch-aj
index cab06179b46..13316e828b3 100644
--- a/comms/hylafax/patches/patch-aj
+++ b/comms/hylafax/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.4 2001/04/23 15:06:16 abs Exp $
+$NetBSD: patch-aj,v 1.5 2003/09/23 21:39:48 abs Exp $
 
---- faxd/Getty.c++.orig	Sat Sep 16 12:13:48 2000
-+++ faxd/Getty.c++
-@@ -219,7 +219,7 @@
-     // NB: this is executed in the parent
-     fxStr device = fxStr::format("%s/" | line, _PATH_DEV);
-     Sys::chown(device, UUCPLock::getUUCPUid(), UUCPLock::getUUCPGid());
--    Sys::chmod(device, 0600);			// reset protection
-+    Sys::chmod(device, 0660);			// reset protection
+--- faxd/FaxModem.c++.orig	Sun Feb  9 02:22:49 2003
++++ faxd/FaxModem.c++
+@@ -823,7 +823,7 @@ u_char* MemoryDecoder::cutExtraRTC()
  }
  
- extern void vlogError(const char* fmt, va_list ap);
+ void
+-FaxModem::correctPhaseCData(u_char* buf, u_long* pBufSize,
++FaxModem::correctPhaseCData(u_char* buf, uint32* pBufSize,
+                             u_int fillorder, const Class2Params& params)
+ {
+     MemoryDecoder dec1(buf, params.pageWidth(), *pBufSize, fillorder, params.is2D());
diff --git a/comms/hylafax/patches/patch-ak b/comms/hylafax/patches/patch-ak
index 5d928fbab5c..9402a1c084b 100644
--- a/comms/hylafax/patches/patch-ak
+++ b/comms/hylafax/patches/patch-ak
@@ -1,27 +1,13 @@
-$NetBSD: patch-ak,v 1.4 2001/04/23 15:06:17 abs Exp $
+$NetBSD: patch-ak,v 1.5 2003/09/23 21:39:48 abs Exp $
 
---- faxd/UUCPLock.c++.orig	Thu Sep 21 10:24:54 2000
-+++ faxd/UUCPLock.c++
-@@ -37,6 +37,7 @@
- }
- #endif
- #include <pwd.h>
-+#include <grp.h>
- 
+--- faxd/FaxModem.h.orig	Sat Apr 26 08:11:21 2003
++++ faxd/FaxModem.h
+@@ -144,7 +144,7 @@ protected:
  /*
-  * UUCP Device Locking Support.
-@@ -146,8 +147,13 @@
- 	if (!pwd)
- 	    faxApp::fatal("Can not deduce identity of UUCP");
- 	UUCPuid = pwd->pw_uid;
--	UUCPgid = pwd->pw_gid;
- 	endpwent();			// paranoia
-+
-+	const group *grp = getgrnam(FAX_GROUP);
-+	if (!grp)
-+	    faxApp::fatal("Can not deduce group identity of '" FAX_GROUP "'");
-+	UUCPgid = grp->gr_gid;
-+	endgrent();			// paranoia
-     }
- }
- uid_t UUCPLock::getUUCPUid() { setupIDs(); return UUCPuid; }
+  * Correct if neccessary Phase C (T.4) data (remove extra RTC etc.)
+  */
+-    void        correctPhaseCData(u_char* buf, u_long* pBufSize,
++    void        correctPhaseCData(u_char* buf, uint32* pBufSize,
+                                   u_int fillorder, const Class2Params& params);
+ public:
+     enum {			// FaxModem::RTNHandling
diff --git a/comms/hylafax/patches/patch-al b/comms/hylafax/patches/patch-al
index 546818deccb..bade3701d5e 100644
--- a/comms/hylafax/patches/patch-al
+++ b/comms/hylafax/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.4 2001/04/23 15:06:17 abs Exp $
+$NetBSD: patch-al,v 1.5 2003/09/23 21:39:48 abs Exp $
 
---- faxd/faxGettyApp.c++.orig	Sun Jun 13 08:41:05 1999
-+++ faxd/faxGettyApp.c++
-@@ -671,7 +671,7 @@
-     FaxServer::notifyDocumentRecvd(ri);
+--- faxd/Getty.c++.orig	Sat Sep 16 12:13:48 2000
++++ faxd/Getty.c++
+@@ -219,7 +219,7 @@ Getty::hangup()
+     // NB: this is executed in the parent
+     fxStr device = fxStr::format("%s/" | line, _PATH_DEV);
+     Sys::chown(device, UUCPLock::getUUCPUid(), UUCPLock::getUUCPGid());
+-    Sys::chmod(device, 0600);			// reset protection
++    Sys::chmod(device, 0660);			// reset protection
+ }
  
-     FaxAcctInfo ai;
--    ai.user = "fax";
-+    ai.user = FAX_USER;
-     ai.commid = getCommID();
-     ai.duration = (time_t) ri.time;
-     ai.start = Sys::now() - ai.duration;
+ extern void vlogError(const char* fmt, va_list ap);
diff --git a/comms/hylafax/patches/patch-am b/comms/hylafax/patches/patch-am
index ca6162761fd..ea9ecfe93ea 100644
--- a/comms/hylafax/patches/patch-am
+++ b/comms/hylafax/patches/patch-am
@@ -1,31 +1,27 @@
-$NetBSD: patch-am,v 1.4 2001/04/23 15:06:18 abs Exp $
+$NetBSD: patch-am,v 1.5 2003/09/23 21:39:48 abs Exp $
 
---- hfaxd/User.c++.orig	Thu Sep 21 09:38:00 2000
-+++ hfaxd/User.c++
-@@ -218,7 +218,7 @@
-     if (id == uid)				// user currently logged in
- 	return (const char*) the_user;
-     if (id == FAXUID_ANON)			// anonymous user
--	return "fax";
-+	return FAX_USER;
-     if (idcache == NULL)			// load cache from file
- 	fillIDCache();
-     const fxStr* hit = idcache->find(id);	// check cache
-@@ -237,7 +237,7 @@
- {
-     if (name == the_user)
- 	id = uid;
--    else if (strcmp(name, "fax") == 0)
-+    else if (strcmp(name, FAX_USER) == 0)
- 	id = FAXUID_ANON;
-     else {
- 	if (idcache == NULL)
-@@ -324,7 +324,7 @@
-     if (faxuid < FAXUID_MAX)
- 	SetBit(FAXUID_RESV);			// reserved uid
-     else
--	logError("Internal error, \"fax\" UID (%u) too large.", faxuid);
-+	logError("Internal error, \"" FAX_USER "\" UID (%u) too large.", faxuid);
-     SetBit(FAXUID_ANON);			// anonymous uid is reserved
-     while (nextRecord(db, line, sizeof (line))) {
- 	if (line[0] == '!')
+--- faxd/UUCPLock.c++.orig	Thu Sep 21 10:24:54 2000
++++ faxd/UUCPLock.c++
+@@ -37,6 +37,7 @@ extern "C" {
+ }
+ #endif
+ #include <pwd.h>
++#include <grp.h>
+ 
+ /*
+  * UUCP Device Locking Support.
+@@ -146,8 +147,13 @@ UUCPLock::setupIDs()
+ 	if (!pwd)
+ 	    faxApp::fatal("Can not deduce identity of UUCP");
+ 	UUCPuid = pwd->pw_uid;
+-	UUCPgid = pwd->pw_gid;
+ 	endpwent();			// paranoia
++
++	const group *grp = getgrnam(FAX_GROUP);
++	if (!grp)
++	    faxApp::fatal("Can not deduce group identity of '" FAX_GROUP "'");
++	UUCPgid = grp->gr_gid;
++	endgrent();			// paranoia
+     }
+ }
+ uid_t UUCPLock::getUUCPUid() { setupIDs(); return UUCPuid; }
diff --git a/comms/hylafax/patches/patch-an b/comms/hylafax/patches/patch-an
index 4629efea04f..3b7cedd569f 100644
--- a/comms/hylafax/patches/patch-an
+++ b/comms/hylafax/patches/patch-an
@@ -1,35 +1,13 @@
-$NetBSD: patch-an,v 1.5 2001/07/08 13:32:15 bad Exp $
+$NetBSD: patch-an,v 1.6 2003/09/23 21:39:48 abs Exp $
 
---- util/Makefile.in.orig	Wed May 30 04:04:39 2001
-+++ util/Makefile.in	Sun Jul  8 01:12:54 2001
-@@ -154,7 +154,7 @@
- PUTCLIENT	= ${INSTALL} -idb ${PRODUCT}.sw.client
- PUTSERVER	= ${INSTALL} -idb ${PRODUCT}.sw.server
- PUTSERV		= ${PUTSERVER} -m 755
--PUTSUPD		= ${PUTSERVER} -F ${SPOOL}/bin -idb "config(update)"
-+PUTSUPD		= ${PUTSERVER} -F ${LIBEXEC}/hylafax -idb "config(update)"
- PUTSBIN		= ${PUTSERVER} -F ${SBIN}
+--- faxd/faxGettyApp.c++.orig	Sun Feb  9 02:03:13 2003
++++ faxd/faxGettyApp.c++
+@@ -694,7 +694,7 @@ faxGettyApp::notifyDocumentRecvd(const F
+     FaxServer::notifyDocumentRecvd(ri);
  
- installClient: default
-@@ -171,6 +171,7 @@
- 	${PUTSBIN} -m 755 -src xferfaxstats.sh -O xferfaxstats
- 	${PUTSBIN} -m 755 -src recvstats.sh -O recvstats
- 	${PUTSBIN} -m 755 -idb "config(update)" -src faxcron.sh -O faxcron
-+	-${MKDIR} -m 755 ${LIBEXEC}/hylafax
- 	${PUTSUPD} -m 755 -src ps2fax.gs.sh -O ps2fax.gs
- 	${PUTSUPD} -m 755 -src ps2fax.dps.sh -O ps2fax.dps
- 	${PUTSUPD} -m 755 -src ps2fax.imp.sh -O ps2fax.imp
-@@ -183,9 +184,11 @@
- 	${PUTSUPD} -m 755 -src pollrcvd.sh -O pollrcvd
- 	${PUTSUPD} -m 755 -src mkcover.sh -O mkcover
- 	${PUTSUPD} -m 755 -src wedged.sh -O wedged
--	${PUTSERVER} -F ${SPOOL}/etc -m 444 -idb "config(update)" \
-+	-${MKDIR} -m 755 ${PREFIX}/share/hylafax
-+	-${MKDIR} -m 755 ${PREFIX}/share/hylafax/etc_template
-+	${PUTSERVER} -F ${PREFIX}/share/hylafax/etc_template -m 444 -idb "config(update)" \
- 	    -src ${SRCDIR}/dpsprinter.ps -O dpsprinter.ps
--	${PUTSERVER} -F ${SPOOL}/etc -idb "config(suggest)" \
-+	${PUTSERVER} -F ${PREFIX}/share/hylafax/etc_template -idb "config(suggest)" \
- 	    -m 444 -src ${SRCDIR}/cover.templ -O cover.templ
- 
- @MAKEDSOINCLUDE@ @MAKELQUOTE@${SRCDIR}/Makefile.@DSO@dso@MAKERQUOTE@
+     FaxAcctInfo ai;
+-    ai.user = "fax";
++    ai.user = FAX_USER;
+     ai.commid = getCommID();
+     ai.duration = (time_t) ri.time;
+     ai.start = Sys::now() - ai.duration;
diff --git a/comms/hylafax/patches/patch-ao b/comms/hylafax/patches/patch-ao
new file mode 100644
index 00000000000..0d502629bd4
--- /dev/null
+++ b/comms/hylafax/patches/patch-ao
@@ -0,0 +1,31 @@
+$NetBSD: patch-ao,v 1.6 2003/09/23 21:39:48 abs Exp $
+
+--- hfaxd/User.c++.orig	Sat Feb  8 22:49:53 2003
++++ hfaxd/User.c++
+@@ -218,7 +218,7 @@ HylaFAXServer::userName(u_int id)
+     if (id == uid)				// user currently logged in
+ 	return (const char*) the_user;
+     if (id == FAXUID_ANON)			// anonymous user
+-	return "fax";
++	return FAX_USER;
+     if (idcache == NULL)			// load cache from file
+ 	fillIDCache();
+     const fxStr* hit = idcache->find(id);	// check cache
+@@ -237,7 +237,7 @@ HylaFAXServer::userID(const char* name, 
+ {
+     if (name == the_user)
+ 	id = uid;
+-    else if (strcmp(name, "fax") == 0)
++    else if (strcmp(name, FAX_USER) == 0)
+ 	id = FAXUID_ANON;
+     else {
+ 	if (idcache == NULL)
+@@ -324,7 +324,7 @@ HylaFAXServer::findUser(FILE* db, const 
+     if (faxuid < FAXUID_MAX)
+ 	SetBit(FAXUID_RESV);			// reserved uid
+     else
+-	logError("Internal error, \"fax\" UID (%u) too large.", faxuid);
++	logError("Internal error, \"" FAX_USER "\" UID (%u) too large.", faxuid);
+     SetBit(FAXUID_ANON);			// anonymous uid is reserved
+     while (nextRecord(db, line, sizeof (line))) {
+ 	if (line[0] == '!')
diff --git a/comms/hylafax/patches/patch-ap b/comms/hylafax/patches/patch-ap
new file mode 100644
index 00000000000..f01ccc724f8
--- /dev/null
+++ b/comms/hylafax/patches/patch-ap
@@ -0,0 +1,35 @@
+$NetBSD: patch-ap,v 1.7 2003/09/23 21:39:48 abs Exp $
+
+--- util/Makefile.in.orig	Tue Oct  1 15:13:43 2002
++++ util/Makefile.in
+@@ -155,7 +155,7 @@ checkat: checkat.o ${LIBS}
+ PUTCLIENT	= ${INSTALL} -idb ${PRODUCT}.sw.client
+ PUTSERVER	= ${INSTALL} -idb ${PRODUCT}.sw.server
+ PUTSERV		= ${PUTSERVER} -m 755
+-PUTSUPD		= ${PUTSERVER} -F ${SPOOL}/bin -idb "config(update)"
++PUTSUPD		= ${PUTSERVER} -F ${LIBEXEC}/hylafax -idb "config(update)"
+ PUTSBIN		= ${PUTSERVER} -F ${SBIN}
+ 
+ installClient: default
+@@ -172,6 +172,7 @@ install: installClient
+ 	${PUTSBIN} -m 755 -src xferfaxstats.sh -O xferfaxstats
+ 	${PUTSBIN} -m 755 -src recvstats.sh -O recvstats
+ 	${PUTSBIN} -m 755 -idb "config(update)" -src faxcron.sh -O faxcron
++	-${MKDIR} -m 755 ${LIBEXEC}/hylafax
+ 	${PUTSUPD} -m 755 -src ps2fax.gs.sh -O ps2fax.gs
+ 	${PUTSUPD} -m 755 -src ps2fax.dps.sh -O ps2fax.dps
+ 	${PUTSUPD} -m 755 -src ps2fax.imp.sh -O ps2fax.imp
+@@ -185,9 +186,11 @@ install: installClient
+ 	${PUTSUPD} -m 755 -src pollrcvd.sh -O pollrcvd
+ 	${PUTSUPD} -m 755 -src mkcover.sh -O mkcover
+ 	${PUTSUPD} -m 755 -src wedged.sh -O wedged
+-	${PUTSERVER} -F ${SPOOL}/etc -m 444 -idb "config(update)" \
++	-${MKDIR} -m 755 ${PREFIX}/share/hylafax
++	-${MKDIR} -m 755 ${PREFIX}/share/hylafax/etc_template
++	${PUTSERVER} -F ${PREFIX}/share/hylafax/etc_template -m 444 -idb "config(update)" \
+ 	    -src ${SRCDIR}/dpsprinter.ps -O dpsprinter.ps
+-	${PUTSERVER} -F ${SPOOL}/etc -idb "config(suggest)" \
++	${PUTSERVER} -F ${PREFIX}/share/hylafax/etc_template -idb "config(suggest)" \
+ 	    -m 444 -src ${SRCDIR}/cover.templ -O cover.templ
+ 
+ @MAKEDSOINCLUDE@ @MAKELQUOTE@${SRCDIR}/Makefile.@DSO@dso@MAKERQUOTE@
diff --git a/comms/hylafax/patches/patch-aq b/comms/hylafax/patches/patch-aq
index b68b112534f..b36e327cb7d 100644
--- a/comms/hylafax/patches/patch-aq
+++ b/comms/hylafax/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.4 2001/04/23 15:06:20 abs Exp $
+$NetBSD: patch-aq,v 1.5 2003/09/23 21:39:48 abs Exp $
 
---- util/faxcron.sh.in.orig	Mon Sep  4 04:18:27 2000
+--- util/faxcron.sh.in.orig	Thu Apr 11 18:55:30 2002
 +++ util/faxcron.sh.in
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ AGEINFO=30			# purge remote info after 3
  AGELOG=30			# keep log info for last 30 days
  AGERCV=7			# purge received facsimile after 7 days
  AGETMP=1			# purge orphaned temp files after 1 day