Update hylafax to 4.1b3, including the recent hfaxd fmt vulnerability fix.

Changelog for 1.4beta3:

* creation of doneq manpage (20Feb2001)
* changed link order in defs.in to fix SCO 3.2v4.2 (11Feb2001)
* standardize default TagLine behavior (05Feb2001)
* add prototype support for more Cirrus modems (05Feb2001)
* added faxstat %Y and %Z JobFmt options (04Dec2000)
* man/sendfax corrections (26Nov2000, 04Dec2000, 05Feb20001)
* replace \(tm and dagger characters in manpages (26Nov2000, 04Dec2000)
* correct recvstats and xferfaxstats from skipping 1st day of month (26Nov2000)
* added prototype support to usr-rts and usr-xon configs (15Nov2000, 05Feb2001)
* added prototype support to config/usr-2.0 (15Nov2000)
* added prototype support to config/rc288dpi (15Nov2000)
* replace SysV SIGCLD define with posix SIGCHLD define (15Nov2000)
* fix faxsetup typo causing a bash error (30Oct2000)
* some typos in the tarball. Corrected Hylafax -> HylaFAX (29Oct2000)
* rework of README, COPYRIGHT, and CONTRIBUTORS files (29Oct2000, 04Dec2000)
* man/config corrections (29Oct2000, 26Nov2000)
* awk fix for Solaris (28Oct2000)
* created a non-interactive configure option (21Oct2000)
* various html documentation updates (15Oct2000)
* significant SysV init-script upgrade (15Oct2000, 31Oct2000)
* remove useless and problematic verifyModemRate from faxaddmodem (24Sep2000)
* fix faxsetup/faxaddmodem fuser errors (24Sep2000, 30Oct2000)
* replace MANSEDLOCAL from configure and manpage numbering fixes
  (23Sep2000, 13Nov2000, 06Feb2001)
* clean up code to create FDIS strings and temp filename creation in
  SendFaxClient (21Sep2000)
* sprintf type cleanups to faxd files (21Sep2000)
* fix fxAssert that was around the wrong way in Str.c++ (21Sep2000)
* replace sprintf with snprintf in faxadduser, faxdeluser and faxmsg
  (20Sep2000)
* trap some other potential overflows in faxmsg (20-21Sep2000)
* enhance the durability of the fxStr classes format() and vformat() methods
  using the [v]snprintf functions (20Sep2000)
* replace sprintf() call in faxalter.c++ with fxStr::format() (20Sep2000)
* add snprintf and vsnprintf to port functions (20Sep2000, 15Nov2000)
* fix format functions(ie sprintf) so that they are not called twice
  on the same string (20Sep2000)
* fix typo fxStr::format() to fxStr::vformat() in ModemServer.c++ (19Sep2000)
* ensure the va_list in ModemServer.c++ is not reused (16Sep2000)
* fix isolating snprintf calls to fxStr class (16Sep2000)
* cleaned up some potential buffer overflows (16Sep2000)
* fix faxsetup for Linux users (14Sep2000)
* fix faxsetup crashes due to useradd not supporting -o option (13Sep2000,
  19Sep2000)
* Class 1 fixes: (08Sep2000)
    - fix minimum scan line time
    - fix first and last scan lines
    - fix some EOP/MPS errors
    - ModemRecvFillOrder default value is now autodetected
    - Class 2.0 for USR modems is now disabled by default if no ModemType
    - ModemFlowControl default value is now XONXOFF instead of NONE
    - correct ModemMfrQueryCmd and ModemModelQueryCmd default values
* fix ugly bash-2 script output in faxaddmodem (05Sep2000)
* shift the left margin in 0.4 inches when invoking textfmt (04Sep2000)
* fix 2 instances of find statement so that it doesn't select directories
  (04Sep2000)
* add -dFIXEDMEDIA in ps2fax.gs to cope with broken Windows Postscript
  (04Sep2000)
* add letter size paper handling to ps2gax.gs script (04Sep2000)
* fix pagesize handling in faxmail (04Sep2000)
* zlib removed from HylaFAX distribution (03Sep2000, 16Sep2000)
* Class 2 fix post-page response (AT+FET) (02Sep2000)
* fix problem on some Solaris systems using gcc (31Aug2000)
* fix a missing format specifier in the FaxRecv.c++ traceServer() call
  (29Aug2000)
* portably fix faxaddmodem to not cause grep to complain about directories
  (29Aug2000)
* Class 2 RTN algorithm changed. RTNHandlingMethod parameter added (26Aug2000)
* checks added to prevent possible crash when the DTE returns a broken NSF
  frame (25Aug2000)
* typerules support for PDF (23Aug2000)
* fix vendorIdSize const definition to be outside the class itself
  (14-15Aug2000)
* use @SCRIPT_SH@ instead of /bin/sh in recvstats, faxcron, and xferfaxstats
  (21Jul2000)
* correct awk substr to be explicitly origin-1 in faxcron (21Jul2000)
* fix variable assignment in faxsetup else loop (21Jul2000)
* fix unbounded access to fxStr nsf in NSF.c++ (29Jun2000)
* rename rockwell config file to rockwell-rc (23Jun2000)
* defensive shell programming action (18Jun2000)
* BSD and other portability fixes (18Jun2000)
* security fixes (18Jun2000, 23Jun2000)
* Class 2 fix to distinguish between RTN and PIN (07Jun2000)
* Dmitry's class1-general patch: (07Jun2000)
    - Decoding T.30 DIS Frame
    - HDLC Timeout
    - Numberof training attempts
    - Correct delay on soft-resets
* beautify SysV init script output (05Jun2000)
* new config file for the AT&T DataPort Express in Class 2 (03Jun2000)
* silence pointless stty errors when running faxaddmodem on Linux (03Jun2000)
* SCO 5 workaround for ioctl (03Jun2000)
* add '-type f' to find invocation in faxcron (01Jun2000)
* added ModemSoftResetCmd to the start of default reset string (29May2000)
* rework of configure libtiff test; supports detecting 3.4 and 3.5
  (28May2000, 29May2000, 03Jun2000, 06Jun2000, 08Jun2000, 13Aug2000)
* allow HylaFAX to print national characters in the tagline (29Mar2000)
* clean up lingering docq files on multi-destination faxes (23Mar2000)
* fix problem with NSF.c++ decode() routine (18May2000)
* recognition of common NSF strings from fax vendors (15May2000)
* remove unused 'modemresetcmd' from ModemConfig.c++ (11May2000)
* libtiff-3.5 compatibility fix!!! (11May2000)
* fix O_EXCL handling when opening sequence file (31Mar2000)
* fix Y2K rollover bug (29Mar2000)
* fix erronious xferfaxstats/recvstats output (29Mar2000)
* correction so faxcron returns traces of suspicious failures (29Mar2000)
* automatically call BreakIntoCommentX in faxcover to create commentX vars
  (10Mar2000, 17Mar2000)
* reorder header files in SuperServer.c++ (10Mar2000)
* Y2K fix to SNPPClient.c++ (08Mar2000)
* fix to faxQueueApp.c++ crackArgv function to correctly handle end of
  string (08Mar2000)
* added snprintf protoype checking to configure (05Mar2000, 10Mar2000)
* ensure that fd_set is properly defined in the Dispatcher header file
  (05Mar2000)
* fixed mkstemp wrapper function in util/Sys.h (05Mar2000)
* added missing 'char*' declaration to cp variable in faxcover (03Mar2000)
* added new config file for Performance modems (29Feb2000)
* create new config file: rockwell-k56 (04Dec1999, 29Feb2000, 22Jun2000)
* updated info about the mailing list archives and added info about the links
  and resources page to the supporting documentation section (03Dec1999)
* made mavigation links consistent in html (03Dec1999)
* in html recommend 1.16b firmware to reduce T.30 T2 timeout errors for
  Multitech (03Dec1999)
* created icon used for navigation in modem pages (21Nov1999)
* html updated for new modem pages and contents.gif icon (21Nov1999)
* security fixes (17-18Nov1999)
    - cleaned up whitespace in MIMEState.c++
    - added a glibc check after mkstemp() in faxmail
    - fixed another potential overflow in imgtofax.c
* security fix for faxcover (17Nov1999)
* zlib configure fixes (17Nov1999, 03Mar2000)
* fix faxalter security vulnerability (11Nov1999)
* fix the BoundingBox parameter in TextFmt.c++ (10Sep1999)
* incorporated the version number into the config.h file (02Sep1999)
* prefer sigaction() over sigvec() for signal handling functions (01Sep1999)
* Unixware portability fixes (01Sep1999)
* support work for HP-UX 11 (23Aug1999, 02Sep1999, 06Sep2000)
* support gcc-2.95 (23Aug1999, 27Aug1999, 30May2000)
* broke hylafax manpage into hylafax-server and hylafax-client (18Aug1999,
  15Oct2000)
* add Ultrix Guidance in html (18Aug1999)
* created manpages for faxadduser and faxdeluser (11Aug1999)
* continued fixes due to renaming etc/hosts to etc/hosts.hfaxd (05Aug1999,
  15Oct2000)
* added faxadduser and faxdeluser utilities (05Aug1999, 11Aug1999)
* fixes in the package directory (05Aug1999)
* standardize defines included in Makefile headers among the subdirectories
  (05Aug1999)
* removed section numbers from manpages in html (02-03Aug1999)
* html modems list updated (26Jul1999)
* fix bool in configure (26Jul1999)
* configure script updates (26Jul1999)
* added support for Elsa Microlink modem (15Jul1999)
* various information updates for change to hylafax.org (15Jul1999)
* change ModemClass parameter to ModemGroup (10Jul1999)
* created a BreakIntoCommentX faxcover function (30Jun1999, 10Jul1999)

18 files changed, 76 insertions, 87 deletions

diff --git a/comms/hylafax/patches/patch-aa b/comms/hylafax/patches/patch-aa
index cb704f26396..eecf2b76094 100644
--- a/comms/hylafax/patches/patch-aa
+++ b/comms/hylafax/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2000/08/30 09:50:45 abs Exp $
+$NetBSD: patch-aa,v 1.7 2001/04/23 15:06:12 abs Exp $
 
---- Makefile.in.orig	Fri Mar 19 04:11:05 1999
+--- Makefile.in.orig	Sun Sep  3 04:39:31 2000
 +++ Makefile.in
-@@ -243,22 +243,13 @@
+@@ -223,22 +223,13 @@
  makeServerDirs::
  	-${INSTALL} -u ${SYSUSER} -g ${SYSGROUP} -m ${DIRMODE} \
  	    -idb hylafax.sw.server -dir ${SBIN};
@@ -25,5 +25,5 @@ $NetBSD: patch-aa,v 1.6 2000/08/30 09:50:45 abs Exp $
 +	-${MKDIR} -p -m 755 ${PREFIX}/share/doc/hylafax
 +	${INSTALL} -m 444 -F ${PREFIX}/share/doc/hylafax -idb hylafax.sw.server \
  	    -src ${SRCDIR}/COPYRIGHT -O COPYRIGHT
- 	@if [ "@ZLIB@" = yes ]; then \
- 	    ${ECHO} "= "zlib; cd zlib; ${MAKE} install; \
+ 	@if [ "@REGEX@" = yes ]; then \
+ 	    ${ECHO} "= "regex; cd regex; ${MAKE} install; \
diff --git a/comms/hylafax/patches/patch-ab b/comms/hylafax/patches/patch-ab
index 1c4164b99b1..36bc8889918 100644
--- a/comms/hylafax/patches/patch-ab
+++ b/comms/hylafax/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2000/08/30 09:50:45 abs Exp $
+$NetBSD: patch-ab,v 1.4 2001/04/23 15:06:12 abs Exp $
 
---- config.h.in.orig	Thu Aug  5 12:11:41 1999
+--- config.h.in.orig	Thu Sep  2 11:16:20 1999
 +++ config.h.in
-@@ -53,6 +53,7 @@
+@@ -58,6 +58,7 @@
   * NB: The Unix-domain support is unfinished.
   */
  #define	FAX_USER	"@FAXUID@"	/* account name of the ``fax user'' */
diff --git a/comms/hylafax/patches/patch-ac b/comms/hylafax/patches/patch-ac
index c677263cbb2..028e31bfe84 100644
--- a/comms/hylafax/patches/patch-ac
+++ b/comms/hylafax/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2000/08/30 09:50:45 abs Exp $
+$NetBSD: patch-ac,v 1.4 2001/04/23 15:06:13 abs Exp $
 
---- config/Makefile.in.orig	Mon Oct 12 21:47:47 1998
+--- config/Makefile.in.orig	Fri Jun 23 08:58:41 2000
 +++ config/Makefile.in
-@@ -95,6 +95,7 @@
+@@ -100,6 +100,7 @@
  PUTSERVER=${INSTALL} -idb ${PRODUCT}.sw.server
  
  install: default ${CONFIGFILES}
diff --git a/comms/hylafax/patches/patch-ad b/comms/hylafax/patches/patch-ad
index 81a851b547b..0df61a135bf 100644
--- a/comms/hylafax/patches/patch-ad
+++ b/comms/hylafax/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2000/08/30 09:50:45 abs Exp $
+$NetBSD: patch-ad,v 1.4 2001/04/23 15:06:13 abs Exp $
 
---- config/skel.orig	Sun Jan 10 09:09:38 1999
+--- config/skel.orig	Mon Feb  5 06:32:56 2001
 +++ config/skel
 @@ -41,8 +41,8 @@
  SessionTracing:		11		# log server-related operations
diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae
index fb925fbbdc1..b1a341d2f21 100644
--- a/comms/hylafax/patches/patch-ae
+++ b/comms/hylafax/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
+$NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
 
---- configure.orig	Mon Jul 26 15:57:29 1999
+--- configure.orig	Tue Feb  6 04:54:05 2001
 +++ configure
 @@ -37,21 +37,19 @@
  #
@@ -31,7 +31,7 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
  SYSUID=bin
  SYSGID=
  DSO=auto
-@@ -67,18 +65,18 @@
+@@ -71,8 +69,8 @@
  GS=no
  IMP=no
  UTMP=auto
@@ -40,13 +40,9 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
 +LIBTIFF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltiff -ljpeg -lz -lm"
 +TIFFINC=${PREFIX}/include
  TIFFBIN=
--ZLIB=yes
--LIBZ='-L${DEPTH}/zlib -lz'
--ZLIBINC='${DEPTH}/${TOPSRCDIR}/zlib'
-+ZLIB=no
-+LIBZ='-lz'
-+ZLIBINC='/usr/include'
- REGEX=yes
+ LIBZ=
+ ZLIBINC=
+@@ -80,8 +78,8 @@
  LIBREGEX='-L${DEPTH}/regex -lregex'
  REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
  DBLIB=no
@@ -55,9 +51,9 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
 +LIBDB="-L${PREFIX}/lib -ldb"
 +DBLIBINC=${PREFIX}/include
  CONFIG_OSFCNH=auto
- 
- # SVR4 packaging stuff
-@@ -195,6 +193,7 @@
+ MANNUM4_5=4F
+ MANNUM1_8=1M
+@@ -208,6 +206,7 @@
  PKG_VENDOR
  PORT
  PORTFUNCS
@@ -65,7 +61,7 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
  PSPACKAGE	PS
  REGEX
  RM		RMCMD
-@@ -247,7 +246,7 @@
+@@ -264,7 +263,7 @@
  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 +70,7 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
  PATH=$PATH:$OPATH
  
  POSIXLY_CORRECT=1; export POSIXLY_CORRECT		# disable GNU extensions
-@@ -617,6 +616,7 @@
+@@ -644,6 +643,7 @@
  {
      echo `(for i do
  	case "$i" in
@@ -82,7 +78,7 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
  	/*|-l*|-l[$]{DEPTH}/*)	echo "$i" ;;
  	-L|-L/*|-L[$]{DEPTH}/*)	echo "$i" ;;
  	-I|-I/*|-I[$]{DEPTH}/*)	echo "$i" ;;
-@@ -2838,7 +2838,7 @@
+@@ -2992,7 +2992,7 @@
  # Location of TIFF binaries
  #
  if [ -z "$TIFFBIN" ]; then
@@ -91,18 +87,21 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
      for i in $DIRS; do
          test -x $i/tiff2ps && { TIFFBIN=$i; break; }
      done
-@@ -2865,10 +2865,6 @@
- 	printf("old include files: version %u\n", TIFFLIB_VERSION);
+@@ -3024,13 +3024,7 @@
+         printf("old include files: version %u\n", ZLIB_VERSION);
          exit(-1);
      }
--    if (strncmp(TIFFGetVersion(), "LIBTIFF, Version 3.4", 20) != 0) {
--	printf("old library: version %s\n", TIFFGetVersion());
--	exit(-1);
--    } else
- 	exit(0);
+-    if (strncmp(zlib_version, ZLIB_VERSION, 4) != 0) {
+-        printf("library/header file incompatibility: %s %s\n",
+-        zlib_version, ZLIB_VERSION);
+-        exit(-1);
+-    } else {
+         exit(0);
+-    }
  }
  EOF
-@@ -3414,7 +3410,7 @@
+ capture cat t.c
+@@ -3591,7 +3585,7 @@
  if [ -z "$PATH_VGETTY" ]; then
      PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_VGETTY" ]; then
@@ -111,7 +110,7 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs 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."
-@@ -3427,7 +3423,7 @@
+@@ -3604,7 +3598,7 @@
  if [ -z "$PATH_EGETTY" ]; then
      PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_EGETTY" ]; then
@@ -120,7 +119,7 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs 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."
-@@ -3497,6 +3493,7 @@
+@@ -3675,6 +3669,7 @@
  {
      if [ -z "$PATH_GSRIP" ]; then
  	GSLOCS="
@@ -128,7 +127,7 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
  	    /usr/local/bin/gs
  	    /usr/contrib/bin/gs
  	    /usr/gnu/bin/gs
-@@ -3544,7 +3541,7 @@
+@@ -3722,7 +3717,7 @@
  on building Ghostscript with the necessary TIFF driver.
  
  EOF
@@ -137,7 +136,7 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
  	PATH_GSRIP=$PATH_PSRIP
      fi
  }
-@@ -3607,9 +3604,9 @@
+@@ -3789,9 +3784,9 @@
      else
          DIR_AFMS="
  	    /usr/lib/afm
@@ -150,7 +149,7 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
  	    /usr/share/ghostscript/fonts
  	    /usr/gnu/lib/ghostscript/fonts
  	    /opt/gnu/lib/ghostscript/fonts
-@@ -3629,7 +3626,7 @@
+@@ -3811,7 +3806,7 @@
  fi
  if [ -z "$PATH_AFM" ]; then
      # put it where ghostscript normally puts things
@@ -159,7 +158,7 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
      Note "WARNING, could not locate a directory with font metric information,"
      Note "guessing that font metric information goes in $PATH_AFM."
  else
-@@ -3648,6 +3645,7 @@
+@@ -3830,6 +3825,7 @@
  #
  if [ -z "$DIR_MAN" ]; then
      MANPATH="
@@ -167,7 +166,7 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
  	$MANPATH
  	/usr/local/man
  	/usr/contrib/man
-@@ -3657,7 +3655,7 @@
+@@ -3839,7 +3835,7 @@
      for i in $MANPATH; do
  	test -d $i && { DIR_MAN=$i; break; }
      done
@@ -176,13 +175,3 @@ $NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
  fi
  Note "Looks like manual pages go in $DIR_MAN."
  if [ -z "$MANSCHEME" ]; then
-@@ -4044,7 +4042,8 @@
- 	printConfig
- 	checkForExecutable $PATH_SENDMAIL
- 	checkForExecutable $PATH_GETTY
--	prompt "Are these ok [yes]?"; read ok
-+#	prompt "Are these ok [yes]?"; read ok
-+	ok=yes
- 	test -z "$ok" && ok=yes
- 	case "$ok" in
- 	[1-9]|1[0-6])	promptForParameter $ok;;
diff --git a/comms/hylafax/patches/patch-af b/comms/hylafax/patches/patch-af
index b6446a97c4d..5b7f2b03363 100644
--- a/comms/hylafax/patches/patch-af
+++ b/comms/hylafax/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.3 2000/08/30 09:50:45 abs Exp $
+$NetBSD: patch-af,v 1.4 2001/04/23 15:06:14 abs Exp $
 
---- defs.in.orig	Mon Jan  4 09:17:09 1999
+--- defs.in.orig	Sun Feb 11 03:29:06 2001
 +++ defs.in
 @@ -44,6 +44,7 @@
  # to insufficient; you are better off rerunning the
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.3 2000/08/30 09:50:45 abs Exp $
  SPOOL		= @SPOOL@
  SBIN		= @SBIN@
  BIN		= @BIN@
-@@ -255,7 +256,7 @@
+@@ -256,7 +257,7 @@
  LDOPTS		= ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
  LDLIBS		= ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
  
diff --git a/comms/hylafax/patches/patch-ag b/comms/hylafax/patches/patch-ag
index 6b76081957e..848c6b2221a 100644
--- a/comms/hylafax/patches/patch-ag
+++ b/comms/hylafax/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2000/08/30 09:50:45 abs Exp $
+$NetBSD: patch-ag,v 1.4 2001/04/23 15:06:14 abs Exp $
 
---- etc/Makefile.in.orig	Thu Aug  5 12:11:42 1999
+--- etc/Makefile.in.orig	Tue Feb  6 04:54:06 2001
 +++ etc/Makefile.in
-@@ -78,14 +78,16 @@
+@@ -85,14 +85,16 @@
  		-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 da64759778c..4e05f10ec6c 100644
--- a/comms/hylafax/patches/patch-ah
+++ b/comms/hylafax/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.3 2000/08/30 09:50:45 abs Exp $
+$NetBSD: patch-ah,v 1.4 2001/04/23 15:06:15 abs Exp $
 
---- etc/faxaddmodem.sh.in.orig	Thu Jul 15 11:48:43 1999
+--- etc/faxaddmodem.sh.in.orig	Tue Feb  6 04:54:06 2001
 +++ etc/faxaddmodem.sh.in
 @@ -46,6 +46,7 @@
  SPOOL=@SPOOL@
@@ -10,7 +10,7 @@ $NetBSD: patch-ah,v 1.3 2000/08/30 09:50:45 abs Exp $
  while [ x"$1" != x"" ] ; do
      case $1 in
      -s)	    SPEED=$2; shift;;
-@@ -91,10 +92,11 @@
+@@ -112,10 +113,11 @@
  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
diff --git a/comms/hylafax/patches/patch-ai b/comms/hylafax/patches/patch-ai
index 64696405e74..1def3a02c8e 100644
--- a/comms/hylafax/patches/patch-ai
+++ b/comms/hylafax/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.4 2000/09/05 14:01:43 rh Exp $
+$NetBSD: patch-ai,v 1.5 2001/04/23 15:06:15 abs Exp $
 
---- etc/faxsetup.sh.in.orig	Thu Aug  5 13:11:42 1999
+--- etc/faxsetup.sh.in.orig	Tue Feb  6 04:54:07 2001
 +++ etc/faxsetup.sh.in
 @@ -41,7 +41,9 @@
  # This script interactively prepares and verifies 
@@ -13,7 +13,7 @@ $NetBSD: patch-ai,v 1.4 2000/09/05 14:01:43 rh 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
-@@ -58,13 +60,14 @@
+@@ -59,13 +61,14 @@
  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.4 2000/09/05 14:01:43 rh 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
-@@ -138,6 +141,7 @@
+@@ -143,6 +146,7 @@
  LIBEXEC		DIR_LIBEXEC
  LN
  MANDIR		DIR_MAN
@@ -37,7 +37,7 @@ $NetBSD: patch-ai,v 1.4 2000/09/05 14:01:43 rh Exp $
  MKFIFO
  MV
  PATH
-@@ -741,6 +745,48 @@
+@@ -747,6 +751,48 @@
      bitch "Sorry, but you must run this script as the super-user!"
      boom
  fi
diff --git a/comms/hylafax/patches/patch-aj b/comms/hylafax/patches/patch-aj
index a966e796cac..cab06179b46 100644
--- a/comms/hylafax/patches/patch-aj
+++ b/comms/hylafax/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.3 2000/08/30 09:50:46 abs Exp $
+$NetBSD: patch-aj,v 1.4 2001/04/23 15:06:16 abs Exp $
 
---- faxd/Getty.c++.orig	Sun Jun 13 08:41:03 1999
+--- faxd/Getty.c++.orig	Sat Sep 16 12:13:48 2000
 +++ faxd/Getty.c++
-@@ -218,7 +218,7 @@
+@@ -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());
diff --git a/comms/hylafax/patches/patch-ak b/comms/hylafax/patches/patch-ak
index c30f8f8bf49..5d928fbab5c 100644
--- a/comms/hylafax/patches/patch-ak
+++ b/comms/hylafax/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.3 2000/08/30 09:50:46 abs Exp $
+$NetBSD: patch-ak,v 1.4 2001/04/23 15:06:17 abs Exp $
 
---- faxd/UUCPLock.c++.orig	Sun Jun 13 08:41:05 1999
+--- faxd/UUCPLock.c++.orig	Thu Sep 21 10:24:54 2000
 +++ faxd/UUCPLock.c++
 @@ -37,6 +37,7 @@
  }
diff --git a/comms/hylafax/patches/patch-al b/comms/hylafax/patches/patch-al
index 9e715f83455..546818deccb 100644
--- a/comms/hylafax/patches/patch-al
+++ b/comms/hylafax/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.3 2000/08/30 09:50:46 abs Exp $
+$NetBSD: patch-al,v 1.4 2001/04/23 15:06:17 abs Exp $
 
 --- faxd/faxGettyApp.c++.orig	Sun Jun 13 08:41:05 1999
 +++ faxd/faxGettyApp.c++
diff --git a/comms/hylafax/patches/patch-am b/comms/hylafax/patches/patch-am
index 80d29f313a2..ca6162761fd 100644
--- a/comms/hylafax/patches/patch-am
+++ b/comms/hylafax/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.3 2000/08/30 09:50:46 abs Exp $
+$NetBSD: patch-am,v 1.4 2001/04/23 15:06:18 abs Exp $
 
---- hfaxd/User.c++.orig	Sun Jun 13 08:41:16 1999
+--- 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
diff --git a/comms/hylafax/patches/patch-an b/comms/hylafax/patches/patch-an
index 1cd038c225e..129ec5d8211 100644
--- a/comms/hylafax/patches/patch-an
+++ b/comms/hylafax/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.3 2000/08/30 09:50:46 abs Exp $
+$NetBSD: patch-an,v 1.4 2001/04/23 15:06:18 abs Exp $
 
---- util/Makefile.in.orig	Thu Aug  5 10:46:06 1999
+--- util/Makefile.in.orig	Sun Sep  3 04:39:34 2000
 +++ util/Makefile.in
 @@ -154,7 +154,7 @@
  PUTCLIENT	= ${INSTALL} -idb ${PRODUCT}.sw.client
diff --git a/comms/hylafax/patches/patch-ao b/comms/hylafax/patches/patch-ao
index d0e9b2ca51a..530c7d44fa4 100644
--- a/comms/hylafax/patches/patch-ao
+++ b/comms/hylafax/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.3 2000/08/30 09:50:46 abs Exp $
+$NetBSD: patch-ao,v 1.4 2001/04/23 15:06:19 abs Exp $
 
 --- util/TypeRules.c++.orig	Sun Jun 13 08:41:26 1999
 +++ util/TypeRules.c++
diff --git a/comms/hylafax/patches/patch-ap b/comms/hylafax/patches/patch-ap
index 48d629f2510..68eb9a8d664 100644
--- a/comms/hylafax/patches/patch-ap
+++ b/comms/hylafax/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.4 2000/08/30 09:50:46 abs Exp $
+$NetBSD: patch-ap,v 1.5 2001/04/23 15:06:19 abs Exp $
 
 --- util/TypeRules.h.orig	Sun Jun 13 08:41:26 1999
 +++ util/TypeRules.h
diff --git a/comms/hylafax/patches/patch-aq b/comms/hylafax/patches/patch-aq
index 6e1c642a909..b68b112534f 100644
--- a/comms/hylafax/patches/patch-aq
+++ b/comms/hylafax/patches/patch-aq
@@ -1,10 +1,10 @@
-$NetBSD: patch-aq,v 1.3 2000/08/30 09:50:46 abs Exp $
+$NetBSD: patch-aq,v 1.4 2001/04/23 15:06:20 abs Exp $
 
---- util/faxcron.sh.in.orig	Tue Jun 29 12:55:07 1999
+--- util/faxcron.sh.in.orig	Mon Sep  4 04:18:27 2000
 +++ util/faxcron.sh.in
 @@ -41,7 +41,7 @@
  AGELOG=30			# keep log info for last 30 days
- AGERCV=7			# purge received facsimile after 2 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
diff --git a/comms/hylafax/patches/patch-ar b/comms/hylafax/patches/patch-ar
index 91c01b36565..4ebd4fe310b 100644
--- a/comms/hylafax/patches/patch-ar
+++ b/comms/hylafax/patches/patch-ar
@@ -1,10 +1,10 @@
-$NetBSD: patch-ar,v 1.3 2000/08/30 09:50:46 abs Exp $
+$NetBSD: patch-ar,v 1.4 2001/04/23 15:06:20 abs Exp $
 
---- util/typerules.orig	Mon Oct 12 21:47:48 1998
+--- util/typerules.orig	Mon Sep  4 06:57:44 2000
 +++ util/typerules
-@@ -128,6 +128,11 @@
+@@ -129,6 +129,11 @@
  >15     string          ascii		ps	%F/textfmt -B -f Courier-Bold\
- 						    -p 11 -s %s >%o <%i
+ 						-Ml=0.4in -p 11 -s %s >%o <%i
  #
 +# Japanization (should help other iso-2022 variants too)
 +#