From 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Dec 2004 09:47:41 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA --- mgetty/mgetty-1.1.30/00-g3_Makefile | 11 - mgetty/mgetty-1.1.30/01-adjust-path | 113 --- mgetty/mgetty-1.1.30/02-pending-fix-includes | 49 -- mgetty/mgetty-1.1.30/03-callback_Makefile | 20 - mgetty/mgetty-1.1.30/04-new_fax.pbm | 8 - mgetty/mgetty-1.1.30/06-pending-contrib_g3tolj.c | 49 -- mgetty/mgetty-1.1.30/07-pending-contrib_g3toxwd.c | 46 - mgetty/mgetty-1.1.30/09-doc_Makefile | 91 -- mgetty/mgetty-1.1.30/10-doc_faxrunqd.8in | 60 -- mgetty/mgetty-1.1.30/12-fax_faxrunqd.in | 183 ---- mgetty/mgetty-1.1.30/13-fax_faxspool.in | 237 ------ .../14-frontends_X11_viewfax-2.5_Makefile | 60 -- mgetty/mgetty-1.1.30/23-samples_new_fax.mime4 | 77 -- mgetty/mgetty-1.1.30/24-voice_include_paths.h | 15 - mgetty/mgetty-1.1.30/26-voice_libpvf_usr.c | 16 - mgetty/mgetty-1.1.30/36-voice_voice.conf-dist | 11 - mgetty/mgetty-1.1.30/37-Makefile | 141 ---- mgetty/mgetty-1.1.30/39-mgetty.cfg.in | 12 - mgetty/mgetty-1.1.30/40-locks.c_bug153394 | 60 -- mgetty/mgetty-1.1.30/41-ugly-redo-ring.c_bug128668 | 27 - mgetty/mgetty-1.1.30/42-voice_libvoice_detect.c | 28 - mgetty/mgetty-1.1.30/43-moreinfo-cnd.c_bug112163 | 36 - .../mgetty-1.1.30/44-pending-faxexpand.h_bug169455 | 24 - mgetty/mgetty-1.1.30/45-logfile.c | 52 -- mgetty/mgetty-1.1.30/47-doc_mgetty.texi-in | 14 - mgetty/mgetty-1.1.30/50-pending-voice-zoom-2949l-c | 145 ---- mgetty/mgetty-1.1.30/51-pending-faxq-time | 10 - mgetty/mgetty-1.1.30/52-pending-metamail | 88 -- mgetty/mgetty-1.1.30/debian.patch | 923 --------------------- mgetty/mgetty-1.1.30/install.patch | 133 --- mgetty/mgetty-1.1.30/policy.h | 602 -------------- mgetty/mgetty-1.1.30/voice-defs.h | 2 - mgetty/mgetty_1.1.30.bb | 0 33 files changed, 3343 deletions(-) delete mode 100644 mgetty/mgetty-1.1.30/00-g3_Makefile delete mode 100644 mgetty/mgetty-1.1.30/01-adjust-path delete mode 100644 mgetty/mgetty-1.1.30/02-pending-fix-includes delete mode 100644 mgetty/mgetty-1.1.30/03-callback_Makefile delete mode 100644 mgetty/mgetty-1.1.30/04-new_fax.pbm delete mode 100644 mgetty/mgetty-1.1.30/06-pending-contrib_g3tolj.c delete mode 100644 mgetty/mgetty-1.1.30/07-pending-contrib_g3toxwd.c delete mode 100644 mgetty/mgetty-1.1.30/09-doc_Makefile delete mode 100644 mgetty/mgetty-1.1.30/10-doc_faxrunqd.8in delete mode 100644 mgetty/mgetty-1.1.30/12-fax_faxrunqd.in delete mode 100644 mgetty/mgetty-1.1.30/13-fax_faxspool.in delete mode 100644 mgetty/mgetty-1.1.30/14-frontends_X11_viewfax-2.5_Makefile delete mode 100644 mgetty/mgetty-1.1.30/23-samples_new_fax.mime4 delete mode 100644 mgetty/mgetty-1.1.30/24-voice_include_paths.h delete mode 100644 mgetty/mgetty-1.1.30/26-voice_libpvf_usr.c delete mode 100644 mgetty/mgetty-1.1.30/36-voice_voice.conf-dist delete mode 100644 mgetty/mgetty-1.1.30/37-Makefile delete mode 100644 mgetty/mgetty-1.1.30/39-mgetty.cfg.in delete mode 100644 mgetty/mgetty-1.1.30/40-locks.c_bug153394 delete mode 100644 mgetty/mgetty-1.1.30/41-ugly-redo-ring.c_bug128668 delete mode 100644 mgetty/mgetty-1.1.30/42-voice_libvoice_detect.c delete mode 100644 mgetty/mgetty-1.1.30/43-moreinfo-cnd.c_bug112163 delete mode 100644 mgetty/mgetty-1.1.30/44-pending-faxexpand.h_bug169455 delete mode 100644 mgetty/mgetty-1.1.30/45-logfile.c delete mode 100644 mgetty/mgetty-1.1.30/47-doc_mgetty.texi-in delete mode 100644 mgetty/mgetty-1.1.30/50-pending-voice-zoom-2949l-c delete mode 100644 mgetty/mgetty-1.1.30/51-pending-faxq-time delete mode 100644 mgetty/mgetty-1.1.30/52-pending-metamail delete mode 100644 mgetty/mgetty-1.1.30/debian.patch delete mode 100644 mgetty/mgetty-1.1.30/install.patch delete mode 100644 mgetty/mgetty-1.1.30/policy.h delete mode 100644 mgetty/mgetty-1.1.30/voice-defs.h delete mode 100644 mgetty/mgetty_1.1.30.bb (limited to 'mgetty') diff --git a/mgetty/mgetty-1.1.30/00-g3_Makefile b/mgetty/mgetty-1.1.30/00-g3_Makefile deleted file mode 100644 index d12ead44b4..0000000000 --- a/mgetty/mgetty-1.1.30/00-g3_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- mgetty-1.1.27.orig/g3/Makefile -+++ mgetty-1.1.27/g3/Makefile -@@ -5,7 +5,7 @@ - # - - CC=gcc --CFLAGS=-O2 -I.. -g -+CFLAGS=-O2 -I.. #-g - - G3_PROGRAMS=pbm2g3 g3cat g32pbm - diff --git a/mgetty/mgetty-1.1.30/01-adjust-path b/mgetty/mgetty-1.1.30/01-adjust-path deleted file mode 100644 index 9ea223f6d3..0000000000 --- a/mgetty/mgetty-1.1.30/01-adjust-path +++ /dev/null @@ -1,113 +0,0 @@ ---- mgetty-1.1.27.orig/frontends/winword2/WinFaxServ.pl -+++ mgetty-1.1.27/frontends/winword2/WinFaxServ.pl -@@ -11,8 +11,8 @@ - # notice if redistributing. - # - --$MAILER="/usr/lib/sendmail"; --$DIR="/usr/spool/fax/winword"; -+$MAILER="/usr/sbin/sendmail"; -+$DIR="/var/spool/fax/winword"; - - open(LOG, ">>/usr/adm/errors"); - select LOG; $| = 1;select STDOUT; ---- mgetty-1.1.27.orig/voice/scripts/new_voice.craig_southern -+++ mgetty-1.1.27/voice/scripts/new_voice.craig_southern -@@ -43,7 +43,7 @@ - outputfn=$fn.$extension - - # convert file into correct format --/usr/local/bin/rmdtopvf $fn | /usr/local/bin/pvftowav 2>/dev/null > $outputfn -+/usr/bin/rmdtopvf $fn | /usr/bin/pvftowav 2>/dev/null > $outputfn - - echo --$seperator >> $tempfn - echo Content-Type: $contenttype\; name=\"$pagefn\" >> $tempfn ---- mgetty-1.1.27.orig/samples/new_fax.all/new_fax -+++ mgetty-1.1.27/samples/new_fax.all/new_fax -@@ -1,4 +1,4 @@ --#!/bin/ksh -+#!/bin/sh - # - # Written 1996 by Darko Krizic - # -@@ -6,10 +6,11 @@ - # mgetty from Gert Doering. See the README file for more information. - - # Do the settings here --home=/usr/local/newfax # The home directory --config=$home/faxlist # The configuration file --from="Fax Subsystem " # From this user --log=/var/log/faxlog # logfile -+home=/etc/mgetty/newfax.d/ # The home directory -+config=/etc/mgetty/faxlist # The configuration file -+this_host=`hostname` -+from="Fax Subsystem " # From this user -+log=/var/log/mgetty/faxlog # logfile - - # Usually nothing to configure beyond this line - PATH=/usr/bin:/bin:/usr/local/bin:/usr/bin/X11 ---- mgetty-1.1.27.orig/login.cfg.in -+++ mgetty-1.1.27/login.cfg.in -@@ -30,7 +30,7 @@ - # (Big advantage: tuucp can use the same passwd file for serial dial-in - # and tcp dial-in [uucico running as in.uucpd]). Works from 1.05 up. - # --#U* uucp @ /usr/lib/uucp/uucico -l -u @ -+#U* uucp @ /usr/sbin/uucico -l -u @ - - # - # Use this one for fido calls (login name /FIDO/ is handled specially) -@@ -39,7 +39,7 @@ - # mgetty has to be compiled with "-DFIDO", otherwise a fido call won't - # be detected. - # --#/FIDO/ uucp fido /usr/local/lib/fnet/ifcico @ -+#/FIDO/ uucp fido /usr/lib/fnet/ifcico @ - - # - # Automatic PPP startup on receipt of LCP configure request (AutoPPP). -@@ -57,7 +57,7 @@ - # - # NOTE4: max. 9 arguments allowed. - # --#/AutoPPP/ - a_ppp /usr/sbin/pppd auth -chap +pap login debug -+/AutoPPP/ - a_ppp /usr/sbin/pppd auth -chap +pap login debug - - # - # ---- mgetty-1.1.30.old/faxrunq.config 1998-11-12 10:26:00.000000000 -0500 -+++ mgetty-1.1.30/faxrunq.config 2003-07-01 19:14:55.000000000 -0400 -@@ -42,7 +42,7 @@ - #delete-sent-jobs y - - # accounting log file (default: see beginning of faxrunq/faxrunqd script) --#acct-log /var/log/acct.log -+#acct-log /var/log/mgetty/fax/acct.log - - # The following options are for faxrunqd only: - -@@ -51,11 +51,11 @@ - #fax-devices ttyS0:ttyS1 - - # log file for faxrunqd (default: see beginning of faxrunqd script) --#faxrunqd-log /var/log/faxrunqd.log -+#faxrunqd-log /var/log/mgetty/fax/faxrunqd.log - - # number of logfiles to keep around when rolling (default: 3) - #faxrunqd-keep-logs 5 - - # configuration file for policy routing, see faxrunqd man page for - # details (default: none, i.e. don't use policy routing) --#policy-config /usr/local/lib/mgetty+sendfax/policy.config -+#policy-config /etc/mgetty/policy.config ---- mgetty-1.1.27.orig/callback/README -+++ mgetty-1.1.27/callback/README -@@ -5,7 +5,7 @@ - # - # callback experiments - # --cback-gert - - /usr/local/sbin/callback -S 11223344 -+cback-gert - - /usr/sbin/callback -S 11223344 - - to call you back on "11223344" upon entering of a login name of - "cback-gert". If you don't specify a number on the command line, diff --git a/mgetty/mgetty-1.1.30/02-pending-fix-includes b/mgetty/mgetty-1.1.30/02-pending-fix-includes deleted file mode 100644 index 8b27dddcd0..0000000000 --- a/mgetty/mgetty-1.1.30/02-pending-fix-includes +++ /dev/null @@ -1,49 +0,0 @@ ---- mgetty-1.1.27.orig/g3/g3cat.c -+++ mgetty-1.1.27/g3/g3cat.c -@@ -21,6 +21,7 @@ - #endif - #include - #include -+#include - - extern int optind; - extern char * optarg; ---- mgetty-1.1.27.orig/compat/newslock.c -+++ mgetty-1.1.27/compat/newslock.c -@@ -6,6 +6,7 @@ - * TAKEN UNMODIFIED FROM C-NEWS BY Geoffrey Collyer AND Henry Spencer - */ - #include -+#include - #include - - int ---- mgetty-1.1.27.orig/voice/libmgsm/code.c -+++ mgetty-1.1.27/voice/libmgsm/code.c -@@ -8,13 +8,14 @@ - - #include "config.h" - -- - #ifdef HAS_STDLIB_H - #include - #else - # include "proto.h" - extern char * memcpy P((char *, char *, int)); - #endif -+ -+#include - - #include "private.h" - #include "gsm.h" ---- mgetty-1.1.27.orig/voice/libutil/test_wildmat.c -+++ mgetty-1.1.27/voice/libutil/test_wildmat.c -@@ -3,6 +3,8 @@ - */ - - #include -+#include -+#include - - extern int wildmat(char *text, char *p, int length); - diff --git a/mgetty/mgetty-1.1.30/03-callback_Makefile b/mgetty/mgetty-1.1.30/03-callback_Makefile deleted file mode 100644 index 4ef5e088f2..0000000000 --- a/mgetty/mgetty-1.1.30/03-callback_Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- mgetty-1.1.27.orig/callback/Makefile -+++ mgetty-1.1.27/callback/Makefile -@@ -5,7 +5,7 @@ - # - - CC=gcc --CFLAGS=-O2 -I.. -g -+CFLAGS=-O2 -I.. - - zigzag: - cd .. ; $(MAKE) call-back -@@ -40,7 +40,7 @@ - # install programs - # - install: all -- $(INSTALL) -s -m 700 -o root callback $(SBINDIR) -+ $(INSTALL) -s -m 755 -o root callback $(SBINDIR) - $(INSTALL) -s -m 4711 -o root ct $(BINDIR) - - # source modules diff --git a/mgetty/mgetty-1.1.30/04-new_fax.pbm b/mgetty/mgetty-1.1.30/04-new_fax.pbm deleted file mode 100644 index a3642482b9..0000000000 --- a/mgetty/mgetty-1.1.30/04-new_fax.pbm +++ /dev/null @@ -1,8 +0,0 @@ ---- mgetty-1.1.30.orig/samples/new_fax.pbm Thu Jan 2 15:40:12 1997 -+++ mgetty-1.1.30/samples/new_fax.pbm Sun Sep 28 16:46:09 2003 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # From: michael@hal6000.thp.uni-duisburg.de (Michael Staats) - # Subject: Re: Fax notify without in/output redirection? - # To: mgetty@greenie.muc.de diff --git a/mgetty/mgetty-1.1.30/06-pending-contrib_g3tolj.c b/mgetty/mgetty-1.1.30/06-pending-contrib_g3tolj.c deleted file mode 100644 index d0ab83fe84..0000000000 --- a/mgetty/mgetty-1.1.30/06-pending-contrib_g3tolj.c +++ /dev/null @@ -1,49 +0,0 @@ ---- mgetty-1.1.27.orig/contrib/g3tolj.c -+++ mgetty-1.1.27/contrib/g3tolj.c -@@ -57,6 +57,7 @@ - #include - #include - #include -+#include - - typedef unsigned char bit; - -@@ -303,6 +304,8 @@ - - #endif /* _G3_H_ */ - -+void skiptoeol (void); -+ - FILE * - pm_openr (name) - char *name; -@@ -552,7 +555,7 @@ - return (0); - } - --skiptoeol () -+void skiptoeol () - { - while (rawzeros < 11) - (void) rawgetbit (); -@@ -707,9 +710,9 @@ - newpage (fd); - }; - --void main (argc, argv) -- int argc; -- char *argv[]; -+int main (argc, argv) -+ int argc; -+ char *argv[]; - { - int argn, rows, wrows, cols, wcols, row, wrow, col, wcol, i; - int vval, hval; -@@ -864,5 +867,6 @@ - break; - } - putrest (); -- exit (0); -+ -+ return 0; - } diff --git a/mgetty/mgetty-1.1.30/07-pending-contrib_g3toxwd.c b/mgetty/mgetty-1.1.30/07-pending-contrib_g3toxwd.c deleted file mode 100644 index 97f59dd484..0000000000 --- a/mgetty/mgetty-1.1.30/07-pending-contrib_g3toxwd.c +++ /dev/null @@ -1,46 +0,0 @@ ---- mgetty-1.1.27.orig/contrib/g3toxwd.c -+++ mgetty-1.1.27/contrib/g3toxwd.c -@@ -26,6 +26,8 @@ - #include - #include - #include -+#include -+#include - - typedef unsigned char bit; - -@@ -331,6 +333,8 @@ - - #endif /* _G3_H_ */ - -+void skiptoeol (void); -+ - FILE * - pm_openr (name) - char *name; -@@ -604,7 +608,7 @@ - return (0); - } - --skiptoeol () -+void skiptoeol () - { - while (rawzeros < 11) - (void) rawgetbit (); -@@ -732,7 +736,7 @@ - putchar (byte); - }; - --void main (argc, argv) -+int main (argc, argv) - int argc; - char *argv[]; - { -@@ -883,5 +887,6 @@ - xwd_writerow (stdout, writerow, wcols); - wrow++; - } -- exit (0); -+ -+ return 0; - } diff --git a/mgetty/mgetty-1.1.30/09-doc_Makefile b/mgetty/mgetty-1.1.30/09-doc_Makefile deleted file mode 100644 index 1af8ca4771..0000000000 --- a/mgetty/mgetty-1.1.30/09-doc_Makefile +++ /dev/null @@ -1,91 +0,0 @@ ---- mgetty-1.1.28.copy/doc/Makefile 1997-11-27 15:33:26.000000000 -0500 -+++ mgetty-1.1.28/doc/Makefile 2002-07-30 03:27:31.000000000 -0400 -@@ -4,6 +4,8 @@ - # - - NROFF=nroff -+ -+INSTALL=install - # - # - MAN1PAGES=g32pbm.1 g3cat.1 pbm2g3.1 fax.1 \ -@@ -12,11 +14,11 @@ - MAN5PAGES=faxqueue.5 - MAN8PAGES=sendfax.8 mgetty.8 callback.8 faxrunqd.8 - MANSRC=$(MAN1PAGES) $(MAN4PAGES) $(MAN5PAGES) $(MAN8PAGES) --MAN1DIR=/usr/local/man/man1 --MAN4DIR=/usr/local/man/man4 --MAN5DIR=/usr/local/man/man5 --MAN8DIR=/usr/local/man/man8 --INFODIR=/usr/local/info -+MAN1DIR=$(PREFIX)/usr/share/man/man1 -+MAN4DIR=$(PREFIX)/usr/share/man/man4 -+MAN5DIR=$(PREFIX)/usr/share/man/man5 -+MAN8DIR=$(PREFIX)/usr/share/man/man8 -+INFODIR=$(PREFIX)/usr/share/info - - # - # formatted man pages -@@ -26,18 +28,19 @@ - - all: - --doc-all: mgetty.asc mgetty.info mgetty.dvi mgetty.ps fmt-manpages $(MANSRC) -+doc-all: mgetty.info mgetty.dvi mgetty.ps fmt-manpages $(MANSRC) # mgetty.asc - - manpages: $(MANSRC) - - fmt-manpages: - -$(MAKE) `for i in $(MANSRC) ; do echo \`expr $$i : "\([^.]*\)"\`.man ; done ` - --mgetty.asc: mgetty.ms -- -$(NROFF) -ms mgetty.ms >mgetty.asc -+# commented out since I couldn't find texi2roff -+#mgetty.asc: mgetty.ms -+# -$(NROFF) -ms mgetty.ms >mgetty.asc - --mgetty.ms: mgetty.texi -- -texi2roff -ms mgetty.ms -+#mgetty.ms: mgetty.texi -+# -texi2roff -ms mgetty.ms - - mgetty.html: mgetty.texi - -texi2html -verbose mgetty.texi -@@ -62,10 +65,12 @@ - - fullclean: clean - rm -f mgetty.ps mgetty.dvi mgetty.aux mgetty.info* mgetty.ms \ -- *.man *.[1-9] mgetty.texi -+ *.man *.[1-9] mgetty.texi # mgetty.asc -+ -+install: install.man install.info - --install: $(MANSRC) mgetty.info -- -mkdir `dirname $(MAN1DIR)` $(MAN1DIR) $(MAN4DIR) $(MAN5DIR) $(MAN8DIR) 2>/dev/null -+install.man: $(MANSRC) -+ -mkdir -p `dirname $(MAN1DIR)` $(MAN1DIR) $(MAN4DIR) $(MAN5DIR) $(MAN8DIR) 2>/dev/null - for i in $(MAN1PAGES) ; do \ - $(INSTALL) -m 644 $$i $(MAN1DIR) ; \ - done -@@ -78,8 +83,10 @@ - for i in $(MAN8PAGES) ; do \ - $(INSTALL) -m 644 $$i $(MAN8DIR) ; \ - done -+ -+install.info: - if [ -f mgetty.info ] ; then\ -- test -d $(INFODIR) || mkdir $(INFODIR) 2>/dev/null ; \ -+ test -d $(INFODIR) || mkdir -p $(INFODIR) 2>/dev/null ; \ - for i in mgetty.info* ; do \ - $(INSTALL) -m 644 $$i $(INFODIR) ; \ - done ; \ -@@ -92,8 +99,8 @@ - ../mgetty0$(VS)doc.tar.gz: doc-all mgetty.html - gtar cvvf ../mgetty0$(VS)doc.tar mgetty.texi mgetty.info* \ - mgetty.dvi mgetty.ps \ -- mgetty.ms mgetty.asc \ - mgetty.html *.man -+# mgetty.ms mgetty.asc - gzip -f -9 -v ../mgetty0$(VS)doc.tar - - # explicit man page dependencies diff --git a/mgetty/mgetty-1.1.30/10-doc_faxrunqd.8in b/mgetty/mgetty-1.1.30/10-doc_faxrunqd.8in deleted file mode 100644 index 5d29580c50..0000000000 --- a/mgetty/mgetty-1.1.30/10-doc_faxrunqd.8in +++ /dev/null @@ -1,60 +0,0 @@ ---- mgetty-1.1.30.old/doc/faxrunqd.8in 2002-11-23 11:47:17.000000000 -0500 -+++ mgetty-1.1.30/doc/faxrunqd.8in 2003-07-15 16:08:22.000000000 -0400 -@@ -3,7 +3,7 @@ - .SH NAME - faxrunqd \- daemon to send fax jobs queued by faxspool(1) - .SH SYNOPSIS --.B faxrunqd [-v] [-d] [-l ] [-u ] [-V] -+.B faxrunqd [-v] [-d] [-D] [-l ] [-u ] [ -g ] [-V] - .SH DESCRIPTION - Runs in the background, and regularily checks the fax queue set up by - faxspool(1). Sends all jobs that are due, records results, and takes -@@ -59,7 +59,7 @@ - would do (send a mail, delete the JOB directory, execute a named program, - etc.). Both programs are fully compatible in this respect. - --.B faxrunqd [-v] [-d] [-l ] [-u ] [-V] -+.B faxrunqd [-v] [-d] [-D] [-l ] [-u ] [ -g ] [-V] - .SH OPTIONS - .TP - .B -v -@@ -67,17 +67,22 @@ - .I faxrunqd - to write progress information to the log file. - .TP -+.B -D -+Tells -+.I faxrunqd -+to run in the background, as a daemon. -+.TP - .B -d - Tells - .I faxrunqd - to write debugging information to stdout and the log file (usually used --together with -v) -+together with -v). - .TP - .B -l - Specifies the list of modem devices to use. Multiple devices are - separated with ':', e.g. '-l ttyS0:ttyS1'. - .TP --.B -u -+.B -u - .I faxrunqd - can now (since 1.1.29) run as unprivileged user. If you start it as root - from /etc/inittab or from one of the /etc/rc* scripts, it's strongly -@@ -86,7 +91,13 @@ - .I faxrunqd - drop all its privileges at startup, and run as the specified user. Running - .I faxrunqd --as root user might lead to security problems - don't do it. -+as root user might lead to security problems - don't do it. This -+parameter takes either a uid or a username as argument. -+.TP -+.B -g -+.I Same effect as above but for the group id. Indicates the group which -+should own the fax files. This parameter takes either a gid or a -+groupname as argument. - .TP - .B -V - print version number and exit diff --git a/mgetty/mgetty-1.1.30/12-fax_faxrunqd.in b/mgetty/mgetty-1.1.30/12-fax_faxrunqd.in deleted file mode 100644 index dfe01784be..0000000000 --- a/mgetty/mgetty-1.1.30/12-fax_faxrunqd.in +++ /dev/null @@ -1,183 +0,0 @@ ---- mgetty-1.1.30/fax/faxrunqd.in.orig 2003-09-13 11:04:12.000000000 +0000 -+++ mgetty-1.1.30-5.1/fax/faxrunqd.in 2003-09-13 11:12:47.000000000 +0000 -@@ -13,6 +13,9 @@ - # - # Change Log: - # -+# Debian 1.1.30-5.1 2003/07/20 Andreas Barth -+# Can specify group per commandline. -+# - # $Log$ - # Revision 1.3 2004-11-09 00:36:47 handhelds.org!kergoth - # Turn off EOLN_NATIVE flag - # - # (Logical change 1.4593) - # - # Revision 1.63 2002/11/23 16:52:18 gert - # make messages more clear, print warning if running as root -@@ -45,6 +48,11 @@ - # a "low prio" job for phone number 123 could be attached to a high prio - # job to 123, and thus be sent before a high prio job to 456) - # -+# Debian 1.1.28-4 2002/11/27 18:32:23 Wolfgang Sourdeau -+# Quit quietly when received signal TERM or HUP since it is expected the -+# user knows what is happening already. The quit message is still written -+# into the logfile. -+# - # Revision 1.56 2002/01/04 17:52:42 gert - # pass sendfax exit code as 2nd argument to success/failure program - # -@@ -55,6 +63,9 @@ - # Revision 1.54 2001/12/16 14:26:25 gert - # stop queue handling if a file named 'stop' exists - # -+# Add a -D option to allow for running in the background as a Daemon -+# Philip Hands -+# - # Revision 1.53 2000/08/06 14:28:37 gert - # go from using $fax_spool_out/.last_run to VARRUNDIR/faxqueue_done - # -@@ -129,6 +140,8 @@ - # - # - require 5.004; -+ -+use Fcntl; - use POSIX; - use IO::Handle; - use Getopt::Std; -@@ -143,10 +156,10 @@ - $mail='@MAILER@'; - - $faxrunq_cf='@CONFDIR@/faxrunq.config'; --$fax_acct='@FAX_SPOOL@/acct.log'; --$faxrd_log='@FAX_SPOOL@/faxrunqd.log'; -+$fax_acct='/var/log/mgetty/fax/acct.log'; -+$faxrd_log='/var/log/mgetty/fax/faxrunqd.log'; - --$faxrd_pid='@FAX_SPOOL_OUT@/faxrunqd.pid'; -+$faxrd_pid='/var/run/mgetty-fax/faxrunqd.pid'; - $last_run='@FAX_SPOOL_OUT@/faxqueue_done'; - - $policy_config=''; -@@ -189,8 +202,10 @@ - $opt_V = 0; # print version number - $opt_l = ''; # ttys to use - $opt_u = ''; # user id to setuid() to --getopts( 'dvVl:u:' ) || -- die "Valid options: -d (debug), -v (verbose), -l tty, -u uid, -V (version)\n"; -+$opt_g = ''; # group id to setgid() to -+$opt_D = 0; # daemon -+getopts( 'DdvVl:u:g:' ) || -+ die "Valid options: -D (daemon), -d (debug), -v (verbose), -l tty, -u uid, -g uid, -V (version)\n"; - - if ( $opt_d ) { $opt_v=1; } - -@@ -201,32 +216,63 @@ - mgetty+sendfax by Gert Doering - $rcs_id - --config file read from '$faxrunq_cf' -+config read from '$faxrunq_cf' - - EOF - exit 0; - } - -+$uid=$>; -+$gid=$); -+ - if ( $opt_u ne '' ) # set user ID to $opt_u - { -- my ( $uid, $gid ) = ( getpwnam( $opt_u ) )[2,3]; -+ ( $uid, $gid ) = ( ( $opt_u =~ /^[0-9]+$/ ) -+ ? getpwuid( $opt_u ) -+ : getpwnam( $opt_u ) )[2,3]; - - if ( !defined($uid) || !defined($gid) ) - { die "$0: no such user: '$opt_u'\n"; } - - print "change user ID to '$opt_u' (numeric uid: $uid, gid: $gid)\n" - if $opt_d; -- $( = $) = $gid; -- $< = $> = $uid; -- -- if ( $> != $uid || $) != $gid ) -- { die "$0: can't set uid to $uid / gid to $gid: $!\n"; } - } -+ -+if ( $opt_g ne '' ) -+ { -+ $gid = ( ( $opt_g =~ /^[0-9]+$/ ) -+ ? getgrgid( $opt_g ) -+ : getgrnam( $opt_g ) )[2]; -+ die "$0: no such group: '$opt_g'\n" unless defined ($gid); -+ } -+ -+$( = $) = $gid; -+$< = $> = $uid; -+ -+if ( $> != $uid || $) != $gid ) -+ { die "$0: can't set uid to $uid / gid to $gid: $!\n"; } -+ - if ( $> == 0 ) # root check - { - print STDERR "$0: running with root privileges is not recommended\n"; - } - -+# fork as a daemon if invoked with -D -+if ( $opt_D ) { -+ $pid = fork ; -+ die "Cannot fork: $!" unless defined $pid ; -+ if (0 == $pid) { -+ # Child process: become leader of a new session, lose STDIN, log STDOUT/ERR -+ POSIX::setsid(); -+ umask(022); -+ open(STDIN, "/dev/null") ; -+ open(STDOUT, ">&LOG") ; -+ open(STDERR, ">&LOG") ; -+ } else { -+ exit 0; # parent process -+ } -+} -+ - # - # startup... write PID file, make sure no other faxrunqd runs - # -@@ -262,7 +308,7 @@ - - $SIG{USR1} = \&signal_handler_USR1; # roll log file - $roll_log_file_requested = 0; --$roll_level=3; # keep 3 old files around -+$roll_level=7; # keep 7 old files around - - $SIG{USR2} = \&signal_handler_USR2; # graceful exit - $graceful_exit_requested = 0; -@@ -355,7 +401,7 @@ - # - # open log file - # --open( LOG, ">>$faxrd_log" ) || -+sysopen( LOG, "$faxrd_log", O_CREAT | O_APPEND | O_WRONLY, 0640 ) || - die "can't write log file '$faxrd_log'"; - LOG->autoflush(1); - print LOG "\n" . localtime() .": faxrunqd starting, pid=$$\n"; -@@ -552,7 +598,7 @@ - $roll_log_file_requested=0; - - # start new -- open( LOG, ">$faxrd_log" ) || -+ sysopen( LOG, "$faxrd_log", O_CREAT | O_APPEND | O_WRONLY, 0640 ) || - die "can't re-open log file '$faxrd_log'"; - LOG->autoflush(1); - print LOG localtime() .": -- new log file started --\n"; -@@ -1639,7 +1685,8 @@ - { - my $sig = shift; - -- print "\nfaxrunqd: signal handler: got signal $sig, goodbye...\n"; -+ print "\nfaxrunqd: signal handler: got signal $sig, goodbye...\n" -+ if ($sig ne 'TERM' && $sig ne 'HUP' && $sig ne 'USR2'); - print LOG "\nfaxrunqd: signal handler: got signal $sig, goodbye...\n"; - - # save tty statistics diff --git a/mgetty/mgetty-1.1.30/13-fax_faxspool.in b/mgetty/mgetty-1.1.30/13-fax_faxspool.in deleted file mode 100644 index ba7a994258..0000000000 --- a/mgetty/mgetty-1.1.30/13-fax_faxspool.in +++ /dev/null @@ -1,237 +0,0 @@ ---- mgetty-1.1.30.orig/fax/faxspool.in 2002-11-23 10:14:57.000000000 -0500 -+++ mgetty-1.1.30/fax/faxspool.in 2003-04-27 23:48:56.000000000 -0400 -@@ -70,7 +70,7 @@ - FAX_SPOOL=@FAX_SPOOL@ - FAX_SPOOL_OUT=@FAX_SPOOL_OUT@ - FAX_SEQ=$FAX_SPOOL_OUT/.Sequence --FAX_SEQ_LOCKDIR=$FAX_SPOOL_OUT/locks -+FAX_SEQ_LOCKDIR=/var/lock/fax - FAX_SEQ_LOCK=$FAX_SEQ_LOCKDIR/LCK..seq - LAST_RUN=@FAX_SPOOL_OUT@/faxqueue_done - -@@ -145,7 +145,7 @@ - # - fs_cvt_pbm() - { -- pbm2g3 $1 >$2.001 -+ pbm2g3 "$1" >"$2".001 - } - - # -@@ -153,7 +153,7 @@ - # - fs_cvt_pgm() - { -- pgmtopbm $1 | pbm2g3 >$2.001 -+ pgmtopbm "$1" | pbm2g3 >"$2".001 - } - - # -@@ -161,7 +161,7 @@ - # - fs_cvt_ppm() - { -- ppmtopgm $1 | pgmtopbm | pbm2g3 >$2.001 -+ ppmtopgm "$1" | pgmtopbm | pbm2g3 >"$2".001 - } - - # -@@ -171,7 +171,7 @@ - # - fs_cvt_g3() - { -- g3cat $1 >$2.001 -+ g3cat "$1" >"$2".001 - } - - # -@@ -183,14 +183,14 @@ - fs_cvt_xwd() - { - REDUCE="cat" -- test X$3 = X-n && REDUCE="pnmscale -yscale 0.5" -+ test X"$3" = X-n && REDUCE="pnmscale -yscale 0.5" - -- xwdtopnm $1 |\ -+ xwdtopnm "$1" |\ - pnmscale -xysize 1728 2000 |\ - $REDUCE |\ - ppmtopgm |\ - pgmtopbm |\ -- pbm2g3 >$2.001 -+ pbm2g3 >"$2".001 - } - - # -@@ -201,14 +201,14 @@ - fs_cvt_gif() - { - REDUCE="cat" -- test X$3 = X-n && REDUCE="pnmscale -yscale 0.5" -+ test X"$3" = X-n && REDUCE="pnmscale -yscale 0.5" - -- giftoppm $1 |\ -+ giftopnm "$1" |\ - pnmscale -xysize 1728 2000 |\ - $REDUCE |\ - ppmtopgm |\ - pgmtopbm |\ -- pbm2g3 >$2.001 -+ pbm2g3 >"$2".001 - } - - # -@@ -219,14 +219,14 @@ - fs_cvt_tif() - { - REDUCE="cat" -- test X$3 = X-n && REDUCE="pnmscale -yscale 0.5" -+ test X"$3" = X-n && REDUCE="pnmscale -yscale 0.5" - -- tifftopnm $1 |\ -+ tifftopnm "$1" |\ - pnmscale -xysize 1728 2000 |\ - $REDUCE |\ - ppmtopgm |\ - pgmtopbm |\ -- pbm2g3 >$2.001 -+ pbm2g3 >"$2".001 - } - - # -@@ -235,11 +235,11 @@ - # - fs_cvt_lj() - { -- if [ X$3 = X-n ] -+ if [ X"$3" = X-n ] - then -- hp2log3 -r$2 <$1 -+ hp2log3 -r"$2" <"$1" - else -- hp2hig3 -r$2 <$1 -+ hp2hig3 -r"$2" <"$1" - fi - } - -@@ -251,10 +251,10 @@ - fs_cvt_ps() - { - driver="$GS_DRIVER_HI" -- test X$3 = X-n && driver="$GS_DRIVER_LO" -+ test X"$3" = X-n && driver="$GS_DRIVER_LO" - -- cat $1 | -- gs $driver -sOutputFile=$2%03d -dNOPAUSE -q -dSAFER - -+ cat "$1" | -+ gs $driver -sOutputFile="$2"%03d -dNOPAUSE -q -dSAFER - - } - - # -@@ -268,19 +268,19 @@ - # via Ghostscript: - - driver="$GS_DRIVER_HI" -- test X$3 = X-n && driver="$GS_DRIVER_LO" -+ test X"$3" = X-n && driver="$GS_DRIVER_LO" - -- gs $driver -sOutputFile=$2%03d -dNOPAUSE \ -- -- gslp.ps -fCourier-Bold10 -B $1 -+ gs $driver -sOutputFile="$2"%03d -dNOPAUSE \ -+ -- gslp.ps -fCourier-Bold10 -B "$1" - - ##### - # via hp2pbm: - # (convert "LF" to "CR+LF" via awk) - - # pgm=hp2hig3 --# test X$3 = X-n && pgm=hp2log3 -+# test X"$3" = X-n && pgm=hp2log3 - # --# $AWK '{ printf "%s\r\n", $0 }' $1 | $pgm -r$2 -+# $AWK '{ printf "%s\r\n", $0 }' "$1" | $pgm -r"$2" - - ##### - # via pbmtext (not really recommended): -@@ -288,13 +288,13 @@ - - ## Select appropriate font - # font=$PBMFONT_BODY_F --# test X$3 = X-n && font=$PBMFONT_BODY_N -+# test X"$3" = X-n && font=$PBMFONT_BODY_N - # Determine how many pages text will be split in to. Uses default pagelen. --# nr=`pgx < $1` -+# nr=`pgx < "$1"` - # Convert each page into a separate G3 file. Uses default pagelen (60). - # page=1 - # while [ $page -le $nr ]; do --# pgx $page < $1 | pbmtext -font $font | pbm2g3 >$2.$page -+# pgx $page < "$1" | pbmtext -font $font | pbm2g3 >"$2".$page - # page=`expr $page + 1` - # done - } -@@ -306,7 +306,7 @@ - # - fs_cvt_dvi() - { -- if [ X$3 = X-n ] -+ if [ X"$3" = X-n ] - then - driver="$GS_DRIVER_LO" ; dvipscfg="-P dfaxlo" - else -@@ -316,18 +316,18 @@ - # if you do not have the dfaxlo(w)/dfaxhigh dvips modes configured, - # remove "$dvipscfg" from the dvips command line below [or configure them!] - -- dvips $dvipscfg $1 -o \ -- !"gs $driver -sOutputFile=$2%03d -dNOPAUSE -dSAFER -q -" -+ dvips $dvipscfg "$1" -o \ -+ !"gs $driver -sOutputFile="$2"%03d -dNOPAUSE -dSAFER -q -" - - # for those that only have the old "dvialw": - # - # dvialw <$file | --# gs $driver -sOutputFile=$2%03d -dNOPAUSE -dSAFER -q - -+# gs $driver -sOutputFile="$2"%03d -dNOPAUSE -dSAFER -q - - - # for those that have dvi2ps and not dvips: - # - # dvi2ps -r -q $q | --# gs $driver -sOutputFile=$2%03d -dNOPAUSE -dSAFER -q - -+# gs $driver -sOutputFile="$2"%03d -dNOPAUSE -dSAFER -q - - - } - -@@ -341,11 +341,11 @@ - fs_cvt_pdf() - { - driver="$GS_DRIVER_HI" -- test X$3 = X-n && driver="$GS_DRIVER_LO" -+ test X"$3" = X-n && driver="$GS_DRIVER_LO" - -- cat $1 | -+ cat "$1" | - acroread -toPostScript | -- gs $driver -sOutputFile=$2%03d -dNOPAUSE -q -dSAFER - -+ gs $driver -sOutputFile="$2"%03d -dNOPAUSE -q -dSAFER - - } - - -@@ -487,7 +487,7 @@ - then - user="$2" - else -- $echo "not authorized to use \`\`-u $2'' switch." >&2 -+ $echo "not authorized to use \`\`-u "$2"'' switch." >&2 - exit 3 - fi - shift ; shift -@@ -547,7 +547,7 @@ - exit 3 - fi - --phone=$1 ; shift -+phone="$1" ; shift - if expr "$phone" : "[-0-9TtPpWw,;]*$" >/dev/null ; then : - else - alias="$phone" diff --git a/mgetty/mgetty-1.1.30/14-frontends_X11_viewfax-2.5_Makefile b/mgetty/mgetty-1.1.30/14-frontends_X11_viewfax-2.5_Makefile deleted file mode 100644 index d218b6e7cc..0000000000 --- a/mgetty/mgetty-1.1.30/14-frontends_X11_viewfax-2.5_Makefile +++ /dev/null @@ -1,60 +0,0 @@ ---- mgetty-1.1.28.old/frontends/X11/viewfax-2.5/Makefile 2002-08-03 17:26:26.000000000 -0400 -+++ mgetty-1.1.28/frontends/X11/viewfax-2.5/Makefile 2002-08-03 17:30:26.000000000 -0400 -@@ -21,15 +21,15 @@ - - ####### Site-specific definitions ####### - # Destination directories and installation program for make install --BINDIR = /usr/local/bin --LIBDIR = /usr/local/lib --MANDIR = /usr/local/man/man1 --INSTALL = /usr/ucb/install -+BINDIR = $(DESTDIR)/usr/bin -+DOCDIR = $(DESTDIR)/usr/share/doc/mgetty-viewfax -+MANDIR = $(DESTDIR)/usr/share/man/man1 -+INSTALL = /usr/bin/install - RM = rm -f - # Location of help file --HELP = \"$(LIBDIR)/viewfax.tif\" -+HELP = \"$(DOCDIR)/viewfax.tif\" - # optimisation level, debug etc --OPT = -g -O2 -Wno-uninitialized -ansi -pedantic -+OPT = -O2 -Wno-uninitialized -ansi -pedantic - # C compiler and libraries - # vanilla sysv - #CC = cc -@@ -43,22 +43,22 @@ - #LIBS = - # sun solaris2 with gcc on supersparc: - CC = gcc --CFLAGS = -Wall $(OPT) -DHELPFILE=$(HELP) -msupersparc -I/usr/openwin/include --LDFLAGS = $(OPT) -L/usr/openwin/lib -R/usr/openwin/lib -+CFLAGS = -Wall $(OPT) -DHELPFILE=$(HELP) -I/usr/openwin/include -+LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 - LIBS = - - ####### End of configurable definitions ####### - OBJS = viewfax.o faxinput.o faxinit.o faxexpand.o - - viewfax: $(OBJS) -- $(CC) $(LDFLAGS) -o viewfax $(OBJS) -lX11 $(LIBS) -+ $(CC) $(LDFLAGS) -o viewfax $(OBJS) $(LIBS) - - g3hack: g3hack.c - - install: viewfax - $(INSTALL) -s -m 755 viewfax $(BINDIR) - $(INSTALL) -m 644 viewfax.man $(MANDIR)/viewfax.1 -- $(INSTALL) -m 644 viewfax.tif $(LIBDIR) -+ $(INSTALL) -m 644 viewfax.tif $(DOCDIR)/ - - D = viewfax-$(VERS) - FILES = $D/README $D/COPYING $D/ChangeLog $D/Imakefile $D/Makefile \ -@@ -75,7 +75,7 @@ - - shar:; (cd ..; shar -a -n$D -M -sfdc@cliwe.ping.de -c -o $D/part -l64 $(FILES)) - --clean:; $(RM) *.o *~ core -+clean:; $(RM) *.o *~ core viewfax - - viewfax.o: faxexpand.h - faxinput.o: faxexpand.h diff --git a/mgetty/mgetty-1.1.30/23-samples_new_fax.mime4 b/mgetty/mgetty-1.1.30/23-samples_new_fax.mime4 deleted file mode 100644 index e5f3d0a061..0000000000 --- a/mgetty/mgetty-1.1.30/23-samples_new_fax.mime4 +++ /dev/null @@ -1,77 +0,0 @@ ---- mgetty-1.1.30.old/samples/new_fax.mime4 1999-04-17 06:38:50.000000000 -0400 -+++ mgetty-1.1.30/samples/new_fax.mime4 2003-07-01 23:45:07.000000000 -0400 -@@ -37,13 +37,14 @@ - PATH=/usr/sbin:/usr/local/bin:/usr/bin:/bin:$PATH - - # Select image type by uncommenting one of the following lines: --#PBMTOX=pnmtopng ; MIME_TYPE="image/png" ; FILE_EXTN=png --PBMTOX=ppmtogif ; MIME_TYPE="image/gif" ; FILE_EXTN=gif -+PBMTOX=pnmtopng ; MIME_TYPE="image/png" ; FILE_EXTN=png -+#PBMTOX=ppmtogif ; MIME_TYPE="image/gif" ; FILE_EXTN=gif - #PBMTOX=pnmtotiff ; MIME_TYPE="image/tiff" ; FILE_EXTN=tif - # PBM files may be huge - #PBMTOX=cat ; MIME_TYPE="image/x-portable-bitmap" ; FILE_EXTN=pbm - # compressed PBM files - #PBMTOX=gzip ; MIME_TYPE="application/octet-stream"; FILE_EXTN=pbm.gz -+#PBMTOX=NONE ; MIME_TYPE="image/fax-g3"; FILE_EXTN=g3 - - # The binaries we need; please check carefully !!! - BASENAME=basename -@@ -63,14 +64,23 @@ - - # Some miscellaneous data and filenames. - TMP=/tmp --MAIL_MESS=$TMP/MESS_$$ --ERRO_MESS=$TMP/ERRO_$$ --IMAG_FILE=$TMP/TIFF_$$ --MIME_MESS=$TMP/MAIL_$$ -+MAIL_MESS=`/bin/tempfile -pMESS_` -+ERRO_MESS=`/bin/tempfile -pERRO_` -+IMAG_FILE=`/bin/tempfile -pTIFF_` -+MIME_MESS=`/bin/tempfile -pMAIL_` -+if [ ! -f $MAIL_MESS ] ||\ -+ [ ! -f $ERRO_MESS ] ||\ -+ [ ! -f $IMAG_FILE ] ||\ -+ [ ! -f $MIME_MESS ] -+then -+ echo "Could not create one of the temporary files. Aborting..."; -+ exit 1; -+fi -+ - umask 077 - - # Clean up from previous invocations and trap errors --$RM -f $MAIL_MESS $ERRO_MESS $IMAG_FILE $MIME_MESS -+# $RM -f $MAIL_MESS $ERRO_MESS $IMAG_FILE $MIME_MESS - trap "$RM -f $MAIL_MESS $ERRO_MESS $IMAG_FILE $MIME_MESS; exit" 0 1 2 15 - - # Essential lines to put into the header of a MIME mail. -@@ -86,7 +96,7 @@ - ATTACHMENT_ENDLINE="--attachment--" - - # Now we build our MIME mailheader using commandline arguments. --$ECHO "Subject: incoming FAX from $2 with $3 pages" > $MAIL_MESS -+$ECHO "Subject: incoming FAX from $2 with $3 pages" >> $MAIL_MESS - $ECHO "$HEADERLINE_1" >> $MAIL_MESS - $ECHO "$HEADERLINE_2" >> $MAIL_MESS - $ECHO "" >> $MAIL_MESS -@@ -109,6 +119,9 @@ - # - for i in $@ - do -+if [ "$PBMTOX" = "NONE" ]; then -+ IMAG_FILE=$i -+else - # We use the second character in the filename to identify the - # resolution of our incoming fax, so we can easily scale the fax for - # display on a screen. -@@ -126,7 +139,8 @@ - # handle standard input correctly. - $CAT $i 2>> $ERRO_MESS \ - | $G3TOPBM $STRETCH 2>> $ERRO_MESS \ -- | $PBMTOX >> $IMAG_FILE 2>> $ERRO_MESS -+ | $PBMTOX > $IMAG_FILE 2>> $ERRO_MESS -+fi - # - # Now we put the header for each attachment into our MIME mail. - $ECHO "$ATTACHMENT_HEADERLINE_1" >> $MIME_MESS diff --git a/mgetty/mgetty-1.1.30/24-voice_include_paths.h b/mgetty/mgetty-1.1.30/24-voice_include_paths.h deleted file mode 100644 index 3503080ad8..0000000000 --- a/mgetty/mgetty-1.1.30/24-voice_include_paths.h +++ /dev/null @@ -1,15 +0,0 @@ ---- mgetty-1.1.27.orig/voice/include/paths.h -+++ mgetty-1.1.27/voice/include/paths.h -@@ -19,10 +19,10 @@ - * the device name. - */ - --#define VGETTY_LOG_PATH "/var/log/vgetty.%s" -+#define VGETTY_LOG_PATH "/var/log/mgetty/vg_%s.log" - - /* - * Filename of the logfile for vm. - */ - --#define VM_LOG_PATH "/var/log/vm.log" -+#define VM_LOG_PATH "/var/log/mgetty/vm.log" diff --git a/mgetty/mgetty-1.1.30/26-voice_libpvf_usr.c b/mgetty/mgetty-1.1.30/26-voice_libpvf_usr.c deleted file mode 100644 index 3396a5616f..0000000000 --- a/mgetty/mgetty-1.1.30/26-voice_libpvf_usr.c +++ /dev/null @@ -1,16 +0,0 @@ ---- mgetty-1.1.27.orig/voice/libpvf/usr.c -+++ mgetty-1.1.27/voice/libpvf/usr.c -@@ -103,9 +103,13 @@ - } - } - gsm_encode(r, s, d); -+#if defined(old_USR_GSM_with_head_and_tail_bytes) - fwrite((char *)gsm_head, 2, 1, fd_out); -+#endif - fwrite((char *)d, sizeof(d), 1, fd_out); -+#if defined(old_USR_GSM_with_head_and_tail_bytes) - fwrite((char *)gsm_tail, 3, 1, fd_out); -+#endif - } - gsm_destroy(r); - return(OK); diff --git a/mgetty/mgetty-1.1.30/36-voice_voice.conf-dist b/mgetty/mgetty-1.1.30/36-voice_voice.conf-dist deleted file mode 100644 index 854fbc12df..0000000000 --- a/mgetty/mgetty-1.1.30/36-voice_voice.conf-dist +++ /dev/null @@ -1,11 +0,0 @@ ---- mgetty-1.1.30.orig/voice/voice.conf-dist 2002-12-15 14:43:49.000000000 -0500 -+++ mgetty-1.1.30/voice/voice.conf-dist 2003-04-27 23:53:14.000000000 -0400 -@@ -51,7 +51,7 @@ - # - - phone_owner root --phone_group phone -+phone_group voice - phone_mode 0660 - - # diff --git a/mgetty/mgetty-1.1.30/37-Makefile b/mgetty/mgetty-1.1.30/37-Makefile deleted file mode 100644 index 49219c1e14..0000000000 --- a/mgetty/mgetty-1.1.30/37-Makefile +++ /dev/null @@ -1,141 +0,0 @@ ---- mgetty-1.1.30.orig/Makefile 2002-12-16 08:08:23.000000000 -0500 -+++ mgetty-1.1.30/Makefile 2003-04-28 00:25:24.000000000 -0400 -@@ -107,7 +107,7 @@ - # prompt first. Don't forget to activate the /AutoPPP/ line in login.config! - # - #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL --CFLAGS=-O2 -Wall -pipe -+CFLAGS=-O2 -Wall -pipe -DAUTO_PPP -DFIDO - #CFLAGS=-O -DSVR4 - #CFLAGS=-O -DSVR4 -DSVR42 - #CFLAGS=-O -DUSE_POLL -@@ -169,7 +169,7 @@ - # - # if your systems doesn't have one, use the shell script that I provide - # in "inst.sh" (taken from X11R5). Needed on IRIX5.2 --INSTALL=install -c -o bin -g bin -+INSTALL=install -c - #INSTALL=install -c -o root -g wheel # NeXT/BSD - #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 -@@ -177,11 +177,11 @@ - # - # prefix, where most (all?) of the stuff lives, usually /usr/local or /usr - # --prefix=/usr/local -+prefix=$(DESTDIR)/usr - # - # prefix for all the spool directories (usually /usr/spool or /var/spool) - # --spool=/var/spool -+spool=$(DESTDIR)/var/spool - # - # where the mgetty + sendfax binaries live (used for "make install") - # -@@ -193,11 +193,11 @@ - # - # where the font+coverpage files go - # --LIBDIR=$(prefix)/lib/mgetty+sendfax -+LIBDIR=$(prefix)/lib/mgetty-fax - # - # where the configuration files (*.config, aliases, fax.allow/deny) go to - # --CONFDIR=$(prefix)/etc/mgetty+sendfax -+CONFDIR=$(DESTDIR)/etc/mgetty - #CONFDIR=/etc/default/ - # - # -@@ -220,31 +220,33 @@ - # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER - # MUST NOT BE root or any other privileged account). - # --FAX_OUT_USER=fax -+FAX_OUT_USER=uucp - # - # - # Where section 1 manual pages should be placed --MAN1DIR=$(prefix)/man/man1 -+MAN1DIR=$(prefix)/share/man/man1 - # - # Where section 4 manual pages (mgettydefs.4) should be placed --MAN4DIR=$(prefix)/man/man4 -+MAN4DIR=$(prefix)/share/man/man4 - # - # Section 5 man pages (faxqueue.5) --MAN5DIR=$(prefix)/man/man5 -+MAN5DIR=$(prefix)/share/man/man5 - # - # Section 8 man pages (sendfax.8) --MAN8DIR=$(prefix)/man/man8 -+MAN8DIR=$(prefix)/share/man/man8 - # - # Where the GNU Info-Files are located - # --INFODIR=$(prefix)/info -+INFODIR=$(prefix)/share/info - # - # - # A shell that understands bourne-shell syntax - # Usually this will be /bin/sh or /usr/bin/sh, but bash or ksh are fine. - # (on some ultrix systems, you may need /bin/sh5 here) - # --SHELL=/bin/sh -+# On Debian GNU/Linux, bash is a required package so we can use it to solve -+# bug #149851. -+SHELL=/bin/bash - # - # If you have problems with the awk-programs in the fax/ shell scripts, - # try using "nawk" or "gawk" (or whatever works...) here -@@ -274,7 +276,7 @@ - # please use the "mg.echo" program provided in the compat/ subdirectory. - # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo - # --ECHO="echo" -+ECHO="echo -e" - # - # INSTALL_MECHO=mg.echo - -@@ -284,7 +286,7 @@ - - # To maintain security, I recommend creating a new group for - # users who are allowed to manipulate the recorded voice messages. --PHONE_GROUP=phone -+PHONE_GROUP=voice - PHONE_PERMS=770 - - # Add -DNO_STRSTR to CFLAGS if you don't have strstr(). -@@ -594,7 +596,7 @@ - -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) - -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old - -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old -- $(INSTALL) -s -m 700 mgetty $(SBINDIR) -+ $(INSTALL) -s -m 755 mgetty $(SBINDIR) - $(INSTALL) -s -m 755 sendfax $(SBINDIR) - # - # data files + directories -@@ -663,12 +665,15 @@ - # - # documentation - # --install.doc: -- cd doc ; $(MAKE) install INSTALL="$(INSTALL)" \ -+install.man: -+ cd doc ; $(MAKE) install.man INSTALL="$(INSTALL)" \ - MAN1DIR=$(MAN1DIR) \ - MAN4DIR=$(MAN4DIR) \ - MAN5DIR=$(MAN5DIR) \ -- MAN8DIR=$(MAN8DIR) \ -+ MAN8DIR=$(MAN8DIR) -+ -+install.info: -+ cd doc ; $(MAKE) install.info INSTALL="$(INSTALL)" \ - INFODIR=$(INFODIR) - - # -@@ -736,3 +741,5 @@ - conf_sf.h - tio.o : tio.c mgetty.h ugly.h tio.h - utmp.o : utmp.c mgetty.h ugly.h mg_utmp.h -+ -+.PHONY: install install.bin install.man install.info diff --git a/mgetty/mgetty-1.1.30/39-mgetty.cfg.in b/mgetty/mgetty-1.1.30/39-mgetty.cfg.in deleted file mode 100644 index 835ed08729..0000000000 --- a/mgetty/mgetty-1.1.30/39-mgetty.cfg.in +++ /dev/null @@ -1,12 +0,0 @@ ---- mgetty-1.1.27.orig/mgetty.cfg.in -+++ mgetty-1.1.27/mgetty.cfg.in -@@ -20,6 +20,9 @@ - # access the modem(s) with @SPEED@ bps - speed @SPEED@ - -+# use an alternate issue file, to avoid being bitten by linuxlogo -+issue-file /etc/issue.mgetty -+ - # use these options to make the /dev/tty-device owned by "uucp.uucp" - # and mode "rw-rw-r--" (0664). *LEADING ZERO NEEDED!* - #port-owner uucp diff --git a/mgetty/mgetty-1.1.30/40-locks.c_bug153394 b/mgetty/mgetty-1.1.30/40-locks.c_bug153394 deleted file mode 100644 index 0de2fb6b0f..0000000000 --- a/mgetty/mgetty-1.1.30/40-locks.c_bug153394 +++ /dev/null @@ -1,60 +0,0 @@ ---- mgetty-1.1.28.old/locks.c 2001-01-06 12:46:34.000000000 -0500 -+++ mgetty-1.1.28/locks.c 2002-08-03 16:25:02.000000000 -0400 -@@ -394,9 +394,42 @@ - - #else /* not SVR4 */ - -+static char * unslash_name _P1 ( (device), -+ char *device ) -+{ -+ char *lock_device, *ldev_begin, *ldevice_orig; -+ -+ ldevice_orig = malloc( strlen (device) + 1 ); -+ sprintf( ldevice_orig, "%s", device ); -+ -+ lock_device = strchr( ldevice_orig, '/' ); -+ while (lock_device) -+ { -+ *lock_device = '_'; -+ lock_device = strchr( lock_device, '/' ); -+ } -+ -+ if ( *ldevice_orig == '_' ) -+ { -+ lock_device = strchr( ldevice_orig + 1, '_' ); -+ if (! lock_device) -+ lock_device = ldevice_orig; -+ lock_device++; -+ } -+ else -+ lock_device = ldevice_orig; -+ -+ ldev_begin = malloc( strlen( lock_device ) + 1 ); -+ sprintf( ldev_begin, "%s", lock_device ); -+ free( ldevice_orig ); -+ -+ return ldev_begin; -+} -+ - static char * get_lock_name _P2( (lock_name, device), - char * lock_name, char * device ) - { -+ char *lock; - #ifdef LOCKS_LOWERCASE - /* sco locking convention -> change all device names to lowercase */ - -@@ -425,10 +458,10 @@ - #endif /* LOCKS_LOWERCASE */ - - /* throw out all directory prefixes */ -- if ( strchr( device, '/' ) != NULL ) -- device = strrchr( device, '/' ) +1; -- -- sprintf( lock_name, LOCK, device); -+ -+ lock = unslash_name ( device ); -+ sprintf( lock_name, LOCK, lock ); -+ free ( lock ); - - return lock_name; - } diff --git a/mgetty/mgetty-1.1.30/41-ugly-redo-ring.c_bug128668 b/mgetty/mgetty-1.1.30/41-ugly-redo-ring.c_bug128668 deleted file mode 100644 index fa07ee1b8e..0000000000 --- a/mgetty/mgetty-1.1.30/41-ugly-redo-ring.c_bug128668 +++ /dev/null @@ -1,27 +0,0 @@ ---- mgetty-1.1.30.orig/ring.c Thu Dec 5 21:29:10 2002 -+++ mgetty-1.1.30/ring.c Mon Sep 29 20:30:23 2003 -@@ -219,6 +219,8 @@ - char buf[BUFSIZE], ch, *p; - int i, w, r; - int rc = SUCCESS; -+boolean got_name = FALSE; -+boolean got_nmbr = FALSE; - boolean got_dle; /* for events (voice mode) */ - - lprintf( L_MESG, "wfr: waiting for ``RING''" ); -@@ -321,7 +324,14 @@ - * instead of waiting for the next "real" RING - * (but don't do this for V253 DRON/DROF modems!) - */ -- if ( strncmp( buf, "NMBR", 4 ) == 0 && drox_count == 0 ) { break; } -+ if ( strncmp( buf, "NMBR", 4 ) == 0 && drox_count == 0 ) { got_nmbr = TRUE; } -+ if ( strncmp( buf, "NAME", 4 ) == 0 ) { got_name = TRUE; } -+ -+ if ( got_nmbr && got_name ) break; /* got both name & number */ -+ -+ /* special case -> break; do not expect caller name */ -+ if ( got_nmbr && CallerId[0] == 'P' ) break; /* private */ -+ if ( got_nmbr && CallerId[0] == 'O' ) break; /* out of area */ - - /* V.253 ring cadences */ - if ( strncmp( buf, "DRON", 4 ) == 0 || diff --git a/mgetty/mgetty-1.1.30/42-voice_libvoice_detect.c b/mgetty/mgetty-1.1.30/42-voice_libvoice_detect.c deleted file mode 100644 index eb414be7d1..0000000000 --- a/mgetty/mgetty-1.1.30/42-voice_libvoice_detect.c +++ /dev/null @@ -1,28 +0,0 @@ ---- mgetty-1.1.30.orig/voice/libvoice/detect.c 2002-12-11 22:44:38.000000000 -0800 -+++ mgetty-1.1.30/voice/libvoice/detect.c 2003-09-07 14:52:01.000000000 -0700 -@@ -86,6 +86,8 @@ - {ati, "Venus V.90 USB U052099a", NULL, &Lucent}, - {ati, "AEIGPM560LKTF1 Voice V2 V92cap", NULL, &V253modem}, - {ati, "Zoom V.90 PCI I030100gV -H Z207",NULL, &Lucent}, -+ {ati, "Zoom V.90 PCI I052099gV -G Z207",NULL, &Lucent}, -+ {ati, "Zoom V.90 Serial s052099g -I Z207", NULL, &Lucent}, - {ati, "28800", ati6, NULL}, - {ati, "2886", NULL, &US_Robotics}, - {ati, "336", NULL, &Rockwell}, -@@ -106,6 +108,7 @@ - {ati, "3X WYSIWYF 628DBX", NULL, &Rockwell}, - {ati, "56000", NULL, &Rockwell}, - {ati, "5601", NULL, &US_Robotics}, -+ {ati, "57600", NULL, &Multitech_2834ZDXv}, - {ati, "961", NULL, &Rockwell}, - {ati, "Digi RAS modem 56000", NULL, &Digi_RAS}, - {ati, "Linux ISDN", NULL, &ISDN4Linux}, -@@ -114,6 +117,8 @@ - NULL, &Multitech_5634ZPX}, - {ati, "LT V.90 1.0 MT5634ZBAV Serial Data/Fax/Voice Modem Version 4.09a", - NULL, &Multitech_5634ZBAV}, -+ {ati, "LT V.92 1.0 MT5634ZBAV-V92 Serial Data/Fax/Voice Modem Version 1.25p", -+ NULL, &Multitech_5634ZBAV}, - {ati4, "33600bps Voice Modem For Italy", - NULL, &Rockwell}, - {ati6, "RCV336DPFSP Rev 44BC", diff --git a/mgetty/mgetty-1.1.30/43-moreinfo-cnd.c_bug112163 b/mgetty/mgetty-1.1.30/43-moreinfo-cnd.c_bug112163 deleted file mode 100644 index 94a3ce66b0..0000000000 --- a/mgetty/mgetty-1.1.30/43-moreinfo-cnd.c_bug112163 +++ /dev/null @@ -1,36 +0,0 @@ ---- mgetty-1.1.30.orig/cnd.c 2002-11-05 16:43:04.000000000 -0500 -+++ mgetty-1.1.30/cnd.c 2003-04-28 00:07:35.000000000 -0400 -@@ -94,6 +94,9 @@ - /* Swedish Telia/ZyXEL Omni 52k - Torulf Lundgren, torulf@upsys.se */ - {"Diverting number:", &CallerId}, - -+ /* FALCOM A2D gsm modem */ -+ {"+CLIP: ", &CallerId}, -+ - {NULL} - }; - -@@ -163,6 +166,23 @@ - if ( *p == '\'' || *p == '\"' || !isprint(*p) ) *p = ' '; - p++; - } -+ -+ if ( strcmp(cp->string,"+CLIP: ") == 0 ) { -+ char *q ; -+ -+ p = *(cp->variable) ; -+ q = *(cp->variable) ; -+ /* strip non digit charaters */ -+ while( ! isdigit(*p) ) p++; -+ /* shift only digit characters */ -+ while( isdigit(*p) ) { -+ *q=*p ; -+ p++ ; -+ q++ ; -+ } -+ *q = 0; -+ } -+ - } - lprintf(L_JUNK, "CND: found: %s", *(cp->variable)); - return; diff --git a/mgetty/mgetty-1.1.30/44-pending-faxexpand.h_bug169455 b/mgetty/mgetty-1.1.30/44-pending-faxexpand.h_bug169455 deleted file mode 100644 index 9ccdf08287..0000000000 --- a/mgetty/mgetty-1.1.30/44-pending-faxexpand.h_bug169455 +++ /dev/null @@ -1,24 +0,0 @@ ---- mgetty-1.1.28.old/frontends/X11/viewfax-2.5/faxexpand.h 2000-08-26 07:08:22.000000000 -0400 -+++ mgetty-1.1.28/frontends/X11/viewfax-2.5/faxexpand.h 2002-11-27 01:01:19.000000000 -0500 -@@ -17,6 +17,12 @@ - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -+/* Wed, 27 Nov 2002 00:59:35 -0500, Wolfgang Sourdeau -+ : -+ - member "vres" of struct pagenode explicitly declared as "signed -+ char" instead of "char" for platforms where char is unsigned. -+ */ -+ - #include - - #if ULONG_MAX == 4294967295UL -@@ -69,7 +75,7 @@ - char inverse; /* black <=> white */ - char lsbfirst; /* bit order is lsb first */ - char orient; /* orientation - upsidedown, landscape, mirrored */ -- char vres; /* vertical resolution: 1 = fine */ -+ signed char vres; /* vertical resolution: 1 = fine */ - void (*expander)(struct pagenode *, drawfunc); - void *extra; /* used for Ximage */ - }; diff --git a/mgetty/mgetty-1.1.30/45-logfile.c b/mgetty/mgetty-1.1.30/45-logfile.c deleted file mode 100644 index a14a380f7a..0000000000 --- a/mgetty/mgetty-1.1.30/45-logfile.c +++ /dev/null @@ -1,52 +0,0 @@ ---- mgetty-1.1.30.orig/logfile.c 2002-11-25 08:08:26.000000000 -0500 -+++ mgetty-1.1.30/logfile.c 2003-04-28 00:08:35.000000000 -0400 -@@ -56,10 +56,14 @@ - /* Most systems have these variables but do not declare them. On many - of those systems that _do_ declare them, it won't hurt */ - --extern int sys_nerr; --#if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__) --extern char *sys_errlist[]; --#endif -+/* commented in by was@debian.org on Wed, 27 Nov 2002 01:15:11 -0500 -+ because sys_nerr and sys_errlist are deprecated. strerror() is used -+ instead below.*/ -+ -+/* extern int sys_nerr; */ -+/* #if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__) */ -+/* extern char *sys_errlist[]; */ -+/* #endif */ - - /* Interactive Unix is a little bit braindead - does not have atexit(), - */ -@@ -209,6 +213,7 @@ - va_list pvar; - int errnr; - char * p; -+char *error_string; - static int first_open = TRUE; - - if ( level > log_level ) /* log level high enough? */ -@@ -325,12 +330,20 @@ - } - else /* ERROR or FATAL */ - { -+ error_string = strerror (errnr); -+ if ( error_string == NULL ) -+ { -+ if ( errno == EINVAL ) -+ error_string = ""; -+ else -+ error_string = ""; -+ } -+ - fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s", - tm->tm_mon+1, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec, - log_infix, ws, -- ( errnr <= sys_nerr ) ? sys_errlist[errnr]: -- "" ); -+ strerror (errnr)); - #ifdef SYSLOG - syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws ); - #endif diff --git a/mgetty/mgetty-1.1.30/47-doc_mgetty.texi-in b/mgetty/mgetty-1.1.30/47-doc_mgetty.texi-in deleted file mode 100644 index 3f6b6c6d1e..0000000000 --- a/mgetty/mgetty-1.1.30/47-doc_mgetty.texi-in +++ /dev/null @@ -1,14 +0,0 @@ ---- mgetty-1.1.30.old/doc/mgetty.texi-in 2002-11-17 16:19:45.000000000 -0500 -+++ mgetty-1.1.30/doc/mgetty.texi-in 2003-07-05 22:23:20.000000000 -0400 -@@ -7,6 +7,11 @@ - @finalout - - @ifinfo -+@dircategory Communication -+@direntry -+* Mgetty: (mgetty). A smart modem replacement for getty. -+@end direntry -+ - This is the online documentation for the mgetty + sendfax - package. - diff --git a/mgetty/mgetty-1.1.30/50-pending-voice-zoom-2949l-c b/mgetty/mgetty-1.1.30/50-pending-voice-zoom-2949l-c deleted file mode 100644 index 1edfe3fd65..0000000000 --- a/mgetty/mgetty-1.1.30/50-pending-voice-zoom-2949l-c +++ /dev/null @@ -1,145 +0,0 @@ ---- mgetty-1.1.30.orig/voice/libvoice/Lucent.c 2001-04-13 04:01:44.000000000 -0700 -+++ mgetty-1.1.30/voice/libvoice/Lucent.c 2003-09-07 14:58:41.000000000 -0700 -@@ -66,6 +66,7 @@ - - static int Lucent_set_compression (int *compression, int *speed, int *bits) - { -+ char buffer[VOICE_BUF_LEN]; - reset_watchdog(); - - if (*compression == 0) -@@ -86,7 +87,8 @@ - return(FAIL); - } - -- if (voice_command("AT+VSM=128", "OK") != VMA_USER_1) -+ sprintf(buffer, "AT+VSM=128,%d", *speed); -+ if (voice_command(buffer, "OK") != VMA_USER_1) - return(FAIL); - - break; -@@ -100,8 +102,8 @@ - return(FAIL); - } - -- -- if (voice_command("AT+VSM=129", "OK") != VMA_USER_1) -+ sprintf(buffer, "AT+VSM=129,%d", *speed); -+ if (voice_command(buffer, "OK") != VMA_USER_1) - return(FAIL); - - break; -@@ -115,8 +117,8 @@ - return(FAIL); - } - -- -- if (voice_command("AT+VSM=130,8000", "OK") != VMA_USER_1) -+ sprintf(buffer, "AT+VSM=130,%d", *speed); -+ if (voice_command(buffer, "OK") != VMA_USER_1) - return(FAIL); - - break; -@@ -130,24 +132,27 @@ - voice_modem_name, *speed); - return(FAIL); - } -- if (voice_command("AT+VSM=131,8000", "OK") != VMA_USER_1) -- return(FAIL); -- -- break; -+ sprintf(buffer, "AT+VSM=131,%d", *speed); -+ if (voice_command(buffer, "OK") != VMA_USER_1) -+ return(FAIL); -+ -+ break; - - case 5: - *bits = 4; - -- if ( *speed != 8000 ) -+ if ((*speed != 8000) && (*speed != 7200) && (*speed != 11025)) - { - lprintf(L_WARN, "%s: Illegal sample rate (%d)", - voice_modem_name, *speed); - return(FAIL); - } -- if (voice_command("AT+VSM=132,8000", "OK") != VMA_USER_1) -- return(FAIL); - -- break; -+ sprintf(buffer, "AT+VSM=132,%d", *speed); -+ if (voice_command(buffer, "OK") != VMA_USER_1) -+ return(FAIL); -+ -+ break; - - default: - lprintf(L_WARN, "%s: Illegal voice compression method (%d)", ---- mgetty-1.1.30.orig/voice/pvftools/pvftormd.c 2002-11-19 07:39:34.000000000 -0800 -+++ mgetty-1.1.30/voice/pvftools/pvftormd.c 2003-09-07 14:11:26.000000000 -0700 -@@ -535,12 +535,13 @@ - { - header_out.bits = 4; - -- if (header_in.speed != 8000) -+ if ((header_in.speed != 7200) && (header_in.speed != 8000) && -+ (header_in.speed != 11025)) - { - fprintf(stderr, "%s: Unsupported sample speed (%d)\n", - program_name, header_in.speed); - fprintf(stderr, -- "%s: The Lucent only supports 8000 samples/second\n", -+ "%s: The Lucent only supports 7.2k, 8k and 11.025k samples/second\n", - program_name); - fclose(fd_out); - ---- mgetty-1.1.30.orig/voice/libvoice/V253modem.c 2002-11-25 13:14:51.000000000 -0800 -+++ mgetty-1.1.30/voice/libvoice/V253modem.c 2003-09-11 08:40:51.000000000 -0700 -@@ -177,26 +177,26 @@ - case 2: /* 2bit ADPCM for some ELSA-modems */ - { - *bits = 2; -- if (voice_command("AT+VSM=140,7200", "OK")!= VMA_USER_1) -- { -+ sprintf(buffer, "AT+VSM=140,%d", *speed); -+ if (voice_command(buffer, "OK") != VMA_USER_1) -+ { - /* there are two diffrent implementations trying one first, - if this fails we try the other one later */ -- Kompressionmethod = 129; -- } -- else -- { -- Kompressionmethod = 140; -- } -- *speed=7200; -+ Kompressionmethod = 129; -+ } -+ else -+ { -+ Kompressionmethod = 140; -+ } - break; - } - case 4: /* 4bit ADPCM for some ELSA-modems */ - { -- if (voice_command("AT+VSM=141,7200", "OK")!= VMA_USER_1) -+ sprintf(buffer, "AT+VSM=141,%d", *speed); -+ if (voice_command(buffer, "OK")!= VMA_USER_1) - { - /* there are two diffrent implementations trying one first, - if this fails we try the other one later */ -- - Kompressionmethod = 131; - } - else -@@ -204,7 +204,6 @@ - Kompressionmethod = 141; - } - *bits=4; -- *speed=7200; - break; - } - case 5: - diff --git a/mgetty/mgetty-1.1.30/51-pending-faxq-time b/mgetty/mgetty-1.1.30/51-pending-faxq-time deleted file mode 100644 index f2538344b5..0000000000 --- a/mgetty/mgetty-1.1.30/51-pending-faxq-time +++ /dev/null @@ -1,10 +0,0 @@ ---- mgetty-1.1.30.orig/fax/faxq.in Sat Nov 23 19:57:59 2002 -+++ mgetty-1.1.30.orig/fax/faxq.in Sun Sep 28 17:59:40 2003 -@@ -100,6 +100,7 @@ - }' -` - $echo "$i:" - $echo "\tQueued by: $USER" -+ $echo "\t at: "`find $(dirname $i)/${PAGES%% *} -printf "%Ax %AH:%AM\n"` - if [ -z "$VERBTO" ] - then - $echo "\t to: $PHONE" diff --git a/mgetty/mgetty-1.1.30/52-pending-metamail b/mgetty/mgetty-1.1.30/52-pending-metamail deleted file mode 100644 index 37d0764745..0000000000 --- a/mgetty/mgetty-1.1.30/52-pending-metamail +++ /dev/null @@ -1,88 +0,0 @@ -diff -urN mgetty-1.1.30~/samples/new_fax.mime3 mgetty-1.1.30/samples/new_fax.mime3 ---- mgetty-1.1.30~/samples/new_fax.mime3 2003-09-23 22:11:05.000000000 +1000 -+++ mgetty-1.1.30/samples/new_fax.mime3 2003-09-23 22:20:41.000000000 +1000 -@@ -13,8 +13,8 @@ - # image/x-fax-g3; viewfax -geometry +5+23 '%s'; test=test -n "$DISPLAY" - # image/x-fax-g3;; print=printfax '%s' - # --# You need the program mmencode for base64 encoding of the fax data, --# which you will find in your metamail distribution. -+# You need the program base64-encode for base64 encoding of the fax data, -+# which you will find in your mime-codecs package. - # - # (c) 1997-1998 Roland Rosenfeld - # -@@ -65,7 +65,7 @@ - echo "" >> $TMPMAIL - - # base64 encoder: -- mmencode -b $file >> $TMPMAIL -+ base64-encode < $file >> $TMPMAIL - - echo "" >> $TMPMAIL - done -@@ -75,4 +75,4 @@ - # Send out the created mail: - sendmail $ADMIN < $TMPMAIL - --exit 0 -\ No newline at end of file -+exit 0 -diff -urN mgetty-1.1.30~/samples/new_fax.mime4 mgetty-1.1.30/samples/new_fax.mime4 ---- mgetty-1.1.30~/samples/new_fax.mime4 2003-09-23 22:11:05.000000000 +1000 -+++ mgetty-1.1.30/samples/new_fax.mime4 2003-09-23 22:21:09.000000000 +1000 -@@ -19,8 +19,8 @@ - # MIME tools as possible. - # - # This 'new_fax' only needs ' g32pbm', 'pnmscale' and 'pnmtotiff' from the --# 'pbmplus' package, 'mmencode' from the 'multimail' packages, and the rest --# is standard Unix tools. -+# 'pbmplus' package, 'base64-encode' from the 'mime-codecs' packages, and -+# the rest is standard Unix tools. - # It was tested with thsmail under Linux and PMMail under OS/2 as frontends. - - # This script is called when a message was recorded. -@@ -50,8 +50,7 @@ - CAT=cat - ECHO=echo - G3TOPBM=g32pbm --#MMENCODE=mmencode --MMENCODE=mimencode -+MMENCODE=base64-encode - RM=rm - SED=sed - SENDMAIL=sendmail -@@ -136,7 +135,7 @@ - # - # Here we do base64 encoding of out TIFF data and add the result - # into our MIME mail as attachment. -- $MMENCODE -b $IMAG_FILE >> $MIME_MESS 2>> $ERRO_MESS -+ $MMENCODE < $IMAG_FILE >> $MIME_MESS 2>> $ERRO_MESS - # - # To clean up temporary TIFF data. - $RM -f $IMAG_FILE -diff -urN mgetty-1.1.30~/samples/new_fax.tiff mgetty-1.1.30/samples/new_fax.tiff ---- mgetty-1.1.30~/samples/new_fax.tiff 2003-09-23 22:11:05.000000000 +1000 -+++ mgetty-1.1.30/samples/new_fax.tiff 2003-09-23 22:19:32.000000000 +1000 -@@ -12,7 +12,7 @@ - # script. The following script combines all received pages to one - # tiff-file which is sent to all recipients beeing in the alias for fax. - # Reading the fax is quite easy with Netscape when the tiffsurf-plugin is --# installed. -+# installed. You need the metamail package for metasend. - # - # As the script may be usefull for someone I'll post it here. It's quite - # short (and perhaps not that elegant...), but for me it works great. -diff -urN mgetty-1.1.30~/voice/scripts/new_voice.craig_southern mgetty-1.1.30/voice/scripts/new_voice.craig_southern ---- mgetty-1.1.30~/voice/scripts/new_voice.craig_southern 2003-09-23 22:11:05.000000000 +1000 -+++ mgetty-1.1.30/voice/scripts/new_voice.craig_southern 2003-09-23 22:13:28.000000000 +1000 -@@ -50,7 +50,7 @@ - echo Content-Transfer-Encoding: base64 >> $tempfn - echo Content-Disposition: attachment\; filename=\"$pagefn\" >> $tempfn - echo "">> $tempfn --/usr/bin/mimencode $outputfn >> $tempfn -+/usr/bin/base64-encode < $outputfn >> $tempfn - - #rm -f $fn - rm -f $outputfn - diff --git a/mgetty/mgetty-1.1.30/debian.patch b/mgetty/mgetty-1.1.30/debian.patch deleted file mode 100644 index 1dd9ff2b9d..0000000000 --- a/mgetty/mgetty-1.1.30/debian.patch +++ /dev/null @@ -1,923 +0,0 @@ ---- mgetty-1.1.30.orig/doc/faxrunqd.8in -+++ mgetty-1.1.30/doc/faxrunqd.8in -@@ -276,23 +276,25 @@ - behaviour, you can send it the following signals: - - .TP --.B SIGHUP --.TP - .B SIGINT - .TP - .B SIGTERM - remove lock file, remove pid file, terminate immediately. - - .TP -+.B SIGHUP -+finish all fax jobs that are currently being sent, then terminate (this -+is used to signal faxrunqd "I want you to terminate" without disturbing -+the normal flow of operation - SIGINT/TERM etc. can lead to some faxes being -+sent twice). -+ -+.TP - .B SIGUSR1 - close, roll, and re-open log file. - - .TP - .B SIGUSR2 --finish all fax jobs that are currently being sent, then terminate (this --is used to signal faxrunqd "I want you to terminate" without disturbing --the normal flow of operation - SIGHUP etc. can lead to some faxes being --sent twice). -+dump current modem success/failure statistics to log file. - - .IX fax - .SH BUGS ---- mgetty-1.1.30.orig/doc/mgetty.8in -+++ mgetty-1.1.30/doc/mgetty.8in -@@ -42,10 +42,13 @@ - .B -p - Use the given string to prompt users for their login names. Various - tokens are allowed in this string. These tokens are: @ for the system --name, \\n, \\r, \\g, \\v, \\f, \\t for newline, carriage return, bell, --vertical tab, form feed, and tab, respectively. \\P and \\L will expand to --the tty name ("ttyS0"). \\I will give the "CONNECT foobar" string returned -+name, \\n, \\r, \\g, \\b, \\v, \\f, \\t for newline, carriage return, bell, -+backspace, vertical tab, form feed, and tab, respectively. -+\\P and \\L will expand to the tty name ("ttyS0"). \\Y will give the Caller -+ID, \\I the "CONNECT foobar" string returned - by the modem, and \\S will output the port speed. -+\\s, \\m, \\V, \\R represent the operating system, the hardware name, -+the OS version, the OS release. - \\N and \\U give the number of users currently logged in. - \\C will be changed into the result of ctime(), and \\D and \\T will - output the date and time, respectively. Finally, \\ will use digit ---- mgetty-1.1.30.orig/doc/mgetty.texi-in -+++ mgetty-1.1.30/doc/mgetty.texi-in -@@ -1,6 +1,6 @@ - \input texinfo @c -*-texinfo-*- - @c %**start of header --@c $Id$ (c) 1993-2000 Gert Doering and Klaus Weidner -+@c $Id$ (c) 1993-2000 Gert Doering and Klaus Weidner - @setfilename mgetty.info - @settitle mgetty + sendfax - @c %**end of header -@@ -1096,6 +1096,9 @@ - @samp{/etc/issue}. Some special characters are substituted by connect - speed, date, etc. - see below (login-prompt) for a list. - -+Note: maximum line length after substitution is 300 characters, so be -+careful with ASCII art banners with lots of color settings and such. -+ - @item @code{prompt-waittime} @var{msecs} - - This specifies how long @code{mgetty} will wait for modem and line to -@@ -1117,6 +1120,10 @@ - @item \b backspace (ascii 010) - @item \f form feed (ascii 013) - @item \t TAB -+@item \s operating system (