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.

3 files changed, 14 insertions, 58 deletions

diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh
deleted file mode 100644
index 71ccc2f4967..00000000000
--- a/print/cups/files/cupsd.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: cupsd.sh,v 1.2 2000/12/09 22:18:24 jlam Exp $
-#
-# PROVIDE: cupsd
-# REQUIRE: DAEMON
-
-name="cupsd"
-command=@PREFIX@/sbin/${name}
-
-pid=`ps -ax | awk '{print $1,$5}' | grep ${name} | awk '{print $1}'`
-
-cmd=${1:-start}
-
-case ${cmd} in
-start|restart)
-	if [ "$pid" = "" -a -x ${command} ]
-	then
-		echo "Starting ${name}."
-		${command}
-	else
-		echo "Restarting ${name}."
-		kill -HUP $pid
-	fi
-	;;
-
-stop)
-	if [ "$pid" != "" ]
-	then
-		echo "Stopping ${name}."
-		kill $pid
-	fi
-	;;
-
-status)
-	if [ "$pid" != "" ]
-	then
-		echo "${name} is running as pid ${pid}."
-	else
-		echo "${name} is not running."
-	fi
-	;;
-
-*)
-	echo 1>&2 "Usage: ${name} [restart|start|stop|status]"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/print/cups/files/md5 b/print/cups/files/md5
index 43f287a6a3a..557638763b9 100644
--- a/print/cups/files/md5
+++ b/print/cups/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 2001/01/11 19:00:42 jlam Exp $
+$NetBSD: md5,v 1.7 2001/01/28 02:05:37 jlam Exp $
 
-MD5 (cups-1.1.5-2-source.tar.bz2) = b8c25a0f01a887b5584d1e2166beff03
+MD5 (cups-1.1.6-1-source.tar.bz2) = 83759c52574337e18a58f31e340ee64b
diff --git a/print/cups/files/patch-sum b/print/cups/files/patch-sum
index f943fa0adc5..11d4e7b29b9 100644
--- a/print/cups/files/patch-sum
+++ b/print/cups/files/patch-sum
@@ -1,8 +1,13 @@
-$NetBSD: patch-sum,v 1.10 2001/01/12 18:34:23 jlam Exp $
+$NetBSD: patch-sum,v 1.11 2001/01/28 02:05:37 jlam Exp $
 
-MD5 (patch-aa) = bd3262a4a78bca35b8127c6c4e32188c
-MD5 (patch-ab) = 1fe6aa85344955313591068c984cccf4
-MD5 (patch-ac) = 56b2896936f298e07c26f3d065a26af6
-MD5 (patch-ad) = 4ea2faaf4cf0ef1a75a3b35d964683e1
-MD5 (patch-af) = 15fc1099bd17c28afd657f22792d1b4e
-MD5 (patch-ag) = 6ec463d6b203a2e539f17b61461c8c2a
+MD5 (patch-aa) = 0d4f5503c08018b655b245368d546860
+MD5 (patch-ab) = 62c2fcd503f8eaa38cbca2028bd31a14
+MD5 (patch-ac) = 4ea2faaf4cf0ef1a75a3b35d964683e1
+MD5 (patch-ad) = ce1fd6b48d75462cd222c510f15f8c7c
+MD5 (patch-ae) = e23521560a35f929c3d6ec586cb8394b
+MD5 (patch-af) = 3b44eace3dde4d9f2f7df834013f76e5
+MD5 (patch-ag) = dfec81a5c1f8658c6ae99d23b07eb240
+MD5 (patch-ah) = e34733f587785c73087725a3c861c5e4
+MD5 (patch-ai) = 6777d3a4248f7dd8b746e2d96cf58a6e
+MD5 (patch-aj) = afe9775bfc8f2568edd9b443c0535292
+MD5 (patch-ak) = ef4c76ef21c68a8714eef2b8efac253c