upgrade to mgetty+sendfax 1.1.21

This commit is contained in:
brad 1999-08-28 18:13:36 +00:00
parent de58fdceda
commit a781a26136
5 changed files with 188 additions and 318 deletions

View File

@ -1,20 +1,20 @@
# $OpenBSD: Makefile,v 1.10 1999/04/01 02:57:55 brad Exp $
# $OpenBSD: Makefile,v 1.11 1999/08/28 18:13:36 brad Exp $
# $FreeBSD: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp $
DISTNAME= mgetty1.1.20-Jan17
PKGNAME= mgetty-1.1.20
DISTNAME= mgetty1.1.21-Jul24
PKGNAME= mgetty-1.1.21
CATEGORIES= comms
MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/
MAINTAINER= ports@openbsd.org
MAINTAINER= brad@openbsd.org
WRKSRC= ${WRKDIR}/${PKGNAME}
MAKE_ENV+= prefix=${PREFIX} spool=/var/spool \
CONFDIR=/etc/mgetty+sendfax \
PHONE_GROUP=wheel PHONE_PERMS=700
MAKE_ENV+= prefix="${PREFIX}" spool="/var/spool" \
CONFDIR="/etc/mgetty+sendfax" \
PHONE_GROUP="wheel" PHONE_PERMS="700"
post-build:
${SED} -e "s,@prefix@,${PREFIX},g" ${FILESDIR}/setup >${WRKDIR}/setup
@${SED} -e "s,@prefix@,${PREFIX},g" ${FILESDIR}/setup > ${WRKDIR}/setup
post-install:
${INSTALL_SCRIPT} ${WRKDIR}/setup ${PREFIX}/lib/mgetty+sendfax

View File

@ -1,3 +1,3 @@
MD5 (mgetty1.1.20-Jan17.tar.gz) = c4b6022240089b90f7218084059d9aa4
RMD160 (mgetty1.1.20-Jan17.tar.gz) = 2c52702fde8bced37a75c81aac4f6f362bebc38f
SHA1 (mgetty1.1.20-Jan17.tar.gz) = 171f805558e312609bd905b5e91b15bcea45bb2e
MD5 (mgetty1.1.21-Jul24.tar.gz) = dce35cf36bdc6b87d3b931a644f0fc0e
RMD160 (mgetty1.1.21-Jul24.tar.gz) = 925e733ab719a76887cc1a51a7cfda9779f20e65
SHA1 (mgetty1.1.21-Jul24.tar.gz) = f71efcf5905d5400d91138f4d47e95edfb901c82

View File

@ -1,6 +1,6 @@
--- fax/faxspool.in.orig Fri Aug 8 21:43:55 1997
+++ fax/faxspool.in Mon Dec 29 22:31:59 1997
@@ -299,11 +299,11 @@
--- 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)
##########

View File

@ -1,301 +1,171 @@
*** Makefile.orig Sun Nov 22 05:19:06 1998
--- Makefile Thu Dec 17 06:29:46 1998
***************
*** 4,11 ****
#
# 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
#
#### C Compiler Flags ####
#
--- 4,11 ----
#
# 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
#
#### C Compiler Flags ####
#
***************
*** 107,113 ****
# 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=-O -DSVR4
#CFLAGS=-O -DSVR4 -DSVR42
#CFLAGS=-O -DUSE_POLL
--- 107,113 ----
# prompt first. Don't forget to activate the /AutoPPP/ line in login.config!
#
#CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
! CFLAGS+=-DAUTO_PPP
#CFLAGS=-O -DSVR4
#CFLAGS=-O -DSVR4 -DSVR42
#CFLAGS=-O -DUSE_POLL
***************
*** 144,155 ****
#
# On SCO Xenix, add -ldir -lx
#
! # For FreeBSD, 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=-lprot -lsocket # SCO Unix
#LIBS=-lsocket
#LIBS=-lbsd # OSF/1
--- 144,155 ----
#
# On SCO Xenix, add -ldir -lx
#
! # 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=-lutil
#LIBS=-lprot -lsocket # SCO Unix
#LIBS=-lsocket
#LIBS=-lbsd # OSF/1
***************
*** 169,175 ****
#
# 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 # 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
--- 169,176 ----
#
# 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 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,187 ****
#
# prefix, where most (all?) of the stuff lives, usually /usr/local or /usr
#
! prefix=/usr/local
#
# prefix for all the spool directories (usually /usr/spool or /var/spool)
#
! spool=/var/spool
#
# where the mgetty + sendfax binaries live (used for "make install")
#
--- 178,188 ----
#
# prefix, where most (all?) of the stuff lives, usually /usr/local or /usr
#
! prefix?=/usr/local
#
# prefix for all the spool directories (usually /usr/spool or /var/spool)
#
! spool?=/var/spool
#
# where the mgetty + sendfax binaries live (used for "make install")
#
***************
*** 197,203 ****
#
# where the configuration files (*.config, aliases, fax.allow/deny) go to
#
! CONFDIR=$(prefix)/etc/mgetty+sendfax
#CONFDIR=/etc/default/
#
#
--- 198,204 ----
#
# where the configuration files (*.config, aliases, fax.allow/deny) go to
#
! CONFDIR?=$(prefix)/etc/mgetty+sendfax
#CONFDIR=/etc/default/
#
#
***************
*** 247,253 ****
# 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
#
#
# An echo program that understands escapes like "\n" for newline or
--- 248,254 ----
# 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
#
#
# An echo program that understands escapes like "\n" for newline or
***************
*** 259,267 ****
# please use the "mg.echo" program provided in the compat/ subdirectory.
# Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
#
! ECHO="echo"
#
! # INSTALL_MECHO=mg.echo
#
# for mgetty, that's it. If you want to use the voice
--- 260,268 ----
# please use the "mg.echo" program provided in the compat/ subdirectory.
# Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
#
! ECHO="mg.echo"
#
! INSTALL_MECHO=mg.echo
#
# for mgetty, that's it. If you want to use the voice
***************
*** 269,276 ****
# 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
# Add -DNO_STRSTR to CFLAGS if you don't have strstr().
--- 270,277 ----
# To maintain security, I recommend creating a new group for
# users who are allowed to manipulate the recorded voice messages.
! PHONE_GROUP?=wheel
! PHONE_PERMS?=700
# Add -DNO_STRSTR to CFLAGS if you don't have strstr().
***************
*** 301,307 ****
all: bin-all doc-all
! bin-all: mgetty sendfax newslock subdirs call-back
# a few C files need extra compiler arguments
--- 302,308 ----
all: bin-all doc-all
! bin-all: mgetty sendfax newslock subdirs call-back vgetty
# a few C files need extra compiler arguments
***************
*** 560,580 ****
cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
! install: install.bin install.doc
install.bin: mgetty sendfax newslock \
! login.config mgetty.config sendfax.config
#
# binaries
#
-test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) )
! $(INSTALL) -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)
#
# data files + directories
#
--- 561,581 ----
cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
! install: install.bin install.doc install-vgetty
install.bin: mgetty sendfax newslock \
! login.config #mgetty.config sendfax.config
#
# binaries
#
-test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(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_PROGRAM) -m 700 mgetty $(SBINDIR)
! $(INSTALL_PROGRAM) -m 700 sendfax $(SBINDIR)
#
# data files + directories
#
***************
*** 584,593 ****
( ./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 || \
--- 585,594 ----
( ./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 || \
***************
*** 618,624 ****
#
# g3 tool programs
#
! cd g3 ; $(MAKE) install INSTALL="$(INSTALL)" \
BINDIR=$(BINDIR) \
LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
#
--- 619,625 ----
#
# g3 tool programs
#
! cd g3 ; $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \
BINDIR=$(BINDIR) \
LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
#
***************
*** 633,639 ****
if [ ! -z "$(INSTALL_MECHO)" ] ; then \
cd compat ; \
$(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
! $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
fi
#
--- 634,640 ----
if [ ! -z "$(INSTALL_MECHO)" ] ; then \
cd compat ; \
$(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
! $(INSTALL_PROGRAM) -m 755 mg.echo $(BINDIR) ; \
fi
#
--- 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
#

View File

@ -1,6 +1,6 @@
--- mgetty.h.orig Thu Jul 2 02:47:37 1998
+++ mgetty.h Thu Aug 27 21:10:05 1998
@@ -61,7 +61,7 @@
--- 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__) || \