diff options
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/mgetty+sendfax/Makefile | 8 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/PLIST | 3 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/distinfo | 18 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-aa | 10 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-ab | 24 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-ae | 24 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-af | 17 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-ah | 21 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-ai | 17 |
9 files changed, 51 insertions, 91 deletions
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index 25d93eb4443..c0bcd0061f1 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.64 2009/08/26 19:57:17 sno Exp $ +# $NetBSD: Makefile,v 1.65 2009/10/02 19:21:58 is Exp $ -DISTNAME= mgetty1.1.31-Jul24 -PKGNAME= mgetty-1.1.31 -PKGREVISION= 7 +DISTNAME= mgetty1.1.36-Jun15 +PKGNAME= mgetty-1.1.36 +PKGREVISION= 1 CATEGORIES= comms MASTER_SITES= ftp://alpha.greenie.net/pub/mgetty/source/1.1/ diff --git a/comms/mgetty+sendfax/PLIST b/comms/mgetty+sendfax/PLIST index 856f6b4acc5..983a4362259 100644 --- a/comms/mgetty+sendfax/PLIST +++ b/comms/mgetty+sendfax/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:38:40 joerg Exp $ +@comment $NetBSD: PLIST,v 1.13 2009/10/02 19:21:59 is Exp $ bin/autopvf bin/basictopvf bin/faxq @@ -53,6 +53,7 @@ man/man1/zplay.1 man/man4/mgettydefs.4 man/man5/faxqueue.5 man/man8/callback.8 +man/man8/faxq-helper.8 man/man8/faxrunqd.8 man/man8/mgetty.8 man/man8/sendfax.8 diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo index cdea45339bd..596c281e808 100644 --- a/comms/mgetty+sendfax/distinfo +++ b/comms/mgetty+sendfax/distinfo @@ -1,17 +1,15 @@ -$NetBSD: distinfo,v 1.28 2007/08/30 16:29:56 joerg Exp $ +$NetBSD: distinfo,v 1.29 2009/10/02 19:21:59 is Exp $ -SHA1 (mgetty1.1.31-Jul24.tar.gz) = a6f20da26b49bbfa695791edec7d0a2247b79e2d -RMD160 (mgetty1.1.31-Jul24.tar.gz) = 255eec0838ce5bfad04c53d478a4505e74111a07 -Size (mgetty1.1.31-Jul24.tar.gz) = 998462 bytes -SHA1 (patch-aa) = 9b6d9d6af2245f3dfea235bc2e044a2151bc4187 -SHA1 (patch-ab) = d6b8279e64c00b09ca4e6bbc4c0027c2073fbbd8 +SHA1 (mgetty1.1.36-Jun15.tar.gz) = a9627e241502c505465a9c8ffadc09dd7d90fc02 +RMD160 (mgetty1.1.36-Jun15.tar.gz) = 421c72b8534c6665c46033d5fe1018ba1300fd50 +Size (mgetty1.1.36-Jun15.tar.gz) = 1046324 bytes +SHA1 (patch-aa) = 2b0432d9d65347d4a5d7a4a442b747e16fc4d54a +SHA1 (patch-ab) = 67c666573ac6aa5a9554e169e81991a6226ea122 SHA1 (patch-ac) = bdc69ccc3430634bb74742fd105ee8f3fcde4d21 SHA1 (patch-ad) = a24776252e36cfe84b10b7a1b03a43b15d7049d0 -SHA1 (patch-ae) = 04f35280e337fb766152b7d9badcd0c417aa1739 -SHA1 (patch-af) = c3d141a0952c54c392e99399fd05efebd55f0267 SHA1 (patch-ag) = f12e39005c78a94f641ccbdbbfa51b5181821148 -SHA1 (patch-ah) = 2d9de861d3bce7b454eee957d32ffe67996e27c7 -SHA1 (patch-ai) = 26038a2960202a0ff6a6e8d919728d68bd2b9e3e +SHA1 (patch-ah) = 0a3e5b1375eb36610e6a97113a8e535bf2fd1c6b +SHA1 (patch-ai) = 2246b08b0211fb2dfb191f45f2599c1fba9a9744 SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475 SHA1 (patch-al) = 2a6dcf13d65446d2064228b1024517e599892a60 diff --git a/comms/mgetty+sendfax/patches/patch-aa b/comms/mgetty+sendfax/patches/patch-aa index d5c219000fb..da1e437ff79 100644 --- a/comms/mgetty+sendfax/patches/patch-aa +++ b/comms/mgetty+sendfax/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.3 2005/03/07 11:29:28 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2009/10/02 19:21:59 is Exp $ ---- fax/faxspool.in.orig 2004-07-17 12:17:49.000000000 +0200 +--- fax/faxspool.in.orig 2007-01-19 08:38:22.000000000 +0100 +++ fax/faxspool.in -@@ -389,11 +389,11 @@ fs_cvt_pdf() - # user name (for authentification) - ########## +@@ -407,11 +407,11 @@ fs_cvt_pdf() + # user name (for fax header only! auth is done by faxq-helper via getuid()) + ########## -if user=`logname 2>/dev/null` -then : +if [ `id -u` = 0 ]; then diff --git a/comms/mgetty+sendfax/patches/patch-ab b/comms/mgetty+sendfax/patches/patch-ab index 7fa653604b5..270ac61a163 100644 --- a/comms/mgetty+sendfax/patches/patch-ab +++ b/comms/mgetty+sendfax/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.10 2007/08/30 16:29:57 joerg Exp $ +$NetBSD: patch-ab,v 1.11 2009/10/02 19:21:59 is Exp $ ---- Makefile.orig 2004-07-24 18:53:47.000000000 +0000 +--- Makefile.orig 2007-06-15 13:15:56.000000000 +0200 +++ Makefile @@ -4,8 +4,8 @@ # @@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.10 2007/08/30 16:29:57 joerg Exp $ # #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL -CFLAGS=-O2 -Wall -pipe -+CFLAGS=-O2 -Wall -pipe -DAUTO_PPP -DPREFIX=\"${PREFIX}\" ++CFLAGS=-O2 -Wall -pipe -DPREFIX=\"${PREFIX}\" #CFLAGS=-O -DSVR4 #CFLAGS=-O -DSVR4 -DSVR42 #CFLAGS=-O -DUSE_POLL @@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.10 2007/08/30 16:29:57 joerg Exp $ #INSTALL=/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x #INSTALL=installbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2 #INSTALL=/usr/bin/X11/bsdinst -c -o bin # IRIX -@@ -253,12 +253,12 @@ AWK=awk +@@ -258,12 +258,12 @@ AWK=awk # and the "tkperl" frontends without PERL, so don't worry if you don't # have it. # If you specify command line arguments (-w), don't forget the quotes! @@ -57,7 +57,7 @@ $NetBSD: patch-ab,v 1.10 2007/08/30 16:29:57 joerg Exp $ # # # An echo program that understands escapes like "\n" for newline or -@@ -270,9 +270,9 @@ TKPERL=/usr/bin/tkperl +@@ -275,9 +275,9 @@ TKPERL=/usr/bin/tkperl # please use the "mg.echo" program provided in the compat/ subdirectory. # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo # @@ -69,7 +69,7 @@ $NetBSD: patch-ab,v 1.10 2007/08/30 16:29:57 joerg Exp $ # # for mgetty, that's it. If you want to use the voice -@@ -280,7 +280,7 @@ ECHO="echo" +@@ -285,7 +285,7 @@ ECHO="echo" # To maintain security, I recommend creating a new group for # users who are allowed to manipulate the recorded voice messages. @@ -78,16 +78,16 @@ $NetBSD: patch-ab,v 1.10 2007/08/30 16:29:57 joerg Exp $ PHONE_PERMS=770 # Add -DNO_STRSTR to CFLAGS if you don't have strstr(). -@@ -312,7 +312,7 @@ SFAXOBJ=sendfax.o logfile.o locks.o mode +@@ -317,7 +317,7 @@ SFAXOBJ=sendfax.o logfile.o locks.o mode all: bin-all doc-all --bin-all: mgetty sendfax newslock subdirs call-back -+bin-all: mgetty sendfax newslock subdirs call-back vgetty +-bin-all: mgetty sendfax newslock sedscript subdirs call-back ++bin-all: mgetty sendfax newslock sedscript subdirs call-back vgetty # a few C files need extra compiler arguments -@@ -564,8 +564,8 @@ newslock: compat/newslock.c +@@ -560,8 +560,8 @@ newslock: compat/newslock.c # internal: use this to create a "clean" mgetty+sendfax tree bindist: all doc-all sedscript -rm -rf bindist @@ -98,7 +98,7 @@ $NetBSD: patch-ab,v 1.10 2007/08/30 16:29:57 joerg Exp $ BINDIR=$$bd$(BINDIR) SBINDIR=$$bd$(SBINDIR) \ LIBDIR=$$bd$(LIBDIR) CONFDIR=$$bd$(CONFDIR) \ spool=$$bd$(spool) FAX_SPOOL=$$bd$(FAX_SPOOL) \ -@@ -577,7 +577,7 @@ bindist: all doc-all sedscript +@@ -573,7 +573,7 @@ bindist: all doc-all sedscript cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz * @@ -107,7 +107,7 @@ $NetBSD: patch-ab,v 1.10 2007/08/30 16:29:57 joerg Exp $ install.bin: mgetty sendfax newslock \ login.config mgetty.config sendfax.config -@@ -585,7 +585,7 @@ install.bin: mgetty sendfax newslock \ +@@ -581,7 +581,7 @@ install.bin: mgetty sendfax newslock \ # binaries # -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) diff --git a/comms/mgetty+sendfax/patches/patch-ae b/comms/mgetty+sendfax/patches/patch-ae deleted file mode 100644 index dee99bcb89d..00000000000 --- a/comms/mgetty+sendfax/patches/patch-ae +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2005/03/07 11:29:28 wiz Exp $ - ---- doc/mgetty.texi-in.orig 2004-07-24 16:54:40.000000000 +0200 -+++ doc/mgetty.texi-in -@@ -7,6 +7,10 @@ - @finalout - - @ifinfo -+@dircategory Miscellaneous -+@direntry -+ * mgetty: (mgetty). Handle external logins, send and receive faxes. -+@end direntry - This is the online documentation for the mgetty + sendfax - package. - -@@ -3825,7 +3829,7 @@ Mgetty should be run from @file{/etc/tty - @code{man ttys} (there is no @file{/etc/inittab}). - - Open issues: --@itemize -+@itemize @bullet - @c @item how to access external serial ports? - @item is it better to use @file{/dev/cu.*} or @file{/dev/tty.*}? - @item how is tty locking done? Couldn't find UUCP lock files diff --git a/comms/mgetty+sendfax/patches/patch-af b/comms/mgetty+sendfax/patches/patch-af deleted file mode 100644 index 00bba2cbb22..00000000000 --- a/comms/mgetty+sendfax/patches/patch-af +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-af,v 1.7 2006/01/05 17:32:52 joerg Exp $ - ---- logfile.c.orig 2003-01-14 22:30:20.000000000 +0100 -+++ logfile.c -@@ -58,9 +58,11 @@ extern int atexit _PROTO(( void (*)(void - /* Most systems have these variables but do not declare them. On many - of those systems that _do_ declare them, it won't hurt */ - -+#if !defined(__NetBSD__) && !defined(__DragonFly__) - extern int sys_nerr; --#if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__) -+# if !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__) - extern char *sys_errlist[]; -+# endif - #endif - - /* Interactive Unix is a little bit braindead - does not have atexit(), diff --git a/comms/mgetty+sendfax/patches/patch-ah b/comms/mgetty+sendfax/patches/patch-ah index c657e9eb265..05279756e71 100644 --- a/comms/mgetty+sendfax/patches/patch-ah +++ b/comms/mgetty+sendfax/patches/patch-ah @@ -1,16 +1,13 @@ -$NetBSD: patch-ah,v 1.4 2005/09/08 22:37:54 abs Exp $ +$NetBSD: patch-ah,v 1.5 2009/10/02 19:21:59 is Exp $ ---- getdisk.c.orig 2001-01-28 14:29:43.000000000 +0100 -+++ getdisk.c 2004-04-26 21:56:58.000000000 +0200 -@@ -94,6 +94,11 @@ - # define USTAT +--- getdisk.c.orig 2004-11-08 21:10:27.000000000 +0100 ++++ getdisk.c +@@ -95,7 +95,7 @@ #endif + /* imported from NetBSD pkgsrc */ +-#if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000) +#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) -+#undef BSDSTATFS -+#define SVR4 -+#endif -+ - #if defined(SVR4) - # define SVR3 - #endif + #undef BSDSTATFS + #define SVR4 + #endif diff --git a/comms/mgetty+sendfax/patches/patch-ai b/comms/mgetty+sendfax/patches/patch-ai index 0d150659898..84b4e25adca 100644 --- a/comms/mgetty+sendfax/patches/patch-ai +++ b/comms/mgetty+sendfax/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.5 2007/03/01 17:09:00 wiz Exp $ +$NetBSD: patch-ai,v 1.6 2009/10/02 19:21:59 is Exp $ ---- policy.h.orig 2007-03-01 17:06:20.000000000 +0000 +--- policy.h.orig 2009-10-02 11:51:33.000000000 +0200 +++ policy.h -@@ -620,3 +620,22 @@ +@@ -593,6 +593,22 @@ */ #define MINFREESPACE 1024 @@ -14,9 +14,6 @@ $NetBSD: patch-ai,v 1.5 2007/03/01 17:09:00 wiz Exp $ +#undef MGETTY_PID_FILE +#define MGETTY_PID_FILE "/var/run/mg-pid.%s" + -+#undef LOCK -+#define LOCK "/var/spool/lock/LCK..%s" -+ +#undef FAX_LOG +#define FAX_LOG "/var/spool/fax/Faxlog" + @@ -25,3 +22,11 @@ $NetBSD: patch-ai,v 1.5 2007/03/01 17:09:00 wiz Exp $ + +#undef DEVICE_GROUP +#define DEVICE_GROUP "wheel" + /* fax machines exchange so-called "non-standard-frames" that can be + * used to identify what vendor and model is on the other end. + * mgetty parses and prints this by default, because it can help +@@ -601,3 +617,4 @@ + */ + #define FAX_NSF_PARSER + ++#define AUTO_PPP |