Subject: mgetty package
To: None <tech-pkg@NetBSD.org>
From: Stephane Fortier <sfortier@wishbone-tech.com>
List: tech-pkg
Date: 09/19/2003 18:34:04
This is a multi-part message in MIME format.
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Hi,
I updated the mgetty+sendfax package.
This is the first time I do this so it might be buggy... anyway, it
compiles, installs and runs.
Stephane
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="distinfo"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="distinfo"
$NetBSD: distinfo,v 1.11 2003/02/27 21:43:36 fredb Exp $=0A=
=0A=
SHA1 (mgetty1.1.30-Dec16.tar.gz) =3D =
aea2a4c999f167e2311e797b164d4797baf328c4=0A=
Size (mgetty1.1.30-Dec16.tar.gz) =3D 969967 bytes=0A=
SHA1 (patch-aa) =3D 52a6537290c2b8e4d71a8ccb0d015a583d718782=0A=
SHA1 (patch-ab) =3D e058fe9a7fb9693770602b475824c0f10e67142e=0A=
SHA1 (patch-ac) =3D ef075ea5e0fa1eaeb0923c5d556a02bbd648b13c=0A=
SHA1 (patch-ad) =3D 9b2b440c1371ad8df8689196e987fc19281c0766=0A=
SHA1 (patch-ae) =3D fb548d6e002f35718beea57a07896d57887844fd=0A=
SHA1 (patch-af) =3D 989e0ebfe0a64dc9b33b8eb28ebdbd0ccccece0c=0A=
SHA1 (patch-ag) =3D c7a77717d83afc2db977a93b83b7dd291efb2fd7=0A=
SHA1 (patch-ah) =3D 6d3a2929e802ba39957a514bd596b58f2fa363be=0A=
SHA1 (patch-ai) =3D bba8ca0e1c5cf1603aef9312247e967e934fa455=0A=
SHA1 (patch-aj) =3D 33865347871b7014345156385d33b16eaa37d656=0A=
SHA1 (patch-ak) =3D a129c8178e47f16915f3dee6a71405f63b1661b9=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="Makefile"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="Makefile"
# $NetBSD: Makefile,v 1.34 2003/08/30 22:51:13 jlam Exp $=0A=
# FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp=0A=
#=0A=
=0A=
DISTNAME=3D mgetty1.1.30-Dec16=0A=
PKGNAME=3D mgetty-1.1.30=0A=
WRKSRC=3D ${WRKDIR}/${PKGNAME_NOREV}=0A=
CATEGORIES=3D comms=0A=
MASTER_SITES=3D ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ \=0A=
ftp://alpha.greenie.net/pub/mgetty/source/1.1/=0A=
=0A=
MAINTAINER=3D tech-pkg@NetBSD.org=0A=
HOMEPAGE=3D http://alpha.greenie.net/mgetty/=0A=
COMMENT=3D Handle external logins, send and receive faxes=0A=
=0A=
BUILD_DEPENDS+=3D texi2roff-[0-9]*:../../textproc/texi2roff=0A=
=0A=
CONFLICTS=3D hylafax-[0-9]*=0A=
=0A=
USE_BUILDLINK2=3D yes=0A=
=0A=
USE_PKGINSTALL=3D yes=0A=
DEINSTALL_EXTRA_TMPL+=3D ${.CURDIR}/DEINSTALL=0A=
INSTALL_EXTRA_TMPL+=3D ${.CURDIR}/INSTALL=0A=
=0A=
MAKE_ENV=3D MGETTY_CONFDIR=3D${PKG_SYSCONFDIR}=0A=
=0A=
USE_MAKEINFO=3D YES=0A=
INFO_FILES=3D mgetty.info=0A=
PKG_SYSCONFSUBDIR=3D mgetty+sendfax=0A=
=0A=
.ifndef CONF_FILES=0A=
. for cfg in dialin.config \=0A=
faxheader \=0A=
faxrunq.config \=0A=
faxspool.rules.sample \=0A=
login.config \=0A=
mgetty.config=0A=
CONF_FILES+=3D ${_EXAMPLES_DIR}/${cfg} ${PKG_SYSCONFDIR}/${cfg}=0A=
. endfor=0A=
.endif=0A=
=0A=
PKG_GROUPS=3D dialer=0A=
PKG_USERS=3D fax:dialer =0A=
=0A=
_EXAMPLES_DIR=3D ${PREFIX}/share/examples/mgetty+sendfax=0A=
MAKE_DIRS_PERMS+=3D /var/spool/fax ${ROOT_USER} ${ROOT_GROUP} 755=0A=
MAKE_DIRS_PERMS+=3D /var/spool/fax/incoming ${ROOT_USER} ${ROOT_GROUP} =
755=0A=
MAKE_DIRS_PERMS+=3D /var/spool/fax/outgoing ${ROOT_USER} ${ROOT_GROUP} =
1777=0A=
MAKE_DIRS_PERMS+=3D /var/spool/fax/outgoing/locks ${ROOT_USER} =
${ROOT_GROUP} 777=0A=
=0A=
do-configure:=0A=
${MV} ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in=0A=
cd ${WRKSRC} \=0A=
&& for _file in faxrunq.config policy.h-dist; \=0A=
do \=0A=
${MV} $$_file $${_file}.orig; \=0A=
${SED} 's|/usr/local|${PREFIX}|' \=0A=
$${_file}.orig > $$_file; \=0A=
done \=0A=
&& cd ${.CURDIR} \=0A=
&& ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure=0A=
=0A=
.include "../../graphics/netpbm/buildlink2.mk"=0A=
.include "../../mk/bsd.pkg.mk"=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="patch-aa"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-aa"
$NetBSD$=0A=
=0A=
--- Makefile.orig Fri Sep 19 15:47:11 2003=0A=
+++ Makefile=0A=
@@ -4,8 +4,8 @@=0A=
#=0A=
# this is the C compiler to use (on SunOS, the standard "cc" does not=0A=
# grok my code, so please use gcc there. On ISC 4.0, use "icc".).=0A=
-CC=3Dgcc=0A=
-#CC=3Dcc=0A=
+#CC=3Dgcc=0A=
+CC=3Dcc=0A=
#=0A=
#### C Compiler Flags ####=0A=
#=0A=
@@ -107,7 +107,7 @@ CC=3Dgcc=0A=
# prompt first. Don't forget to activate the /AutoPPP/ line in =
login.config!=0A=
#=0A=
#CFLAGS=3D-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL=0A=
-CFLAGS=3D-O2 -Wall -pipe=0A=
+CFLAGS+=3D-DAUTO_PPP -DPREFIX=3D\"${PREFIX}\"=0A=
#CFLAGS=3D-O -DSVR4=0A=
#CFLAGS=3D-O -DSVR4 -DSVR42=0A=
#CFLAGS=3D-O -DUSE_POLL=0A=
@@ -149,7 +149,7 @@ CFLAGS=3D-O2 -Wall -pipe=0A=
# For Linux, add "-lutil" if the linker complains about "updwtmp".=0A=
#=0A=
LDFLAGS=3D=0A=
-LIBS=3D=0A=
+LIBS=3D-lutil=0A=
#LIBS=3D-lprot -lsocket # SCO Unix=0A=
#LIBS=3D-lsocket=0A=
#LIBS=3D-lbsd # OSF/1=0A=
@@ -169,15 +169,15 @@ LIBS=3D=0A=
#=0A=
# if your systems doesn't have one, use the shell script that I provide=0A=
# in "inst.sh" (taken from X11R5). Needed on IRIX5.2=0A=
-INSTALL=3Dinstall -c -o bin -g bin=0A=
-#INSTALL=3Dinstall -c -o root -g wheel # NeXT/BSD=0A=
+#INSTALL=3Dinstall -c -o bin -g bin=0A=
+INSTALL=3Dinstall -c -o root -g wheel # NeXT/BSD=0A=
#INSTALL=3D/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x=0A=
#INSTALL=3Dinstallbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2=0A=
#INSTALL=3D/usr/bin/X11/bsdinst -c -o bin # IRIX=0A=
#=0A=
# prefix, where most (all?) of the stuff lives, usually /usr/local or =
/usr=0A=
#=0A=
-prefix=3D/usr/local=0A=
+prefix=3D${PREFIX}=0A=
#=0A=
# prefix for all the spool directories (usually /usr/spool or =
/var/spool)=0A=
#=0A=
@@ -185,20 +185,20 @@ spool=3D/var/spool=0A=
#=0A=
# where the mgetty + sendfax binaries live (used for "make install")=0A=
#=0A=
-SBINDIR=3D$(prefix)/sbin=0A=
+SBINDIR=3D${PREFIX}/sbin=0A=
#=0A=
# where the user executable binaries live=0A=
#=0A=
-BINDIR=3D$(prefix)/bin=0A=
+BINDIR=3D${PREFIX}/bin=0A=
#=0A=
# where the font+coverpage files go=0A=
#=0A=
-LIBDIR=3D$(prefix)/lib/mgetty+sendfax=0A=
+LIBDIR=3D${PREFIX}/lib/mgetty+sendfax=0A=
#=0A=
# where the configuration files (*.config, aliases, fax.allow/deny) go =
to=0A=
#=0A=
-CONFDIR=3D$(prefix)/etc/mgetty+sendfax=0A=
-#CONFDIR=3D/etc/default/=0A=
+CONFDIR=3D${MGETTY_CONFDIR}=0A=
+CONF_EXAMPLES_DIR=3D${PREFIX}/share/examples/mgetty+sendfax=0A=
#=0A=
#=0A=
# where mgetty PID files (mgetty.pid) go to=0A=
@@ -224,20 +224,20 @@ FAX_OUT_USER=3Dfax=0A=
#=0A=
#=0A=
# Where section 1 manual pages should be placed=0A=
-MAN1DIR=3D$(prefix)/man/man1=0A=
+MAN1DIR=3D${PREFIX}/man/man1=0A=
#=0A=
# Where section 4 manual pages (mgettydefs.4) should be placed=0A=
-MAN4DIR=3D$(prefix)/man/man4=0A=
+MAN4DIR=3D${PREFIX}/man/man4=0A=
#=0A=
# Section 5 man pages (faxqueue.5)=0A=
-MAN5DIR=3D$(prefix)/man/man5=0A=
+MAN5DIR=3D${PREFIX}/man/man5=0A=
#=0A=
# Section 8 man pages (sendfax.8)=0A=
-MAN8DIR=3D$(prefix)/man/man8=0A=
+MAN8DIR=3D${PREFIX}/man/man8=0A=
#=0A=
# Where the GNU Info-Files are located=0A=
#=0A=
-INFODIR=3D$(prefix)/info=0A=
+INFODIR=3D${PREFIX}/info=0A=
#=0A=
#=0A=
# A shell that understands bourne-shell syntax=0A=
@@ -262,7 +262,7 @@ PERL=3D"/usr/bin/perl -w"=0A=
# If you have Perl with TK extentions, define it here. This may be the=0A=
# same as PERL=3D... above, or different, if you have TkPerl statically=0A=
# linked.=0A=
-TKPERL=3D/usr/bin/tkperl=0A=
+#TKPERL=3D/usr/bin/tkperl=0A=
#=0A=
#=0A=
# An echo program that understands escapes like "\n" for newline or=0A=
@@ -274,9 +274,9 @@ TKPERL=3D/usr/bin/tkperl=0A=
# please use the "mg.echo" program provided in the compat/ subdirectory.=0A=
# Set ECHO=3D"mg.echo" and INSTALL_MECHO to mg.echo=0A=
#=0A=
-ECHO=3D"echo"=0A=
+ECHO=3D"mg.echo"=0A=
#=0A=
-# INSTALL_MECHO=3Dmg.echo=0A=
+INSTALL_MECHO=3Dmg.echo=0A=
=0A=
#=0A=
# for mgetty, that's it. If you want to use the voice=0A=
@@ -284,7 +284,7 @@ ECHO=3D"echo"=0A=
=0A=
# To maintain security, I recommend creating a new group for=0A=
# users who are allowed to manipulate the recorded voice messages.=0A=
-PHONE_GROUP=3Dphone=0A=
+PHONE_GROUP=3Duucp=0A=
PHONE_PERMS=3D770=0A=
=0A=
# Add -DNO_STRSTR to CFLAGS if you don't have strstr().=0A=
@@ -316,7 +316,7 @@ SFAXOBJ=3Dsendfax.o logfile.o locks.o mode=0A=
=0A=
all: bin-all doc-all=0A=
=0A=
-bin-all: mgetty sendfax newslock subdirs call-back =0A=
+bin-all: mgetty sendfax newslock subdirs call-back vgetty=0A=
=0A=
# a few C files need extra compiler arguments=0A=
=0A=
@@ -568,8 +568,8 @@ newslock: compat/newslock.c=0A=
# internal: use this to create a "clean" mgetty+sendfax tree=0A=
bindist: all doc-all sedscript=0A=
-rm -rf bindist=0A=
- ./mkidirs bindist$(prefix) bindist$(spool)=0A=
- bd=3D`pwd`/bindist; PATH=3D`pwd`:"$$PATH" $(MAKE) =
prefix=3D$$bd$(prefix) \=0A=
+ ./mkidirs bindist${PREFIX}/ bindist$(spool)=0A=
+ bd=3D`pwd`/bindist; PATH=3D`pwd`:"$$PATH" $(MAKE) =
prefix=3D$$bd${PREFIX}/ \=0A=
BINDIR=3D$$bd$(BINDIR) SBINDIR=3D$$bd$(SBINDIR) \=0A=
LIBDIR=3D$$bd$(LIBDIR) CONFDIR=3D$$bd$(CONFDIR) \=0A=
spool=3D$$bd$(spool) FAX_SPOOL=3D$$bd$(FAX_SPOOL) \=0A=
@@ -581,7 +581,7 @@ bindist: all doc-all sedscript=0A=
cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *=0A=
=0A=
=0A=
-install: install.bin install.doc=0A=
+install: install.bin install.doc install-vgetty=0A=
=0A=
install.bin: mgetty sendfax newslock \=0A=
login.config mgetty.config sendfax.config =0A=
@@ -589,7 +589,7 @@ install.bin: mgetty sendfax newslock \=0A=
# binaries=0A=
#=0A=
-test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) )=0A=
- $(INSTALL) -m 755 newslock $(BINDIR)=0A=
+ $(INSTALL) -s -m 755 newslock $(BINDIR)=0A=
=0A=
-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )=0A=
-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old=0A=
@@ -601,18 +601,13 @@ install.bin: mgetty sendfax newslock \=0A=
#=0A=
test -d $(LIBDIR) || \=0A=
( ./mkidirs $(LIBDIR) ; chmod 755 $(LIBDIR) )=0A=
- test -d $(CONFDIR) || \=0A=
- ( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR))=0A=
- test -f $(CONFDIR)/login.config || \=0A=
- $(INSTALL) -o root -m 600 login.config $(CONFDIR)/=0A=
- test -f $(CONFDIR)/mgetty.config || \=0A=
- $(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/=0A=
- test -f $(CONFDIR)/sendfax.config || \=0A=
- $(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/=0A=
- test -f $(CONFDIR)/dialin.config || \=0A=
- $(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/=0A=
- test -f $(CONFDIR)/faxrunq.config || \=0A=
- $(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/=0A=
+ test -d $(CONF_EXAMPLES_DIR) || \=0A=
+ ( ./mkidirs $(CONF_EXAMPLES_DIR); chmod 755 $(CONF_EXAMPLES_DIR))=0A=
+ $(INSTALL) -o root -m 600 login.config $(CONF_EXAMPLES_DIR)/=0A=
+ $(INSTALL) -o root -m 600 mgetty.config $(CONF_EXAMPLES_DIR)/=0A=
+ $(INSTALL) -o root -m 644 sendfax.config $(CONF_EXAMPLES_DIR)/=0A=
+ $(INSTALL) -o root -m 600 dialin.config $(CONF_EXAMPLES_DIR)/=0A=
+ $(INSTALL) -o root -m 644 faxrunq.config $(CONF_EXAMPLES_DIR)/=0A=
#=0A=
# test for outdated stuff=0A=
#=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="patch-ab"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-ab"
$NetBSD$=0A=
=0A=
--- doc/Makefile.orig Fri Sep 19 15:47:34 2003=0A=
+++ doc/Makefile=0A=
@@ -6,7 +6,7 @@=0A=
NROFF=3Dnroff=0A=
#=0A=
#=0A=
-MAN1PAGES=3Dg32pbm.1 g3cat.1 pbm2g3.1 fax.1 \=0A=
+MAN1PAGES=3Dg32pbm.1 g3cat.1 pbm2g3.1 sendfax.1 \=0A=
faxspool.1 faxrunq.1 faxq.1 faxrm.1 coverpg.1=0A=
MAN4PAGES=3Dmgettydefs.4=0A=
MAN5PAGES=3Dfaxqueue.5=0A=
@@ -26,7 +26,7 @@ MAN_FMT_PRG=3D$(NROFF) -man=0A=
=0A=
all:=0A=
=0A=
-doc-all: mgetty.asc mgetty.info mgetty.dvi mgetty.ps fmt-manpages =
$(MANSRC) =0A=
+doc-all: mgetty.asc mgetty.info fmt-manpages $(MANSRC) =0A=
=0A=
manpages: $(MANSRC)=0A=
=0A=
@@ -43,7 +43,7 @@ mgetty.html: mgetty.texi=0A=
-texi2html -verbose mgetty.texi=0A=
=0A=
mgetty.info: mgetty.texi=0A=
- -makeinfo mgetty.texi=0A=
+ -${MAKEINFO} mgetty.texi=0A=
=0A=
mgetty.ps: mgetty.dvi=0A=
-dvips -o mgetty.ps mgetty.dvi=0A=
@@ -98,7 +98,7 @@ doc-tar: ../mgetty0$(VS)doc.tar.gz=0A=
=0A=
# explicit man page dependencies=0A=
=0A=
-fax.1: fax.1in ../sedscript=0A=
+sendfax.1: sendfax.1in ../sedscript=0A=
faxq.1: faxq.1in ../sedscript=0A=
faxqueue.5: faxqueue.5in ../sedscript=0A=
faxrm.1: faxrm.1in ../sedscript=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="patch-ac"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-ac"
$NetBSD$=0A=
=0A=
--- doc/fax.1in.orig Fri Sep 19 15:48:08 2003=0A=
+++ doc/fax.1in=0A=
@@ -1,7 +1,7 @@=0A=
-.TH fax 1 "23 Nov 02" "greenie" "mgetty+sendfax manual"=0A=
+.TH sendfax 1 "23 Nov 02" "greenie" "mgetty+sendfax manual"=0A=
.IX fax=0A=
.SH NAME=0A=
-fax \- fax sending and receiving with mgetty+sendfax=0A=
+sendfax \- fax sending and receiving with mgetty+sendfax=0A=
.SH SYNOPSIS=0A=
.B faxspool=0A=
.RB [options]=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="patch-ad"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-ad"
$NetBSD$=0A=
=0A=
--- doc/mgetty.texi-in.orig Fri Sep 19 15:47:44 2003=0A=
+++ doc/mgetty.texi-in=0A=
@@ -7,6 +7,10 @@=0A=
@finalout=0A=
=0A=
@ifinfo=0A=
+@dircategory Miscellaneous=0A=
+@direntry=0A=
+ * mgetty: (mgetty). Handle external logins, send and receive faxes.=0A=
+@end direntry=0A=
This is the online documentation for the mgetty + sendfax=0A=
package.=0A=
=0A=
@@ -3756,7 +3760,7 @@ Mgetty should be run from @file{/etc/tty=0A=
@code{man ttys} (there is no @file{/etc/inittab}).=0A=
=0A=
Open issues:=0A=
-@itemize=0A=
+@itemize @bullet=0A=
@c @item how to access external serial ports?=0A=
@item is it better to use @file{/dev/cu.*} or @file{/dev/tty.*}?=0A=
@item how is tty locking done? Couldn't find UUCP lock files=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="patch-ae"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-ae"
$NetBSD$=0A=
=0A=
--- fax/Makefile.orig Fri Sep 19 15:48:00 2003=0A=
+++ fax/Makefile=0A=
@@ -12,6 +12,9 @@ FAX_SCRIPTS=3Dfaxspool faxrunq faxq faxrm =0A=
zigzag: =0A=
cd .. ; $(MAKE) subdirs=0A=
=0A=
+CONFDIR=3D${MGETTY_CONFDIR}=0A=
+CONF_EXAMPLES_DIR=3D${PREFIX}/share/examples/mgetty+sendfax=0A=
+=0A=
all: $(FAX_SCRIPTS) faxrunqd faxheader faxq-helper=0A=
=0A=
faxspool: faxspool.in ../sedscript=0A=
@@ -68,8 +71,8 @@ install: all=0A=
#=0A=
$(INSTALL) -m 644 cour25.pbm $(LIBDIR)=0A=
$(INSTALL) -m 644 cour25n.pbm $(LIBDIR)=0A=
- -test -f $(CONFDIR)/faxheader || \=0A=
- $(INSTALL) -m 644 faxheader $(CONFDIR)=0A=
+ -test -f $(CONF_EXAMPLES_DIR)/faxheader || \=0A=
+ $(INSTALL) -m 644 faxheader $(CONF_EXAMPLES_DIR)=0A=
#=0A=
# /etc/magic=0A=
#=0A=
@@ -82,4 +85,4 @@ install: all=0A=
#=0A=
# faxspool.rules sample file=0A=
#=0A=
- $(INSTALL) -m 644 faxspool.rules $(CONFDIR)/faxspool.rules.sample=0A=
+ $(INSTALL) -m 644 faxspool.rules =
$(CONF_EXAMPLES_DIR)/faxspool.rules.sample=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="patch-af"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-af"
$NetBSD$=0A=
=0A=
--- fax/faxspool.in.orig Fri Sep 19 15:47:01 2003=0A=
+++ fax/faxspool.in=0A=
@@ -361,11 +361,11 @@ fs_cvt_pdf()=0A=
# user name (for authentification)=0A=
##########=0A=
=0A=
-if user=3D`logname 2>/dev/null`=0A=
-then :=0A=
+if [ `id -u` =3D 0 ]; then=0A=
+ user=3Droot=0A=
else=0A=
id=3D`id`=0A=
- user=3D`expr "$id" : "[^( ]*(\([^)]*\)"`=0A=
+ user=3D`logname`=0A=
fi=0A=
test -z "$user" && user=3D$LOGNAME=0A=
test -z "$user" && user=3D$USER=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="patch-ag"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-ag"
$NetBSD$=0A=
=0A=
--- g3/Makefile.orig Fri Sep 19 15:47:52 2003=0A=
+++ g3/Makefile=0A=
@@ -42,5 +42,5 @@ install: all=0A=
#=0A=
# make symlink for "g3topbm" (so third-party fax viewers won't fail)=0A=
#=0A=
- -cd $(BINDIR) ; \=0A=
- test -x g3topbm || ln -s g32pbm g3topbm=0A=
+# -cd $(BINDIR) ; \=0A=
+# test -x g3topbm || ln -s g32pbm g3topbm=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="patch-ah"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-ah"
$NetBSD$=0A=
=0A=
--- mg_utmp.h.orig Fri Sep 19 15:48:15 2003=0A=
+++ mg_utmp.h=0A=
@@ -4,6 +4,22 @@=0A=
* highly SysV / BSD dependent=0A=
*/=0A=
=0A=
+#if __NetBSD_Version__ >=3D 106020000 /* NetBSD >=3D 1.6B has =
SVR4-style utmpx */=0A=
+# define NETBSD_UTMPX=0A=
+# include <util.h> /* for loginx */=0A=
+# define login loginx=0A=
+# define utmp utmpx=0A=
+# define getutent getutxent=0A=
+# define getutid getutxid=0A=
+# define pututline pututxline=0A=
+# define setutent setutxent=0A=
+# define endutent endutxent=0A=
+=0A=
+# define UT_INIT INIT_PROCESS=0A=
+# define UT_LOGIN LOGIN_PROCESS=0A=
+# define UT_USER USER_PROCESS=0A=
+=0A=
+#else=0A=
#if !defined(sunos4) && !defined(BSD) && !defined(ultrix) /* SysV style =
*/=0A=
=0A=
#ifdef SVR4 /* on SVR4, use extended utmpx file */=0A=
@@ -42,6 +58,7 @@ void setutent();=0A=
#define UT_USER 2=0A=
=0A=
#endif /* SysV vs. BSD */=0A=
+#endif /* NetBSD with utmpx */=0A=
=0A=
/* prototypes */=0A=
=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="patch-ai"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-ai"
$NetBSD$=0A=
=0A=
--- mgetty.c.orig Fri Sep 19 15:48:31 2003=0A=
+++ mgetty.c=0A=
@@ -512,7 +512,8 @@ int main _P2((argc, argv), int argc, cha=0A=
=0A=
rmlocks(); =0A=
=0A=
-#if ( defined(linux) && defined(NO_SYSVINIT) ) || defined(sysV68)=0A=
+#if ( defined(linux) && defined(NO_SYSVINIT) ) || defined(sysV68) \=0A=
+ || defined(NETBSD_UTMPX)=0A=
/* on linux, "simple init" does not make a wtmp entry when you=0A=
* log so we have to do it here (otherwise, "who" won't work) */=0A=
make_utmp_wtmp( Device, UT_INIT, "uugetty", NULL );=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="patch-aj"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-aj"
$NetBSD$=0A=
=0A=
--- utmp.c.orig Fri Sep 19 15:48:22 2003=0A=
+++ utmp.c=0A=
@@ -7,7 +7,7 @@=0A=
=0A=
#include "mgetty.h"=0A=
=0A=
-#if defined(sunos4) || defined(BSD)=0A=
+#if defined(sunos4) || ( defined(BSD) && !defined(NETBSD_UTMPX) )=0A=
=0A=
#include <stdio.h>=0A=
#include <string.h>=0A=
@@ -20,10 +20,11 @@=0A=
#include <time.h>=0A=
#include <string.h>=0A=
#include <sys/types.h>=0A=
-#include <sys/stat.h>=0A=
-=0A=
-#ifndef ENOENT=0A=
-#include <errno.h>=0A=
+#if !defined(SVR4) && !defined(NETBSD_UTMPX) && !defined(__GLIBC__) || =
__GLIBC__ < 2=0A=
+# include <sys/stat.h>=0A=
+# ifndef ENOENT=0A=
+# include <errno.h>=0A=
+# endif=0A=
#endif=0A=
=0A=
#if defined(_3B1_) || defined(MEIBE) || defined(ISC)=0A=
@@ -42,8 +43,14 @@ typedef short pid_t;=0A=
# endif=0A=
#endif=0A=
=0A=
+#ifndef WTMPX_FILE=0A=
+# ifdef _PATH_WTMPX=0A=
+# define WTMPX_FILE _PATH_WTMPX /* NetBSD */=0A=
+# endif=0A=
+#endif=0A=
+=0A=
=0A=
-#if defined(sunos4) || defined(BSD) || defined(ultrix)=0A=
+#if ( defined(sunos4) || defined(BSD) || defined(ultrix) ) && =
!defined(NETBSD_UTMPX)=0A=
/* on SunOS (and other BSD-derived systems), the getty process does *=0A=
* not have to care for the utmp entries, login and init do all the work=0A=
* Anyway, we have to _read_ it to get the number of users logged in.=0A=
@@ -109,26 +116,74 @@ void make_utmp_wtmp _P4( (line, ut_type,=0A=
{=0A=
struct utmp *utmp;=0A=
pid_t pid;=0A=
+#ifdef NETBSD_UTMPX=0A=
+struct utmpx ut;=0A=
+char *id;=0A=
+#else=0A=
+# if !defined(SVR4) && !defined(__GLIBC__) || __GLIBC__ < 2=0A=
struct stat st;=0A=
+# endif=0A=
+#endif=0A=
FILE * fp;=0A=
=0A=
+#ifdef NETBSD_UTMPX=0A=
+ id =3D line;=0A=
+ if ( strlen( line ) > sizeof( ut.ut_id ) )=0A=
+ id +=3D strlen( line ) - sizeof( ut.ut_id );=0A=
+=0A=
+ if ( ut_type =3D=3D UT_INIT ) {=0A=
+ lprintf(L_JUNK,=0A=
+ "creating initial utmp entry... (ID: %s)",=0A=
+ id);=0A=
+=0A=
+ memset( &ut, 0, sizeof( ut ) );=0A=
+ strncpy( ut.ut_id, id, sizeof( ut.ut_id ) );=0A=
+ strncpy( ut.ut_line, line, sizeof( ut.ut_line ) );=0A=
+ gettimeofday( &ut.ut_tv, NULL );=0A=
+ ut.ut_type =3D INIT_PROCESS;=0A=
+ login( &ut );=0A=
+=0A=
+ lprintf(L_NOISE, "initial utmp + wtmp entry made");=0A=
+ return;=0A=
+ }=0A=
+=0A=
+ if ((pid =3D checklock( line )) =3D=3D NO_LOCK) {=0A=
+ pid =3D getpid();=0A=
+ }=0A=
+=0A=
+ lprintf(L_JUNK,=0A=
+ "looking for utmp entry... (ID: %s)", id);=0A=
+#else=0A=
pid =3D getpid();=0A=
+=0A=
lprintf(L_JUNK, "looking for utmp entry... (my PID: %d)", pid);=0A=
+#endif=0A=
=0A=
+ setutent();=0A=
while ((utmp =3D getutent()) !=3D (struct utmp *) NULL)=0A=
{=0A=
- if (utmp->ut_pid =3D=3D pid &&=0A=
- (utmp->ut_type =3D=3D INIT_PROCESS || utmp->ut_type =3D=3D =
LOGIN_PROCESS))=0A=
+#ifdef NETBSD_UTMPX=0A=
+ if ( strncmp( utmp->ut_id, id, sizeof( utmp->ut_id ) ) =3D=3D 0 &&=0A=
+#else=0A=
+ if ( utmp->ut_pid =3D=3D pid &&=0A=
+#endif=0A=
+ (utmp->ut_type =3D=3D INIT_PROCESS || utmp->ut_type =3D=3D =
LOGIN_PROCESS) )=0A=
{=0A=
- strcpy(utmp->ut_line, line );=0A=
+ strncpy(utmp->ut_line, line, sizeof( utmp->ut_line) );=0A=
=0A=
+#ifdef NETBSD_UTMPX=0A=
+ utmp->ut_pid =3D pid;=0A=
+ gettimeofday( &utmp->ut_tv, NULL );=0A=
+#else=0A=
utmp->ut_time =3D time( NULL );=0A=
+#endif=0A=
=0A=
utmp->ut_type =3D ut_type; /* {INIT,LOGIN,USER}_PROCESS */=0A=
- /* "LOGIN", "uugetty", "dialout" */=0A=
+=0A=
strncpy( utmp->ut_user, ut_user, sizeof( utmp->ut_user ) );=0A=
+ /* "LOGIN", "uugetty", "dialout" */=0A=
=0A=
-#if defined(SVR4) || defined(linux)=0A=
+#if defined(SVR4) || defined(linux) || defined(NETBSD_UTMPX)=0A=
if (ut_host !=3D NULL)=0A=
{=0A=
strncpy( utmp->ut_host, ut_host, sizeof( utmp->ut_host ) - 1);=0A=
@@ -138,7 +193,7 @@ FILE * fp;=0A=
}=0A=
#endif /* SVR4 */=0A=
=0A=
-#if defined(M_UNIX) || defined(__GLIBC__)=0A=
+#if defined(M_UNIX) || defined(__GLIBC__) || defined(NETBSD_UTMPX)=0A=
if ( pututline(utmp) =3D=3D NULL )=0A=
{=0A=
lprintf( L_ERROR, "cannot create utmp entry" );=0A=
@@ -151,7 +206,7 @@ FILE * fp;=0A=
/* write same record to end of wtmp=0A=
* if wtmp file exists=0A=
*/=0A=
-#ifdef SVR4=0A=
+#if defined(SVR4) || defined(NETBSD_UTMPX)=0A=
updwtmpx(WTMPX_FILE, utmp);=0A=
#else=0A=
# if defined(__GLIBC__) && __GLIBC__ >=3D 2=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0
Content-Type: application/octet-stream;
name="patch-ak"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch-ak"
$NetBSD$=0A=
=0A=
--- voice/Makefile.orig Fri Sep 19 15:47:24 2003=0A=
+++ voice/Makefile=0A=
@@ -92,11 +92,11 @@ vgetty-install: vgetty-all=0A=
$(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR)=0A=
$(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR)=0A=
$(INSTALL) -m 644 man/man8/vgetty.8 $(MAN8DIR)=0A=
- cd $(MAN1DIR); \=0A=
- for i in $(PVFTOOLS); \=0A=
- do \=0A=
- $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \=0A=
- done=0A=
+# cd $(MAN1DIR); \=0A=
+# for i in $(PVFTOOLS); \=0A=
+# do \=0A=
+# $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \=0A=
+# done=0A=
# [ -d $(VOICE_DIR) ] || mkdir $(VOICE_DIR)=0A=
# [ -d $(VOICE_DIR)/incoming ] || mkdir $(VOICE_DIR)/incoming=0A=
# chown 0 $(VOICE_DIR)/incoming=0A=
------=_NextPart_000_0200_01C37EDC.9A988EA0--