Hello community, here is the log from the commit of package mgetty checked in at Fri Nov 7 15:24:54 CET 2008. -------- --- mgetty/mgetty.changes 2008-10-09 05:15:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/mgetty/mgetty.changes 2008-11-07 12:22:39.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 7 12:22:01 CET 2008 - prusnak@suse.cz + +- alter tempfile.patch to reuse spooldir (CVE-2008-4936) [bnc#442596] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mgetty-1.1.36-callback.diff mgetty-1.1.36-local.diff mgetty-1.1.36-makefile.diff mgetty-1.1.36-specialdigits.diff mgetty-1.1.36-tempfile.diff New: ---- mgetty-1.1.36-callback.patch mgetty-1.1.36-local.patch mgetty-1.1.36-makefile.patch mgetty-1.1.36-specialdigits.patch mgetty-1.1.36-tempfile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mgetty.spec ++++++ --- /var/tmp/diff_new_pack.i25347/_old 2008-11-07 15:24:13.000000000 +0100 +++ /var/tmp/diff_new_pack.i25347/_new 2008-11-07 15:24:13.000000000 +0100 @@ -23,7 +23,7 @@ # allow postinst script to succeed BuildRequires: pwdutils Version: 1.1.36 -Release: 25 +Release: 26 PreReq: %install_info_prereq filesystem Requires: g3utils Recommends: logrotate @@ -34,12 +34,12 @@ Summary: Mgetty Listens for Data, Fax, or Voice Calls on a Serial Line Source0: %{name}%{version}-Jun15.tar.bz2 Source2: logrotate -Patch0: %{name}-%{version}-makefile.diff -Patch1: %{name}-%{version}-local.diff -Patch5: %{name}-%{version}-tempfile.diff -Patch6: %{name}-%{version}-callback.diff -Patch7: %{name}-%{version}-specialdigits.diff -Patch8: mgetty-1.1.36-implicit-fortify-decl.patch +Patch0: %{name}-%{version}-makefile.patch +Patch1: %{name}-%{version}-local.patch +Patch2: %{name}-%{version}-tempfile.patch +Patch3: %{name}-%{version}-callback.patch +Patch4: %{name}-%{version}-specialdigits.patch +Patch5: %{name}-%{version}-implicit-fortify-decl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -101,12 +101,12 @@ %prep %setup -q -%patch +%patch0 %patch1 +%patch2 +%patch3 -p1 +%patch4 %patch5 -%patch6 -p1 -%patch7 -%patch8 %build ln -s policy.h-dist policy.h @@ -274,6 +274,8 @@ %doc %{_mandir}/man8/sendfax.8.gz %changelog +* Fri Nov 07 2008 prusnak@suse.cz +- alter tempfile.patch to reuse spooldir (CVE-2008-4936) [bnc#442596] * Thu Oct 09 2008 crrodriguez@suse.de - fix implicit-fortify-decl errors * Thu Aug 07 2008 prusnak@suse.cz @@ -386,7 +388,7 @@ * Tue Jun 14 2005 meissner@suse.de - use RPM_OPT_FLAGS. - fixed 1 single byte overflow (harmless) -* Wed Feb 09 2005 kkeil@suse.de +* Tue Feb 08 2005 kkeil@suse.de - allow '#' and '*' in faxspool phone numbers (#26060) * Thu Jan 13 2005 pth@suse.de - fix calls of trap in faxrunq. @@ -503,7 +505,7 @@ * Mon Jan 25 1999 uli@suse.de - update 1.1.18 -> 1.1.19 - fixed typo in frontends/dialog/faxv.in code -* Fri Oct 02 1998 ro@suse.de +* Thu Oct 01 1998 ro@suse.de - remove origs in voice/scripts * Thu Oct 01 1998 ro@suse.de - added tmp-fix for frontends/dialog/faxv.in ++++++ mgetty-1.1.36-callback.patch ++++++ Index: mgetty-1.1.35/callback/callback.config ================================================================================ --- mgetty-1.1.36/Makefile +++ mgetty-1.1.36/Makefile @@ -578,7 +578,7 @@ install: install.bin install.doc install.bin: mgetty sendfax newslock \ - login.config mgetty.config sendfax.config + login.config mgetty.config sendfax.config call-back callback # # binaries # @@ -590,6 +590,9 @@ -mv -f $(DESTDIR)$(SBINDIR)/sendfax $(DESTDIR)$(SBINDIR)/sendfax.old $(INSTALL) -m 700 mgetty $(DESTDIR)$(SBINDIR) $(INSTALL) -m 755 sendfax $(DESTDIR)$(SBINDIR) + + -mv -f $(DESTDIR)$(SBINDIR)/callback $(DESTDIR)$(SBINDIR)/callback.old + $(INSTALL) -m 755 callback/callback $(DESTDIR)$(SBINDIR) # # data files + directories # @@ -607,6 +610,9 @@ $(INSTALL) -m 600 dialin.config $(DESTDIR)$(CONFDIR)/ test -f $(DESTDIR)$(CONFDIR)/faxrunq.config || \ $(INSTALL) -m 644 faxrunq.config $(DESTDIR)$(CONFDIR)/ + + test -f $(DESTDIR)$(CONFDIR)/callback.config || \ + $(INSTALL) -m 644 callback/callback.config $(DESTDIR)$(CONFDIR)/ # # test for outdated stuff # @@ -644,6 +650,15 @@ BINDIR=$(BINDIR) SBINDIR=$(SBINDIR) \ LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) # +# callback tool +# + + cd callback ; $(MAKE) install INSTALL="$(INSTALL)" \ + FAX_OUT_USER=$(FAX_OUT_USER) $(DESTDIR) \ + BINDIR=$(BINDIR) SBINDIR=$(SBINDIR) \ + LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) + +# # compatibility # if [ ! -z "$(INSTALL_MECHO)" ] ; then \ --- mgetty-1.1.36/callback/Makefile +++ mgetty-1.1.36/callback/Makefile @@ -37,7 +37,7 @@ # install programs # install: all - $(INSTALL) -m 755 callback $(SBINDIR) - $(INSTALL) -m 4755 ct $(BINDIR) + $(INSTALL) -m 755 callback $(DESTDIR)$(SBINDIR) + #$(INSTALL) -m 4755 ct $(DESTDIR)$(BINDIR) # source modules --- mgetty-1.1.36/callback/callback.config +++ mgetty-1.1.36/callback/callback.config @@ -8,3 +8,15 @@ max-time 90 debug 9 dial-prefix ATX3D + +# options taken from sources (with default values) +# "dialout-devices" +# "delay", 20 +# "delay-randomize", 10 +# "retry-time", 30 +# "max-time", 600 +# "modem-init", 0 +# "speed", 38400 +# "dial-prefix" +# "autobauding", false +# "prompt-waittime", 300 ++++++ mgetty-1.1.36-implicit-fortify-decl.patch ++++++ --- /var/tmp/diff_new_pack.i25347/_old 2008-11-07 15:24:13.000000000 +0100 +++ /var/tmp/diff_new_pack.i25347/_new 2008-11-07 15:24:13.000000000 +0100 @@ -1,7 +1,5 @@ -Index: faxsend.c -=================================================================== ---- faxsend.c.orig 2007-06-15 08:44:58.000000000 +0200 -+++ faxsend.c 2008-10-09 05:08:09.000000000 +0200 +--- faxsend.c ++++ faxsend.c @@ -18,6 +18,7 @@ */ ++++++ mgetty-1.1.36-local.patch ++++++ --- contrib/faxdvi2.perl +++ contrib/faxdvi2.perl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # # faxdvi2 -- pass a DVI file to the FAX subsystem. # @@ -21,7 +21,7 @@ # rs@purple.PNoF.sub.org -$config_file = '/usr/local/lib/mgetty+sendfax/faxdvi.config'; +$config_file = '/usr/lib/mgetty+sendfax/faxdvi.config'; $user_file = "$ENV{'HOME'}/.faxdvirc"; $dvips = 'dvips -t letter -P fax'; --- contrib/faxiobe.sh +++ contrib/faxiobe.sh @@ -35,8 +35,8 @@ X X# define GHOSTSCRIPT and SENDFAX correct for you site X -XGHOSTSCRIPT=\"/usr/local/bin/gs\" -XSENDFAX=\"/usr/local/sbin/sendfax -v\" +XGHOSTSCRIPT=\"/usr/bin/gs\" +XSENDFAX=\"/usr/sbin/sendfax -v\" X X# define NOFAX for a dummy program instead of sendfax X# this is for debugging. A sample "nofax" is in the distribution. @@ -160,11 +160,11 @@ X#define SLEEPTIME 300 /* make multiple of 10 please */ X X#ifndef GHOSTSCRIPT -X#define GHOSTSCRIPT "/usr/local/bin/gs" +X#define GHOSTSCRIPT "/usr/bin/gs" X#endif X X#ifndef SENDFAX -X#define SENDFAX "/usr/local/sbin/sendfax" +X#define SENDFAX "/usr/sbin/sendfax" X#endif X X#ifndef NOFAX --- contrib/lp-fax +++ contrib/lp-fax @@ -81,7 +81,7 @@ # send the file(s) to the standard out $copies times while [ "$copies" -gt 0 ] do - /usr/local/bin/faxspool -u $name -f "$name ($user)" $fax_no $* + /usr/bin/faxspool -u $name -f "$name ($user)" $fax_no $* # for file # do # 0<${file} eval ${FILTER} 2>&1 --- contrib/mgetty-to-flexfax.sh +++ contrib/mgetty-to-flexfax.sh @@ -28,7 +28,7 @@ --- new_fax --- #! /bin/sh -PATH=/usr/local/bin:/usr/ucb:/bin:/usr/local/lib/mgetty+sendfax:$PATH +PATH=/usr/local/bin:/usr/ucb:/bin:/usr/lib/mgetty+sendfax:$PATH export PATH FILE=/var/spool/fax/recvq/mgetty.$$ --- contrib/watchit.pl +++ contrib/watchit.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl5 +#!/usr/bin/perl # # watchit.pl # --- doc/Makefile +++ doc/Makefile @@ -12,11 +12,11 @@ MAN5PAGES=faxqueue.5 MAN8PAGES=sendfax.8 mgetty.8 callback.8 faxrunqd.8 faxq-helper.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=/usr/share/man/man1 +MAN4DIR=/usr/share/man/man4 +MAN5DIR=/usr/share/man/man5 +MAN8DIR=/usr/share/man/man8 +INFODIR=/usr/share/info # # formatted man pages --- doc/loginv2.txt +++ doc/loginv2.txt @@ -29,7 +29,7 @@ # # this is the dummy user name, it's allowed to login only if this # is not already an ongoing callback -callback N - - /usr/local/sbin/callback -S 12345 +callback N - - /usr/sbin/callback -S 12345 # # these are the real users: only allowed if it's a callback ("Y") * Y - - /bin/login @ --- doc/mgetty.texi-in +++ doc/mgetty.texi-in @@ -2449,7 +2449,7 @@ do sleep 60 done -exec /usr/local/sbin/mgetty ttyS1 +exec /usr/sbin/mgetty ttyS1 @end example @item @@ -3691,7 +3691,7 @@ add an entry to @file{/etc/inittab} like the following: @example -ya:234:respawn:/usr/local/sbin/mgetty -s 38400 -x 3 term/a +ya:234:respawn:/usr/sbin/mgetty -s 38400 -x 3 term/a @end example @emph{Don't use the Solaris @code{admintool} to create any port monitoring --- doc/scanner.txt +++ doc/scanner.txt @@ -44,7 +44,7 @@ Of course you should set up mgetty for the terminal port of Fax modem as follows. -/usr/local/sbin/mgetty -x 9 ttym0 +/usr/sbin/mgetty -x 9 ttym0 As you know, "push data/voice button of Fax modem" can be substituted by kill -USR1 <mgetty-pid>. @@ -174,7 +174,7 @@ 07/03 17:58:49 m0 (Normal and proper end of connection)** found ** 07/03 17:58:49 m0 fax receiver: hangup & end 07/03 17:58:49 m0 fax_notify_mail: sending mail to: faxadmin -07/03 17:58:51 m0 notify: '/usr/local/lib/mgetty+sendfax/new_fax 0 ' ' 1 /usr/spool/fax/incoming/ffe167d6am0.01 >/dev/console 2>&1 /dev/console 2>&1 # -COVER_PAGE=/usr/local/lib/mgetty+sendfax/make.coverpg +COVER_PAGE=/usr/lib/mgetty+sendfax/make.coverpg if [ $# -lt 2 ] then --- samples/new_fax.all/README +++ samples/new_fax.all/README @@ -43,7 +43,7 @@ THE CONFIGURATION FILE -The configuration file usually has the name /usr/etc/mgetty+sendfax/faxlist +The configuration file usually has the name /etc/mgetty+sendfax/faxlist but can be moved to any destination. The file is referenced inside new_fax with the variable "config" in the header. The config file consists of sections. Each section contains at least one identifier which must be a --- samples/new_fax.all/new_fax +++ samples/new_fax.all/new_fax @@ -1,4 +1,5 @@ -#!/bin/ksh +#!/bin/bash +## ! /bin/ksh # # Written 1996 by Darko Krizic # --- samples/new_fax.lj +++ samples/new_fax.lj @@ -16,7 +16,7 @@ SENDER="$2" PAGES="$3" -G3TOPBM=/usr/local/bin/g32pbm +G3TOPBM=/usr/bin/g32pbm shift 3 P=1 --- samples/new_fax.mime1 +++ samples/new_fax.mime1 @@ -1,4 +1,4 @@ -#!/bin/ksh +#!/bin/bash # # new_fax.mime # @@ -13,7 +13,7 @@ # The script needs the ``mh'' mailer installed # # -#! /bin/ksh +## ! /bin/ksh FAX_DIR=/var/spool/fax @@ -52,7 +52,7 @@ let page=page+1 done ) >$TMP -echo 'send' | comp -use -editor /usr/local/bin/mh/mhn -file $TMP >/dev/null +echo 'send' | comp -use -editor /usr/bin/mh/mhn -file $TMP >/dev/null rm -f $TMP ## Alternative method (using metamail directly) --- samples/new_fax.mime3 +++ samples/new_fax.mime3 @@ -1,6 +1,6 @@ #!/bin/sh # -# /usr/local/lib/mgetty+sendfax/new_fax +# /usr/lib/mgetty+sendfax/new_fax # # new_fax <getty-exit-code> <fax-sender-id> <number-of-pages> <page> [<page>..] # @@ -75,4 +75,4 @@ # Send out the created mail: sendmail $ADMIN < $TMPMAIL -exit 0 \ No newline at end of file +exit 0 --- samples/new_fax.pbm +++ samples/new_fax.pbm @@ -28,7 +28,7 @@ id= for i in $@ do - /usr/local/bin/g32pbm $STRETCH $i | compress > $i.pbm.Z + /usr/bin/g32pbm $STRETCH $i | compress > $i.pbm.Z # our compress is faster than gzip, so use this here. # this make preview faster.... [ $? -eq 0 -a -f $i.pbm.Z ] && /bin/rm -f $i --- samples/new_fax.th +++ samples/new_fax.th @@ -15,13 +15,13 @@ # The user to receive the fax and the get the fax viewer on its display my $user = 'torsten'; -my $faxviewer = '/usr/local/bin/faxview'; +my $faxviewer = '/usr/bin/faxview'; my $sendmail = '/usr/sbin/sendmail'; my $tar = '/bin/tar'; my $gzip = '/bin/gzip'; my $su = '/bin/su'; -my $mmencode = '/usr/local/bin/mmencode'; +my $mmencode = '/usr/bin/mmencode'; # Information received from mgetty my $hangup_code = shift; --- samples/new_fax.vacation +++ samples/new_fax.vacation @@ -25,13 +25,13 @@ ,,, (o o) ---------------------------oOO-(_)-OOo--------------------------- -#!/usr/local/bin/perl +#!/usr/bin/perl # # Ralph Schleicher # rs@purple.in-ulm.de -$message = '/usr/local/lib/mgetty+sendfax/vacation.tex'; +$message = '/usr/lib/mgetty+sendfax/vacation.tex'; exit 0 if ! -r $message; # Do nothing. --- voice/contrib/Mark_Haun +++ voice/contrib/Mark_Haun @@ -28,7 +28,7 @@ current call-out script (a modified version of the "notify.sh" distributed with vgetty), in the hope that it will prove useful to someone: -#! /usr/local/bin/vm shell +#! /usr/bin/vm shell function receive { --- voice/doc/Readme.Beginners +++ voice/doc/Readme.Beginners @@ -36,7 +36,7 @@ 2. Replace the invocation of mgetty in your /etc/inittab with vgetty if there is one. If there is no mgetty invocation you just have to insert - a line like that: "S1:345:respawn:/usr/local/sbin/vgetty ttyxx" in your + a line like that: "S1:345:respawn:/usr/sbin/vgetty ttyxx" in your /etc/inittab file. (like that vgetty is running at runlevels 3 4 and 5 see inittab(5) man page for more) --- voice/scripts/button.sh +++ voice/scripts/button.sh @@ -1,4 +1,4 @@ -#! /usr/local/bin/vm shell +#! /usr/bin/vm shell # # This is the button script. It is called by vgetty when --- voice/scripts/demo.pl +++ voice/scripts/demo.pl @@ -1,6 +1,6 @@ -#! /usr/local/bin/vm shell -exec /usr/local/bin/perl -x $0 -#! /usr/local/bin/perl +#! /usr/bin/vm shell +exec /usr/bin/perl -x $0 +#! /usr/bin/perl # # This is a demo script for the new interface between shell scripts and --- voice/scripts/demo.sh +++ voice/scripts/demo.sh @@ -1,4 +1,4 @@ -#! /usr/local/bin/vm shell +#! /usr/bin/vm shell # # This is a demo script for the new interface between shell scripts and --- voice/scripts/dtmf.sh +++ voice/scripts/dtmf.sh @@ -1,4 +1,4 @@ -#! /usr/local/bin/vm shell +#! /usr/bin/vm shell # # This is the dtmf script. It is called by vgetty when a dtmf code was --- voice/scripts/events.sh +++ voice/scripts/events.sh @@ -1,4 +1,4 @@ -#! /usr/local/bin/vm shell +#! /usr/bin/vm shell # # This is a demo script for the new event handling interface between --- voice/scripts/message.sh +++ voice/scripts/message.sh @@ -1,4 +1,4 @@ -#! /usr/local/bin/vm shell +#! /usr/bin/vm shell # # This script calls the given phone number and plays a message. --- voice/scripts/vmtest.sh +++ voice/scripts/vmtest.sh @@ -1,4 +1,4 @@ -#! /usr/local/bin/vm shell +#! /usr/bin/vm shell # # This is the vmtest script. You can call this script to test voice shell ++++++ mgetty-1.1.36-makefile.patch ++++++ --- Makefile +++ Makefile @@ -102,7 +102,8 @@ # USTAT - ustat(), no statfs etc. # #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL -CFLAGS=-O2 -Wall -pipe +OPTFLAGS=-O2 +CFLAGS=-Wall $(OPTFLAGS) -pipe -DAUTO_PPP #CFLAGS=-O -DSVR4 #CFLAGS=-O -DSVR4 -DSVR42 #CFLAGS=-O -DUSE_POLL @@ -116,6 +117,7 @@ #CFLAGS=-D_HPUX_SOURCE -Aa -DBSDSTATFS # for HP-UX 9.x #CFLAGS=-cckr -D__STDC__ -O -DUSE_READ # for IRIX 5.2 and up +DESTDIR = # # LDFLAGS specify flags to pass to the linker. You could specify @@ -164,7 +166,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 @@ -172,7 +174,7 @@ # # prefix, where most (all?) of the stuff lives, usually /usr/local or /usr # -prefix=/usr/local +prefix=/usr # # prefix for all the spool directories (usually /usr/spool or /var/spool) # @@ -192,7 +194,7 @@ # # where the configuration files (*.config, aliases, fax.allow/deny) go to # -CONFDIR=$(prefix)/etc/mgetty+sendfax +CONFDIR=/etc/mgetty+sendfax #CONFDIR=/etc/default/ # # @@ -220,20 +222,20 @@ # # # 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 @@ -275,7 +277,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 @@ -580,35 +582,35 @@ # # binaries # - -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) - $(INSTALL) -m 755 newslock $(BINDIR) + -test -d $(DESTDIR)$(BINDIR) || ( ./mkidirs $(DESTDIR)$(BINDIR) ; chmod 755 $(DESTDIR)$(BINDIR) ) + $(INSTALL) -m 755 newslock $(DESTDIR)$(BINDIR) - -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 sendfax $(SBINDIR) + -test -d $(DESTDIR)$(SBINDIR) || ( ./mkidirs $(DESTDIR)$(SBINDIR) ; chmod 755 $(DESTDIR)$(SBINDIR) ) + -mv -f $(DESTDIR)$(SBINDIR)/mgetty $(DESTDIR)$(SBINDIR)/mgetty.old + -mv -f $(DESTDIR)$(SBINDIR)/sendfax $(DESTDIR)$(SBINDIR)/sendfax.old + $(INSTALL) -m 700 mgetty $(DESTDIR)$(SBINDIR) + $(INSTALL) -m 755 sendfax $(DESTDIR)$(SBINDIR) # # data files + directories # - test -d $(LIBDIR) || \ - ( ./mkidirs $(LIBDIR) && chmod 755 $(LIBDIR) ) - test -d $(CONFDIR) || \ - ( ./mkidirs $(CONFDIR) && chmod 755 $(CONFDIR)) - test -f $(CONFDIR)/login.config || \ - $(INSTALL) -o root -m 600 login.config $(CONFDIR)/ - test -f $(CONFDIR)/mgetty.config || \ - $(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/ - test -f $(CONFDIR)/sendfax.config || \ - $(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/ - test -f $(CONFDIR)/dialin.config || \ - $(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/ - test -f $(CONFDIR)/faxrunq.config || \ - $(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/ + test -d $(DESTDIR)$(LIBDIR) || \ + ( ./mkidirs $(DESTDIR)$(LIBDIR) && chmod 755 $(DESTDIR)$(LIBDIR) ) + test -d $(DESTDIR)$(CONFDIR) || \ + ( ./mkidirs $(DESTDIR)$(CONFDIR) && chmod 755 $(DESTDIR)$(CONFDIR)) + test -f $(DESTDIR)$(CONFDIR)/login.config || \ + $(INSTALL) -m 600 login.config $(DESTDIR)$(CONFDIR)/ + test -f $(DESTDIR)$(CONFDIR)/mgetty.config || \ + $(INSTALL) -m 600 mgetty.config $(DESTDIR)$(CONFDIR)/ + test -f $(DESTDIR)$(CONFDIR)/sendfax.config || \ + $(INSTALL) -m 644 sendfax.config $(DESTDIR)$(CONFDIR)/ + test -f $(DESTDIR)$(CONFDIR)/dialin.config || \ + $(INSTALL) -m 600 dialin.config $(DESTDIR)$(CONFDIR)/ + test -f $(DESTDIR)$(CONFDIR)/faxrunq.config || \ + $(INSTALL) -m 644 faxrunq.config $(DESTDIR)$(CONFDIR)/ # # test for outdated stuff # - -@if test -f $(LIBDIR)/mgetty.login ; \ + -@if test -f $(DESTDIR)$(LIBDIR)/mgetty.login ; \ then \ echo "WARNING: the format of $(LIBDIR)/mgetty.login has " ;\ echo "been changed. Because of this, to avoid confusions, it's called " ;\ @@ -618,29 +620,27 @@ # # fax spool directories # - test -d $(spool) || \ - ( mkdir $(spool) && chmod 755 $(spool) ) - test -d $(FAX_SPOOL) || \ - ( mkdir $(FAX_SPOOL) && \ - chown $(FAX_OUT_USER) $(FAX_SPOOL) && \ - chmod 755 $(FAX_SPOOL) ) - test -d $(FAX_SPOOL_IN) || \ - ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) ) - test -d $(FAX_SPOOL_OUT) || \ - mkdir $(FAX_SPOOL_OUT) - chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT) - chmod 755 $(FAX_SPOOL_OUT) + test -d $(DESTDIR)$(spool) || \ + ( ./mkidirs $(DESTDIR)$(spool) && chmod 755 $(DESTDIR)$(spool) ) + test -d $(DESTDIR)$(FAX_SPOOL) || \ + ( ./mkidirs $(DESTDIR)$(FAX_SPOOL) && \ + chmod 755 $(DESTDIR)$(FAX_SPOOL) ) + test -d $(DESTDIR)$(FAX_SPOOL_IN) || \ + ( ./mkidirs $(DESTDIR)$(FAX_SPOOL_IN) && chmod 755 $(DESTDIR)$(FAX_SPOOL_IN) ) + test -d $(DESTDIR)$(FAX_SPOOL_OUT) || \ + ./mkidirs $(DESTDIR)$(FAX_SPOOL_OUT) + chmod 755 $(DESTDIR)$(FAX_SPOOL_OUT) # # g3 tool programs # cd g3 ; $(MAKE) install INSTALL="$(INSTALL)" \ - BINDIR=$(BINDIR) \ + BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) \ LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) # # fax programs / scripts / font file # cd fax ; $(MAKE) install INSTALL="$(INSTALL)" \ - FAX_OUT_USER=$(FAX_OUT_USER) \ + FAX_OUT_USER=$(FAX_OUT_USER) DESTDIR=$(DESTDIR) \ BINDIR=$(BINDIR) SBINDIR=$(SBINDIR) \ LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) # @@ -649,7 +649,7 @@ if [ ! -z "$(INSTALL_MECHO)" ] ; then \ cd compat ; \ $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ - $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \ + $(INSTALL) -m 755 mg.echo $(DESTDIR)$(BINDIR) ; \ fi # @@ -657,19 +657,19 @@ # install.doc: cd doc ; $(MAKE) install INSTALL="$(INSTALL)" \ - MAN1DIR=$(MAN1DIR) \ - MAN4DIR=$(MAN4DIR) \ - MAN5DIR=$(MAN5DIR) \ - MAN8DIR=$(MAN8DIR) \ - INFODIR=$(INFODIR) + MAN1DIR=$(DESTDIR)$(MAN1DIR) \ + MAN4DIR=$(DESTDIR)$(MAN4DIR) \ + MAN5DIR=$(DESTDIR)$(MAN5DIR) \ + MAN8DIR=$(DESTDIR)$(MAN8DIR) \ + INFODIR=$(DESTDIR)$(INFODIR) # # WWW frontend stuff # install.www: cd frontends/www ; $(MAKE) install.www INSTALL="$(INSTALL)" \ - BINDIR=$(BINDIR) \ - LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) + BINDIR=$(DESTDIR)$(BINDIR) \ + LIBDIR=$(DESTDIR)$(LIBDIR) CONFDIR=$(DESTDIR)$(CONFDIR) # # voice extensions, consult the `voice' chapter in the documentation # @@ -678,7 +678,7 @@ @$(MAKE) mgetty cd voice; $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" LDFLAGS="$(LDFLAGS)" \ LN="$(LN)" MV="$(MV)" RM="$(RM)" \ - LIBS="$(LIBS)" \ + LIBS="$(LIBS)" DESTDIR=$(DESTDIR) \ FAX_SPOOL_IN="$(FAX_SPOOL_IN)" CONFDIR="$(CONFDIR)" \ VARRUNDIR="$(VARRUNDIR)" \ SHELL="$(SHELL)" vgetty-all --- callback/Makefile +++ callback/Makefile @@ -37,7 +37,7 @@ # install programs # install: all - $(INSTALL) -s -m 700 -o root callback $(SBINDIR) - $(INSTALL) -s -m 4711 -o root ct $(BINDIR) + $(INSTALL) -m 755 callback $(SBINDIR) + $(INSTALL) -m 4755 ct $(BINDIR) # source modules --- doc/Makefile +++ doc/Makefile @@ -63,7 +63,7 @@ *.man *.[1-9] mgetty.texi install: $(MANSRC) mgetty.info - -mkdir `dirname $(MAN1DIR)` $(MAN1DIR) $(MAN4DIR) $(MAN5DIR) $(MAN8DIR) 2>/dev/null + -mkdir -p `dirname $(MAN1DIR)` $(MAN1DIR) $(MAN4DIR) $(MAN5DIR) $(MAN8DIR) 2>/dev/null for i in $(MAN1PAGES) ; do \ $(INSTALL) -m 644 $$i $(MAN1DIR) ; \ done @@ -77,7 +77,7 @@ $(INSTALL) -m 644 $$i $(MAN8DIR) ; \ done 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 ; \ --- fax/Makefile +++ fax/Makefile @@ -52,26 +52,29 @@ # # programs / scripts # + -test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) -for i in $(FAX_SCRIPTS); do \ - mv -f $(BINDIR)/$$i $(BINDIR)/$$i.old 2>/dev/null ; \ - $(INSTALL) -m 755 $$i $(BINDIR) ; \ + mv -f $(DESTDIR)$(BINDIR)/$$i $(DESTDIR)$(BINDIR)/$$i.old 2>/dev/null ; \ + $(INSTALL) -m 755 $$i $(DESTDIR)$(BINDIR) ; \ done - $(INSTALL) -m 755 faxrunqd $(SBINDIR) - $(INSTALL) faxq-helper $(LIBDIR) - chown $(FAX_OUT_USER) $(LIBDIR)/faxq-helper - chmod 4711 $(LIBDIR)/faxq-helper + $(INSTALL) -m 755 faxrunqd $(DESTDIR)$(SBINDIR) + $(INSTALL) faxq-helper $(DESTDIR)$(LIBDIR) + chmod 4711 $(DESTDIR)$(LIBDIR)/faxq-helper # # data files # - $(INSTALL) -m 644 cour25.pbm $(LIBDIR) - $(INSTALL) -m 644 cour25n.pbm $(LIBDIR) - -test -f $(CONFDIR)/faxheader || \ - $(INSTALL) -m 644 faxheader $(CONFDIR) + -test -d $(DESTDIR)$(LIBDIR) || mkdir -p $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 644 cour25.pbm $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 644 cour25n.pbm $(DESTDIR)$(LIBDIR) + -test -d $(DESTDIR)$(CONFDIR) || mkdir -p $(DESTDIR)$(CONFDIR) + -test -f $(DESTDIR)$(CONFDIR)/faxheader || \ + $(INSTALL) -m 644 faxheader $(DESTDIR)$(CONFDIR) # # /etc/magic # - -@test -r /etc/magic && \ - if grep "string.*P1" /etc/magic >/dev/null ; then : ; \ + -test -d $(DESTDIR)/etc || mkdir -p $(DESTDIR)/etc + -@test -r $(DESTDIR)/etc/magic && \ + if grep "string.*P1" $(DESTDIR)/etc/magic >/dev/null ; then : ; \ else \ echo "WARNING: no PBM magic (string P1) found in /etc/magic" ; \ echo " maybe you should append the definitions in \`\`fax/etc-magic''." ; \ @@ -79,4 +82,4 @@ # # faxspool.rules sample file # - $(INSTALL) -m 644 faxspool.rules $(CONFDIR)/faxspool.rules.sample + $(INSTALL) -m 644 faxspool.rules $(DESTDIR)$(CONFDIR)/faxspool.rules.sample --- g3/Makefile +++ g3/Makefile @@ -37,12 +37,12 @@ # install programs # for f in $(G3_PROGRAMS) ; do \ - $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ + $(INSTALL) -m 755 $$f $(DESTDIR)$(BINDIR) ; \ done # # make symlink for "g3topbm" (so third-party fax viewers won't fail) # - -cd $(BINDIR) ; \ + -cd $(DESTDIR)$(BINDIR) ; \ test -x g3topbm || ln -s g32pbm g3topbm --- login.cfg.in +++ 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) @@ -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 # # --- policy.h-dist +++ policy.h-dist @@ -114,7 +114,7 @@ /* group id that the device is chown()ed to. If not defined, the * primary group of "DEVICE_OWNER" is used. */ -#define DEVICE_GROUP "modem" +#define DEVICE_GROUP "uucp" /* access mode for the line while getty has it - it should be accessible * by uucp / uucp, but not by others (imagine someone dialing into your @@ -256,7 +256,7 @@ /* if your system isn't listed above, change that line here */ #ifndef LOCK -#define LOCK "/usr/spool/uucp/LCK..%s" +#define LOCK "/var/lock/LCK..%s" #endif /* Set this to "1" if your system uses binary lock files (i.e., the pid @@ -370,7 +370,7 @@ /* incoming faxes will be chown()ed to this uid and gid. * if FAX_IN_GROUP is undefined, the group of ...OWNER is used. */ -#define FAX_IN_OWNER "uucp" +#define FAX_IN_OWNER "root" /* #define FAX_IN_GROUP "root" */ /* incoming faxes will be chmod()ed to this mode @@ -528,7 +528,7 @@ * If you don't adapt this for your needs, sendfax won't run (you can * set it from the sendfax.config file, though)! */ -#define FAX_MODEM_TTYS "tty4c:tty4d" +#define FAX_MODEM_TTYS "ttyS1:ttyS2" /* Xon or not? * @@ -564,14 +564,14 @@ #endif #ifndef MAILER -# define MAILER "/usr/lib/sendmail" +# define MAILER "/usr/sbin/sendmail" # define NEED_MAIL_HEADERS #endif /* where to send notify mail about incoming faxes to * (remember to create an mail alias if no such user exists!) */ -#define MAIL_TO "faxadmin" +#define MAIL_TO "faxadm" /* after a fax has arrived, mgetty can call a program for further * processing of this fax. @@ -586,7 +586,7 @@ * If you don't want this type of service, do not define it at all * Absolute path name has to be used here! */ -#define FAX_NOTIFY_PROGRAM "/usr/local/lib/mgetty+sendfax/new_fax" +#define FAX_NOTIFY_PROGRAM "/etc/mgetty+sendfax/new_fax" /* default minimum space required on spooling partition for receiving a FAX * (in KILObytes) --- samples/new_fax.mail +++ samples/new_fax.mail @@ -10,8 +10,8 @@ # Revision 1.2 2000/07/16 21:18:08 gert # add .gz to file names, for automatic unziping # -MAILTO="you@yourhost.do.main" -MAILER=/usr/lib/sendmail +MAILTO="root" +MAILER=/usr/sbin/sendmail PATH=$PATH:/usr/local/bin G3TOPBM=g32pbm @@ -40,6 +40,7 @@ echo "Subject: fax from $SENDER, page $P of $PAGES" echo "To: $MAILTO" echo "" + # mimencode could be used instead of uuencode $G3TOPBM $STRETCH $FAX \ | gzip -9 \ | uuencode `basename $FAX`.pbm.gz --- voice/Makefile +++ voice/Makefile @@ -6,6 +6,8 @@ # $Id: Makefile,v 1.9 2006/09/26 11:57:46 gert Exp $ # +DESTDIR= + AR=ar ARFLAGS=rc RANLIB=ranlib @@ -83,35 +85,35 @@ @echo " Installing the voice extensions" @echo " -------------------------------" @echo "" - $(INSTALL) -m 700 vgetty/vgetty $(SBINDIR) - $(INSTALL) -m 755 vm/vm $(BINDIR) + $(INSTALL) -m 755 vgetty/vgetty $(DESTDIR)$(SBINDIR) + $(INSTALL) -m 755 vm/vm $(DESTDIR)$(BINDIR) for i in $(PVFTOOLS); \ do \ - $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \ + $(INSTALL) -m 755 pvftools/$$i $(DESTDIR)$(BINDIR); \ done - $(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR) - $(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR) - $(INSTALL) -m 644 man/man8/vgetty.8 $(MAN8DIR) + $(INSTALL) -m 644 man/man1/zplay.1 $(DESTDIR)$(MAN1DIR) + $(INSTALL) -m 644 man/man1/pvf.1 $(DESTDIR)$(MAN1DIR) + $(INSTALL) -m 644 man/man8/vgetty.8 $(DESTDIR)$(MAN8DIR) cd $(MAN1DIR); \ for i in $(PVFTOOLS); \ do \ - $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \ + $(RM) -f $(DESTDIR)$(MAN1DIR)/$$i.1; $(LN) -s pvf.1 $(DESTDIR)$(MAN1DIR)/$$i.1; \ done -# [ -d $(VOICE_DIR) ] || mkdir $(VOICE_DIR) -# [ -d $(VOICE_DIR)/incoming ] || mkdir $(VOICE_DIR)/incoming -# chown 0 $(VOICE_DIR)/incoming -# chgrp $(PHONE_GROUP) $(VOICE_DIR)/incoming -# chmod $(PHONE_PERMS) $(VOICE_DIR)/incoming -# [ -d $(VOICE_DIR)/messages ] || mkdir $(VOICE_DIR)/messages +# [ -d $(DESTDIR)$(VOICE_DIR) ] || mkdir $(DESTDIR)$(VOICE_DIR) +# [ -d $(DESTDIR)$(VOICE_DIR)/incoming ] || mkdir $(DESTDIR)$(VOICE_DIR)/incoming +# chown 0 $(DESTDIR)$(VOICE_DIR)/incoming +# chgrp $(PHONE_GROUP) $(DESTDIR)$(VOICE_DIR)/incoming +# chmod $(PHONE_PERMS) $(DESTDIR)$(VOICE_DIR)/incoming +# [ -d $(DESTDIR)$(VOICE_DIR)/messages ] || mkdir $(DESTDIR)$(VOICE_DIR)/messages # for i in $(SHELLSCRIPTS); do \ -# $(INSTALL) -m 755 $$i $(VOICE_DIR) ;\ +# $(INSTALL) -m 755 $$i $(DESTDIR)$(VOICE_DIR) ;\ # done -# [ -f $(VOICE_DIR)/.code ] || echo '12345' >$(VOICE_DIR)/.code -# chgrp $(PHONE_GROUP) $(VOICE_DIR)/.code -# chmod $(PHONE_PERMS) $(VOICE_DIR)/.code -# chmod 660 $(VOICE_DIR)/.code -# [ -f $(VOICE_DIR)/messages/Index ] || \ -# echo 'put_filename_here' >$(VOICE_DIR)/messages/Index +# [ -f $(DESTDIR)$(VOICE_DIR)/.code ] || echo '12345' >$(DESTDIR)$(VOICE_DIR)/.code +# chgrp $(PHONE_GROUP) $(DESTDIR)$(VOICE_DIR)/.code +# chmod $(PHONE_PERMS) $(DESTDIR)$(VOICE_DIR)/.code +# chmod 660 $(DESTDIR)$(VOICE_DIR)/.code +# [ -f $(DESTDIR)$(VOICE_DIR)/messages/Index ] || \ +# echo 'put_filename_here' >$(DESTDIR)$(VOICE_DIR)/messages/Index clean: @echo "Cleaning..." ++++++ mgetty-1.1.36-specialdigits.patch ++++++ --- fax/faxspool.in +++ fax/faxspool.in @@ -578,7 +578,7 @@ fi phone=$1 ; shift -if expr "$phone" : "[-0-9TtPpWw,;]*$" >/dev/null ; then : +if expr "$phone" : "[-0-9TtPpWw*#,;]*$" >/dev/null ; then : else alias="$phone" phone="" ++++++ mgetty-1.1.36-tempfile.patch ++++++ --- fax/faxspool.in +++ fax/faxspool.in @@ -675,9 +675,7 @@ if [ x$file = x- ] then $echo "spooling $file (stdin)..." - trap "rm /tmp/faxsp.$$" 0 - cat - >/tmp/faxsp.$$ - file=/tmp/faxsp.$$ + file=$spooldir/faxsp else $echo "spooling $file..." fi @@ -924,7 +922,7 @@ then $echo "\nnothing to do (no cover page, no data)." >&2 cd $FAX_SPOOL_OUT - rmdir $spooldir + rm -rf $spooldir exit 52 fi @@ -965,7 +963,7 @@ # clean up rm $job.q cd .. -rmdir $spooldir +rm -rf $spooldir if [ -z "`find $LAST_RUN -ctime -1 -print 2>/dev/null`" ] then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org