Update to cups 1.4.4

CHANGES IN CUPS V1.4.4

	- Documentation updates (STR #3453, STR #3527, STR #3528, STR #3529)
	- Security: The texttops filter did not check the results of allocations
	  (STR #3516)
	- Security: The fix for CVE-2009-3553 was incomplete (STR #3490)
	- Security: The web admin interface could disclose the contents of
	  memory (STR #3577)
	- Security: CUPS could overwrite files as root in directories owned or
	  writable by non-root users (STR #3510)
	- The cups-config utility did not return the correct linker options on
	  AIX (STR #3587)
	- Fixed some IPP conformance issues with the scheduler's
	  ippget-event-life, operations-supported, output-bin, and sides
	  attributes (STR #3554)
	- The OpenSSL interfaces have been made thread-safe and the GNU TLS
	  interface is explicitly forbidden when threading is enabled
	  (STR #3461)
	- Fixed an IPP conformance issue with the scheduler's Send-Document
	  implementation (STR #3514)
	- Added additional validation checks for the 1284 device ID (STR #3534)
	- Fixed a problem with the RPM spec file (STR #3544)
	- The lpstat command did not limit the job list to the specified
	  printers (STR #3541)
	- The cupsfilter command did not set the RIP_MAX_CACHE environment
	  variable (STR #3531)
	- Fixed support for media-col and page size variants (STR #3394)
	- The PostScript filter did not support all media selection options for
	  the first page (STR #3525)
	- The scheduler did not always remove job control files (STR #3425)
	- The scheduler could crash on restart if classes were defined
	  (STR #3524)
	- The scheduler no longer looks up network interface hostnames by
	  default on Mac OS X (STR #3523)
	- ippWriteIO did not write collection (member) attributes properly in
	  all cases (STR #3521)
	- The "cupsctl --remote-any" and corresponding web interface check box
	  (allow printing from the Internet) did not work reliably (STR #3520)
	- The lpq and lpr commands would sometimes choose different default
	  printers (STR #3503)
	- cupsDo*Request did not flush error text, leading to multiple issues
	  (STR #3325, STR #3519)
	- cupsDoAuthentication did not cancel password authentication after 3
	  failures (STR #3518)
	- Fixed several LDAP browsing bugs (STR #3392)
	- The Dymo driver did not support copies (STR #3457)
	- The scheduler did not update the classes.conf file when deleting a
	  printer belonging to a class (STR #3505)
	- The lppasswd command did not use localized password prompts
	  (STR #3492)
	- The socket backend no longer waits for back-channel data on platforms
	  other than Mac OS X (STR #3495)
	- The scheduler didn't send events when a printer started accepting or
	  rejecting jobs (STR #3480)
	- The web interface now includes additional CSRF protection (STR #3498)

4 files changed, 21 insertions, 26 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 38f8e495cec..2d24a10a183 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.170 2010/11/12 08:24:31 sbd Exp $
+# $NetBSD: Makefile,v 1.171 2010/11/12 08:54:58 sbd Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -6,9 +6,8 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${DIST_VERS:S/-/./g}
-BASE_VERS=	1.4.3
+BASE_VERS=	1.4.4
 DIST_VERS=	${BASE_VERS}
-PKGREVISION=	10
 
 CATEGORIES=	print
 MASTER_SITES=	http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 77e2d1d2541..527b72cd781 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.76 2010/11/12 08:24:32 sbd Exp $
+$NetBSD: distinfo,v 1.77 2010/11/12 08:54:58 sbd Exp $
 
-SHA1 (cups-1.4.3-source.tar.bz2) = 0dd9e3d709614d26cce77728b9263556c94c9559
-RMD160 (cups-1.4.3-source.tar.bz2) = 6c5ab282405d6a1132163c727583f3a572307d88
-Size (cups-1.4.3-source.tar.bz2) = 4461101 bytes
+SHA1 (cups-1.4.4-source.tar.bz2) = 3e179c007fa6cd6874b60ff18a6f48070547a00a
+RMD160 (cups-1.4.4-source.tar.bz2) = 1f486acda02e83b6824f8ca33b74c02ff3f01994
+Size (cups-1.4.4-source.tar.bz2) = 4472741 bytes
 SHA1 (patch-aa) = ddb088080d433b8b364ae9e0708cc79c249a1160
 SHA1 (patch-ab) = 8269ed7f24bcd5b16c143353443d4689fef082b2
 SHA1 (patch-ac) = d99dfa6e71efdc5f069c2c3e73e1b29beebf5c9b
-SHA1 (patch-ad) = 4ba06354ead85138340b87caabf87d153a15036a
-SHA1 (patch-ae) = d89b47961d899f99b6c57be3ebdb6a7b34e55324
+SHA1 (patch-ad) = 40c7f9d14619fec77255783d918c79c24ead6631
+SHA1 (patch-ae) = b4b2444d113c1d82edeb2e1dde5514978fa0b242
 SHA1 (patch-af) = c05f7739d65c7b81cc712cbf6008d53568601f6a
 SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e
 SHA1 (patch-ah) = 763220bdbc01c9ab323c62b7bc601a3082bd03e2
@@ -22,7 +22,3 @@ SHA1 (patch-ap) = 70c5fa4a19ca2812818844180ca9db9cb7cfd601
 SHA1 (patch-aq) = 098d78b7dd82ae0d69804d736603cdad9814ee9a
 SHA1 (patch-ar) = ec48fcb37ed2525af4ee669e6f3fa6a253e7bf10
 SHA1 (patch-at) = aee1f0e8cbcd9e2dbcfa9af3fb675ea7ce1ce622
-SHA1 (patch-ba) = caf7c85d5c23cb36711b56cc401ae3b6f7e366df
-SHA1 (patch-bb) = 4a554f5815c8dd7a79d2a0c7080b8b5095b37515
-SHA1 (patch-bc) = c3d05049ae35245073a43138ca17d0a96818f428
-SHA1 (patch-bd) = 1cd37b0a54057973dca3d961fd7acf4024c7bfd9
diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad
index ff0b1280a6a..cafa6be7cdb 100644
--- a/print/cups/patches/patch-ad
+++ b/print/cups/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.15 2010/05/21 10:05:20 sbd Exp $
+$NetBSD: patch-ad,v 1.16 2010/11/12 08:54:58 sbd Exp $
 
 libtoolize.
 
---- config-scripts/cups-sharedlibs.m4.orig	2009-02-10 17:05:35.000000000 +0000
+--- config-scripts/cups-sharedlibs.m4.orig	2010-06-16 00:49:01.000000000 +0000
 +++ config-scripts/cups-sharedlibs.m4
 @@ -18,6 +18,24 @@ DSOFLAGS="${DSOFLAGS:=}"
  
@@ -58,10 +58,10 @@ libtoolize.
 +		LINKCUPS="../cups/\$(LIBCUPS)"
 +		LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
 +	fi
- else
- 	if test $uname = AIX; then
- 		LINKCUPS="-lcups_s"
-@@ -182,10 +214,11 @@ if test "$DSO" != ":"; then
+ 
+ 	EXTLINKCUPS="-lcups"
+ 	EXTLINKCUPSDRIVER="-lcupsdriver"
+@@ -197,10 +229,11 @@ if test "$DSO" != ":"; then
  	DSOLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
  	IMGLIBS=""
  
@@ -77,7 +77,7 @@ libtoolize.
                  HP-UX*)
  			# HP-UX needs the path, even for /usr/lib...
  			case "$uarch" in
-@@ -233,7 +266,8 @@ if test "$DSO" != ":"; then
+@@ -248,7 +281,8 @@ if test "$DSO" != ":"; then
  				EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
  			fi
  			;;
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
index d4f28d54f52..2ec58d942c0 100644
--- a/print/cups/patches/patch-ae
+++ b/print/cups/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.26 2010/05/21 10:05:20 sbd Exp $
+$NetBSD: patch-ae,v 1.27 2010/11/12 08:54:58 sbd Exp $
 
 For proper libtool usage split CC into CC_COMPILE and CC with libtool
 mode options compile/link respectively.
 
 Same for CXX.
 
---- Makedefs.in.orig	2009-05-26 23:27:06.000000000 +0000
+--- Makedefs.in.orig	2010-04-23 18:56:34.000000000 +0000
 +++ Makedefs.in
 @@ -19,9 +19,11 @@
  
@@ -39,8 +39,8 @@ Same for CXX.
  
  .c.o:
  	echo Compiling $<...
--	$(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c $<
-+	$(CC_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c $<
+-	$(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
++	$(CC_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
  
  .c.32.o:
  	echo Compiling 32-bit $<...
@@ -54,8 +54,8 @@ Same for CXX.
  
  .cxx.o:
  	echo Compiling $<...
--	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
-+	$(CXX_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
+-	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<
++	$(CXX_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<
  
  .man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
  	echo Linking $<...