Updated cups to 1.1.14

- The ippRead() function did not verify that the
  attribute name length or string with language value
  was not larger than the read buffer.
- The scheduler set the signal handlers before loading
  the configuration files the first time; this prevented
  the RunAsUser directive from blocking server reloads.
- Added Swedish message catalog.
- The parallel backend now recognizes the /dev/printers
  device directory under Linux 2.4.x.
- MacOS X fixes.
- The cupsaddsmb utility sent the server name after the
  user information when executing the rpcclient program.
  This caused problems with some versions of SAMBA
  2.2.x.
- The IPP backend did not pass the requesting user name
  when checking on the print job status. This prevented
  it from waiting for the job to complete when
  communicating with some IPP implementations that
  require it.

4 files changed, 13 insertions, 13 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index b16f0ca7880..8dc66929300 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2002/01/31 17:51:26 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2002/02/18 11:26:15 martti Exp $
 
 DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
-BASE_VERS=		1.1.13
+BASE_VERS=		1.1.14
 DIST_VERS=		${BASE_VERS}
 VERS=			${DIST_VERS:S/-/./g}
 WRKSRC=			${WRKDIR}/cups-${BASE_VERS}
diff --git a/print/cups/PLIST b/print/cups/PLIST
index b2977f97e02..8a535f2142d 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/31 17:51:27 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/02/18 11:26:15 martti Exp $
 bin/cancel
 bin/cups-config
 bin/disable
@@ -374,13 +374,13 @@ share/locale/he/cups_he
 share/locale/it/cups_it
 share/locale/ru_RU.cp1251/cups_ru_RU.cp1251
 share/locale/ru_RU.koi8r/cups_ru_RU.koi8r
+share/locale/sv/cups_sv
 share/locale/uk/cups_uk
 share/locale/uk_UA.cp1251/cups_uk_UA.cp1251
 share/locale/zh_CN/cups_zh_CN
 @dirrm share/locale/uk_UA.cp1251
 @dirrm share/locale/ru_RU.koi8r
 @dirrm share/locale/ru_RU.cp1251
-@dirrm share/locale/he
 @dirrm share/locale/be
 @dirrm share/locale/C
 @dirrm share/examples/cups
diff --git a/print/cups/distinfo b/print/cups/distinfo
index a78ec3322d0..cbd75712e56 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2002/02/05 04:34:09 jlam Exp $
+$NetBSD: distinfo,v 1.13 2002/02/18 11:26:15 martti Exp $
 
-SHA1 (cups-1.1.13-source.tar.bz2) = a4203fd94ee53b3dd81ff40670ad13ee47bc7a8d
-Size (cups-1.1.13-source.tar.bz2) = 5432116 bytes
-SHA1 (patch-ab) = 940c5fdae628e0c4f8ff914c365055086d6781dd
+SHA1 (cups-1.1.14-source.tar.bz2) = b1a940af5f27cebb8bef340aa6a3552c887ad67d
+Size (cups-1.1.14-source.tar.bz2) = 5408714 bytes
+SHA1 (patch-ab) = 72eca08a8198cc94f817bdb4435e43e637886587
 SHA1 (patch-ag) = df2c471d9dd013017afdef80a41ea2b2e5bdca27
 SHA1 (patch-ah) = a7cdf225c7256c3277559d5bd2923df74ee3d26e
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index 5bc5279d468..4b09dd7d832 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.13 2002/01/31 17:51:27 jlam Exp $
+$NetBSD: patch-ab,v 1.14 2002/02/18 11:26:16 martti Exp $
 
---- Makefile.orig	Thu Jan 24 13:51:04 2002
-+++ Makefile
+--- Makefile.orig	Tue Feb 12 20:05:36 2002
++++ Makefile	Mon Feb 18 11:44:24 2002
 @@ -61,8 +61,6 @@
  		echo Installing in $$dir... ;\
  		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
@@ -30,8 +30,8 @@ $NetBSD: patch-ab,v 1.13 2002/01/31 17:51:27 jlam Exp $
 -	fi
 -	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
 -		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
--		if test "$(INITDDIR)" = "/System/Library/StartupItems/CUPS"; then \
--			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/CUPS; \
+-		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
+-			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices.sh; \
 -			$(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
 -			$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
 -			$(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \