Update to 1.1.30, submitted by Stephane Fortier in PR pkg/22867.

"ChangeLog" since 1.1.28 w/dates and blank lines elided:

	* release 1.1.30
	* voice/vgetty/answer.c, voice/include/default.c: integrate Paul
	Fox' pre_message and beep_sound patches
	* voice/libvoice/detect.c: recognize MultiTech MT3334ZDXV
	* faxhng.c: add some result codes for the i4l DIVA driver
	* voice/libvoice/IS_101.c: fix DTMF events for the unshielded case
	* voice/vgetty/answer.c: accept arbitrary ring types, not only 0..6
	* ring.c: map DRON/DROF return codes to binary word, use result
	  as distinctive RING number
	* frontends/www/README: add user authentication example
	* voice/libvoice/V253modem.c: repair messed-up 16 bit PCM patch

	* release 1.1.29
	* voice/libvoice/detect.c: insert delay before sending ATE0 to
	  modem (timing issue - modem might not have sent the full \r\n
	  sequence from the last "OK" yet when the new AT comes in)
	* doc/*.[158]in: bring man pages up to date
	* tools/ltest.c, tools/mid.c: adapt to new lprintf() prototype
	* mgetty.h, logfile.c: adapt to use <stdarg.h> and "..."
	  function declaration (unless USE_VARARGS is set, which is
	  needed for NeXT platforms).  Karsten Keil <kkeil@suse.de>.
	* Makefile: relax permissions on sendfax and faxrunq.config
	  install - must be readable/executeable by user "fax" now
	* doc/faxrunqd.8in: document "-u", minor updates
	* fax/faxrunqd.in, fax/faxspool.in, fax/faxrunq.in: revert
	  Aug 6, 200 change - put faxqueue_done back into $FAX_SPOOL_OUT/
	  (faxrunq/faxrunqd have no access rights to $VARRUNDIR/ anymore,
	  and $FAX_SPOOL_OUT is no longer world writeable anyway)
	* fax/faxq.in: change from .last_run to faxqueue_done
	* fax/faxrunqd.in: add "-u <user>" switch (set uid to <user>)
	* fax/faxq-helper.c: finalize new fax queue handling using helper
	  process (suid fax) and a fax queue that is no longer
	  world-readable (open issue since 1994 :) )
	* faxrecp.c: implement experimental teergrubing mode (signal
	  "page bad, please retransmit" at the end of each page - or just
	  hang up hard on caller).  Activared with "modem-quirks 0x100"
	  or "0x200", respectively.
	* voice/libvoice/V253Modem.c: add 16 bit linear PCM support
	  (patch coming from Peter Bruley)
	* voice/pvftools/pvftormd.c, rmdtopvf.c: add 16 bit linear PCM
	* rework faxq-helper concept (suid root -> suid fax)
	* fax/faxq.in: adap "-r" to use faxq-helper
	* fax/faxspool.in: adapt to use faxq-helper
	* fax/faxrm.in: adapt to use faxq-helper
	* Makefile: create FAX_SPOOL_OUT with mode 755 and owner FAX_OUT_USER
	* Makefile: add FAX_OUT_USER definition, pass lots of variables
	  to fax/Makefile (for faxq-helper)
	* README.1st: add instructions about FAX_OUT_USER setup
	* doc/mgetty.texi-in add instructions about FAX_OUT_USER setup
	* fax/faxrunqd.in: fix symlink / file overwrite race in JOB files.
	  Pointed out by Jablonovsky Alexander <sasha@cit-saratov.ru>
	* doc/faxrunq.8in: point out insecurity in symlink handling
	* mgetty.h: Intel 64bit platforms (__x86_64__) needs PTR_IS_LONG
	* voice/libvoice/IS_101.c: implement DLE shielding for long DTMF tones
	  for V.253 (initially by Lee Howard <faxguy@howardsilvan.com>)
	* mgetty.c: throw out DIST_RING #define - not used anymore
	* ring.c: make sure action strings (CONNECT) are only recognized
	  at the beginning if a line, not in the middle (Paul Fox,
	  pgf@foxharp.boston.ma.us, CALLER NAME = CONNECTICUT).
	* cnd.c: replace non-printable characters and quotes in caller ID
	  or caller name strings with ' ' - safeguard for passing them to
	  shell later on.
	* doc/mgetty.texi-in: add stuff about recent multitech modems,
	  superfine+v.34 fax, and rework chapter about common problems
	* faxlib.c: fix ugliness with USR modems reporting remote fax
	  ID as "     12345" -> skip leading '"' and all whitespace
	* cnd.c: possible buffer overrun via CallName
	  (found by "A. Guru" <a.guru@sympatico.ca>)
	* fax/faxrunqd: fix priority vs. write combining bug
	* login.c: check for close-on-exec bit on FD 0 (FreeBSD 4.1 bug)
	* login.c: export Caller Name as environment variable $CALLER_NAME
	* login.c: make message about bad permissions even more clear

6 files changed, 30 insertions, 27 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 4f46f9dadce..508f8bdc802 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2003/08/30 22:51:13 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2003/09/20 16:39:33 fredb Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp
 #
 
-DISTNAME=	mgetty1.1.28-Jan10
-PKGNAME=	mgetty-1.1.28
-PKGREVISION=	3
+DISTNAME=	mgetty1.1.30-Dec16
+PKGNAME=	mgetty-1.1.30
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ \
@@ -41,6 +40,9 @@ CONF_FILES+=		${_EXAMPLES_DIR}/${cfg} ${PKG_SYSCONFDIR}/${cfg}
 . endfor
 .endif
 
+PKG_GROUPS=		dialer
+PKG_USERS=		fax:dialer 
+
 _EXAMPLES_DIR=		${PREFIX}/share/examples/mgetty+sendfax
 MAKE_DIRS_PERMS+=	/var/spool/fax ${ROOT_USER} ${ROOT_GROUP} 755
 MAKE_DIRS_PERMS+=	/var/spool/fax/incoming ${ROOT_USER} ${ROOT_GROUP} 755
diff --git a/comms/mgetty+sendfax/PLIST b/comms/mgetty+sendfax/PLIST
index 651a74c94aa..7098e2d51a4 100644
--- a/comms/mgetty+sendfax/PLIST
+++ b/comms/mgetty+sendfax/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/06/27 17:19:21 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/09/20 16:39:34 fredb Exp $
 bin/autopvf
 bin/basictopvf
 bin/faxspool
@@ -40,6 +40,7 @@ info/mgetty.info-3
 info/mgetty.info-4
 lib/mgetty+sendfax/cour25.pbm
 lib/mgetty+sendfax/cour25n.pbm
+lib/mgetty+sendfax/faxq-helper
 man/man1/g3cat.1
 man/man1/sendfax.1
 man/man1/g32pbm.1
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index 0c1aa5b2657..3e3b76044a4 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.11 2003/02/27 21:43:36 fredb Exp $
+$NetBSD: distinfo,v 1.12 2003/09/20 16:39:34 fredb Exp $
 
-SHA1 (mgetty1.1.28-Jan10.tar.gz) = b0c33bf5f5137f17f8d1fbd529c5ba6f0afb9dbc
-Size (mgetty1.1.28-Jan10.tar.gz) = 964610 bytes
+SHA1 (mgetty1.1.30-Dec16.tar.gz) = aea2a4c999f167e2311e797b164d4797baf328c4
+Size (mgetty1.1.30-Dec16.tar.gz) = 969967 bytes
 SHA1 (patch-aa) = 249ec3d2425d359a5d89241978ff9ac6122d0eb6
-SHA1 (patch-ab) = ca2ff2961b045b66a3aedf692ce83e8fc6ecdd09
+SHA1 (patch-ab) = ef88867f22b963015b9decaac69829653348c852
 SHA1 (patch-ac) = 1ff9866dd8a54fca4fa59d5144117fa3b46a9b4f
 SHA1 (patch-ad) = 27fcebfe959a1d24657f504b89017fa3a58ae6c1
 SHA1 (patch-ae) = f274db8059463f8b915c2d2faa86aa0e956e5a2c
 SHA1 (patch-ag) = 943aa837a285663ff6cf5ab07c3f908f499c2074
-SHA1 (patch-ai) = 98eba401e1b422e2f759eca00132a75e68518f4d
-SHA1 (patch-aj) = d03345166f70270d05ae478287165089bd832c16
+SHA1 (patch-ai) = d3f4795898b435b04124cac5af0289157a86c659
+SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d
 SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475
 SHA1 (patch-al) = 2a6dcf13d65446d2064228b1024517e599892a60
 SHA1 (patch-am) = 6b7516b3f857f65c0ecc7963f39e433e4ef8771d
diff --git a/comms/mgetty+sendfax/patches/patch-ab b/comms/mgetty+sendfax/patches/patch-ab
index 6da8c531f93..e074adcccb1 100644
--- a/comms/mgetty+sendfax/patches/patch-ab
+++ b/comms/mgetty+sendfax/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2001/06/21 17:02:24 fredb Exp $
+$NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $
 
 --- Makefile.orig	Sun Feb 25 06:33:49 2001
 +++ Makefile
@@ -75,8 +75,8 @@ $NetBSD: patch-ab,v 1.5 2001/06/21 17:02:24 fredb Exp $
 +CONF_EXAMPLES_DIR=${PREFIX}/share/examples/mgetty+sendfax
  #
  #
- # where PID and status files (mgetty.pid, faxrunqd.pid, 
-@@ -216,20 +216,20 @@
+ # where mgetty PID files (mgetty.pid) go to
+@@ -224,20 +224,20 @@ FAX_OUT_USER=fax
  #
  #
  # Where section 1 manual pages should be placed
@@ -185,14 +185,14 @@ $NetBSD: patch-ab,v 1.5 2001/06/21 17:02:24 fredb Exp $
 -	test -f $(CONFDIR)/dialin.config || \
 -		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
 -	test -f $(CONFDIR)/faxrunq.config || \
--		$(INSTALL) -o root -m 600 faxrunq.config $(CONFDIR)/
+-		$(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/
 +	test -d $(CONF_EXAMPLES_DIR) || \
 +		( ./mkidirs $(CONF_EXAMPLES_DIR); chmod 755 $(CONF_EXAMPLES_DIR))
 +	$(INSTALL) -o root -m 600 login.config $(CONF_EXAMPLES_DIR)/
 +	$(INSTALL) -o root -m 600 mgetty.config $(CONF_EXAMPLES_DIR)/
 +	$(INSTALL) -o root -m 644 sendfax.config $(CONF_EXAMPLES_DIR)/
 +	$(INSTALL) -o root -m 600 dialin.config $(CONF_EXAMPLES_DIR)/
-+	$(INSTALL) -o root -m 600 faxrunq.config $(CONF_EXAMPLES_DIR)/
++	$(INSTALL) -o root -m 644 faxrunq.config $(CONF_EXAMPLES_DIR)/
  #
  # test for outdated stuff
  #
diff --git a/comms/mgetty+sendfax/patches/patch-ai b/comms/mgetty+sendfax/patches/patch-ai
index 8bd56f120a3..d63849f20ce 100644
--- a/comms/mgetty+sendfax/patches/patch-ai
+++ b/comms/mgetty+sendfax/patches/patch-ai
@@ -1,18 +1,18 @@
-$NetBSD: patch-ai,v 1.1 2001/06/21 17:02:24 fredb Exp $
+$NetBSD: patch-ai,v 1.2 2003/09/20 16:39:38 fredb Exp $
 
---- fax/Makefile.orig	Sat Jul 24 16:27:24 1999
+--- fax/Makefile.orig
 +++ fax/Makefile
-@@ -9,6 +9,9 @@
- 
- FAX_SCRIPTS=faxspool faxrunq faxq faxrm 
+@@ -12,6 +12,9 @@
+ zigzag: 
+ 	cd .. ; $(MAKE) subdirs
  
 +CONFDIR=${MGETTY_CONFDIR}
 +CONF_EXAMPLES_DIR=${PREFIX}/share/examples/mgetty+sendfax
 +
- all: $(FAX_SCRIPTS) faxrunqd faxheader
+ all: $(FAX_SCRIPTS) faxrunqd faxheader faxq-helper
  
  faxspool: faxspool.in ../sedscript
-@@ -53,8 +56,8 @@
+@@ -68,8 +71,8 @@ install: all
  #
  	$(INSTALL) -m 644 cour25.pbm $(LIBDIR)
  	$(INSTALL) -m 644 cour25n.pbm $(LIBDIR)
diff --git a/comms/mgetty+sendfax/patches/patch-aj b/comms/mgetty+sendfax/patches/patch-aj
index d569b36639e..120ed571134 100644
--- a/comms/mgetty+sendfax/patches/patch-aj
+++ b/comms/mgetty+sendfax/patches/patch-aj
@@ -1,10 +1,10 @@
-$NetBSD: patch-aj,v 1.2 2003/02/27 17:13:38 fredb Exp $
+$NetBSD: patch-aj,v 1.3 2003/09/20 16:39:39 fredb Exp $
 
---- doc/fax.1in.orig	Sun Jan 12 08:52:30 1997
+--- doc/fax.1in.orig
 +++ doc/fax.1in
 @@ -1,7 +1,7 @@
--.TH fax 1 "27 Oct 94" "greenie" "mgetty+sendfax manual"
-+.TH sendfax 1 "27 Oct 94" "greenie" "mgetty+sendfax manual"
+-.TH fax 1 "23 Nov 02" "greenie" "mgetty+sendfax manual"
++.TH sendfax 1 "23 Nov 02" "greenie" "mgetty+sendfax manual"
  .IX fax
  .SH NAME
 -fax \- fax sending and receiving with mgetty+sendfax