Index: head/comms/mgetty+sendfax/Makefile =================================================================== --- head/comms/mgetty+sendfax/Makefile (revision 403475) +++ head/comms/mgetty+sendfax/Makefile (revision 403476) @@ -1,56 +1,46 @@ # Created by: rkw # $FreeBSD$ PORTNAME= mgetty -PORTVERSION= 1.1.35 -PORTREVISION= 8 +PORTVERSION= 1.1.37 CATEGORIES= comms MASTER_SITES= ftp://mgetty.greenie.net/pub/mgetty/source/1.1/ -DISTNAME= ${PORTNAME}${PORTVERSION}-Feb22 +DISTNAME= ${PORTNAME}${PORTVERSION}-Jun05 MAINTAINER= olgeni@FreeBSD.org COMMENT= Handle external logins, send and receive faxes LICENSE= GPLv2 USE_CSTD= gnu89 USES= makeinfo perl5 shebangfix -SHEBANG_FILES= samples/fax \ - samples/new_fax.all/new_fax \ - samples/new_fax.mime1 +SHEBANG_FILES= samples/fax samples/new_fax.all/new_fax samples/new_fax.mime1 SUB_FILES= pkg-message mgettycfg WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKE_FLAGS= CFLAGS="${CFLAGS}" prefix=${PREFIX} LOCALBASE=${LOCALBASE} STAGEDIR=${STAGEDIR} -f +MAKE_FLAGS= CFLAGS="${CFLAGS}" prefix=${PREFIX} LOCALBASE=${LOCALBASE}\ + STAGEDIR=${STAGEDIR} -f ALL_TARGET= noident all INFO= mgetty +CFLAGS+= -DAUTO_PPP MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= FIDO - FIDO_DESC= Enable FIDO EMSI support - -CFLAGS+= -DAUTO_PPP - FIDO_CFLAGS= -DFIDO pre-install: @(cd ${WRKSRC}/doc; ${MAKE} manpages) post-install: - @${MV} ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/dialin.config \ - ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/dialin.config.sample - @${MV} ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/faxheader \ - ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/faxheader.sample - @${MV} ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/faxrunq.config \ - ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/faxrunq.config.sample - @${MV} ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/login.config \ - ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/login.config.sample +.for a in dialin.config faxheader faxrunq.config login.config + cd ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/ && ${MV} ${a} ${a}.sample +.endfor ${INSTALL_DATA} -m 600 ${WRKSRC}/voice/voice.conf-dist \ ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/voice.conf.sample - ${TAR} -cf - -C ${WRKSRC} samples | ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/lib/mgetty+sendfax/ + cd ${WRKSRC} && ${COPYTREE_BIN} samples\ + ${STAGEDIR}${PREFIX}/lib/mgetty+sendfax ${INSTALL_SCRIPT} ${WRKDIR}/mgettycfg ${STAGEDIR}${PREFIX}/bin - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mgetty+sendfax/faxq-helper .include Index: head/comms/mgetty+sendfax/distinfo =================================================================== --- head/comms/mgetty+sendfax/distinfo (revision 403475) +++ head/comms/mgetty+sendfax/distinfo (revision 403476) @@ -1,2 +1,2 @@ -SHA256 (mgetty1.1.35-Feb22.tar.gz) = 0846bfdc49f535842be033a3080b2b08499fabeec8de644c34470243d799f928 -SIZE (mgetty1.1.35-Feb22.tar.gz) = 1023412 +SHA256 (mgetty1.1.37-Jun05.tar.gz) = 6ff8cbc4f8aacd3dd7f247ff96715141bc6173745ea916dd98b8381a85ecdf0e +SIZE (mgetty1.1.37-Jun05.tar.gz) = 1057939 Index: head/comms/mgetty+sendfax/files/patch-CVE-2008-4936 =================================================================== --- head/comms/mgetty+sendfax/files/patch-CVE-2008-4936 (revision 403475) +++ head/comms/mgetty+sendfax/files/patch-CVE-2008-4936 (revision 403476) @@ -1,52 +1,52 @@ ---- fax/faxspool.in.orig 2008-12-06 22:30:36.000000000 +0300 -+++ fax/faxspool.in 2008-12-06 22:48:40.000000000 +0300 -@@ -653,12 +653,12 @@ +--- fax/faxspool.in.orig 2010-06-04 13:01:49 UTC ++++ fax/faxspool.in +@@ -672,12 +672,12 @@ fi # # mkdir a directory in $TMP (or /tmp), convert input to G3 in there # -spooldir=${TMP:-/tmp}/$new_seq.$$.`date +%S` +spooldir=`mktemp -d "${TMP:-/tmp}"/"$new_seq.$$".XXXXXXXX` -if ( umask 077 ; mkdir $spooldir ) ; then +if [ $? -eq 0 ]; then $echo "spooling to $spooldir (->$new_seq)..." else - $echo "ERROR: can't create work dir '$spooldir', giving up" >&2 ; exit 6 + $echo "ERROR: can't create work dir inside '${TMP:-/tmp}', giving up" >&2 ; exit 6 fi # -@@ -675,9 +675,12 @@ +@@ -694,9 +694,12 @@ do if [ x$file = x- ] then $echo "spooling $file (stdin)..." - trap "rm /tmp/faxsp.$$" 0 - cat - >/tmp/faxsp.$$ - file=/tmp/faxsp.$$ + file=`mktemp "$spooldir/faxsp.XXXXXXXX"` + if [ -z "$file" ]; then + $echo "ERROR: can't create work file, giving up" >&2; exit 6 + fi + trap "rm -f $file" 0 + cat - >"$file" else $echo "spooling $file..." fi -@@ -924,7 +927,7 @@ +@@ -951,7 +954,7 @@ if [ -z "$finalpg" -a -z "$poll_req" ] 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 +968,7 @@ +@@ -992,7 +995,7 @@ $FAXQ_HELPER activate $new_seq < $job.q # clean up rm $job.q cd .. -rmdir $spooldir +rm -rf $spooldir if [ -z "`find $LAST_RUN -ctime -1 -print 2>/dev/null`" ] then Index: head/comms/mgetty+sendfax/files/patch-Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-Makefile (revision 403475) +++ head/comms/mgetty+sendfax/files/patch-Makefile (revision 403476) @@ -1,202 +1,202 @@ ---- Makefile.orig +--- Makefile.orig 2010-06-05 09:48:22 UTC +++ Makefile -@@ -4,8 +4,8 @@ - # - # this is the C compiler to use (on SunOS, the standard "cc" does not +@@ -6,7 +6,7 @@ # grok my code, so please use gcc there. On ISC 4.0, use "icc".). + # + # if you are cross-compiling, this is the C compiler for the target platform -CC=gcc --#CC=cc +#CC=gcc -+CC=cc + #CC=cc # - #### C Compiler Flags #### - # -@@ -102,7 +102,7 @@ + # if you are cross-compiling, *this* needs to be the C compiler that +@@ -109,7 +109,7 @@ HOSTCC=$(CC) # USTAT - ustat(), no statfs etc. # #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL -CFLAGS=-O2 -Wall -pipe +#CFLAGS=-O2 -Wall -pipe #CFLAGS=-O -DSVR4 #CFLAGS=-O -DSVR4 -DSVR42 #CFLAGS=-O -DUSE_POLL -@@ -144,7 +144,7 @@ +@@ -151,7 +151,7 @@ CFLAGS=-O2 -Wall -pipe # For Linux, add "-lutil" if the linker complains about "updwtmp". # LDFLAGS= -LIBS= -+LIBS= -lutil ++LIBS= -lutil #LIBS=-lprot -lsocket # SCO Unix #LIBS=-lsocket #LIBS=-lbsd # OSF/1 -@@ -164,7 +164,8 @@ +@@ -171,7 +171,8 @@ LIBS= # # 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_PROGRAM=install -s -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 -@@ -216,7 +217,7 @@ +@@ -223,7 +224,7 @@ FAX_SPOOL_OUT=$(FAX_SPOOL)/outgoing # (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=root # # # Where section 1 manual pages should be placed -@@ -258,12 +259,12 @@ +@@ -265,12 +266,12 @@ AWK=awk # and the "tkperl" frontends without PERL, so don't worry if you don't # have it. # If you specify command line arguments (-w), don't forget the quotes! -PERL="/usr/bin/perl -w" +PERL="$(LOCALBASE)/bin/perl -w" # # If you have Perl with TK extentions, define it here. This may be the # same as PERL=... above, or different, if you have TkPerl statically # linked. -TKPERL=/usr/bin/tkperl +#TKPERL=/usr/bin/tkperl # # # An echo program that understands escapes like "\n" for newline or -@@ -275,9 +276,9 @@ +@@ -282,9 +283,9 @@ TKPERL=/usr/bin/tkperl # please use the "mg.echo" program provided in the compat/ subdirectory. # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo # -ECHO="echo" +ECHO="mg.echo" # -# INSTALL_MECHO=mg.echo +INSTALL_MECHO=mg.echo # # for mgetty, that's it. If you want to use the voice -@@ -317,7 +318,7 @@ +@@ -324,7 +325,7 @@ SFAXOBJ=sendfax.o logfile.o locks.o mode - all: bin-all doc-all + all: bin-all doc-man-only -bin-all: mgetty sendfax newslock sedscript subdirs call-back +bin-all: mgetty sendfax newslock sedscript subdirs call-back vgetty # a few C files need extra compiler arguments -@@ -578,42 +579,39 @@ +@@ -585,44 +586,39 @@ bindist: all doc-all sedscript cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz * -install: install.bin install.doc +install: install.bin install.doc install-vgetty install.bin: mgetty sendfax newslock \ - login.config mgetty.config sendfax.config + login.config #mgetty.config sendfax.config # # binaries # - -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) - $(INSTALL) -m 755 newslock $(BINDIR) + -test -d $(STAGEDIR)$(BINDIR) || ( ./mkidirs $(STAGEDIR)$(BINDIR) ; chmod 755 $(STAGEDIR)$(BINDIR) ) + $(INSTALL_PROGRAM) -m 755 newslock $(STAGEDIR)$(BINDIR) - -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) -- -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old -- -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old +- if [ -f $(SBINDIR)/mgetty ] ; then \ +- mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old ; fi +- if [ -f $(SBINDIR)/sendfax ] ; then \ +- mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old ; fi - $(INSTALL) -s -m 700 mgetty $(SBINDIR) - $(INSTALL) -s -m 755 sendfax $(SBINDIR) + -test -d $(STAGEDIR)$(SBINDIR) || ( ./mkidirs $(STAGEDIR)$(SBINDIR) ; chmod 755 $(STAGEDIR)$(SBINDIR) ) + -mv -f $(STAGEDIR)$(SBINDIR)/mgetty $(STAGEDIR)$(SBINDIR)/mgetty.old + -mv -f $(STAGEDIR)$(SBINDIR)/sendfax $(STAGEDIR)$(SBINDIR)/sendfax.old + $(INSTALL_PROGRAM) -s -m 700 mgetty $(STAGEDIR)$(SBINDIR) + $(INSTALL_PROGRAM) -s -m 755 sendfax $(STAGEDIR)$(SBINDIR) + $(INSTALL_PROGRAM) -s -m 755 callback/callback $(STAGEDIR)$(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 $(STAGEDIR)$(LIBDIR) || \ + ( ./mkidirs $(STAGEDIR)$(LIBDIR) && chmod 755 $(STAGEDIR)$(LIBDIR) ) + test -d $(STAGEDIR)$(CONFDIR) || \ + ( ./mkidirs $(STAGEDIR)$(CONFDIR) && chmod 755 $(STAGEDIR)$(CONFDIR)) + test -f $(STAGEDIR)$(CONFDIR)/login.config || \ + $(INSTALL) -m 600 login.config $(STAGEDIR)$(CONFDIR)/ + test -f $(STAGEDIR)$(CONFDIR)/dialin.config || \ + $(INSTALL) -m 600 dialin.config $(STAGEDIR)$(CONFDIR)/ + test -f $(STAGEDIR)$(CONFDIR)/faxrunq.config || \ + $(INSTALL) -m 644 faxrunq.config $(STAGEDIR)$(CONFDIR)/ # # test for outdated stuff # - -@if test -f $(LIBDIR)/mgetty.login ; \ + -@if test -f $(STAGEDIR)$(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 " ;\ -@@ -621,24 +619,9 @@ +@@ -630,24 +626,9 @@ install.bin: mgetty sendfax newslock \ echo "" ;\ fi # -# 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) -# # g3 tool programs # -- cd g3 ; $(MAKE) install INSTALL="$(INSTALL)" \ -+ cd g3 ; $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \ +- cd g3 && $(MAKE) install INSTALL="$(INSTALL)" \ ++ cd g3 && $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \ BINDIR=$(BINDIR) \ LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) # -@@ -654,7 +637,7 @@ +@@ -663,7 +644,7 @@ install.bin: mgetty sendfax newslock \ if [ ! -z "$(INSTALL_MECHO)" ] ; then \ cd compat ; \ $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ - $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \ + $(INSTALL) -s -m 755 mg.echo $(STAGEDIR)$(BINDIR) ; \ fi # -@@ -662,11 +645,11 @@ +@@ -671,11 +652,11 @@ install.bin: mgetty sendfax newslock \ # install.doc: cd doc ; $(MAKE) install INSTALL="$(INSTALL)" \ - MAN1DIR=$(MAN1DIR) \ - MAN4DIR=$(MAN4DIR) \ - MAN5DIR=$(MAN5DIR) \ - MAN8DIR=$(MAN8DIR) \ - INFODIR=$(INFODIR) + MAN1DIR=$(STAGEDIR)$(MAN1DIR) \ + MAN4DIR=$(STAGEDIR)$(MAN4DIR) \ + MAN5DIR=$(STAGEDIR)$(MAN5DIR) \ + MAN8DIR=$(STAGEDIR)$(MAN8DIR) \ + INFODIR=$(STAGEDIR)$(INFODIR) # # WWW frontend stuff Index: head/comms/mgetty+sendfax/files/patch-doc_Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-doc_Makefile (revision 403475) +++ head/comms/mgetty+sendfax/files/patch-doc_Makefile (revision 403476) @@ -1,20 +1,20 @@ ---- doc/Makefile.orig Fri Nov 28 04:33:26 1997 -+++ doc/Makefile Tue Dec 1 00:49:56 1998 -@@ -26,7 +26,7 @@ +--- doc/Makefile.orig 2009-02-18 08:15:59 UTC ++++ doc/Makefile +@@ -26,7 +26,7 @@ MAN_FMT_PRG=$(NROFF) -man - all: + all: manpages fmt-manpages mgetty.texi -doc-all: mgetty.asc mgetty.info mgetty.dvi mgetty.ps fmt-manpages $(MANSRC) +doc-all: mgetty.asc mgetty.info fmt-manpages $(MANSRC) manpages: $(MANSRC) -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ mgetty.html: mgetty.texi -texi2html -verbose mgetty.texi mgetty.info: mgetty.texi - -makeinfo mgetty.texi + -makeinfo --no-split mgetty.texi mgetty.ps: mgetty.dvi -dvips -o mgetty.ps mgetty.dvi Index: head/comms/mgetty+sendfax/files/patch-fax_Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-fax_Makefile (revision 403475) +++ head/comms/mgetty+sendfax/files/patch-fax_Makefile (revision 403476) @@ -1,35 +1,43 @@ ---- fax/Makefile.orig +--- fax/Makefile.orig 2006-02-22 17:25:30 UTC +++ fax/Makefile -@@ -56,20 +56,16 @@ +@@ -6,6 +6,7 @@ + + CC=gcc + CFLAGS=-O2 -I.. -Wall ++INSTALL_PROGRAM=install -s -c + + FAX_SCRIPTS=faxspool faxrunq faxq faxrm + +@@ -53,20 +54,16 @@ install: all # programs / scripts # -for i in $(FAX_SCRIPTS); do \ - mv -f $(BINDIR)/$$i $(BINDIR)/$$i.old 2>/dev/null ; \ - $(INSTALL) -m 755 $$i $(BINDIR) ; \ + $(INSTALL) -m 755 $$i $(STAGEDIR)$(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 $(STAGEDIR)$(SBINDIR) -+ $(INSTALL) faxq-helper $(STAGEDIR)$(LIBDIR) ++ $(INSTALL_PROGRAM) faxq-helper $(STAGEDIR)$(LIBDIR) # # data files # - $(INSTALL) -m 644 cour25.pbm $(LIBDIR) - $(INSTALL) -m 644 cour25n.pbm $(LIBDIR) - -test -f $(CONFDIR)/faxheader || \ - $(INSTALL) -m 644 faxheader $(CONFDIR) + $(INSTALL) -m 644 cour25.pbm $(STAGEDIR)$(LIBDIR) + $(INSTALL) -m 644 cour25n.pbm $(STAGEDIR)$(LIBDIR) + $(INSTALL) -m 644 faxheader $(STAGEDIR)$(CONFDIR) # # /etc/magic # -@@ -82,4 +78,4 @@ +@@ -79,4 +76,4 @@ install: all # # faxspool.rules sample file # - $(INSTALL) -m 644 faxspool.rules $(CONFDIR)/faxspool.rules.sample + $(INSTALL) -m 644 faxspool.rules $(STAGEDIR)$(CONFDIR)/faxspool.rules.sample Index: head/comms/mgetty+sendfax/files/patch-fax_faxspool.in =================================================================== --- head/comms/mgetty+sendfax/files/patch-fax_faxspool.in (revision 403475) +++ head/comms/mgetty+sendfax/files/patch-fax_faxspool.in (revision 403476) @@ -1,17 +1,17 @@ ---- fax/faxspool.in~ Sat Jul 9 14:25:15 2005 -+++ fax/faxspool.in Sat Jul 9 14:30:44 2005 -@@ -401,11 +401,11 @@ +--- fax/faxspool.in.orig 2010-06-04 13:01:49 UTC ++++ fax/faxspool.in +@@ -417,11 +417,11 @@ fs_cvt_pdf() # user name (for fax header only! auth is done by faxq-helper via getuid()) ########## -if user=`logname 2>/dev/null` -then : +if [ `id -u` = 0 ]; then + user=root else id=`id` - user=`expr "$id" : "[^( ]*(\([^)]*\)"` + user=`logname` fi test -z "$user" && user=$LOGNAME test -z "$user" && user=$USER Index: head/comms/mgetty+sendfax/files/patch-g3_Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-g3_Makefile (revision 403475) +++ head/comms/mgetty+sendfax/files/patch-g3_Makefile (revision 403476) @@ -1,19 +1,19 @@ ---- g3/Makefile.orig +--- g3/Makefile.orig 2006-02-22 17:25:34 UTC +++ g3/Makefile -@@ -40,13 +40,13 @@ +@@ -37,13 +37,13 @@ install: all # install programs # for f in $(G3_PROGRAMS) ; do \ - $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ + $(INSTALL) -s -m 755 $$f $(STAGEDIR)$(BINDIR) ; \ done # # make symlink for "g3topbm" (so third-party fax viewers won't fail) # - -cd $(BINDIR) ; \ - test -x g3topbm || ln -s g32pbm g3topbm +# -cd $(BINDIR) ; \ +# test -x g3topbm || ln -s g32pbm g3topbm # test suite Index: head/comms/mgetty+sendfax/files/patch-mg__utmp.h =================================================================== --- head/comms/mgetty+sendfax/files/patch-mg__utmp.h (revision 403475) +++ head/comms/mgetty+sendfax/files/patch-mg__utmp.h (revision 403476) @@ -1,43 +1,43 @@ ---- mg_utmp.h.orig +--- mg_utmp.h.orig 1997-01-12 14:53:42 UTC +++ mg_utmp.h @@ -1,4 +1,4 @@ -#ident "$Id: mg_utmp.h,v 4.1 1997/01/12 14:53:42 gert Exp $ Copyright (c) Gert Doering" +static char sccs_mg_utmp[] = "$Id: mg_utmp.h,v 4.1 1997/01/12 14:53:42 gert Exp $ Copyright (c) Gert Doering"; /* definitions for utmp reading / writing routines, * highly SysV / BSD dependent -@@ -31,6 +31,25 @@ +@@ -31,6 +31,25 @@ void setutent(); #else /* SunOS or generic BSD */ +#if defined(__FreeBSD__) && (__FreeBSD_version >= 900007) + +# include +# define utmp utmpx +# define getutent getutxent +# define getutid getutxid +# define getutline getutxline +# define pututline pututxline +# define setutent setutxent +# define endutent endutxent +# define ut_time ut_tv +# define ut_name ut_user + +#define UT_INIT INIT_PROCESS +#define UT_LOGIN LOGIN_PROCESS +#define UT_USER USER_PROCESS + +#else + #include #include -@@ -41,6 +60,8 @@ +@@ -41,6 +60,8 @@ void setutent(); #define UT_LOGIN 1 #define UT_USER 2 +#endif /* __FreeBSD_version */ + #endif /* SysV vs. BSD */ /* prototypes */ Index: head/comms/mgetty+sendfax/files/patch-mg_m_init.c =================================================================== --- head/comms/mgetty+sendfax/files/patch-mg_m_init.c (revision 403475) +++ head/comms/mgetty+sendfax/files/patch-mg_m_init.c (revision 403476) @@ -1,25 +1,25 @@ ---- mg_m_init.c.orig Sat Nov 26 17:47:44 2005 -+++ mg_m_init.c Sat Dec 17 12:24:51 2005 -@@ -269,7 +269,7 @@ +--- mg_m_init.c.orig 2006-01-03 10:15:37 UTC ++++ mg_m_init.c +@@ -284,7 +284,7 @@ int mg_open_device _P2 ( (devname, block if (fd > 0) { (void) close(0); - if (dup(fd) != 0) + if (dup2(fd,0) != 0) { lprintf( L_FATAL, "mod: cannot make %s stdin", devname ); return ERROR; -@@ -281,11 +281,11 @@ +@@ -296,11 +296,11 @@ int mg_open_device _P2 ( (devname, block (void) close(1); (void) close(2); - if (dup(0) != 1) + if (dup2(0,1) != 1) { lprintf( L_FATAL, "mod: cannot dup to stdout"); return ERROR; } - if (dup(0) != 2) + if (dup2(0,2) != 2) { lprintf( L_FATAL, "mod: cannot dup to stderr"); return ERROR; } Index: head/comms/mgetty+sendfax/files/patch-utmp.c =================================================================== --- head/comms/mgetty+sendfax/files/patch-utmp.c (revision 403475) +++ head/comms/mgetty+sendfax/files/patch-utmp.c (revision 403476) @@ -1,17 +1,17 @@ ---- utmp.c.orig +--- utmp.c.orig 2001-12-17 22:43:25 UTC +++ utmp.c @@ -1,4 +1,4 @@ -#ident "$Id: utmp.c,v 4.4 2001/12/17 22:43:24 gert Exp $ Copyright (c) Gert Doering" +static char sccsid[] = "$Id: utmp.c,v 4.4 2001/12/17 22:43:24 gert Exp $ Copyright (c) Gert Doering"; /* some parts of the code (writing of the utmp entry) * is based on the "getty kit 2.0" by Paul Sutcliffe, Jr., -@@ -58,7 +58,7 @@ +@@ -58,7 +58,7 @@ void make_utmp_wtmp _P4( (line, ut_type, * [NB: If we wanted to set UT_INIT, it would have to be an entry with * empty ut_name and ut_host] */ -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if (defined(__FreeBSD__) && (__FreeBSD_version < 900007)) || defined(__NetBSD__) struct utmp utmp; extern void login _PROTO(( struct utmp * utmp )); Index: head/comms/mgetty+sendfax/files/patch-voice_Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-voice_Makefile (revision 403475) +++ head/comms/mgetty+sendfax/files/patch-voice_Makefile (revision 403476) @@ -1,35 +1,35 @@ ---- voice/Makefile.orig +--- voice/Makefile.orig 2006-09-26 15:38:17 UTC +++ voice/Makefile -@@ -13,6 +13,8 @@ +@@ -13,6 +13,8 @@ CC=gcc LN=ln MV=mv RM=rm +INSTALL=install -c +INSTALL_PROGRAM=install -s -c - MGETTYLIB=../../getdisk.o ../../goodies.o ../../io.o \ + MGETTYLIB=../../getdisk.o ../../goodies.o ../../io.o ../../g3file.o \ ../../locks.o ../../tio.o ../../modem.o \ -@@ -83,16 +85,16 @@ +@@ -83,16 +85,16 @@ vgetty-install: vgetty-all @echo " Installing the voice extensions" @echo " -------------------------------" @echo "" - $(INSTALL) -m 700 vgetty/vgetty $(SBINDIR) - $(INSTALL) -m 755 vm/vm $(BINDIR) + $(INSTALL_PROGRAM) -m 700 vgetty/vgetty $(STAGEDIR)$(SBINDIR) + $(INSTALL_PROGRAM) -m 755 vm/vm $(STAGEDIR)$(BINDIR) for i in $(PVFTOOLS); \ do \ - $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \ + $(INSTALL_PROGRAM) -m 755 pvftools/$$i $(STAGEDIR)$(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) - cd $(MAN1DIR); \ + $(INSTALL) -m 644 man/man1/zplay.1 $(STAGEDIR)$(MAN1DIR) + $(INSTALL) -m 644 man/man1/pvf.1 $(STAGEDIR)$(MAN1DIR) + $(INSTALL) -m 644 man/man8/vgetty.8 $(STAGEDIR)$(MAN8DIR) + cd $(STAGEDIR)$(MAN1DIR); \ for i in $(PVFTOOLS); \ do \ $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \ Index: head/comms/mgetty+sendfax/files/patch-voice_libvoice_signal.c =================================================================== --- head/comms/mgetty+sendfax/files/patch-voice_libvoice_signal.c (revision 403475) +++ head/comms/mgetty+sendfax/files/patch-voice_libvoice_signal.c (revision 403476) @@ -1,30 +1,31 @@ ---- voice/libvoice/signal.c.orig Sat Oct 23 23:58:01 1999 -+++ voice/libvoice/signal.c Fri Jan 24 22:03:15 2003 -@@ -34,23 +34,16 @@ +--- voice/libvoice/signal.c.orig 1999-10-23 21:58:01 UTC ++++ voice/libvoice/signal.c +@@ -34,23 +34,16 @@ static void signal_sigalrm(int sig) static void signal_sigchld(int sig) { + /* + This appears to break passing back the shells exitstatus to vgetty + pid_t pid; int status; - pid = wait(&status); /* This appears to fix core dumps on HPUX. Maybe this + pid = wait(&status);*/ /* This appears to fix core dumps on HPUX. Maybe this * also fixes the same problem on Solaris. */ signal(SIGCHLD, signal_sigchld); - if (status) { - lprintf(L_WARN, "%s: Got child %d exit status %d signal", - program_name, - pid, - status); - } - else { - lprintf(L_JUNK, "%s: Got child %d exit signal", - program_name, - pid); - } + lprintf(L_JUNK, "%s: Got child status change signal", program_name); queue_event(create_event(SIGNAL_SIGCHLD)); } + Index: head/comms/mgetty+sendfax/pkg-plist =================================================================== --- head/comms/mgetty+sendfax/pkg-plist (revision 403475) +++ head/comms/mgetty+sendfax/pkg-plist (revision 403476) @@ -1,131 +1,132 @@ @mode 600 @sample etc/mgetty+sendfax/dialin.config.sample @sample etc/mgetty+sendfax/login.config.sample @sample etc/mgetty+sendfax/voice.conf.sample @mode @sample etc/mgetty+sendfax/faxheader.sample @sample etc/mgetty+sendfax/faxrunq.config.sample @sample etc/mgetty+sendfax/faxspool.rules.sample bin/autopvf bin/basictopvf bin/faxq bin/faxrm bin/faxrunq bin/faxspool bin/g32pbm bin/g3cat bin/lintopvf bin/mg.echo bin/mgettycfg bin/newslock bin/pbm2g3 bin/pvfamp bin/pvfcut bin/pvfecho bin/pvffft bin/pvffile bin/pvffilter bin/pvfmix bin/pvfnoise bin/pvfreverse bin/pvfsine bin/pvfspeed bin/pvftoau bin/pvftobasic bin/pvftolin bin/pvftormd bin/pvftovoc bin/pvftowav bin/rmdfile bin/rmdtopvf bin/sff2g3 bin/vm bin/voctopvf bin/wavtopvf lib/mgetty+sendfax/cour25.pbm lib/mgetty+sendfax/cour25n.pbm @mode 4711 lib/mgetty+sendfax/faxq-helper -@mode -lib/mgetty+sendfax/samples/answer_fax.sh -lib/mgetty+sendfax/samples/coverpg-pl.ps +@mode 0755 lib/mgetty+sendfax/samples/coverpg.pbm lib/mgetty+sendfax/samples/coverpg.ps lib/mgetty+sendfax/samples/fax lib/mgetty+sendfax/samples/faxmemo +lib/mgetty+sendfax/samples/new_fax.all/new_fax +lib/mgetty+sendfax/samples/new_fax.hpa +lib/mgetty+sendfax/samples/new_fax.lj +lib/mgetty+sendfax/samples/new_fax.mail +lib/mgetty+sendfax/samples/new_fax.mime1 +lib/mgetty+sendfax/samples/new_fax.pbm +lib/mgetty+sendfax/samples/printfax +@mode +lib/mgetty+sendfax/samples/answer_fax.sh +lib/mgetty+sendfax/samples/coverpg-pl.ps lib/mgetty+sendfax/samples/faxview.th lib/mgetty+sendfax/samples/new_fax.NeXT lib/mgetty+sendfax/samples/new_fax.all/INSTALL lib/mgetty+sendfax/samples/new_fax.all/README lib/mgetty+sendfax/samples/new_fax.all/archive.module lib/mgetty+sendfax/samples/new_fax.all/delete.module lib/mgetty+sendfax/samples/new_fax.all/fax.module lib/mgetty+sendfax/samples/new_fax.all/faxlist lib/mgetty+sendfax/samples/new_fax.all/faxlist.dist lib/mgetty+sendfax/samples/new_fax.all/list.module lib/mgetty+sendfax/samples/new_fax.all/mail.module -lib/mgetty+sendfax/samples/new_fax.all/new_fax lib/mgetty+sendfax/samples/new_fax.all/notify.module lib/mgetty+sendfax/samples/new_fax.all/print.module lib/mgetty+sendfax/samples/new_fax.all/write.module -lib/mgetty+sendfax/samples/new_fax.hpa -lib/mgetty+sendfax/samples/new_fax.lj -lib/mgetty+sendfax/samples/new_fax.mail -lib/mgetty+sendfax/samples/new_fax.mime1 lib/mgetty+sendfax/samples/new_fax.mime3 lib/mgetty+sendfax/samples/new_fax.mime4 -lib/mgetty+sendfax/samples/new_fax.pbm lib/mgetty+sendfax/samples/new_fax.th lib/mgetty+sendfax/samples/new_fax.tiff lib/mgetty+sendfax/samples/new_fax.vacation -lib/mgetty+sendfax/samples/printfax lib/mgetty+sendfax/samples/printfax.ps man/man1/autopvf.1.gz man/man1/basictopvf.1.gz man/man1/coverpg.1.gz man/man1/fax.1.gz man/man1/faxq.1.gz man/man1/faxrm.1.gz man/man1/faxrunq.1.gz man/man1/faxspool.1.gz man/man1/g32pbm.1.gz man/man1/g3cat.1.gz man/man1/lintopvf.1.gz man/man1/pbm2g3.1.gz man/man1/pvf.1.gz man/man1/pvfamp.1.gz man/man1/pvfcut.1.gz man/man1/pvfecho.1.gz man/man1/pvffft.1.gz man/man1/pvffile.1.gz man/man1/pvffilter.1.gz man/man1/pvfmix.1.gz man/man1/pvfnoise.1.gz man/man1/pvfreverse.1.gz man/man1/pvfsine.1.gz man/man1/pvfspeed.1.gz man/man1/pvftoau.1.gz man/man1/pvftobasic.1.gz man/man1/pvftolin.1.gz man/man1/pvftormd.1.gz man/man1/pvftovoc.1.gz man/man1/pvftowav.1.gz man/man1/rmdfile.1.gz man/man1/rmdtopvf.1.gz man/man1/sff2g3.1.gz man/man1/voctopvf.1.gz man/man1/wavtopvf.1.gz man/man1/zplay.1.gz man/man4/mgettydefs.4.gz man/man5/faxqueue.5.gz man/man8/callback.8.gz man/man8/faxq-helper.8.gz man/man8/faxrunqd.8.gz man/man8/mgetty.8.gz man/man8/sendfax.8.gz man/man8/vgetty.8.gz sbin/callback sbin/faxrunqd sbin/mgetty sbin/sendfax sbin/vgetty Property changes on: head/comms/mgetty+sendfax/pkg-plist ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property