From b4f474e085675b7aec171de7bea1a0d98e65e290 Mon Sep 17 00:00:00 2001 From: aanriot Date: Sun, 25 Sep 2005 18:18:23 +0000 Subject: [PATCH] update to 1.1.33. It's no longer broken, as the temporary files issue has gone away. from Antoine Jacoutot ; ok alek@ brad@ --- comms/mgetty+sendfax/Makefile | 74 ++++-- comms/mgetty+sendfax/distinfo | 8 +- comms/mgetty+sendfax/files/setup | 7 +- comms/mgetty+sendfax/patches/patch-Makefile | 225 ++++++++++++++++++ comms/mgetty+sendfax/patches/patch-aa | 17 -- comms/mgetty+sendfax/patches/patch-ab | 171 ------------- comms/mgetty+sendfax/patches/patch-ac | 39 --- comms/mgetty+sendfax/patches/patch-ad | 20 -- comms/mgetty+sendfax/patches/patch-ae | 11 - comms/mgetty+sendfax/patches/patch-af | 24 -- comms/mgetty+sendfax/patches/patch-ag | 11 - comms/mgetty+sendfax/patches/patch-ah | 11 - comms/mgetty+sendfax/patches/patch-ai | 11 - comms/mgetty+sendfax/patches/patch-aj | 11 - comms/mgetty+sendfax/patches/patch-ak | 11 - comms/mgetty+sendfax/patches/patch-al | 11 - comms/mgetty+sendfax/patches/patch-am | 11 - .../mgetty+sendfax/patches/patch-doc_Makefile | 48 ++++ .../patches/patch-doc_mgetty_texi_in | 24 ++ .../mgetty+sendfax/patches/patch-fax_Makefile | 36 +++ .../patches/patch-fax_faxspool_in | 18 ++ .../mgetty+sendfax/patches/patch-g3_Makefile | 20 ++ .../patches/patch-policy_h_dist | 39 +++ .../patches/patch-voice_Makefile | 35 +++ .../patches/patch-voice_libvoice_Elsa_c | 16 ++ comms/mgetty+sendfax/pkg/DESCR | 23 +- comms/mgetty+sendfax/pkg/MESSAGE | 7 + comms/mgetty+sendfax/pkg/PLIST | 164 +++++++++---- comms/mgetty+sendfax/scripts/configure | 27 --- 29 files changed, 651 insertions(+), 479 deletions(-) create mode 100755 comms/mgetty+sendfax/patches/patch-Makefile delete mode 100644 comms/mgetty+sendfax/patches/patch-aa delete mode 100644 comms/mgetty+sendfax/patches/patch-ab delete mode 100644 comms/mgetty+sendfax/patches/patch-ac delete mode 100644 comms/mgetty+sendfax/patches/patch-ad delete mode 100644 comms/mgetty+sendfax/patches/patch-ae delete mode 100644 comms/mgetty+sendfax/patches/patch-af delete mode 100644 comms/mgetty+sendfax/patches/patch-ag delete mode 100644 comms/mgetty+sendfax/patches/patch-ah delete mode 100644 comms/mgetty+sendfax/patches/patch-ai delete mode 100644 comms/mgetty+sendfax/patches/patch-aj delete mode 100644 comms/mgetty+sendfax/patches/patch-ak delete mode 100644 comms/mgetty+sendfax/patches/patch-al delete mode 100644 comms/mgetty+sendfax/patches/patch-am create mode 100755 comms/mgetty+sendfax/patches/patch-doc_Makefile create mode 100755 comms/mgetty+sendfax/patches/patch-doc_mgetty_texi_in create mode 100755 comms/mgetty+sendfax/patches/patch-fax_Makefile create mode 100755 comms/mgetty+sendfax/patches/patch-fax_faxspool_in create mode 100755 comms/mgetty+sendfax/patches/patch-g3_Makefile create mode 100755 comms/mgetty+sendfax/patches/patch-policy_h_dist create mode 100755 comms/mgetty+sendfax/patches/patch-voice_Makefile create mode 100755 comms/mgetty+sendfax/patches/patch-voice_libvoice_Elsa_c create mode 100755 comms/mgetty+sendfax/pkg/MESSAGE delete mode 100644 comms/mgetty+sendfax/scripts/configure diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index 599adccad41..1f21dbdb2d1 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -1,40 +1,62 @@ -# $OpenBSD: Makefile,v 1.23 2002/07/17 16:30:58 naddy Exp $ -# $FreeBSD: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp $ +# $OpenBSD: Makefile,v 1.24 2005/09/25 18:18:23 aanriot Exp $ COMMENT= "handle external logins, send and receive faxes" -BROKEN= insecure tempfile handling: can overwrite any file on the system - -DISTNAME= mgetty1.1.21-Jul24 -PKGNAME= mgetty-1.1.21 +VERSION= 1.1.33 +RELEASE= Apr10 +DISTNAME= mgetty${VERSION}-${RELEASE} +PKGNAME= mgetty+sendfax-${VERSION} CATEGORIES= comms -PERMIT_PACKAGE_CDROM= -PERMIT_PACKAGE_FTP= -PERMIT_DISTFILES_CDROM= -PERMIT_DISTFILES_FTP= - -FAKE=No -MASTER_SITES= ftp://alpha.greenie.net/pub/mgetty/source/1.1/ \ - ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ - HOMEPAGE= http://alpha.greenie.net/mgetty/ -MAKE_ENV+= prefix="${PREFIX}" spool="/var/spool" \ - CONFDIR="/etc/mgetty+sendfax" \ - PHONE_GROUP="wheel" PHONE_PERMS="700" +MAINTAINER= Antoine Jacoutot -WRKDIST= ${WRKDIR}/${PKGNAME} +# GPL +PERMIT_PACKAGE_CDROM= yes +PERMIT_PACKAGE_FTP= yes +PERMIT_DISTFILES_CDROM= yes +PERMIT_DISTFILES_FTP= yes +WANTLIB= c m util -post-build: - @sed -e "s,@prefix@,${PREFIX},g" ${FILESDIR}/setup > ${WRKDIR}/setup +MASTER_SITES= ftp://alpha.greenie.net/pub/mgetty/source/1.1/ \ + ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ +RUN_DEPENDS= ::print/ghostscript/gnu \ + ::graphics/netpbm + +WRKDIST= ${WRKDIR}/mgetty-${VERSION} + +MAKE_ENV+= SYSCONFDIR=${SYSCONFDIR} + +pre-configure: + @sed -e "s,@prefix@,${PREFIX},g" \ + -e "s,@sysconfdir@,${SYSCONFDIR},g" \ + ${FILESDIR}/setup > ${WRKDIR}/setup + @cp ${WRKSRC}/policy.h-dist ${WRKSRC}/policy.h + +pre-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mgetty+sendfax + post-install: ${INSTALL_SCRIPT} ${WRKDIR}/setup ${PREFIX}/lib/mgetty+sendfax - @echo "***" - @echo "*** Finished installing mgetty+sendfax." - @echo "*** To complete the install, run ${PREFIX}/lib/mgetty+sendfax/setup" - @echo "*** script." - @echo "***" + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgetty+sendfax + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgetty+sendfax/faq + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgetty+sendfax/voice + ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/mgetty+sendfax + ${INSTALL_DATA} ${WRKSRC}/faq/SGML/* ${PREFIX}/share/doc/mgetty+sendfax/faq + ${INSTALL_DATA} ${WRKSRC}/voice/doc/* ${PREFIX}/share/doc/mgetty+sendfax/voice + ${INSTALL_DATA} -m 600 ${WRKSRC}/voice/voice.conf-dist ${PREFIX}/share/examples/mgetty+sendfax/voice.conf + ${TAR} -cf - -C ${WRKSRC} samples | ${TAR} -xf - -C ${PREFIX}/share/examples/mgetty+sendfax + +REGRESS_TARGET= check +TESTS_ENVIRONMENT= MAKE=${GMAKE} + +do-regress: + @cd ${WRKBUILD} && \ + exec ${SETENV} ${MAKE_ENV} \ + TESTS_ENVIRONMENT='${TESTS_ENVIRONMENT}' \ + ${MAKE_PROGRAM} ${REGRESS_FLAGS} -f ${MAKE_FILE} \ + ${REGRESS_TARGET} .include diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo index f24ae0585e0..ed4c35220a8 100644 --- a/comms/mgetty+sendfax/distinfo +++ b/comms/mgetty+sendfax/distinfo @@ -1,4 +1,4 @@ -MD5 (mgetty1.1.21-Jul24.tar.gz) = dce35cf36bdc6b87d3b931a644f0fc0e -RMD160 (mgetty1.1.21-Jul24.tar.gz) = 925e733ab719a76887cc1a51a7cfda9779f20e65 -SHA1 (mgetty1.1.21-Jul24.tar.gz) = f71efcf5905d5400d91138f4d47e95edfb901c82 -SIZE (mgetty1.1.21-Jul24.tar.gz) = 920524 +MD5 (mgetty1.1.33-Apr10.tar.gz) = d61a2bd343111be35250496710393bd5 +RMD160 (mgetty1.1.33-Apr10.tar.gz) = 25b4a2056f7e09ad90a256fcbfb3c21c22ad1b11 +SHA1 (mgetty1.1.33-Apr10.tar.gz) = ae8b3bc09426fa8d01448a4305f361f87235d4f5 +SIZE (mgetty1.1.33-Apr10.tar.gz) = 1024596 diff --git a/comms/mgetty+sendfax/files/setup b/comms/mgetty+sendfax/files/setup index 100b77710b1..dc699ed4528 100644 --- a/comms/mgetty+sendfax/files/setup +++ b/comms/mgetty+sendfax/files/setup @@ -1,6 +1,9 @@ #!/usr/bin/perl -$confdir = "/etc/mgetty+sendfax"; -$defport = "tty00"; + +# $OpenBSD: setup,v 1.2 2005/09/25 18:18:23 aanriot Exp $ + +$confdir = "@sysconfdir@/mgetty+sendfax"; +$defport = "cua00"; print STDERR "\n\n*** mgetty+sendfax configuration program ***\n\n"; diff --git a/comms/mgetty+sendfax/patches/patch-Makefile b/comms/mgetty+sendfax/patches/patch-Makefile new file mode 100755 index 00000000000..2fcf82ead65 --- /dev/null +++ b/comms/mgetty+sendfax/patches/patch-Makefile @@ -0,0 +1,225 @@ +$OpenBSD: patch-Makefile,v 1.1 2005/09/25 18:18:23 aanriot Exp $ +--- Makefile.orig Sun Mar 13 18:59:34 2005 ++++ Makefile Tue Aug 9 12:47:46 2005 +@@ -4,7 +4,7 @@ + # + # this is the C compiler to use (on SunOS, the standard "cc" does not + # grok my code, so please use gcc there. On ISC 4.0, use "icc".). +-CC=gcc ++#CC=gcc + #CC=cc + # + #### C Compiler Flags #### +@@ -102,7 +102,7 @@ CC=gcc + # USTAT - ustat(), no statfs etc. + # + #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL +-CFLAGS=-O2 -Wall -pipe ++CFLAGS+=-DAUTO_PPP -DPREFIX=\"${PREFIX}\" + #CFLAGS=-O -DSVR4 + #CFLAGS=-O -DSVR4 -DSVR42 + #CFLAGS=-O -DUSE_POLL +@@ -144,7 +144,7 @@ CFLAGS=-O2 -Wall -pipe + # For Linux, add "-lutil" if the linker complains about "updwtmp". + # + LDFLAGS= +-LIBS= ++LIBS=-lutil + #LIBS=-lprot -lsocket # SCO Unix + #LIBS=-lsocket + #LIBS=-lbsd # OSF/1 +@@ -164,7 +164,7 @@ 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 -o root -g bin + #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,11 +172,11 @@ INSTALL=install -c -o bin -g bin + # + # prefix, where most (all?) of the stuff lives, usually /usr/local or /usr + # +-prefix=/usr/local ++prefix?=${PREFIX} + # + # prefix for all the spool directories (usually /usr/spool or /var/spool) + # +-spool=/var/spool ++spool?=/var/spool + # + # where the mgetty + sendfax binaries live (used for "make install") + # +@@ -192,7 +192,7 @@ LIBDIR=$(prefix)/lib/mgetty+sendfax + # + # where the configuration files (*.config, aliases, fax.allow/deny) go to + # +-CONFDIR=$(prefix)/etc/mgetty+sendfax ++CONFDIR?=${SYSCONFDIR}/mgetty+sendfax + #CONFDIR=/etc/default/ + # + # +@@ -216,7 +216,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=uucp + # + # + # Where section 1 manual pages should be placed +@@ -263,7 +263,7 @@ PERL="/usr/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 +@@ -285,7 +285,7 @@ ECHO="echo" + + # To maintain security, I recommend creating a new group for + # users who are allowed to manipulate the recorded voice messages. +-PHONE_GROUP=phone ++PHONE_GROUP=dialer + PHONE_PERMS=770 + + # Add -DNO_STRSTR to CFLAGS if you don't have strstr(). +@@ -317,7 +317,7 @@ SFAXOBJ=sendfax.o logfile.o locks.o mode + + all: bin-all doc-all + +-bin-all: mgetty sendfax newslock sedscript subdirs call-back ++bin-all: mgetty sendfax newslock subdirs call-back vgetty + + # a few C files need extra compiler arguments + +@@ -583,7 +583,7 @@ 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 +@@ -591,30 +591,31 @@ install.bin: mgetty sendfax newslock \ + # binaries + # + -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) +- $(INSTALL) -m 755 newslock $(BINDIR) ++ $(BSD_INSTALL_PROGRAM) newslock $(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) ++# -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old ++# -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old ++ $(BSD_INSTALL_PROGRAM) -m 700 mgetty $(SBINDIR) ++ $(BSD_INSTALL_PROGRAM) sendfax $(SBINDIR) ++ $(BSD_INSTALL_PROGRAM) callback/callback $(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 $(CONFDIR) || \ ++# ( ./mkidirs $(CONFDIR) && chmod 755 $(CONFDIR)) ++# test -f $(CONFDIR)/login.config || \ ++ $(BSD_INSTALL_DATA) -m 600 login.config ${PREFIX}/share/examples/mgetty+sendfax ++# test -f $(CONFDIR)/mgetty.config || \ ++ $(BSD_INSTALL_DATA) -m 600 mgetty.config ${PREFIX}/share/examples/mgetty+sendfax ++# test -f $(CONFDIR)/sendfax.config || \ ++ $(BSD_INSTALL_DATA) sendfax.config ${PREFIX}/share/examples/mgetty+sendfax ++# test -f $(CONFDIR)/dialin.config || \ ++ $(BSD_INSTALL_DATA) -m 600 dialin.config ${PREFIX}/share/examples/mgetty+sendfax ++# test -f $(CONFDIR)/faxrunq.config || \ ++ $(BSD_INSTALL_DATA) faxrunq.config ${PREFIX}/share/examples/mgetty+sendfax + # + # test for outdated stuff + # +@@ -628,28 +629,28 @@ install.bin: mgetty sendfax newslock \ + # + # 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 $(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="$(BSD_INSTALL_PROGRAM)" \ + BINDIR=$(BINDIR) \ + LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) + # + # fax programs / scripts / font file + # +- cd fax ; $(MAKE) install INSTALL="$(INSTALL)" \ ++ cd fax ; $(MAKE) install INSTALL="$(BSD_INSTALL_PROGRAM)" \ + FAX_OUT_USER=$(FAX_OUT_USER) \ + BINDIR=$(BINDIR) SBINDIR=$(SBINDIR) \ + LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) +@@ -659,14 +660,14 @@ 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) ; \ ++ $(BSD_INSTALL_PROGRAM) mg.echo $(BINDIR) ; \ + fi + + # + # documentation + # + install.doc: +- cd doc ; $(MAKE) install INSTALL="$(INSTALL)" \ ++ cd doc ; $(MAKE) install INSTALL="$(BSD_INSTALL_MAN)" \ + MAN1DIR=$(MAN1DIR) \ + MAN4DIR=$(MAN4DIR) \ + MAN5DIR=$(MAN5DIR) \ +@@ -677,7 +678,7 @@ install.doc: + # WWW frontend stuff + # + install.www: +- cd frontends/www ; $(MAKE) install.www INSTALL="$(INSTALL)" \ ++ cd frontends/www ; $(MAKE) install.www INSTALL="$(BSD_INSTALL_PROGRAM)" \ + BINDIR=$(BINDIR) \ + LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) + # diff --git a/comms/mgetty+sendfax/patches/patch-aa b/comms/mgetty+sendfax/patches/patch-aa deleted file mode 100644 index bb3df31801a..00000000000 --- a/comms/mgetty+sendfax/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ ---- fax/faxspool.in.orig Sat Jul 24 17:27:25 1999 -+++ fax/faxspool.in Sat Aug 28 13:30:14 1999 -@@ -313,11 +313,11 @@ - # user name (for authentification) - ########## - --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 diff --git a/comms/mgetty+sendfax/patches/patch-ab b/comms/mgetty+sendfax/patches/patch-ab deleted file mode 100644 index ba0e96ac86e..00000000000 --- a/comms/mgetty+sendfax/patches/patch-ab +++ /dev/null @@ -1,171 +0,0 @@ ---- Makefile.orig Sat Jul 24 17:28:18 1999 -+++ Makefile Sat Aug 28 13:30:15 1999 -@@ -4,8 +4,8 @@ - # - # this is the C compiler to use (on SunOS, the standard "cc" does not - # grok my code, so please use gcc there. On ISC 4.0, use "icc".). --CC=gcc --#CC=cc -+#CC=gcc -+CC=cc - # - #### C Compiler Flags #### - # -@@ -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+=-DAUTO_PPP - #CFLAGS=-O -DSVR4 - #CFLAGS=-O -DSVR4 -DSVR42 - #CFLAGS=-O -DUSE_POLL -@@ -144,12 +144,12 @@ - # - # On SCO Xenix, add -ldir -lx - # --# For FreeBSD, add "-lutil" if the linker complains about -+# For FreeBSD and OpenBSD, add "-lutil" if the linker complains about - # "utmp.o: unresolved symbod _login" - # For Linux, add "-lutil" if the linker complains about "updwtmp". - # - LDFLAGS= --LIBS= -+LIBS=-lutil - #LIBS=-lprot -lsocket # SCO Unix - #LIBS=-lsocket - #LIBS=-lbsd # OSF/1 -@@ -169,7 +169,8 @@ - # - # 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 -o root -g wheel -+INSTALL_PROGRAM=install -s -c -o root -g wheel - #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 +178,11 @@ - # - # prefix, where most (all?) of the stuff lives, usually /usr/local or /usr - # --prefix=/usr/local -+prefix?=/usr/local - # - # prefix for all the spool directories (usually /usr/spool or /var/spool) - # --spool=/var/spool -+spool?=/var/spool - # - # where the mgetty + sendfax binaries live (used for "make install") - # -@@ -197,7 +198,7 @@ - # - # where the configuration files (*.config, aliases, fax.allow/deny) go to - # --CONFDIR=$(prefix)/etc/mgetty+sendfax -+CONFDIR?=$(prefix)/etc/mgetty+sendfax - #CONFDIR=/etc/default/ - # - # -@@ -247,7 +248,7 @@ - # 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 -@@ -259,9 +260,9 @@ - # 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 -@@ -269,8 +270,8 @@ - - # To maintain security, I recommend creating a new group for - # users who are allowed to manipulate the recorded voice messages. --PHONE_GROUP=phone --PHONE_PERMS=770 -+PHONE_GROUP?=wheel -+PHONE_PERMS?=700 - - # Add -DNO_STRSTR to CFLAGS if you don't have strstr(). - -@@ -301,7 +302,7 @@ - - all: bin-all doc-all - --bin-all: mgetty sendfax newslock subdirs call-back -+bin-all: mgetty sendfax newslock subdirs call-back vgetty - - # a few C files need extra compiler arguments - -@@ -563,21 +564,21 @@ - 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) -+ $(INSTALL_PROGRAM) -m 755 newslock $(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 700 sendfax $(SBINDIR) -+ $(INSTALL_PROGRAM) -m 700 mgetty $(SBINDIR) -+ $(INSTALL_PROGRAM) -m 700 sendfax $(SBINDIR) - # - # data files + directories - # -@@ -587,10 +588,10 @@ - ( ./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)/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 || \ -@@ -621,7 +622,7 @@ - # - # g3 tool programs - # -- cd g3 ; $(MAKE) install INSTALL="$(INSTALL)" \ -+ cd g3 ; $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \ - BINDIR=$(BINDIR) \ - LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) - # -@@ -636,7 +637,7 @@ - if [ ! -z "$(INSTALL_MECHO)" ] ; then \ - cd compat ; \ - $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ -- $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \ -+ $(INSTALL_PROGRAM) -m 755 mg.echo $(BINDIR) ; \ - fi - - # diff --git a/comms/mgetty+sendfax/patches/patch-ac b/comms/mgetty+sendfax/patches/patch-ac deleted file mode 100644 index 16172c88d5e..00000000000 --- a/comms/mgetty+sendfax/patches/patch-ac +++ /dev/null @@ -1,39 +0,0 @@ ---- voice/Makefile.orig Thu Sep 10 05:06:12 1998 -+++ voice/Makefile Tue Dec 1 01:39:38 1998 -@@ -13,6 +13,8 @@ - LN=ln - MV=mv - RM=rm -+INSTALL=install -c -o root -g wheel -+INSTALL_PROGRAM=install -s -c -o root -g wheel - - MGETTYLIB=../../getdisk.o ../../goodies.o ../../io.o \ - ../../locks.o ../../tio.o ../../modem.o \ -@@ -82,19 +84,19 @@ - @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 $(SBINDIR) -+ $(INSTALL_PROGRAM) -m 755 vm/vm $(BINDIR) - for i in $(PVFTOOLS); \ - do \ -- $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \ -+ $(INSTALL_PROGRAM) -m 755 pvftools/$$i $(BINDIR); \ - done - $(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR) - $(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR) -- cd $(MAN1DIR); \ -- for i in $(PVFTOOLS); \ -- do \ -- $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \ -- done -+# cd $(MAN1DIR); \ -+# for i in $(PVFTOOLS); \ -+# do \ -+# $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \ -+# done - # [ -d $(VOICE_DIR) ] || mkdir $(VOICE_DIR) - # [ -d $(VOICE_DIR)/incoming ] || mkdir $(VOICE_DIR)/incoming - # chown 0 $(VOICE_DIR)/incoming diff --git a/comms/mgetty+sendfax/patches/patch-ad b/comms/mgetty+sendfax/patches/patch-ad deleted file mode 100644 index 13d8848d3b4..00000000000 --- a/comms/mgetty+sendfax/patches/patch-ad +++ /dev/null @@ -1,20 +0,0 @@ ---- doc/Makefile.orig Fri Nov 28 04:33:26 1997 -+++ doc/Makefile Tue Dec 1 00:49:56 1998 -@@ -26,7 +26,7 @@ - - all: - --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 @@ - -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 diff --git a/comms/mgetty+sendfax/patches/patch-ae b/comms/mgetty+sendfax/patches/patch-ae deleted file mode 100644 index b5bc60cecd6..00000000000 --- a/comms/mgetty+sendfax/patches/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- syslibs.h.orig Sun Jan 12 06:53:46 1997 -+++ syslibs.h Thu Aug 27 21:08:18 1998 -@@ -7,7 +7,7 @@ - #include - #endif - --#if !defined( __bsdi__ ) && !defined(__FreeBSD__) && !defined(NeXT) -+#if !defined( __bsdi__ ) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) - #include - #endif - diff --git a/comms/mgetty+sendfax/patches/patch-af b/comms/mgetty+sendfax/patches/patch-af deleted file mode 100644 index 62a142aa1fa..00000000000 --- a/comms/mgetty+sendfax/patches/patch-af +++ /dev/null @@ -1,24 +0,0 @@ -*** logfile.c.orig Thu Dec 17 06:12:16 1998 ---- logfile.c Thu Dec 17 06:13:05 1998 -*************** -*** 52,59 **** - /* 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(__GLIBC__) - extern char *sys_errlist[]; - #endif - ---- 52,62 ---- - /* Most systems have these variables but do not declare them. On many - of those systems that _do_ declare them, it won't hurt */ - -+ #ifndef __OpenBSD__ - extern int sys_nerr; -! #endif -! -! #if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined( __FreeBSD__ ) && !defined(__GLIBC__) - extern char *sys_errlist[]; - #endif - diff --git a/comms/mgetty+sendfax/patches/patch-ag b/comms/mgetty+sendfax/patches/patch-ag deleted file mode 100644 index 11a597bc283..00000000000 --- a/comms/mgetty+sendfax/patches/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- mgetty.c.orig Mon Aug 3 13:02:08 1998 -+++ mgetty.c Thu Aug 27 21:09:15 1998 -@@ -64,7 +64,7 @@ - /* prototypes for system functions (that are missing in some - * system header files) - */ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__OpenBSD__) - time_t time _PROTO(( long * tloc )); - #endif - diff --git a/comms/mgetty+sendfax/patches/patch-ah b/comms/mgetty+sendfax/patches/patch-ah deleted file mode 100644 index 865ab1cf950..00000000000 --- a/comms/mgetty+sendfax/patches/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ ---- sendfax.c.orig Thu Jul 2 02:47:38 1998 -+++ sendfax.c Thu Aug 27 21:09:42 1998 -@@ -40,7 +40,7 @@ - extern time_t call_start; /* for accounting */ - - /* seems to missing nearly everywhere */ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__OpenBSD__) - time_t time _PROTO(( long * tloc )); - #endif - diff --git a/comms/mgetty+sendfax/patches/patch-ai b/comms/mgetty+sendfax/patches/patch-ai deleted file mode 100644 index 69290b01bb3..00000000000 --- a/comms/mgetty+sendfax/patches/patch-ai +++ /dev/null @@ -1,11 +0,0 @@ ---- mgetty.h.orig Mon May 24 09:35:06 1999 -+++ mgetty.h Sat Aug 28 13:30:19 1999 -@@ -62,7 +62,7 @@ - - /* bsd stuff */ - #if defined(__BSD_NET2__) || defined(__386BSD__) || \ -- defined(__NetBSD__) || defined(__FreeBSD__) -+ defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) - # include /* defines BSD, BSD4_3 and BSD4_4 */ - # ifndef BSD - # define BSD /* just in case... */ diff --git a/comms/mgetty+sendfax/patches/patch-aj b/comms/mgetty+sendfax/patches/patch-aj deleted file mode 100644 index 1ecbdfc310b..00000000000 --- a/comms/mgetty+sendfax/patches/patch-aj +++ /dev/null @@ -1,11 +0,0 @@ ---- faxrec.c.orig Tue Dec 16 03:39:24 1997 -+++ faxrec.c Thu Aug 27 21:10:24 1998 -@@ -35,7 +35,7 @@ - extern time_t call_start; /* in faxrecp.c, set in mgetty.c */ - static time_t call_done; - --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__OpenBSD__) - time_t time _PROTO(( long * tloc )); - #endif - diff --git a/comms/mgetty+sendfax/patches/patch-ak b/comms/mgetty+sendfax/patches/patch-ak deleted file mode 100644 index d69883db9c5..00000000000 --- a/comms/mgetty+sendfax/patches/patch-ak +++ /dev/null @@ -1,11 +0,0 @@ ---- callback/callback.c.orig Mon Jun 1 05:02:55 1998 -+++ callback/callback.c Thu Aug 27 21:10:49 1998 -@@ -68,7 +68,7 @@ - /* prototypes for system functions (that are missing in some - * system header files) - */ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__OpenBSD__) - time_t time _PROTO(( long * tloc )); - #endif - diff --git a/comms/mgetty+sendfax/patches/patch-al b/comms/mgetty+sendfax/patches/patch-al deleted file mode 100644 index 595db00a55a..00000000000 --- a/comms/mgetty+sendfax/patches/patch-al +++ /dev/null @@ -1,11 +0,0 @@ ---- voice/include/voice.h.orig Thu Jul 2 05:02:14 1998 -+++ voice/include/voice.h Thu Aug 27 21:11:19 1998 -@@ -19,7 +19,7 @@ - #include - #include - --#if !defined( __bsdi__ ) && !defined(__FreeBSD__) && !defined(NeXT) -+#if !defined( __bsdi__ ) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) - # include - #endif - diff --git a/comms/mgetty+sendfax/patches/patch-am b/comms/mgetty+sendfax/patches/patch-am deleted file mode 100644 index 303c904e1b3..00000000000 --- a/comms/mgetty+sendfax/patches/patch-am +++ /dev/null @@ -1,11 +0,0 @@ ---- voice/libvoice/voice_fax.c.orig Thu Mar 26 00:58:50 1998 -+++ voice/libvoice/voice_fax.c Thu Aug 27 21:11:49 1998 -@@ -29,7 +29,7 @@ - #define REVERSE 1 - - /* seems to missing nearly everywhere */ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__OpenBSD__) - time_t time _PROTO(( long * tloc )); - #endif - diff --git a/comms/mgetty+sendfax/patches/patch-doc_Makefile b/comms/mgetty+sendfax/patches/patch-doc_Makefile new file mode 100755 index 00000000000..346ef089295 --- /dev/null +++ b/comms/mgetty+sendfax/patches/patch-doc_Makefile @@ -0,0 +1,48 @@ +$OpenBSD: patch-doc_Makefile,v 1.1 2005/09/25 18:18:23 aanriot Exp $ +--- doc/Makefile.orig Sun Feb 27 13:09:53 2005 ++++ doc/Makefile Tue Jun 14 09:18:01 2005 +@@ -26,7 +26,7 @@ MAN_FMT_PRG=$(NROFF) -man + + all: + +-doc-all: mgetty.asc mgetty.info mgetty.dvi mgetty.ps fmt-manpages $(MANSRC) ++doc-all: mgetty.info fmt-manpages $(MANSRC) + + manpages: $(MANSRC) + +@@ -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 +@@ -67,21 +67,21 @@ fullclean: clean + install: $(MANSRC) mgetty.info + -mkdir `dirname $(MAN1DIR)` $(MAN1DIR) $(MAN4DIR) $(MAN5DIR) $(MAN8DIR) 2>/dev/null + for i in $(MAN1PAGES) ; do \ +- $(INSTALL) -m 644 $$i $(MAN1DIR) ; \ ++ $(BSD_INSTALL_MAN) $$i $(MAN1DIR) ; \ + done + for i in $(MAN4PAGES) ; do \ +- $(INSTALL) -m 644 $$i $(MAN4DIR) ; \ ++ $(BSD_INSTALL_MAN) $$i $(MAN4DIR) ; \ + done + for i in $(MAN5PAGES) ; do \ +- $(INSTALL) -m 644 $$i $(MAN5DIR) ; \ ++ $(BSD_INSTALL_MAN) $$i $(MAN5DIR) ; \ + done + for i in $(MAN8PAGES) ; do \ +- $(INSTALL) -m 644 $$i $(MAN8DIR) ; \ ++ $(BSD_INSTALL_MAN) $$i $(MAN8DIR) ; \ + done + if [ -f mgetty.info ] ; then\ + test -d $(INFODIR) || mkdir $(INFODIR) 2>/dev/null ; \ + for i in mgetty.info* ; do \ +- $(INSTALL) -m 644 $$i $(INFODIR) ; \ ++ $(BSD_INSTALL_MAN) $$i $(INFODIR) ; \ + done ; \ + else \ + echo "mgetty.info not made, skipping" ; \ diff --git a/comms/mgetty+sendfax/patches/patch-doc_mgetty_texi_in b/comms/mgetty+sendfax/patches/patch-doc_mgetty_texi_in new file mode 100755 index 00000000000..c316a4413d7 --- /dev/null +++ b/comms/mgetty+sendfax/patches/patch-doc_mgetty_texi_in @@ -0,0 +1,24 @@ +$OpenBSD: patch-doc_mgetty_texi_in,v 1.1 2005/09/25 18:18:23 aanriot Exp $ +--- doc/mgetty.texi-in.orig Tue Feb 15 11:28:37 2005 ++++ doc/mgetty.texi-in Sun Sep 11 13:26:33 2005 +@@ -17,6 +17,11 @@ This is the online documentation for the + package. + + Copyright @copyright{} 1993-2005 Gert Doering +++@format +++START-INFO-DIR-ENTRY +++* Mgetty: (mgetty). Mgetty: an advanced getty that can manage faxes. +++END-INFO-DIR-ENTRY +++@end format + @end ifinfo + + @titlepage +@@ -1458,7 +1463,7 @@ FAX_NOTIFY_PROGRAM @var{} ' + + @var{} is 0 if the receive was successful, non-zero + otherwise. @var{} is the fax identification string received +-from the other side. @var{} is the full path name for ++from the other side. @var{} is the full path name for + each received page. + + A sample command line might look like this: diff --git a/comms/mgetty+sendfax/patches/patch-fax_Makefile b/comms/mgetty+sendfax/patches/patch-fax_Makefile new file mode 100755 index 00000000000..9da93bf6e77 --- /dev/null +++ b/comms/mgetty+sendfax/patches/patch-fax_Makefile @@ -0,0 +1,36 @@ +$OpenBSD: patch-fax_Makefile,v 1.1 2005/09/25 18:18:24 aanriot Exp $ +--- fax/Makefile.orig Wed Feb 16 16:54:46 2005 ++++ fax/Makefile Tue Aug 9 12:02:02 2005 +@@ -57,19 +57,19 @@ install: all + # + -for i in $(FAX_SCRIPTS); do \ + mv -f $(BINDIR)/$$i $(BINDIR)/$$i.old 2>/dev/null ; \ +- $(INSTALL) -m 755 $$i $(BINDIR) ; \ ++ $(BSD_INSTALL_SCRIPT) $$i $(BINDIR) ; \ + done +- $(INSTALL) -m 755 faxrunqd $(SBINDIR) +- $(INSTALL) faxq-helper $(LIBDIR) ++ $(BSD_INSTALL_SCRIPT) faxrunqd $(SBINDIR) ++ $(BSD_INSTALL_PROGRAM) faxq-helper $(LIBDIR) + chown $(FAX_OUT_USER) $(LIBDIR)/faxq-helper + chmod 4711 $(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) ++ $(BSD_INSTALL_DATA) cour25.pbm $(LIBDIR) ++ $(BSD_INSTALL_DATA) cour25n.pbm $(LIBDIR) ++# -test -f $(CONFDIR)/faxheader || \ ++ $(BSD_INSTALL_DATA) faxheader ${PREFIX}/share/examples/mgetty+sendfax + # + # /etc/magic + # +@@ -82,4 +82,4 @@ install: all + # + # faxspool.rules sample file + # +- $(INSTALL) -m 644 faxspool.rules $(CONFDIR)/faxspool.rules.sample ++ $(BSD_INSTALL_DATA) faxspool.rules ${PREFIX}/share/examples/mgetty+sendfax/faxspool.rules.sample diff --git a/comms/mgetty+sendfax/patches/patch-fax_faxspool_in b/comms/mgetty+sendfax/patches/patch-fax_faxspool_in new file mode 100755 index 00000000000..a62a32748da --- /dev/null +++ b/comms/mgetty+sendfax/patches/patch-fax_faxspool_in @@ -0,0 +1,18 @@ +$OpenBSD: patch-fax_faxspool_in,v 1.1 2005/09/25 18:18:24 aanriot Exp $ +--- fax/faxspool.in.orig Sun Feb 27 13:10:51 2005 ++++ fax/faxspool.in Sun Sep 11 13:26:33 2005 +@@ -401,11 +401,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 diff --git a/comms/mgetty+sendfax/patches/patch-g3_Makefile b/comms/mgetty+sendfax/patches/patch-g3_Makefile new file mode 100755 index 00000000000..88c2b93ed6e --- /dev/null +++ b/comms/mgetty+sendfax/patches/patch-g3_Makefile @@ -0,0 +1,20 @@ +$OpenBSD: patch-g3_Makefile,v 1.1 2005/09/25 18:18:24 aanriot Exp $ +--- g3/Makefile.orig Sun Feb 27 20:02:16 2005 ++++ g3/Makefile Tue Jun 14 09:23:50 2005 +@@ -40,13 +40,13 @@ install: all + # install programs + # + for f in $(G3_PROGRAMS) ; do \ +- $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ ++ $(BSD_INSTALL_PROGRAM) $$f $(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 diff --git a/comms/mgetty+sendfax/patches/patch-policy_h_dist b/comms/mgetty+sendfax/patches/patch-policy_h_dist new file mode 100755 index 00000000000..c44e0e10bb5 --- /dev/null +++ b/comms/mgetty+sendfax/patches/patch-policy_h_dist @@ -0,0 +1,39 @@ +$OpenBSD: patch-policy_h_dist,v 1.1 2005/09/25 18:18:24 aanriot Exp $ +--- policy.h-dist.orig Tue Dec 16 12:43:07 2003 ++++ policy.h-dist Sun Jun 26 16:15:01 2005 +@@ -48,7 +48,7 @@ + * Normally, this is "/bin/login", just a few systems put "login" + * elsewhere (e.g. Free/NetBSD in "/usr/bin/login"). + */ +-#define DEFAULT_LOGIN_PROGRAM "/bin/login" ++#define DEFAULT_LOGIN_PROGRAM "/usr/bin/login" + + /* FidoNet mailer support + * +@@ -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 "dialer" + + /* 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 +@@ -264,7 +264,7 @@ + # ifdef linux + # define LOCK "/var/lock/LCK..%s" + # endif +-# if defined(__FreeBSD__) || defined(__NetBSD__) ++# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + # define LOCK "/var/spool/lock/LCK..%s" + # endif + #endif +@@ -591,7 +591,7 @@ + #endif + + #ifndef MAILER +-# define MAILER "/usr/lib/sendmail" ++# define MAILER "/usr/sbin/sendmail" + # define NEED_MAIL_HEADERS + #endif + diff --git a/comms/mgetty+sendfax/patches/patch-voice_Makefile b/comms/mgetty+sendfax/patches/patch-voice_Makefile new file mode 100755 index 00000000000..f15a73a0105 --- /dev/null +++ b/comms/mgetty+sendfax/patches/patch-voice_Makefile @@ -0,0 +1,35 @@ +$OpenBSD: patch-voice_Makefile,v 1.1 2005/09/25 18:18:24 aanriot Exp $ +--- voice/Makefile.orig Sun Dec 23 16:08:13 2001 ++++ voice/Makefile Tue Jun 14 09:25:07 2005 +@@ -83,20 +83,20 @@ vgetty-install: vgetty-all + @echo " Installing the voice extensions" + @echo " -------------------------------" + @echo "" +- $(INSTALL) -m 700 vgetty/vgetty $(SBINDIR) +- $(INSTALL) -m 755 vm/vm $(BINDIR) ++ $(BSD_INSTALL_PROGRAM) -m 700 vgetty/vgetty $(SBINDIR) ++ $(BSD_INSTALL_PROGRAM) vm/vm $(BINDIR) + for i in $(PVFTOOLS); \ + do \ +- $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \ ++ $(BSD_INSTALL_PROGRAM) pvftools/$$i $(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); \ +- for i in $(PVFTOOLS); \ +- do \ +- $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \ +- done ++ $(BSD_INSTALL_MAN) man/man1/zplay.1 $(MAN1DIR) ++ $(BSD_INSTALL_MAN) man/man1/pvf.1 $(MAN1DIR) ++ $(BSD_INSTALL_MAN) man/man8/vgetty.8 $(MAN8DIR) ++# cd $(MAN1DIR); \ ++# for i in $(PVFTOOLS); \ ++# do \ ++# $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \ ++# done + # [ -d $(VOICE_DIR) ] || mkdir $(VOICE_DIR) + # [ -d $(VOICE_DIR)/incoming ] || mkdir $(VOICE_DIR)/incoming + # chown 0 $(VOICE_DIR)/incoming diff --git a/comms/mgetty+sendfax/patches/patch-voice_libvoice_Elsa_c b/comms/mgetty+sendfax/patches/patch-voice_libvoice_Elsa_c new file mode 100755 index 00000000000..a492e70e4e4 --- /dev/null +++ b/comms/mgetty+sendfax/patches/patch-voice_libvoice_Elsa_c @@ -0,0 +1,16 @@ +$OpenBSD: patch-voice_libvoice_Elsa_c,v 1.1 2005/09/25 18:18:24 aanriot Exp $ +--- voice/libvoice/Elsa.c.orig Mon Aug 8 10:47:51 2005 ++++ voice/libvoice/Elsa.c Mon Aug 8 10:49:09 2005 +@@ -49,10 +49,10 @@ static int Elsa_init (void) + if (voice_command(buffer, "OK") != VMA_USER_1) + lprintf(L_WARN, "can't set BDR=16"); + +- sprintf(buffer, "AT#VTD=3F,3F,3F"); ++ sprintf(buffer, "AT#VTD=2F,3F,3F"); + + if (voice_command(buffer, "OK") != VMA_USER_1) +- lprintf(L_WARN, "can't set VTD=3F"); ++ lprintf(L_WARN, "can't set DTMF tone reporting"); + + sprintf(buffer, "AT#VSS=%1u", cvd.rec_silence_threshold.d.i * 3 / 100); + diff --git a/comms/mgetty+sendfax/pkg/DESCR b/comms/mgetty+sendfax/pkg/DESCR index 875438a2376..983dcc9a57d 100644 --- a/comms/mgetty+sendfax/pkg/DESCR +++ b/comms/mgetty+sendfax/pkg/DESCR @@ -1,10 +1,15 @@ -Mgetty is a ``smart'' getty replacement, designed to be used with hayes -compatible data and data/fax modems. -Mgetty knows about modem initialization, manual modem answering (so your -modem doesn't answer if the machine isn't ready), UUCP locking (so you can -use the same device for dial-in and dial-out). -Mgetty provides very extensive logging facilities. +Mgetty+sendfax is a collection of programs to send and receive faxes in +a unix environment using a class 2.0 or 2 (they're different) faxmodem. +vgetty is an extension to mgetty, distributed with it, that implements +incoming voice call handling for certain voice-capable modems, with new +ones added regularly, if specs are available. -Sendfax send the named g3 fax files to the fax machine at "phone number". -The g3 files can be created with pbmtog3(1) or GNU's GhostScript with the -"digifax" driver. +More specifically, the program `mgetty' allows you to use a class 2.0 or +2 fax modem for receiving faxes and handling external logins without +interfering with outgoing calls. `sendfax' is a standalone program which +sends fax files. `vgetty' is an extended version of mgetty that can +answer the telephone like an answering machine and record a voice-mail +message (if it finds one), or perform `mgetty's fax or data call +handling otherwise. The mgetty+sendfax distribution includes vgetty and +a good-sized gob of utility programs that help you manage faxes and +voice messages. diff --git a/comms/mgetty+sendfax/pkg/MESSAGE b/comms/mgetty+sendfax/pkg/MESSAGE new file mode 100755 index 00000000000..2a20b1fcf8e --- /dev/null +++ b/comms/mgetty+sendfax/pkg/MESSAGE @@ -0,0 +1,7 @@ +If you're installing for the first time or want to change your +configuration, run the following script as root: +${PREFIX}/lib/mgetty+sendfax/setup + +It will help you to create the following configuration files in +${SYSCONFDIR}/mgetty+sendfax: +faxheader mgetty.config sendfax.config diff --git a/comms/mgetty+sendfax/pkg/PLIST b/comms/mgetty+sendfax/pkg/PLIST index 6b8290052e4..8f47f89a178 100644 --- a/comms/mgetty+sendfax/pkg/PLIST +++ b/comms/mgetty+sendfax/pkg/PLIST @@ -1,73 +1,133 @@ -@comment $OpenBSD: PLIST,v 1.4 2002/04/07 01:54:48 naddy Exp $ -bin/newslock -bin/pbm2g3 -bin/g3cat -bin/g32pbm -bin/g3topbm -bin/faxspool -bin/faxrunq +@comment $OpenBSD: PLIST,v 1.5 2005/09/25 18:18:24 aanriot Exp $ +@conflict hylafax-* +bin/autopvf +bin/basictopvf bin/faxq bin/faxrm -bin/mg.echo -bin/vm +bin/faxrunq +bin/faxspool +bin/g32pbm +bin/g3cat +bin/lintopvf +bin/newslock +bin/pbm2g3 bin/pvfamp bin/pvfcut bin/pvfecho +bin/pvffft bin/pvffile bin/pvffilter -bin/pvffft bin/pvfmix bin/pvfnoise bin/pvfreverse bin/pvfsine bin/pvfspeed -bin/pvftormd -bin/rmdtopvf -bin/rmdfile -bin/pvftovoc -bin/voctopvf -bin/pvftolin -bin/lintopvf -bin/pvftobasic -bin/basictopvf bin/pvftoau -bin/autopvf +bin/pvftobasic +bin/pvftolin +bin/pvftormd +bin/pvftovoc bin/pvftowav +bin/rmdfile +bin/rmdtopvf +bin/sff2g3 +bin/vm +bin/voctopvf bin/wavtopvf -info/mgetty.info +@info info/mgetty.info +lib/mgetty+sendfax/ lib/mgetty+sendfax/cour25.pbm lib/mgetty+sendfax/cour25n.pbm +lib/mgetty+sendfax/faxq-helper lib/mgetty+sendfax/setup -man/man1/g32pbm.1 -man/man1/g3cat.1 -man/man1/pbm2g3.1 -man/man1/fax.1 -man/man1/faxspool.1 -man/man1/faxrunq.1 -man/man1/faxq.1 -man/man1/faxrm.1 -man/man1/coverpg.1 -man/man1/zplay.1 -man/man1/pvf.1 -man/man4/mgettydefs.4 -man/man5/faxqueue.5 -man/man8/sendfax.8 -man/man8/mgetty.8 -man/man8/callback.8 -man/man8/faxrunqd.8 +@man man/man1/coverpg.1 +@man man/man1/fax.1 +@man man/man1/faxq.1 +@man man/man1/faxrm.1 +@man man/man1/faxrunq.1 +@man man/man1/faxspool.1 +@man man/man1/g32pbm.1 +@man man/man1/g3cat.1 +@man man/man1/pbm2g3.1 +@man man/man1/pvf.1 +@man man/man1/sff2g3.1 +@man man/man1/zplay.1 +@man man/man4/mgettydefs.4 +@man man/man5/faxqueue.5 +@man man/man8/callback.8 +@man man/man8/faxrunqd.8 +@man man/man8/mgetty.8 +@man man/man8/sendfax.8 +@man man/man8/vgetty.8 +sbin/callback +sbin/faxrunqd sbin/mgetty sbin/sendfax -sbin/faxrunqd sbin/vgetty -@dirrm lib/mgetty+sendfax -@exec echo "***" -@exec echo "*** Finished installing mgetty+sendfax." -@exec echo "*** To complete the install, run %D/lib/mgetty+sendfax/setup" -@exec echo "*** script." -@exec echo "***" -@unexec echo "***" -@unexec echo "*** Finished uninstalling mgetty+sendfax." -@unexec echo "*** Please remove /etc/mgetty+sendfax directory if you" -@unexec echo "*** don't want to keep mgetty configuration files." -@unexec echo "*** Don't forget to edit /etc/ttys files." -@unexec echo "***" +share/doc/mgetty+sendfax/ +share/doc/mgetty+sendfax/faq/ +share/doc/mgetty+sendfax/faq/FAQ.sgml +share/doc/mgetty+sendfax/loginv2.txt +share/doc/mgetty+sendfax/scanner.txt +share/doc/mgetty+sendfax/secure_tty.txt +share/doc/mgetty+sendfax/ttyS-cua.txt +share/doc/mgetty+sendfax/voice/ +share/doc/mgetty+sendfax/voice/NOTE +share/doc/mgetty+sendfax/voice/Readme.Beginners +share/doc/mgetty+sendfax/voice/Readme.pvftools +share/doc/mgetty+sendfax/voice/Readme.voice_shell +share/doc/mgetty+sendfax/voice/compression_settings +share/doc/mgetty+sendfax/voice/device_settings +share/examples/mgetty+sendfax/ +share/examples/mgetty+sendfax/dialin.config +share/examples/mgetty+sendfax/faxheader +share/examples/mgetty+sendfax/faxrunq.config +share/examples/mgetty+sendfax/faxspool.rules.sample +share/examples/mgetty+sendfax/login.config +share/examples/mgetty+sendfax/mgetty.config +share/examples/mgetty+sendfax/samples/ +share/examples/mgetty+sendfax/samples/answer_fax.sh +share/examples/mgetty+sendfax/samples/coverpg-pl.ps +share/examples/mgetty+sendfax/samples/coverpg.pbm +share/examples/mgetty+sendfax/samples/coverpg.ps +share/examples/mgetty+sendfax/samples/fax +share/examples/mgetty+sendfax/samples/faxmemo +share/examples/mgetty+sendfax/samples/faxview.th +share/examples/mgetty+sendfax/samples/new_fax.NeXT +share/examples/mgetty+sendfax/samples/new_fax.all/ +share/examples/mgetty+sendfax/samples/new_fax.all/INSTALL +share/examples/mgetty+sendfax/samples/new_fax.all/README +share/examples/mgetty+sendfax/samples/new_fax.all/archive.module +share/examples/mgetty+sendfax/samples/new_fax.all/delete.module +share/examples/mgetty+sendfax/samples/new_fax.all/fax.module +share/examples/mgetty+sendfax/samples/new_fax.all/faxlist +share/examples/mgetty+sendfax/samples/new_fax.all/faxlist.dist +share/examples/mgetty+sendfax/samples/new_fax.all/list.module +share/examples/mgetty+sendfax/samples/new_fax.all/mail.module +share/examples/mgetty+sendfax/samples/new_fax.all/new_fax +share/examples/mgetty+sendfax/samples/new_fax.all/notify.module +share/examples/mgetty+sendfax/samples/new_fax.all/print.module +share/examples/mgetty+sendfax/samples/new_fax.all/write.module +share/examples/mgetty+sendfax/samples/new_fax.hpa +share/examples/mgetty+sendfax/samples/new_fax.lj +share/examples/mgetty+sendfax/samples/new_fax.mail +share/examples/mgetty+sendfax/samples/new_fax.mime1 +share/examples/mgetty+sendfax/samples/new_fax.mime3 +share/examples/mgetty+sendfax/samples/new_fax.mime4 +share/examples/mgetty+sendfax/samples/new_fax.pbm +share/examples/mgetty+sendfax/samples/new_fax.th +share/examples/mgetty+sendfax/samples/new_fax.tiff +share/examples/mgetty+sendfax/samples/new_fax.vacation +share/examples/mgetty+sendfax/samples/printfax +share/examples/mgetty+sendfax/samples/printfax.ps +share/examples/mgetty+sendfax/sendfax.config +share/examples/mgetty+sendfax/voice.conf +@sample ${SYSCONFDIR}/mgetty+sendfax/ +@sample ${SYSCONFDIR}/mgetty+sendfax/voice.conf +@mode 750 +@owner uucp +@group dialer +@sample /var/spool/fax/ +@sample /var/spool/fax/incoming/ +@sample /var/spool/fax/outgoing/ +@extraunexec rm -rf /var/spool/fax/* diff --git a/comms/mgetty+sendfax/scripts/configure b/comms/mgetty+sendfax/scripts/configure deleted file mode 100644 index d219dbe8c26..00000000000 --- a/comms/mgetty+sendfax/scripts/configure +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -cd $WRKSRC || exit 1 -cp policy.h-dist policy.h - -cat >> policy.h <