Changes 4.2.1:

* fix CAN-2004-1182: hfaxd client/server authentication
  vulnerability (10 Jan 2005)
* fix possible filename race in tiff2pdf (10 Jan 2005)
* improve modern distinctive ring support, add
  NoAnswerVoice config feature, and enhance third-party
  getty interaction (1, 2 Jan 2005)
* add support for etc/resetmodem (30 Dec 2004)
* fix NOTIFY_FAXMASTER within notify (30 Dec 2004)
* improve tiff2pdf and use it more (29 Dec 2004)
* fix 300 dpi support for some receivers (28 Dec 2004)
* cause faxsetup to double-check and fix attachment encoding
  setup (27 Dec 2004)
* add uuencode support in pollrcvd (27 Dec 2004)
* add support for base64-encode (27 Dec 2004)
* check strftime with arguments, gcc-3.3 fix (23 Dec 2004)
* initialize some variables in some scripts that may not
  be initialzed in setup.cache (23, 27 Dec 2004)
* remove need to have separate "fax" user (22 Dec 2004)
* fix parsing of AT+FCLASS=? response within faxaddmodem
  and probemodem (21 Dec 2004)
* improve multi-line handling within notify (20 Dec 2004)
* improve trap handling in faxaddmodem/probemodem (17 Dec 2004)
* fix hfaxd from rejecting jobs scheduled for the past while
  the killtime is still in the future (15 Dec 2004)
* drop ftp links from received notification e-mail (8 Dec 2004)
* fix dial-and-answer feature (2 Dec 2004)
* add NSF recognition for MFC-3100C (29 Nov 2004)
* fix Class 1 support for services "0,1.0" (26 Nov 2004)
* limit hfaxd jobs cache size (23 Nov 2004)
* fix hfaxd ABOR command and trigger (23 Nov 2004)
* fix error when hfaxd FIFO fills (23 Nov 2004)
* document -age option for recvstats/xferfaxstats (23 Nov 2004)
* add coversheet information into the q-file (23 Nov 2004)
* fix documentation regarding DesiredEC (23 Nov 2004)
* change minsp to minbr for consistency (23 Nov, 2 Dec 2004)
* fix hfaxd problem with file descriptors (23 Nov 2004)
* fix hfaxd from dying on ECONNABORTED (23 Nov 2004)
* add -fpic to DSO build for non-x86 Linux (23 Nov 2004)
* add CALL records to xferfaxlog and LogCalls config (16 Nov 2004)
* fix/implement desireddf in faxsend and faxq (29 Oct 2004)
* fix the filetype output for JPARM DOCUMENTS (14 Oct 2004)
* add SHIELDED_DTMF option for CIDNumber (7 Oct 2004)
* add Class1Resolutions, deprecate Class1ExtendedRes (20 Sep 2004)
* fix a bug in notify when the job is killed (15 Sep 2004)
* initialize supplementary groups when switching
  uid (13 Sep, 8 Dec 2004)
* fix faxsend to retrain after receiving RTP (9 Sep 2004)
* fix tiffcheck unit comparison error (1 Sep 2004)
* fix misconfirmation of some ECM faxes (30 Aug 2004)
* add fax batching support to faxq (30 Aug, 9 Sep 2004)
* ignore garbage after sending TCF data (26 Aug 2004)
* fix truncation of filenames in faxcron (26 Aug 2004)
* add configure support for libtiff 3.7 (25 Aug 2004)
* extend short send-HDLC timeouts (18 Aug 2004)
* add a pause after receiving MCF on non-ECM send sessions (18 Aug 2004)
* fix broken fax polling (17 Aug 2004)
* add several timing enhancements for stressed
  servers (16 Aug, 10, 15 Sep, 14 Oct 2004)

17 files changed, 113 insertions, 142 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index d60acec9838..51df185b957 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2004/12/28 23:18:20 reed Exp $
-#
+# $NetBSD: Makefile,v 1.42 2005/01/27 16:22:37 adam Exp $
 
-DISTNAME=	hylafax-4.1.8
-PKGREVISION=	6
+DISTNAME=	hylafax-4.2.1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/ \
 		ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/
@@ -17,21 +15,22 @@ DIST_SUBDIR=	hylafax
 
 CONFLICTS=	mgetty-[0-9]*
 
-USE_PKGINSTALL=	yes
-USE_BUILDLINK3=	yes
-USE_LANGUAGES=	c c++
+USE_PKGINSTALL=		yes
+USE_BUILDLINK3=		yes
+USE_LANGUAGES=		c c++
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-MAKE=${MAKE_PROGRAM}
+CONFIGURE_ARGS+=	--with-INSTALL="" --nointeractive
+CONFIGURE_ARGS+=	--with-ZLIBINC=-I${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=	--with-LIBZ="-L${BUILDLINK_PREFIX.zlib}/lib -lz"
+CONFIGURE_ENV+=		PREFIX="${PREFIX}" OPTIMIZER="${CFLAGS}"
+CONFIGURE_ENV+=		FAXUID="${FAXUSER}" FAXGID="${FAXGROUP}"
+MANCOMPRESSED=		yes
 
 FAXUSER?=	uucp
 FAXGROUP?=	dialer
 RCD_SCRIPTS=	hylafax
 
-HAS_CONFIGURE=	YES
-CONFIGURE_ENV=	PREFIX="${PREFIX}" FAXUID="${FAXUSER}" FAXGID="${FAXGROUP}"
-CONFIGURE_ARGS=	--with-MAKE=${MAKE_PROGRAM} --with-INSTALL="" --nointeractive
-CONFIGURE_ARGS+=	--with-ZLIBINC=-I${BUILDLINK_PREFIX.zlib}/include
-CONFIGURE_ARGS+=	--with-LIBZ="-L${BUILDLINK_PREFIX.zlib}/lib -lz"
-MANCOMPRESSED=	yes
-
 SUID_EXES=	${PREFIX}/libexec/faxgetty ${PREFIX}/sbin/faxq \
 		${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
 
@@ -42,5 +41,6 @@ post-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/hylafax/PLIST b/comms/hylafax/PLIST
index 7fcdf463546..eb1723ae4f2 100644
--- a/comms/hylafax/PLIST
+++ b/comms/hylafax/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/05/22 11:59:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/01/27 16:22:37 adam Exp $
 bin/faxalter
 bin/faxcover
 bin/faxmail
@@ -19,7 +19,7 @@ libexec/hylafax/archive
 libexec/hylafax/faxrcvd
 libexec/hylafax/mkcover
 libexec/hylafax/notify
-libexec/hylafax/notify.awk
+libexec/hylafax/notify-4.1
 libexec/hylafax/pcl2fax
 libexec/hylafax/pdf2fax.gs
 libexec/hylafax/pollrcvd
@@ -27,6 +27,7 @@ libexec/hylafax/ps2fax.dps
 libexec/hylafax/ps2fax.gs
 libexec/hylafax/ps2fax.imp
 libexec/hylafax/tiff2fax
+libexec/hylafax/tiff2pdf
 libexec/hylafax/wedged
 libexec/lockname
 libexec/ondelay
@@ -130,6 +131,8 @@ sbin/tsitest
 sbin/typetest
 sbin/xferfaxstats
 share/doc/hylafax/COPYRIGHT
+share/hylafax/config_template/agere-mp-2
+share/hylafax/config_template/agere-mp-21
 share/hylafax/config_template/att-dataport
 share/hylafax/config_template/att-dataport-2
 share/hylafax/config_template/att-dataport-2.0
@@ -157,6 +160,7 @@ share/hylafax/config_template/hayes
 share/hylafax/config_template/intel-400e
 share/hylafax/config_template/lucent
 share/hylafax/config_template/lucent-isa
+share/hylafax/config_template/lucent-mt-10
 share/hylafax/config_template/lucent-mt-2
 share/hylafax/config_template/lucent-mt-20
 share/hylafax/config_template/lucent-mt-21
@@ -176,6 +180,7 @@ share/hylafax/config_template/rockwell-k56
 share/hylafax/config_template/rockwell-rc
 share/hylafax/config_template/sierra
 share/hylafax/config_template/skel
+share/hylafax/config_template/t38modem
 share/hylafax/config_template/telebit-qblazer
 share/hylafax/config_template/telebit-t3000
 share/hylafax/config_template/telebit-wb
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo
index d84d6992d62..6cfdb515edd 100644
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@@ -1,23 +1,22 @@
-$NetBSD: distinfo,v 1.12 2005/01/03 22:58:14 markd Exp $
+$NetBSD: distinfo,v 1.13 2005/01/27 16:22:37 adam Exp $
 
-SHA1 (hylafax/hylafax-4.1.8.tar.gz) = e720bc964ecad84146f4ea2cdcdc374af66e2ce5
-Size (hylafax/hylafax-4.1.8.tar.gz) = 1285536 bytes
+SHA1 (hylafax/hylafax-4.2.1.tar.gz) = 7686daa4db84a90695cff6eba2f873ef59659e0e
+Size (hylafax/hylafax-4.2.1.tar.gz) = 1412035 bytes
 SHA1 (patch-aa) = 94de7c7fb55c9c95c6a774fb732e2d47ec818152
 SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d
-SHA1 (patch-ac) = 3f7173b784df070b6103d808287e5fb21ebe1d16
+SHA1 (patch-ac) = 6f89cc0c9e7a0e789c23b0dfc604376e457091b7
 SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72
-SHA1 (patch-ae) = 423246af7c2473309c6080cb04c1080e01d20704
-SHA1 (patch-af) = efa0af45eaa8eeee354bdecfe7e9ea8db2b0ffcb
+SHA1 (patch-ae) = 5ecc3759186a1b8612aaece698a65135b03f5329
+SHA1 (patch-af) = 5c2429d08f2f4c6f5af19dd4775277434abc7ac4
 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-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) = 248947a7fcca4cb1d7417b71990a731324408fb8
-SHA1 (patch-ao) = 2ff605159f2d95b8e5e4eee30c85c5b48ade66fd
-SHA1 (patch-ap) = 66dba8fb2252e2feb032dedc04df4f705411a813
-SHA1 (patch-aq) = 53501db9369da6410faeaa11e8c4e910019f1d11
-SHA1 (patch-ar) = 7ecc2115f2ee87f2088c3c9d754a226a8cced5c9
-SHA1 (patch-as) = 9f712eb83a2629c130735c2b2c50f34dc58759b1
+SHA1 (patch-an) = 535f9454e473d7bb26a256aec3158cffdb3d0399
+SHA1 (patch-ao) = 73da088c0dbc13a0dcb8d6abaa36804f34638c51
+SHA1 (patch-ap) = f9d6a2796535e7200419d6e24203b9995e5cfb39
+SHA1 (patch-ar) = d5f331cf4be711c33073a348304eb053d41ab0b3
+SHA1 (patch-as) = 57c85bfd08738efdb91ec63f5d5e5c36c79fd3a3
diff --git a/comms/hylafax/patches/patch-ac b/comms/hylafax/patches/patch-ac
index b22a89ef03f..16c75ca9e75 100644
--- a/comms/hylafax/patches/patch-ac
+++ b/comms/hylafax/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2003/09/23 21:39:47 abs Exp $
+$NetBSD: patch-ac,v 1.7 2005/01/27 16:22:37 adam Exp $
 
---- config/Makefile.in.orig	Tue Aug 27 23:56:42 2002
+--- config/Makefile.in.orig	2004-05-22 02:12:35.000000000 +0000
 +++ config/Makefile.in
-@@ -116,6 +116,7 @@ targets: ${TARGETS}
+@@ -120,6 +120,7 @@ targets: ${TARGETS}
  PUTSERVER=${INSTALL} -idb ${PRODUCT}.sw.server
  
  install: default ${CONFIGFILES}
diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae
index b84e314f02f..b1fc32b4be0 100644
--- a/comms/hylafax/patches/patch-ae
+++ b/comms/hylafax/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
+$NetBSD: patch-ae,v 1.10 2005/01/27 16:22:37 adam Exp $
 
---- configure.orig	2003-05-23 15:28:51.000000000 +1200
+--- configure.orig	2004-12-28 04:45:03.000000000 +0000
 +++ configure
 @@ -37,23 +37,23 @@
  #
@@ -35,10 +35,11 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
  SYSGID=
  DSO=auto
  GETTY=auto
-@@ -73,8 +73,8 @@ GS=no
+@@ -72,9 +72,8 @@ DPS=no
+ GS=no
  IMP=no
  UTMP=auto
- OPTIMIZER="-O"
+-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 +47,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
  TIFFBIN=
  LIBZ=
  ZLIBINC=
-@@ -82,8 +82,8 @@ REGEX=yes
+@@ -82,8 +81,8 @@ REGEX=yes
  LIBREGEX='-L${DEPTH}/regex -lregex'
  REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
  DBLIB=no
@@ -57,7 +58,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
  FAXD=
  LIBFAXSERVER='libfaxserver.${DSO}'
  LIBUTIL='${UTIL}/libfaxutil.${DSO}'
-@@ -218,6 +218,7 @@ PKG_EMAIL
+@@ -222,6 +221,7 @@ PKG_EMAIL
  PKG_VENDOR
  PORT
  PORTFUNCS
@@ -65,7 +66,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
  PROTOTYPES
  PSPACKAGE	PS
  PWDCMD
-@@ -281,7 +282,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd	
+@@ -287,7 +287,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,16 +75,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
  PATH=$PATH:$OPATH
  
  POSIXLY_CORRECT=1; export POSIXLY_CORRECT		# disable GNU extensions
-@@ -2327,7 +2328,7 @@ EOF
- 	if [ ${header_ver} -ge 19960307 ]; then
- 	    if [ "${lib_ver}" = "3.4" ]; then
- 		tiff_runlen_t="uint16"
--	    elif [ "${lib_ver}" = "3.5" -o "${lib_ver}" = "3.6" ]; then
-+	    elif [ "${lib_ver}" = "3.5" -o "${lib_ver}" = "3.6" -o "${lib_ver}" = "3.7" ]; then
- 		tiff_runlen_t="uint32"
- 	    fi
- 	fi
-@@ -3042,13 +3043,7 @@ main()
+@@ -3086,13 +3086,7 @@ main()
          printf("old include files: version %u\n", ZLIB_VERSION);
          exit(-1);
      }
@@ -97,7 +89,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
  }
  EOF
  capture cat t.c
-@@ -3110,7 +3105,7 @@ Note "Checking TIFF support."
+@@ -3154,7 +3148,7 @@ Note "Checking TIFF support."
  # Location of TIFF binaries
  #
  if [ -z "$TIFFBIN" ]; then
@@ -106,7 +98,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
      for i in $DIRS; do
          test -x $i/tiff2ps && { TIFFBIN=$i; break; }
      done
-@@ -3694,7 +3689,7 @@ fi
+@@ -3775,7 +3769,7 @@ fi
  if [ -z "$PATH_VGETTY" ]; then
      PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_VGETTY" ]; then
@@ -115,7 +107,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd 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."
-@@ -3707,7 +3702,7 @@ fi
+@@ -3788,7 +3782,7 @@ fi
  if [ -z "$PATH_EGETTY" ]; then
      PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_EGETTY" ]; then
@@ -124,7 +116,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd 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."
-@@ -3778,6 +3773,7 @@ PickRIP()
+@@ -3859,6 +3853,7 @@ PickRIP()
  {
      if [ -z "$PATH_GSRIP" ]; then
  	GSLOCS="
@@ -132,7 +124,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
  	    /usr/local/bin/gs
  	    /usr/contrib/bin/gs
  	    /usr/gnu/bin/gs
-@@ -3825,7 +3821,7 @@ fax software to operate correctly.  See 
+@@ -3906,7 +3901,7 @@ fax software to operate correctly.  See 
  on building Ghostscript with the necessary TIFF driver.
  
  EOF
@@ -141,7 +133,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
  	PATH_GSRIP=$PATH_PSRIP
      fi
  }
-@@ -3892,9 +3888,9 @@ if [ -z "$PATH_AFM" ]; then
+@@ -3973,9 +3968,9 @@ if [ -z "$PATH_AFM" ]; then
      else
          DIR_AFMS="
  	    /usr/lib/afm
@@ -154,7 +146,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
  	    /usr/share/ghostscript/fonts
  	    /usr/gnu/lib/ghostscript/fonts
  	    /opt/gnu/lib/ghostscript/fonts
-@@ -3914,7 +3910,7 @@ if [ -z "$PATH_AFM" ]; then
+@@ -3995,7 +3990,7 @@ if [ -z "$PATH_AFM" ]; then
  fi
  if [ -z "$PATH_AFM" ]; then
      # put it where ghostscript normally puts things
@@ -163,7 +155,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
      Note "WARNING, could not locate a directory with font metric information,"
      Note "guessing that font metric information goes in $PATH_AFM."
  else
-@@ -3933,6 +3929,7 @@ fi
+@@ -4014,6 +4009,7 @@ fi
  #
  if [ -z "$DIR_MAN" ]; then
      MANPATH="
@@ -171,7 +163,7 @@ $NetBSD: patch-ae,v 1.9 2005/01/03 22:58:14 markd Exp $
  	$MANPATH
  	/usr/local/man
  	/usr/contrib/man
-@@ -3942,7 +3939,7 @@ if [ -z "$DIR_MAN" ]; then
+@@ -4023,7 +4019,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 4c1086f3286..7b137c63c33 100644
--- a/comms/hylafax/patches/patch-af
+++ b/comms/hylafax/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.6 2003/09/23 21:39:48 abs Exp $
+$NetBSD: patch-af,v 1.7 2005/01/27 16:22:37 adam Exp $
 
---- defs.in.orig	Tue Apr 29 04:32:19 2003
+--- defs.in.orig	2004-04-27 20:16:15.000000000 +0000
 +++ defs.in
 @@ -44,6 +44,7 @@ SHELL		= @SCRIPT_SH@
  # to insufficient; you are better off rerunning the
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.6 2003/09/23 21:39:48 abs Exp $
  SPOOL		= @SPOOL@
  SBIN		= @SBIN@
  BIN		= @BIN@
-@@ -260,7 +261,7 @@ LDFLAGS		= ${LDOPTS} ${LDLIBS}
+@@ -261,7 +262,7 @@ LDFLAGS		= ${LDOPTS} ${LDLIBS}
  LDOPTS		= ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
  LDLIBS		= ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
  
diff --git a/comms/hylafax/patches/patch-ah b/comms/hylafax/patches/patch-ah
index 091bfaf5324..e51808cd80b 100644
--- a/comms/hylafax/patches/patch-ah
+++ b/comms/hylafax/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.5 2003/09/23 21:39:48 abs Exp $
+$NetBSD: patch-ah,v 1.6 2005/01/27 16:22:37 adam Exp $
 
---- etc/faxaddmodem.sh.in.orig	Fri May 30 00:30:11 2003
+--- etc/faxaddmodem.sh.in.orig	2004-12-22 13:44:05.000000000 +0000
 +++ etc/faxaddmodem.sh.in
 @@ -46,6 +46,7 @@
  SPOOL=@SPOOL@
@@ -10,12 +10,8 @@ $NetBSD: patch-ah,v 1.5 2003/09/23 21:39:48 abs Exp $
  while [ x"$1" != x"" ] ; do
      case $1 in
      -s)	    SPEED=$2; shift;;
-@@ -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
+@@ -115,7 +116,7 @@ CAT="$CAT -u"			# something to do unbuff
+ FAX=@FAXUID@			# identity of the fax user
  GROUP=/etc/group		# where to go for group entries
  PROTOGID=@FAXGID@		# group who's gid we use for FAX user
 -defPROTOGID=10			# use this gid if PROTOGID doesn't exist
@@ -32,7 +28,7 @@ $NetBSD: patch-ah,v 1.5 2003/09/23 21:39:48 abs Exp $
      *)	onDev $STTY 0; sleep 1	;;		# reset the modem (hopefully)
      esac
  						# start listening for output
-@@ -1129,7 +1130,7 @@ if [ "$RESULT" = "OK" ]; then
+@@ -1152,7 +1153,7 @@ EOF
      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'`.
@@ -41,12 +37,12 @@ $NetBSD: patch-ah,v 1.5 2003/09/23 21:39:48 abs Exp $
      case "$MODEMCLASSES" in
      "")			giveup;;
      "1")		ModemType=Class1; configureClass1Modem;;
-@@ -1140,7 +1141,7 @@ if [ "$RESULT" = "OK" ]; then
+@@ -1163,7 +1164,7 @@ EOF
      *)
  	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]?"
+ 	    prompt "How should it be configured [$DEFAULTCLASS]?";
  	    read x
diff --git a/comms/hylafax/patches/patch-ai b/comms/hylafax/patches/patch-ai
index b179d69dae8..584f47e7188 100644
--- a/comms/hylafax/patches/patch-ai
+++ b/comms/hylafax/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.8 2003/09/23 21:39:48 abs Exp $
+$NetBSD: patch-ai,v 1.9 2005/01/27 16:22:37 adam Exp $
 
---- etc/faxsetup.sh.in.orig	Tue May  6 21:41:17 2003
+--- etc/faxsetup.sh.in.orig	2004-12-28 04:45:04.000000000 +0000
 +++ etc/faxsetup.sh.in
 @@ -41,7 +41,9 @@
  # This script interactively prepares and verifies 
@@ -13,31 +13,23 @@ $NetBSD: patch-ai,v 1.8 2003/09/23 21:39:48 abs 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 @@ FUSER=@FUSER@			# fuser command to dump 
+@@ -60,6 +62,7 @@ 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
 +MKDIR=@MKDIR@			# directory creation program for use below
+ MIMENCODE=@MIMENCODE@		# mimencode command to dump in setup.cache
  MKFIFO=@MKFIFO@			# FIFO creation program for use below
  MV=@MV@				# move file for use below
- RMCMD=@RM@			# remove file for use below
- SCRIPT_SH=@SCRIPT_SH@		# shell for use below
- SED=@SED@			# sed for use below
- 
--FAX=fax				# identity of the fax user
-+FAX=@FAXUID@			# identity of the fax user
- 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 @@ LIBDATA		DIR_LIBDATA
- LIBEXEC		DIR_LIBEXEC
+@@ -149,6 +152,7 @@ LIBEXEC		DIR_LIBEXEC
  LN
  MANDIR		DIR_MAN
+ MIMENCODE
 +MKDIR
  MKFIFO
  MV
  PATH
-@@ -757,6 +761,61 @@ if [ "$euid" != "root" ]; then
+@@ -816,6 +820,61 @@ if [ "$euid" != "root" ]; then
      boom
  fi
  
@@ -99,7 +91,7 @@ $NetBSD: patch-ai,v 1.8 2003/09/23 21:39:48 abs Exp $
  onClient && Note "Checking system for proper client configuration."
  onServer && Note "Checking system for proper server configuration."
  
-@@ -2199,12 +2258,7 @@ if onServer; then
+@@ -2214,12 +2273,7 @@ if onServer; then
  
      findproc()
      {
diff --git a/comms/hylafax/patches/patch-aj b/comms/hylafax/patches/patch-aj
index 13316e828b3..d4333244ff4 100644
--- a/comms/hylafax/patches/patch-aj
+++ b/comms/hylafax/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.5 2003/09/23 21:39:48 abs Exp $
+$NetBSD: patch-aj,v 1.6 2005/01/27 16:22:37 adam Exp $
 
---- faxd/FaxModem.c++.orig	Sun Feb  9 02:22:49 2003
+--- faxd/FaxModem.c++.orig	2004-11-23 18:11:02.000000000 +0000
 +++ faxd/FaxModem.c++
-@@ -823,7 +823,7 @@ u_char* MemoryDecoder::cutExtraRTC()
- }
+@@ -734,7 +734,7 @@ FaxModem::notifyPageSent(TIFF* tif)
+ #include "MemoryDecoder.h"
  
- void
+ int
 -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());
+     u_char* endOfData;
diff --git a/comms/hylafax/patches/patch-ak b/comms/hylafax/patches/patch-ak
index 9402a1c084b..5cda9fd2830 100644
--- a/comms/hylafax/patches/patch-ak
+++ b/comms/hylafax/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.5 2003/09/23 21:39:48 abs Exp $
+$NetBSD: patch-ak,v 1.6 2005/01/27 16:22:37 adam Exp $
 
---- faxd/FaxModem.h.orig	Sat Apr 26 08:11:21 2003
+--- faxd/FaxModem.h.orig	2004-09-20 19:18:07.000000000 +0000
 +++ faxd/FaxModem.h
-@@ -144,7 +144,7 @@ protected:
+@@ -152,7 +152,7 @@ protected:
  /*
-  * Correct if neccessary Phase C (T.4) data (remove extra RTC etc.)
+  * Correct if neccessary Phase C (T.4/T.6) data (remove extra RTC/EOFB etc.)
   */
--    void        correctPhaseCData(u_char* buf, u_long* pBufSize,
-+    void        correctPhaseCData(u_char* buf, uint32* pBufSize,
+-    int		correctPhaseCData(u_char* buf, u_long* pBufSize,
++    int		correctPhaseCData(u_char* buf, uint32* pBufSize,
                                    u_int fillorder, const Class2Params& params);
- public:
-     enum {			// FaxModem::RTNHandling
+ /*
+  * Convert Phase C data...
diff --git a/comms/hylafax/patches/patch-al b/comms/hylafax/patches/patch-al
index bade3701d5e..4f5a76d2507 100644
--- a/comms/hylafax/patches/patch-al
+++ b/comms/hylafax/patches/patch-al
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.5 2003/09/23 21:39:48 abs Exp $
+$NetBSD: patch-al,v 1.6 2005/01/27 16:22:37 adam Exp $
 
---- faxd/Getty.c++.orig	Sat Sep 16 12:13:48 2000
+--- faxd/Getty.c++.orig	2005-01-01 21:27:15.000000000 +0000
 +++ faxd/Getty.c++
-@@ -219,7 +219,7 @@ Getty::hangup()
+@@ -234,7 +234,7 @@ Getty::hangup()
      // NB: this is executed in the parent
-     fxStr device = fxStr::format("%s/" | line, _PATH_DEV);
+     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
diff --git a/comms/hylafax/patches/patch-an b/comms/hylafax/patches/patch-an
index 3b7cedd569f..39a6fb5bebe 100644
--- a/comms/hylafax/patches/patch-an
+++ b/comms/hylafax/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.6 2003/09/23 21:39:48 abs Exp $
+$NetBSD: patch-an,v 1.7 2005/01/27 16:22:37 adam Exp $
 
---- faxd/faxGettyApp.c++.orig	Sun Feb  9 02:03:13 2003
+--- faxd/faxGettyApp.c++.orig	2005-01-01 21:27:16.000000000 +0000
 +++ faxd/faxGettyApp.c++
-@@ -694,7 +694,7 @@ faxGettyApp::notifyDocumentRecvd(const F
+@@ -789,7 +789,7 @@ faxGettyApp::notifyDocumentRecvd(const F
      FaxServer::notifyDocumentRecvd(ri);
  
      FaxAcctInfo ai;
diff --git a/comms/hylafax/patches/patch-ao b/comms/hylafax/patches/patch-ao
index 0d502629bd4..b8d940f56d2 100644
--- a/comms/hylafax/patches/patch-ao
+++ b/comms/hylafax/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.6 2003/09/23 21:39:48 abs Exp $
+$NetBSD: patch-ao,v 1.7 2005/01/27 16:22:37 adam Exp $
 
---- hfaxd/User.c++.orig	Sat Feb  8 22:49:53 2003
+--- hfaxd/User.c++.orig	2005-01-10 04:52:09.000000000 +0000
 +++ hfaxd/User.c++
-@@ -218,7 +218,7 @@ HylaFAXServer::userName(u_int id)
+@@ -244,7 +244,7 @@ HylaFAXServer::userName(u_int id)
      if (id == uid)				// user currently logged in
  	return (const char*) the_user;
      if (id == FAXUID_ANON)			// anonymous user
@@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.6 2003/09/23 21:39:48 abs Exp $
      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, 
+@@ -263,7 +263,7 @@ HylaFAXServer::userID(const char* name, 
  {
      if (name == the_user)
  	id = uid;
@@ -20,7 +20,7 @@ $NetBSD: patch-ao,v 1.6 2003/09/23 21:39:48 abs Exp $
  	id = FAXUID_ANON;
      else {
  	if (idcache == NULL)
-@@ -324,7 +324,7 @@ HylaFAXServer::findUser(FILE* db, const 
+@@ -350,7 +350,7 @@ HylaFAXServer::findUser(FILE* db, const 
      if (faxuid < FAXUID_MAX)
  	SetBit(FAXUID_RESV);			// reserved uid
      else
diff --git a/comms/hylafax/patches/patch-ap b/comms/hylafax/patches/patch-ap
index f01ccc724f8..382c963f25f 100644
--- a/comms/hylafax/patches/patch-ap
+++ b/comms/hylafax/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.7 2003/09/23 21:39:48 abs Exp $
+$NetBSD: patch-ap,v 1.8 2005/01/27 16:22:37 adam Exp $
 
---- util/Makefile.in.orig	Tue Oct  1 15:13:43 2002
+--- util/Makefile.in.orig	2004-08-16 12:58:22.000000000 +0000
 +++ util/Makefile.in
-@@ -155,7 +155,7 @@ checkat: checkat.o ${LIBS}
+@@ -156,7 +156,7 @@ checkat: checkat.o ${LIBS}
  PUTCLIENT	= ${INSTALL} -idb ${PRODUCT}.sw.client
  PUTSERVER	= ${INSTALL} -idb ${PRODUCT}.sw.server
  PUTSERV		= ${PUTSERVER} -m 755
@@ -11,7 +11,7 @@ $NetBSD: patch-ap,v 1.7 2003/09/23 21:39:48 abs Exp $
  PUTSBIN		= ${PUTSERVER} -F ${SBIN}
  
  installClient: default
-@@ -172,6 +172,7 @@ install: installClient
+@@ -173,6 +173,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
@@ -19,7 +19,7 @@ $NetBSD: patch-ap,v 1.7 2003/09/23 21:39:48 abs Exp $
  	${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
+@@ -187,9 +188,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
diff --git a/comms/hylafax/patches/patch-aq b/comms/hylafax/patches/patch-aq
deleted file mode 100644
index b36e327cb7d..00000000000
--- a/comms/hylafax/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.5 2003/09/23 21:39:48 abs Exp $
-
---- util/faxcron.sh.in.orig	Thu Apr 11 18:55:30 2002
-+++ util/faxcron.sh.in
-@@ -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
--FAXUSER=fax			# owner of log files
-+FAXUSER=@FAXUID@		# owner of log files
- LOGMODE=0644			# mode for log files
- XFERLOG=etc/xferfaxlog		# HylaFAX xferfaxlog file location
- LAST=etc/lastrun		# file where time+date of last run recorded
diff --git a/comms/hylafax/patches/patch-ar b/comms/hylafax/patches/patch-ar
index 76cfe5021e6..58481c81356 100644
--- a/comms/hylafax/patches/patch-ar
+++ b/comms/hylafax/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.7 2004/05/22 11:58:42 wiz Exp $
+$NetBSD: patch-ar,v 1.8 2005/01/27 16:22:37 adam Exp $
 
---- faxd/Class1Send.c++.orig	2003-02-08 23:58:09.000000000 +0100
+--- faxd/Class1Send.c++.orig	2004-12-29 02:16:46.000000000 +0000
 +++ faxd/Class1Send.c++
-@@ -797,7 +797,7 @@ Class1Modem::sendPage(TIFF* tif, const C
+@@ -1673,7 +1673,7 @@ Class1Modem::sendPage(TIFF* tif, Class2P
  	uint32* stripbytecount;
  	(void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &stripbytecount);
  	tstrip_t strip;
diff --git a/comms/hylafax/patches/patch-as b/comms/hylafax/patches/patch-as
index a7b5cae6d5f..b1a2e00bb7c 100644
--- a/comms/hylafax/patches/patch-as
+++ b/comms/hylafax/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.5 2004/05/22 11:58:42 wiz Exp $
+$NetBSD: patch-as,v 1.6 2005/01/27 16:22:37 adam Exp $
 
---- faxd/Class2Send.c++.orig	2003-04-19 18:23:51.000000000 +0200
+--- faxd/Class2Send.c++.orig	2004-11-23 18:11:02.000000000 +0000
 +++ faxd/Class2Send.c++
-@@ -394,7 +394,7 @@ Class2Modem::sendPageData(TIFF* tif, u_i
+@@ -450,7 +450,7 @@ Class2Modem::sendPageData(TIFF* tif, u_i
  	uint32* stripbytecount;
  	(void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &stripbytecount);
  	tstrip_t strip;