Splitted "LPRng" package into "LPRng-core" and "LPRng-doc" packages.

Also updated "LPRng-core" to 3.6.26, "LPRng-doc" to 3.6.13.

fixes CERT Advisory CA-2000-22.

12 files changed, 315 insertions, 0 deletions

diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
new file mode 100644
index 00000000000..f432c615286
--- /dev/null
+++ b/print/LPRng-core/Makefile
@@ -0,0 +1,69 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 20:09:42 kei Exp $
+# FreeBSD Id: Makefile,v 1.5 1998/10/21 00:57:27 steve Exp
+#
+
+DISTNAME=	LPRng-3.6.26
+PKGNAME=	LPRng-core-3.6.26
+CATEGORIES=	print
+MASTER_SITES=	ftp://ftp.astart.com/pub/LPRng/LPRng/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	jlam@netbsd.org
+HOMEPAGE=	http://www.astart.com/LPRng.html
+
+BUILD_DEFS+=	LPRNG_SUID LPRNG_PRIV_PORTS
+
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${LPRNG_SYSCONFDIR} \
+			--with-filterdir=${FILTER_DIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+LPRNG_SUID?=		YES
+LPRNG_PRIV_PORTS?=	NO
+
+.if (${LPRNG_SUID} == "NO")
+CONFIGURE_ARGS+=	--disable-setuid
+.endif
+.if (${LPRNG_PRIV_PORTS} == "YES")
+CONFIGURE_ARGS+=	--enable-priv_ports
+.endif
+
+LPRNG_SYSCONFDIR=	/etc
+LPD_PRINTCAP_PATH=	${LPRNG_SYSCONFDIR}/lpd_printcap,${PREFIX}/etc/lpd_printcap
+LPD_PERMS_PATH=		${LPRNG_SYSCONFDIR}/lpd.perms
+PRINTCAP_PATH=		${LPRNG_SYSCONFDIR}/printcap
+
+EXAMPLES_DIR=	 	${PREFIX}/share/examples/LPRng
+FILTER_DIR=		${PREFIX}/libexec/LPRng
+FILTER_LD_PATH=		/usr/lib:${PREFIX}/lib:/usr/local/lib
+FILTER_PATH=		${FILTER_DIR}:/sbin:/usr/sbin:/bin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin:/usr/local/sbin:/usr/local/bin
+
+MAKE_ENV+=	FILTER_LD_PATH="${FILTER_LD_PATH}" \
+		FILTER_PATH="${FILTER_PATH}" \
+		LPD_PRINTCAP_PATH="${LPD_PRINTCAP_PATH}"
+
+pre-patch:
+	${MV} ${WRKSRC}/man/lpd.conf.5 ${WRKSRC}/man/lpd.conf.5.in
+
+post-configure:
+	${SED}	-e "s#@@FILTER_LD_PATH@@#${FILTER_LD_PATH}#g" \
+		-e "s#@@FILTER_PATH@@#${FILTER_PATH}#g" \
+		-e "s#@@LPD_PRINTCAP_PATH@@#${LPD_PRINTCAP_PATH}#g" \
+		-e "s#@@LPD_PERMS_PATH@@#${LPD_PERMS_PATH}#g" \
+		-e "s#@@PRINTCAP_PATH@@#${PRINTCAP_PATH}#g" \
+		${WRKSRC}/man/lpd.conf.5.in > ${WRKSRC}/man/lpd.conf.5
+
+post-install:
+	${INSTALL_DATA_DIR} ${EXAMPLES_DIR}
+	${MV} ${LPRNG_SYSCONFDIR}/lpd.conf.example ${EXAMPLES_DIR}
+	${MV} ${LPRNG_SYSCONFDIR}/lpd.perms.example ${EXAMPLES_DIR}
+	${MV} ${LPRNG_SYSCONFDIR}/printcap.example ${EXAMPLES_DIR}
+	${SED}	-e "s#@@PREFIX@@#${PREFIX}#g" \
+		-e "s#@@CAT@@#${CAT}#g" \
+		-e "s#@@ECHO@@#${ECHO}#g" \
+		${FILESDIR}/lprng.sh > ${WRKDIR}/lprng.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/lprng.sh ${PREFIX}/etc/rc.d/lprng.sh
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/LPRng-core/files/lprng.sh b/print/LPRng-core/files/lprng.sh
new file mode 100644
index 00000000000..c9d8a0c1375
--- /dev/null
+++ b/print/LPRng-core/files/lprng.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# $NetBSD: lprng.sh,v 1.1.1.1 2000/12/12 20:09:42 kei Exp $
+
+# Stop BSD lpd if it is running.
+#
+if [ -f /var/run/lpd.pid ]; then
+	kill `@@CAT@@ /var/run/lpd.pid`
+fi
+
+# Start LPRng lpd if it exists.
+#
+if [ -x @@PREFIX@@/sbin/lpd ]; then
+	@@ECHO@@ -n ' LPRng';
+	@@PREFIX@@/sbin/lpd
+fi
diff --git a/print/LPRng-core/files/md5 b/print/LPRng-core/files/md5
new file mode 100644
index 00000000000..8c54895e041
--- /dev/null
+++ b/print/LPRng-core/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/12/12 20:09:42 kei Exp $
+
+MD5 (LPRng-3.6.26.tgz) = 8d3dc76549191ae6681f6b61ed9fc660
diff --git a/print/LPRng-core/files/patch-sum b/print/LPRng-core/files/patch-sum
new file mode 100644
index 00000000000..369ea95e6ab
--- /dev/null
+++ b/print/LPRng-core/files/patch-sum
@@ -0,0 +1,5 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/12/12 20:09:42 kei Exp $
+
+MD5 (patch-ab) = b91d3b0d6624edd43adf33c9852a4984
+MD5 (patch-ac) = 89fa587f78602373b3e3b0e736125c92
+MD5 (patch-ad) = b6ee24a8fba88e704be025f9efbb004c
diff --git a/print/LPRng-core/patches/patch-ab b/print/LPRng-core/patches/patch-ab
new file mode 100644
index 00000000000..ab0cd55dac9
--- /dev/null
+++ b/print/LPRng-core/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 20:09:42 kei Exp $
+
+--- src/Makefile.in.orig	Sat Oct 14 00:08:21 2000
++++ src/Makefile.in	Mon Dec 11 16:38:18 2000
+@@ -95,7 +95,10 @@
+ FORCE_LOCALHOST=@FORCE_LOCALHOST@
+ PERMS=@PERMS@
+ 
+-CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ -DLOCALEDIR=\"$(localedir)\" $(CFLAGS)
++CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ -DLOCALEDIR=\"$(localedir)\" $(CFLAGS) \
++	 -DFILTER_LD_PATH=\"${FILTER_LD_PATH}\" \
++	 -DFILTER_PATH=\"${FILTER_PATH}\" \
++	 -DLPD_PRINTCAP_PATH=\"${LPD_PRINTCAP_PATH}\"
+ LDFLAGS:= @LDFLAGS@
+ 
+ STRIP=@STRIP@
diff --git a/print/LPRng-core/patches/patch-ac b/print/LPRng-core/patches/patch-ac
new file mode 100644
index 00000000000..9ba2087b96f
--- /dev/null
+++ b/print/LPRng-core/patches/patch-ac
@@ -0,0 +1,48 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/12/12 20:09:42 kei Exp $
+
+--- man/lpd.conf.5.in.orig	Fri Aug 27 21:38:52 1999
++++ man/lpd.conf.5.in	Mon Sep 13 11:35:56 1999
+@@ -250,7 +250,7 @@
+ Formfeed string.
+ .TP
+ \fBfilter_ld_path\fR
+-(default: /lib:/usr/lib:/usr/5lib:/usr/ucblib)
++(default: @@FILTER_LD_PATH@@)
+ The value for the environment variable LD_LIBRARY_PATH, 
+ both used when executing, and passed on to filters.
+ This variable is used to find shared libraries on
+@@ -268,7 +268,7 @@
+ (see of_filter_options, filter_options, bk_filter_options, bk_of_filter_options)
+ .TP
+ \fBfilter_path\fR
+-(default: /bin:/usr/bin:/usr/ucb:/usr/sbin:/usr/etc:/etc)
++(default: @@FILTER_PATH@@)
+ The value for the environment variable PATH, both used to find filters
+ and passed on to filters run by \fBlpd\fR and \fBlpr\fR.
+ .TP
+@@ -387,7 +387,7 @@
+ interfere with a previous installation of
+ LPD or LPRng.
+ .TP
+-\fBlpd_printcap_path\fR (default: "/etc/lpd_printcap:/usr/etc/lpd_printcap")
++\fBlpd_printcap_path\fR (default: @@LPD_PRINTCAP_PATH@@)
+ The location of additional 
+ .B lpd
+ server printcap database information.
+@@ -487,14 +487,14 @@
+ See \fBprintcap\fP(5) for details.
+ .TP
+ \fBprintcap_path\fR
+-(default: "etc/printcap:/usr/etc/printcap:/var/spool/lpd/printcap.%h")
++(default: @@PRINTCAP_PATH@@)
+ The location of the printcap database information.
+ If a file or filter does not exist, it is skipped.
+ All valid entries in these files will be used.
+ See PRINTCAP LOOKUP for details.
+ .TP
+ \fBperms_path\fR
+-(default: /etc/lpd.perms:/usr/etc/lpd.perms:/var/spool/lpd/lpd.perms.%h)
++(default: @@LPD_PERMS_PATH@@)
+ The location of the printer permissions database.
+ If a file or filter does not exist, it is skipped.
+ The first file or filter that exists and is readable will be used.
diff --git a/print/LPRng-core/patches/patch-ad b/print/LPRng-core/patches/patch-ad
new file mode 100644
index 00000000000..902276f042b
--- /dev/null
+++ b/print/LPRng-core/patches/patch-ad
@@ -0,0 +1,46 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/12/12 20:09:42 kei Exp $
+
+--- postinstall.generic.sh.orig	Wed Dec 13 03:48:10 2000
++++ postinstall.generic.sh	Wed Dec 13 03:48:31 2000
+@@ -7,7 +7,7 @@
+ #  It needs to be massaged with the information for
+ #  various paths.
+ # If you are building a package,  then you do NOT want
+-#  to have this executed - it will put the sample files
++#  to have this executed - it will put the example files
+ #  in place.  You need to do this during the postinstall
+ #  step in the package installation.
+ #
+@@ -19,23 +19,23 @@
+ 		echo "$v is a filter '$p'" 
+ 		exit 0
+ 	fi
+-	echo "Checking for $v.sample in $d"
++	echo "Checking for $v.example in $d"
+ 	if [ ! -d "$d" ] ; then
+ 		echo "Directory $d does not exist!"
+ 		sh mkinstalldirs $d
+ 	fi
+-	if [ -f $v.sample ] ; then
+-		if [ $v.sample != $p.sample ] ; then cp $v.sample $p.sample; fi
++	if [ -f $v.example ] ; then
++		if [ $v.example != $p.example ] ; then cp $v.example $p.example; fi
+ 	elif [ -f $v ] ; then
+-		if [ $v != $p.sample ] ; then cp $v $p.sample; fi
++		if [ $v != $p.example ] ; then cp $v $p.example; fi
+ 	else
+-		echo "Do not have $v.sample or $v"
++		echo "Do not have $v.example or $v"
+ 	fi
+-	if [ ! -f $p.sample ] ; then
+-		echo "Do not have $p.sample"
++	if [ ! -f $p.example ] ; then
++		echo "Do not have $p.example"
+ 	elif [ ! -f $p ] ; then
+-		chmod 644 $p.sample
+-		cp $p.sample $p;
++		chmod 644 $p.example
++		cp $p.example $p;
+ 		chmod 644 $p;
+ 	fi;
+ }
diff --git a/print/LPRng-core/patches/tmp.patch-aa b/print/LPRng-core/patches/tmp.patch-aa
new file mode 100644
index 00000000000..0156c86dec2
--- /dev/null
+++ b/print/LPRng-core/patches/tmp.patch-aa
@@ -0,0 +1,43 @@
+$NetBSD: tmp.patch-aa,v 1.1.1.1 2000/12/12 20:09:42 kei Exp $
+
+--- Makefile.in.orig	Fri Aug 27 21:37:47 1999
++++ Makefile.in	Mon Sep 13 13:24:16 1999
+@@ -31,6 +31,8 @@
+ libexecdir=@libexecdir@
+ # for the configuration stuff
+ sysconfdir=@sysconfdir@
++# for the sample configuraton files
++egdir=${prefix}/share/examples/LPRng
+ 
+ LPD_PERMS_PATH=@LPD_PERMS_PATH@
+ LPD_CONF_PATH=@LPD_CONF_PATH@
+@@ -73,20 +75,20 @@
+ install::
+ 	#install default versions of the lpd.conf and lpd.perm files
+ 
++	${BSD_INSTALL_DATA_DIR} ${egdir};
++
+ 	f=$(LPD_CONF_PATH) ; g=lpd.conf; \
+-	if [ -z "$$f" ] ; then f=${admindir}/$$g; fi; \
+-	$(INSTALL) -m 644 $(SRC)/$$g $$f.sample; \
++	${BSD_INSTALL_DATA} ${SRC}/$$g ${egdir}/$$g.sample; \
+ 	if [ ! -f "$$f" ] ; then \
+-		echo $(INSTALL) -m 644 $(SRC)/$$g $$f; \
+-		$(INSTALL) -m 644 $(SRC)/$$g $$f; \
++		echo ${BSD_INSTALL_DATA} ${SRC}/$$g $$f; \
++		${BSD_INSTALL_DATA} ${SRC}/$$g $$f; \
+ 	fi;
+ 
+-	f=$(LPD_PERMS_PATH); g=lpd.perms; \
+-	if [ -z "$$f" ] ; then f=${admindir}/$$g; fi; \
+-	$(INSTALL) -m 644 $(SRC)/$$g $$f.sample; \
++	f=$(LPD_PERMS_PATH) ; g=lpd.perms; \
++	${BSD_INSTALL_DATA} ${SRC}/$$g ${egdir}/$$g.sample; \
+ 	if [ ! -f "$$f" ] ; then \
+-		echo $(INSTALL) -m 644 $(SRC)/$$g $$f; \
+-		$(INSTALL) -m 644 $(SRC)/$$g $$f; \
++		echo ${BSD_INSTALL_DATA} ${SRC}/$$g $$f; \
++		${BSD_INSTALL_DATA} ${SRC}/$$g $$f; \
+ 	fi;
+ 
+ info dvi check:
diff --git a/print/LPRng-core/pkg/COMMENT b/print/LPRng-core/pkg/COMMENT
new file mode 100644
index 00000000000..1300bcb7129
--- /dev/null
+++ b/print/LPRng-core/pkg/COMMENT
@@ -0,0 +1 @@
+Enhanced Printer Spooler
diff --git a/print/LPRng-core/pkg/DESCR b/print/LPRng-core/pkg/DESCR
new file mode 100644
index 00000000000..9f47015462b
--- /dev/null
+++ b/print/LPRng-core/pkg/DESCR
@@ -0,0 +1,9 @@
+The LPRng software is an enhanced, extended, and portable implementation
+of the Berkeley LPR print spooler functionality.  While providing the
+same interface and meeting RFC1179 requirements, the implementation is
+completely new and provides support for the following features:
+lightweight (no databases needed) lpr, lpc, and lprm programs; dynamic
+redirection of print queues; automatic job holding; highly verbose
+diagnostics; multiple printers serving a single queue; client programs
+do not need to run SUID root; greatly enhanced security checks; and a
+greatly improved permission and authorization mechanism.
diff --git a/print/LPRng-core/pkg/MESSAGE b/print/LPRng-core/pkg/MESSAGE
new file mode 100644
index 00000000000..24b5ca485fe
--- /dev/null
+++ b/print/LPRng-core/pkg/MESSAGE
@@ -0,0 +1,18 @@
+$NetBSD: MESSAGE,v 1.1.1.1 2000/12/12 20:09:42 kei Exp $
+===========================================================================
+
+To activate the LPRng printing system do the following:
+	- set `lpd=NO' in /etc/rc.conf
+	- run ${PREFIX}/etc/rc.d/lprng.sh (may be added to /etc/rc.local)
+	- remember to adjust your aliases or your PATH to use the new programs
+
+Note that LPRng uses:
+	/etc/printcap
+	/etc/lpd_printcap
+	/etc/lpd.conf
+	/etc/lpd.perms
+
+Simple example configuration files are found at:
+	${PREFIX}/share/examples/LPRng
+
+===========================================================================
diff --git a/print/LPRng-core/pkg/PLIST b/print/LPRng-core/pkg/PLIST
new file mode 100644
index 00000000000..149b8989485
--- /dev/null
+++ b/print/LPRng-core/pkg/PLIST
@@ -0,0 +1,41 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/12 20:09:42 kei Exp $
+bin/cancel
+bin/lp
+bin/lpq
+bin/lpr
+bin/lprm
+bin/lpstat
+etc/rc.d/lprng.sh
+libexec/LPRng/lpbanner
+libexec/LPRng/lpf
+libexec/LPRng/pclbanner
+libexec/LPRng/psbanner
+man/man1/cancel.1
+man/man1/lp.1
+man/man1/lpbanner.1
+man/man1/lpf.1
+man/man1/lpq.1
+man/man1/lpr.1
+man/man1/lpraccnt.1
+man/man1/lprm.1
+man/man1/lpstat.1
+man/man1/monitor.1
+man/man1/pclbanner.1
+man/man1/psbanner.1
+man/man5/lpd.conf.5
+man/man5/lpd.perms.5
+man/man5/printcap.5
+man/man8/checkpc.8
+man/man8/lpd.8
+sbin/checkpc
+sbin/lpc
+sbin/lpd
+sbin/lpraccnt
+share/examples/LPRng/lpd.conf.example
+@exec if [ ! -f /etc/lpd.conf ]; then cp %D/%F /etc/lpd.conf; fi
+share/examples/LPRng/lpd.perms.example
+@exec if [ ! -f /etc/lpd.perms ]; then cp %D/%F /etc/lpd.perms; fi
+share/examples/LPRng/printcap.example
+@unexec echo "If you won't be using the LPRng-core package anymore, you may want to manually delete /etc/lpd.conf and /etc/lpd.perms."
+@dirrm share/examples/LPRng
+@dirrm libexec/LPRng