Update cups to 1.1.6.1. Changes from version 1.1.5.2 include bug fixes,

additions to the documentation, plus the following changes:

	- Fixed another possible DoS attack in httpGets().
	- Added check for "LANGUAGE = PCL" and "LANGUAGE = POSTSCRIPT" in
	  mime.types.
	- The printers.conf and classes.conf files are now written with
	  restricted permissions.
	- If LoadAllJobs() is unable to determine the file type of a print
	  job, assume "application/vnd.cups-raw".
	- The web interface now provides a job_printer_name value for any
	  corresponding job_printer_uri value.
	- The cups-lpd mini-daemon now logs the client address and hostname
	  as well as all commands and errors in the syslog file.
	- The IPP backend now detects the supported file formats and only
	  specifies the document format if it is supported.  This makes IPP
	  printing to network print servers and cards more reliable without
	  affecting the capabilities of CUPS servers.
	- The time_at_xyz attributes are now converted to human-readable
	  dates and times for the web interfaces.
	- The file type logging code in the scheduler referenced the optional
	  document-format attribute; the new code uses the resolved MIME type
	  instead.
	- The client.conf parsing code now removes trailing whitespace.
	- The lpadmin command now supports setting of options and user-level
	  access control.
	- Added "-E" option to all printing commands to force encryption.
	- The socket backend now starts retries at 5 seconds and increases
	  the interval to 30 seconds.  This should provide faster printing
	  when multiple jobs/files are queued for a printer.
	- The filters and backends no longer buffer output to stderr.  This
	  should provide much more accurate status reporting.

11 files changed, 330 insertions, 57 deletions

diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
index f1ca461a884..e9d8eaa128b 100644
--- a/print/cups/patches/patch-aa
+++ b/print/cups/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2001/01/11 19:00:43 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2001/01/28 02:05:37 jlam Exp $
 
---- Makedefs.in.orig	Wed Jan  3 12:44:39 2001
+--- Makedefs.in.orig	Mon Jan 22 10:03:15 2001
 +++ Makedefs.in
 @@ -48,11 +48,11 @@
  # Installation programs...
@@ -19,3 +19,15 @@ $NetBSD: patch-aa,v 1.6 2001/01/11 19:00:43 jlam Exp $
  INSTALL_SYSV	=	@INSTALL_SYSV@
  
  #
+@@ -137,6 +137,11 @@
+ CAT1EXT		=	@CAT1EXT@
+ CAT5EXT		=	@CAT5EXT@
+ CAT8EXT		=	@CAT8EXT@
++
++#
++# Init script installation script
++#
++INITSCRIPT	=	@INITSCRIPT@
+ 
+ #
+ # Rules...
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index 1cdbc6fcba7..cb0a75e16b5 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2001/01/11 19:00:43 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2001/01/28 02:05:37 jlam Exp $
 
 --- Makefile.orig	Wed Jan  3 12:44:40 2001
 +++ Makefile
@@ -13,3 +13,26 @@ $NetBSD: patch-ab,v 1.7 2001/01/11 19:00:43 jlam Exp $
  	echo Installing in data...
  	(cd data; $(MAKE) $(MFLAGS) install)
  	echo Installing in doc...
+@@ -75,21 +75,7 @@
+ 	echo Installing in templates...
+ 	(cd templates; $(MAKE) $(MFLAGS) install)
+ 	echo Installing startup script...
+-	if test "x$(INITDIR)" != "x"; then \
+-		$(MKDIR) $(prefix)/$(INITDIR)/init.d; \
+-		$(RM) $(prefix)/$(INITDIR)/init.d/cups; \
+-		$(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/init.d/cups; \
+-		$(CHMOD) ugo+rx $(prefix)/$(INITDIR)/init.d/cups; \
+-		$(MKDIR) $(prefix)/$(INITDIR)/rc0.d; \
+-		$(RM) $(prefix)/$(INITDIR)/rc0.d/K00cups; \
+-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc0.d/K00cups; \
+-		$(MKDIR) $(prefix)/$(INITDIR)/rc3.d; \
+-		$(RM) $(prefix)/$(INITDIR)/rc3.d/S99cups; \
+-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc3.d/S99cups; \
+-		$(MKDIR) $(prefix)/$(INITDIR)/rc5.d; \
+-		$(RM) $(prefix)/$(INITDIR)/rc5.d/S99cups; \
+-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc5.d/S99cups; \
+-	fi
++	$(INITSCRIPT)
+ 
+ #
+ # Make software distributions using EPM (http://www.easysw.com/epm)...
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac
index 8f0a41adfe8..f714adf6b0a 100644
--- a/print/cups/patches/patch-ac
+++ b/print/cups/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.6 2001/01/11 19:00:43 jlam Exp $
+$NetBSD: patch-ac,v 1.7 2001/01/28 02:05:37 jlam Exp $
 
---- backend/serial.c.orig	Wed Jan  3 12:44:40 2001
-+++ backend/serial.c
-@@ -800,7 +800,7 @@
-              device, i + 1);
-     }
-   }
--+#elif defined(__NetBSD__)
-+#elif defined(__NetBSD__)
-   int	i, j;		/* Looping vars */
-   int	fd;		/* File descriptor */
-   char	device[255];	/* Device filename */
+--- conf/cupsd.conf.in.orig	Wed Dec 20 08:41:12 2000
++++ conf/cupsd.conf.in
+@@ -247,8 +247,8 @@
+ # program is run...
+ #
+ 
+-#User lp
+-#Group sys
++User @CUPS_USER@
++Group @CUPS_GROUP@
+ 
+ #
+ # RIPCache: the amount of memory that each RIP should use to cache
diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad
index bef9332908e..4557039eecc 100644
--- a/print/cups/patches/patch-ad
+++ b/print/cups/patches/patch-ad
@@ -1,15 +1,72 @@
-$NetBSD: patch-ad,v 1.4 2000/12/21 14:59:38 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2001/01/28 02:05:37 jlam Exp $
 
---- conf/cupsd.conf.in.orig	Wed Dec 20 08:41:12 2000
-+++ conf/cupsd.conf.in
-@@ -247,8 +247,8 @@
- # program is run...
- #
- 
--#User lp
--#Group sys
-+User @CUPS_USER@
-+Group @CUPS_GROUP@
- 
- #
- # RIPCache: the amount of memory that each RIP should use to cache
+--- configure.in.orig	Fri Jan 26 10:01:59 2001
++++ configure.in
+@@ -514,8 +514,14 @@
+ dnl Setup init.d locations...
+ case "$uname" in
+-	FreeBSD* | NetBSD* | OpenBSD*)
+-		# *BSD
++	FreeBSD* | OpenBSD*)
+ 		INITDIR=""
+ 		INITDDIR=""
++		INITSCRIPT=""
++		;;
++
++	NetBSD*)
++		INITDIR="/etc/rc.d"
++		INITDDIR=""
++		INITSCRIPT="scripts/netbsd"
+ 		;;
+ 
+@@ -526,4 +532,5 @@
+ 			INITDIR="/sbin/init.d"
+ 			INITDDIR=".."
++			INITSCRIPT="scripts/sysv"
+ 		else
+ 			if test -d /etc/rc.d; then
+@@ -531,8 +538,10 @@
+ 				INITDIR="/etc/rc.d"
+ 				INITDDIR="../init.d"
++				INITSCRIPT="scripts/sysv"
+ 			else
+ 				# Others
+ 				INITDIR="/etc"
+ 				INITDDIR="../init.d"
++				INITSCRIPT="scripts/sysv"
+ 			fi
+ 		fi
+@@ -542,4 +551,5 @@
+ 		INITDIR="/sbin"
+ 		INITDDIR="../init.d"
++		INITSCRIPT="scripts/sysv"
+ 		;;
+ 
+@@ -547,4 +557,5 @@
+ 		INITDIR="/etc"
+ 		INITDDIR="../init.d"
++		INITSCRIPT="scripts/sysv"
+ 		;;
+ 
+@@ -553,4 +564,5 @@
+ AC_SUBST(INITDIR)
+ AC_SUBST(INITDDIR)
++AC_SUBST(INITSCRIPT)
+ 
+ dnl Setup default locations...
+@@ -612,6 +624,6 @@
+ 
+ dnl Set the CUPS_DOCROOT directory...
+-CUPS_DOCROOT='${datadir}/doc/cups'
+-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/cups")
++CUPS_DOCROOT='${datadir}/doc/html/cups'
++AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/html/cups")
+ AC_SUBST(CUPS_DOCROOT)
+ 
+@@ -619,5 +631,5 @@
+ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
+ 
+-AC_OUTPUT(Makedefs cups.sh)
++AC_OUTPUT(Makedefs cups.sh scripts/common)
+ 
+ dnl
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
new file mode 100644
index 00000000000..b6232527a20
--- /dev/null
+++ b/print/cups/patches/patch-ae
@@ -0,0 +1,37 @@
+$NetBSD: patch-ae,v 1.6 2001/01/28 02:05:37 jlam Exp $
+
+--- cups.sh.in.orig	Mon Jan 22 10:03:16 2001
++++ cups.sh.in
+@@ -10,6 +10,12 @@
+ #   description: Startup/shutdown script for the Common UNIX \
+ #                Printing System (CUPS).
+ #
++#   NetBSD 1.5+ rcorder script lines.  The format of the following two
++#   lines is very strict -- please don't add additional spaces!
++#
++# PROVIDE: cups
++# REQUIRE: DAEMON
++#
+ #   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ #
+ #   These coded instructions, statements, and computer programs are the
+@@ -35,6 +41,9 @@
+ 		IS_ON=/sbin/chkconfig
+ 		;;
+ 
++	NetBSD*)
++		IS_ON=:
++
+ 	*)
+ 		IS_ON=/bin/true
+ 		;;
+@@ -57,6 +66,9 @@
+ 		pid=`ps -e | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
+ 		;;
+ 	Linux)
++		pid=`ps ax | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
++		;;
++	NetBSD)
+ 		pid=`ps ax | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
+ 		;;
+ 	*)
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
index f505ac51f0e..e227186aa93 100644
--- a/print/cups/patches/patch-af
+++ b/print/cups/patches/patch-af
@@ -1,24 +1,22 @@
-$NetBSD: patch-af,v 1.6 2001/01/12 18:34:24 jlam Exp $
+$NetBSD: patch-af,v 1.7 2001/01/28 02:05:38 jlam Exp $
 
---- configure.in.orig	Wed Jan  3 12:44:40 2001
-+++ configure.in
-@@ -534,7 +534,7 @@
- AC_SUBST(INITDDIR)
+--- cups/Makefile.orig	Mon Jan 22 10:03:23 2001
++++ cups/Makefile
+@@ -87,7 +87,7 @@
  
- dnl Setup default locations...
--CUPS_SERVERROOT='${sysconfdif}/cups'
-+CUPS_SERVERROOT='${sysconfdir}/cups'
- CUPS_LOGDIR='${localstatedir}/log/cups'
- CUPS_REQUESTS='${localstatedir}/spool/cups'
+ libcups.so.2 libcups.sl.2:	$(LIBOBJS) ../Makedefs
+ 	echo Linking $@...
+-	$(DSO) $@ $(LIBOBJS) $(SSLLIBS)
++	$(DSO) $@ $(LDFLAGS) $(LIBOBJS) $(SSLLIBS)
+ 	$(RM) `basename $@ .2`
+ 	$(LN) $@ `basename $@ .2`
  
-@@ -591,8 +591,8 @@
- AC_SUBST(CUPS_DATADIR)
+@@ -99,7 +99,7 @@
+ libcups.la:    $(LIBOBJS) ../Makedefs
+ 	echo Linking $@...
+ 	$(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+-		-version-info 2:0 $(SSLLIBS) $(LIBS)
++		-version-info 2:0 $(SSLLIBS)
  
- dnl Set the CUPS_DOCROOT directory...
--CUPS_DOCROOT='${datadir}/doc/cups'
--AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/cups")
-+CUPS_DOCROOT='${datadir}/doc/html/cups'
-+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/html/cups")
- AC_SUBST(CUPS_DOCROOT)
  
- dnl Set the CUPS_FONTPATH directory...
+ #
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
index a1b7d8a761f..4e2846154d2 100644
--- a/print/cups/patches/patch-ag
+++ b/print/cups/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2000/12/21 14:59:38 jlam Exp $
+$NetBSD: patch-ag,v 1.4 2001/01/28 02:05:38 jlam Exp $
 
---- cups/Makefile.orig	Mon Dec 18 16:38:55 2000
-+++ cups/Makefile
-@@ -98,7 +98,7 @@
+--- filter/Makefile.orig	Mon Jan 22 10:03:36 2001
++++ filter/Makefile
+@@ -102,7 +102,7 @@
  
- libcups.la:    $(LIBOBJS) ../Makedefs
+ libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS) ../Makedefs
  	echo Linking $@...
--	$(CC) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) -version-info 2:0
-+	$(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) $(SSLLIBS) -rpath $(LIBDIR) -version-info 2:0
+-	$(DSO) $@ $(IMAGEOBJS) $(DSOLIBS) -lm
++	$(DSO) $@ $(LDFLAGS) $(IMAGEOBJS) $(DSOLIBS) -lm
+ 	$(RM) `basename $@ .2`
+ 	$(LN) $@ `basename $@ .2`
  
- 
- #
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah
new file mode 100644
index 00000000000..5cdcda199ce
--- /dev/null
+++ b/print/cups/patches/patch-ah
@@ -0,0 +1,52 @@
+$NetBSD: patch-ah,v 1.5 2001/01/28 02:05:38 jlam Exp $
+
+--- scripts/common.in.orig	Sat Jan 27 19:27:30 2001
++++ scripts/common.in
+@@ -0,0 +1,47 @@
++#
++#   Common shell variable definitions
++#
++#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
++#
++#   These coded instructions, statements, and computer programs are the
++#   property of Easy Software Products and are protected by Federal
++#   copyright law.  Distribution and use rights are outlined in the file
++#   "LICENSE.txt" which should have been included with this file.  If this
++#   file is missing or damaged please contact Easy Software Products
++#   at:
++#
++#       Attn: CUPS Licensing Information
++#       Easy Software Products
++#       44141 Airport View Drive, Suite 204
++#       Hollywood, Maryland 20636-3111 USA
++#
++#       Voice: (301) 373-9603
++#       EMail: cups-info@cups.org
++#         WWW: http://www.cups.org
++#
++
++#
++# Programs...
++#
++
++CHMOD="@CHMOD@"
++CP="@CP@"
++LIBTOOL="@LIBTOOL@"
++LN="/bin/ln -sf"
++MKDIR="@MKDIR@ -p"
++MV="@MV@"
++RM="@RM@ -f"
++
++#
++# Installation programs...
++#
++
++INSTALL_SCRIPT="${CP}"
++
++#
++# Directories...
++#
++
++prefix="@prefix@"
++INITDIR="@INITDIR@"
++INITDDIR="@INITDDIR@"
diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai
new file mode 100644
index 00000000000..a8ea9bed4ec
--- /dev/null
+++ b/print/cups/patches/patch-ai
@@ -0,0 +1,34 @@
+$NetBSD: patch-ai,v 1.5 2001/01/28 02:05:38 jlam Exp $
+
+--- scripts/netbsd.orig	Sat Jan 27 19:27:30 2001
++++ scripts/netbsd
+@@ -0,0 +1,29 @@
++#!/bin/sh
++#
++#   Startup script installation for NetBSD
++#
++#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
++#
++#   These coded instructions, statements, and computer programs are the
++#   property of Easy Software Products and are protected by Federal
++#   copyright law.  Distribution and use rights are outlined in the file
++#   "LICENSE.txt" which should have been included with this file.  If this
++#   file is missing or damaged please contact Easy Software Products
++#   at:
++#
++#       Attn: CUPS Licensing Information
++#       Easy Software Products
++#       44141 Airport View Drive, Suite 204
++#       Hollywood, Maryland 20636-3111 USA
++#
++#       Voice: (301) 373-9603
++#       EMail: cups-info@cups.org
++#         WWW: http://www.cups.org
++#
++
++. scripts/common
++
++${MKDIR} ${prefix}/${INITDIR}
++${RM} ${prefix}/${INITDIR}/cups
++${INSTALL_SCRIPT} cups.sh ${prefix}/${INITDIR}/cups
++${CHMOD} ugo+rx ${prefix}/${INITDIR}/cups
diff --git a/print/cups/patches/patch-aj b/print/cups/patches/patch-aj
new file mode 100644
index 00000000000..d1e6b26945e
--- /dev/null
+++ b/print/cups/patches/patch-aj
@@ -0,0 +1,46 @@
+$NetBSD: patch-aj,v 1.5 2001/01/28 02:05:38 jlam Exp $
+
+--- scripts/sysv.orig	Sat Jan 27 19:27:30 2001
++++ scripts/sysv
+@@ -0,0 +1,41 @@
++#!/bin/sh
++#
++#   Startup script installation for SysV systems
++#
++#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
++#
++#   These coded instructions, statements, and computer programs are the
++#   property of Easy Software Products and are protected by Federal
++#   copyright law.  Distribution and use rights are outlined in the file
++#   "LICENSE.txt" which should have been included with this file.  If this
++#   file is missing or damaged please contact Easy Software Products
++#   at:
++#
++#       Attn: CUPS Licensing Information
++#       Easy Software Products
++#       44141 Airport View Drive, Suite 204
++#       Hollywood, Maryland 20636-3111 USA
++#
++#       Voice: (301) 373-9603
++#       EMail: cups-info@cups.org
++#         WWW: http://www.cups.org
++#
++
++. scripts/common
++
++${MKDIR} ${prefix}/${INITDIR}/init.d
++${RM} ${prefix}/${INITDIR}/init.d/cups
++${INSTALL_SCRIPT} cups.sh ${prefix}/${INITDIR}/init.d/cups
++${CHMOD} ugo+rx ${prefix}/${INITDIR}/init.d/cups
++
++${MKDIR} ${prefix}/${INITDIR}/rc0.d
++${RM} ${prefix}/${INITDIR}/rc0.d/K00cups
++${LN} ${INITDDIR}/cups ${prefix}/${INITDIR}/rc0.d/K00cups
++
++${MKDIR} ${prefix}/${INITDIR}/rc3.d
++${RM} ${prefix}/${INITDIR}/rc3.d/S99cups
++${LN} ${INITDDIR}/cups ${prefix}/${INITDIR}/rc3.d/S99cups
++
++${MKDIR} ${prefix}/${INITDIR}/rc5.d
++${RM} ${prefix}/${INITDIR}/rc5.d/S99cups
++${LN} ${INITDDIR}/cups ${prefix}/${INITDIR}/rc5.d/S99cups
diff --git a/print/cups/patches/patch-ak b/print/cups/patches/patch-ak
new file mode 100644
index 00000000000..ab90f559bf6
--- /dev/null
+++ b/print/cups/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.5 2001/01/28 02:05:38 jlam Exp $
+
+--- systemv/lpstat.c.orig	Fri Jan 26 09:22:00 2001
++++ systemv/lpstat.c
+@@ -761,6 +761,7 @@
+       */
+ 
+       printer = NULL;
++      printer_uri = NULL;
+       members = NULL;
+ 
+       while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)