Changes 3.8.27:

* Fixed: 'Missing HOLD_FILE' logic error fixed in lpd_rcvjob.c
* Fixed: configure with-initpath
   --with-initpath=PATH now works correctly
* Fixed (well, clarified):
  Errormsg() now checks for a 'null' error string and provides
  a printable version of errno for logging.
* Edited the Scan_queue() function to print error message and removed
  some dead code.
* lpc MOVE could result in endless loop.
* lpc MOVE will now start printing job in destination, rather than just copying
  and preserving status of last operation.
* Added detailed error message for connection failure.
* Found a really small (1 byte) memory leak in LPD.  Solves the mystery of
  the server dying with malloc failed messages.

5 files changed, 38 insertions, 63 deletions

diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index a0315c04434..59b6109b91f 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -1,21 +1,24 @@
-# $NetBSD: Makefile,v 1.9 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/21 13:44:29 adam 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
+DISTNAME=	LPRng-3.8.27
+PKGNAME=	LPRng-core-3.8.27
+CATEGORIES=	print
+MASTER_SITES=	ftp://ftp.lprng.com/pub/LPRng/LPRng/ \
+		http://www.lprng.com/DISTRIB/LPRng/ \
+		http://lprng.sourceforge.net/DISTRIB/LPRng/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.lprng.com/
-COMMENT=		Enhanced Printer Spooler
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.lprng.com/
+COMMENT=	Enhanced Printer Spooler
 
 CONFLICTS+=		cups-[0-9]*
 
 USE_GNU_TOOLS+=		make
-GNU_CONFIGURE=		# defined
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir="/etc"
 CONFIGURE_ARGS+=	--with-lpd_perms_path="${LPD_PERMS_PATH}"
 CONFIGURE_ARGS+=	--with-lpd_printcap_path="${LPD_PRINTCAP_PATH}"
@@ -48,9 +51,10 @@ FILTER_PATH=		${FILTER_DIR}:/sbin:/usr/sbin:/bin:/usr/bin:${PREFIX}/sbin:${PREFI
 
 MAKE_ENV+=		POSTINSTALL="NO"
 
-EXAMPLES_DIR=	 	${PREFIX}/share/examples/LPRng
+EXAMPLESDIR=	 	${PREFIX}/share/examples/LPRng
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
+#RCD_SCRIPTS=		LPRng
 
 FILES_SUBST=		CAT=${CAT:Q}
 FILES_SUBST+=		CHMOD=${CHMOD:Q}
@@ -61,7 +65,7 @@ FILES_SUBST+=		TRUE=${TRUE:Q}
 FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
 
 pre-patch:
-	${MV} ${WRKSRC}/man/lpd.conf.5 ${WRKSRC}/man/lpd.conf.5.in
+	${MV} ${WRKSRC}/man/lpd.conf.n ${WRKSRC}/man/lpd.conf.n.in
 
 post-configure:
 	${SED}	-e "s,@FILTER_LD_PATH@,${FILTER_LD_PATH},g" \
@@ -69,7 +73,7 @@ post-configure:
 		-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
+		< ${WRKSRC}/man/lpd.conf.n.in > ${WRKSRC}/man/lpd.conf.n
 
 pre-install:
 	${SED}	-e "s,@PREFIX@,${PREFIX},g" \
@@ -79,10 +83,10 @@ pre-install:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/LPRng.sh ${PREFIX}/etc/rc.d/LPRng
-	${INSTALL_DATA_DIR} ${EXAMPLES_DIR}
+	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 	for file in lpd.conf lpd.perms printcap; do \
 		${INSTALL_DATA} ${WRKSRC}/$${file} \
-			${EXAMPLES_DIR}/$${file}.example; \
+			${EXAMPLESDIR}/$${file}.example; \
 	done
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
diff --git a/print/LPRng-core/PLIST b/print/LPRng-core/PLIST
index c043e00a938..1c3c09cec95 100644
--- a/print/LPRng-core/PLIST
+++ b/print/LPRng-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/22 00:43:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/21 13:44:29 adam Exp $
 bin/cancel
 bin/lp
 bin/lpq
@@ -6,6 +6,8 @@ bin/lpr
 bin/lprm
 bin/lpstat
 etc/rc.d/LPRng
+lib/liblpr.a
+lib/liblpr.la
 libexec/LPRng/lpbanner
 libexec/LPRng/lpf
 libexec/LPRng/pclbanner
@@ -16,8 +18,9 @@ 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/lprng_certs.1
+man/man1/lprng_index_certs.1
 man/man1/lpstat.1
 man/man1/monitor.1
 man/man1/pclbanner.1
@@ -31,7 +34,8 @@ man/man8/lpd.8
 sbin/checkpc
 sbin/lpc
 sbin/lpd
-sbin/lpraccnt
+sbin/lprng_certs
+sbin/lprng_index_certs
 share/examples/LPRng/lpd.conf.example
 share/examples/LPRng/lpd.perms.example
 share/examples/LPRng/printcap.example
diff --git a/print/LPRng-core/distinfo b/print/LPRng-core/distinfo
index 2b4de3b5a6e..a53073bd9a4 100644
--- a/print/LPRng-core/distinfo
+++ b/print/LPRng-core/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/09/27 04:01:32 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2004/05/21 13:44:29 adam Exp $
 
-SHA1 (LPRng-3.6.26.tgz) = 9ca6e7eff9acbcaad81109e34a47cab1675fc030
-Size (LPRng-3.6.26.tgz) = 2135703 bytes
-SHA1 (patch-aa) = b205c5fb93c47bd8cbfce6fecc765e9c4101d7c6
-SHA1 (patch-ac) = 18672f47fd9fcb8288c070a89278ecb1c8ee8242
+SHA1 (LPRng-3.8.27.tgz) = 2a6fdf97d86baf381f9cc241724e40e2e44c096c
+Size (LPRng-3.8.27.tgz) = 10574042 bytes
+SHA1 (patch-ac) = 820629869ca4452886b5860de11a449a7b4603e9
diff --git a/print/LPRng-core/patches/patch-aa b/print/LPRng-core/patches/patch-aa
deleted file mode 100644
index 62f1c233a7e..00000000000
--- a/print/LPRng-core/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/09/27 04:01:32 dmcmahill Exp $
-
---- src/include/linksupport.h.orig	Fri Oct 13 11:08:35 2000
-+++ src/include/linksupport.h
-@@ -42,8 +42,10 @@ const char *Link_err_str (int n);
- const char *Ack_err_str (int n);
- int AF_Protocol(void);
- int inet_pton( int family, const char *strptr, void *addr );
-+#ifndef HAVE_INET_NTOP
- const char *inet_ntop( int family, const void *addr,
- 	char *str, size_t len );
-+#endif
- const char *inet_ntop_sockaddr( struct sockaddr *addr,
- 	char *str, int len );
- 
diff --git a/print/LPRng-core/patches/patch-ac b/print/LPRng-core/patches/patch-ac
index c4a8ae71c71..4199c9e7273 100644
--- a/print/LPRng-core/patches/patch-ac
+++ b/print/LPRng-core/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2000/12/28 00:13:08 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2004/05/21 13:44:29 adam 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 @@
+--- man/lpd.conf.n.in.orig	2002-06-12 00:31:55.000000000 +0000
++++ man/lpd.conf.n.in
+@@ -251,7 +251,7 @@ using other means, such as \fBgethostbyn
  Formfeed string.
  .TP
  \fBfilter_ld_path\fR
@@ -11,33 +11,16 @@ $NetBSD: patch-ac,v 1.2 2000/12/28 00:13:08 jlam Exp $
  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 @@
+@@ -269,7 +269,7 @@ and job information.
  (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: /bin:/usr/bin:)
 +(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.
+@@ -498,7 +498,7 @@ All valid entries in these files will be
  See PRINTCAP LOOKUP for details.
  .TP
  \fBperms_path\fR