Update CUPS to 1.1.6.3nb1 from source distribution 1.1.6-3. Changes from

version 1.1.6.2nb1 include incorporation of USB fixes from NetBSD pkgsrc,
security fixes from SuSE, lpr-compatibility fixes from Caldera, and:

- Fix problem exposed by the MaxJobs directive where the scheduler was
  losing count of the number of jobs.  This fix, stored in patch-ah, was
  gleaned from the CUPS mailing list, and bumps the cups packages version
  number to 1.1.6.3nb1.
- The updated cupsTempFile() function did not return the filename when
  called with a filename buffer of NULL (previously it used a static
  buffer.)
- DeletePrinter() didn't remove the printer from any classes it was a member of.
- DeletePrinterFromClass() didn't preserve the implicit status of a class.
- DeletePrinterFromClasses() didn't remove printers from implicit classes.
- StartJob() didn't send the job-sheets, job-priority, and job-hold-until
  attributes to remote printers.
- LoadAllJobs() was looking for job-sheets-completed instead of
  job-media-sheets-completed.  This would prevent accumulation of page data
  after a restart of the scheduler.
- The pstops and imagetops filters now generate copies using the appropriate
  method for a Level 1, 2, or 3 printer since some Level 2/3 printers don't
  support the /#copies variable anymore.
- The IPP backend didn't handle version-not-supported errors and revert to
  IPP/1.0 (previously it only checked for a bad-request error)

8 files changed, 102 insertions, 89 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 8df3435e4f9..e240c425bc2 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2001/02/17 17:51:38 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2001/02/27 17:37:53 jlam Exp $
 #
 
-DISTNAME=		cups-${VERS}-2-source
-PKGNAME=		cups-${VERS}.2nb1
+DISTNAME=		cups-${VERS}-3-source
+PKGNAME=		cups-${VERS}.3nb1
 VERS=			1.1.6
 WRKSRC=			${WRKDIR}/cups-${VERS}
 CATEGORIES=		print
diff --git a/print/cups/files/md5 b/print/cups/files/md5
index f0af32d42b5..5d68a7fb2c3 100644
--- a/print/cups/files/md5
+++ b/print/cups/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 2001/02/08 19:05:01 jlam Exp $
+$NetBSD: md5,v 1.9 2001/02/27 17:37:53 jlam Exp $
 
-MD5 (cups-1.1.6-2-source.tar.bz2) = 1cef7a1bc8b4995842d01516f4193dde
+MD5 (cups-1.1.6-3-source.tar.bz2) = 1f85c53afc8f2eb752eb3f24d220ac3e
diff --git a/print/cups/files/patch-sum b/print/cups/files/patch-sum
index 683f9dc534c..392d48f15ff 100644
--- a/print/cups/files/patch-sum
+++ b/print/cups/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.13 2001/02/13 20:21:36 jlam Exp $
+$NetBSD: patch-sum,v 1.14 2001/02/27 17:37:53 jlam Exp $
 
 MD5 (patch-aa) = 9e634f9986e0cec53cb2c4fd673755e4
 MD5 (patch-ab) = 4155498923feeee81ea9f8b99821fb82
 MD5 (patch-ac) = 4ea2faaf4cf0ef1a75a3b35d964683e1
-MD5 (patch-ad) = bc2bbc360d01993f2986abb79eca9dfc
-MD5 (patch-ae) = 3ba4bf6d38ef644e713f37125a83951e
-MD5 (patch-af) = bc8ceab0769999b4acc5b7eb0b3c4007
+MD5 (patch-ad) = 250117284e59dba57f234ba941547f45
+MD5 (patch-ag) = b8bc803ab02adcfe0cdb7cc11ea6ab44
+MD5 (patch-ah) = c1db5a2db6340a836eba9f749cef3468
diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad
index baeb66b3c55..c8f2d150246 100644
--- a/print/cups/patches/patch-ad
+++ b/print/cups/patches/patch-ad
@@ -1,37 +1,14 @@
-$NetBSD: patch-ad,v 1.6 2001/02/08 19:05:01 jlam Exp $
+$NetBSD: patch-ad,v 1.7 2001/02/27 17:37:53 jlam Exp $
 
---- configure.in.orig	Tue Feb  6 20:25:38 2001
+--- configure.in.orig	Tue Feb 20 12:32:59 2001
 +++ configure.in
-@@ -390,18 +390,7 @@
- 	# rather than to the executables.  This makes things smaller if you
- 	# are using any static libraries, and it also allows us to distribute
--	# a single DSO rather than a bunch...unless the linker is dumb.
--	case $uname in
--		NetBSD*)
--			# NetBSD's linker won't resolve symbols in a shared
--			# libraries unless their enclosing shared libraries
--			# are explicitly listed.
--			DSOLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
--			IMGLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
--			;;
--		*)
--			DSOLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
--			IMGLIBS=""
--			;;
--	esac
-+	# a single DSO rather than a bunch.
-+	DSOLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
-+	IMGLIBS=""
+@@ -494,4 +494,5 @@
  
- 	# The *BSD, HP-UX, and Solaris run-time linkers need help when
-@@ -427,5 +416,5 @@
- else
- 	DSOLIBS=""
--	IMGLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
-+	IMGLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
- fi
- 
-@@ -655,6 +644,6 @@
+ dnl Fix "mandir" variable...
++AMANDIR="\${mandir}"
+ if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
+ 	case "$uname" in
+@@ -664,6 +665,6 @@
  
  dnl Set the CUPS_DOCROOT directory...
 -CUPS_DOCROOT='${datadir}/doc/cups'
@@ -40,7 +17,7 @@ $NetBSD: patch-ad,v 1.6 2001/02/08 19:05:01 jlam Exp $
 +AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/html/cups")
  AC_SUBST(CUPS_DOCROOT)
  
-@@ -662,5 +651,5 @@
+@@ -671,5 +672,5 @@
  AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
  
 -AC_OUTPUT(Makedefs cups.sh)
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
deleted file mode 100644
index 523a8c1beae..00000000000
--- a/print/cups/patches/patch-ae
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2001/02/13 20:21:36 jlam Exp $
-
---- backend/usb.c.orig	Tue Feb  6 05:41:04 2001
-+++ backend/usb.c
-@@ -398,7 +398,7 @@
- #elif defined(__sun)
- #elif defined(__hpux)
- #elif defined(__osf)
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__)
-   int   i;                      /* Looping var */
-   int   fd;                     /* File descriptor */
-   char  device[255];            /* Device filename */
-@@ -407,6 +407,21 @@
-   for (i = 0; i < 3; i ++)
-   {
-     sprintf(device, "/dev/unlpt%d", i);
-+    if ((fd = open(device, O_WRONLY)) >= 0)
-+    {
-+      close(fd);
-+      printf("direct usb:%s \"Unknown\" \"USB Port #%d\"\n", device, i + 1);
-+    }
-+  }
-+#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+  int   i;                      /* Looping var */
-+  int   fd;                     /* File descriptor */
-+  char  device[255];            /* Device filename */
-+
-+
-+  for (i = 0; i < 3; i ++)
-+  {
-+    sprintf(device, "/dev/ulpt%d", i);
-     if ((fd = open(device, O_WRONLY)) >= 0)
-     {
-       close(fd);
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
deleted file mode 100644
index 733461bbe7e..00000000000
--- a/print/cups/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.8 2001/02/08 19:05:01 jlam Exp $
-
---- cups/Makefile.orig	Fri Feb  2 11:37:44 2001
-+++ cups/Makefile
-@@ -99,7 +99,7 @@
- libcups.la:    $(LIBOBJS) ../Makedefs
- 	echo Linking $@...
- 	$(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
--		-version-info 2:0 $(SSLLIBS)
-+		-version-info 2:1 $(SSLLIBS)
- 
- 
- #
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
new file mode 100644
index 00000000000..a5436f61620
--- /dev/null
+++ b/print/cups/patches/patch-ag
@@ -0,0 +1,19 @@
+$NetBSD: patch-ag,v 1.6 2001/02/27 17:37:54 jlam Exp $
+
+--- cgi-bin/Makefile.orig	Thu Feb 15 08:34:14 2001
++++ cgi-bin/Makefile
+@@ -50,10 +50,10 @@
+ #
+ 
+ install:
+-	-$(MKDIR) $(SERVERROOT)/cgi-bin
+-	$(CHMOD) ugo+rx $(SERVERROOT)
+-	$(CHMOD) ugo+rx $(SERVERROOT)/cgi-bin
+-	$(INSTALL_BIN) $(CGIS) $(SERVERROOT)/cgi-bin
++	-$(MKDIR) $(SERVERBIN)/cgi-bin
++	$(CHMOD) ugo+rx $(SERVERBIN)
++	$(CHMOD) ugo+rx $(SERVERBIN)/cgi-bin
++	$(INSTALL_BIN) $(CGIS) $(SERVERBIN)/cgi-bin
+ 
+ 
+ #
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah
new file mode 100644
index 00000000000..b8a3eb5729c
--- /dev/null
+++ b/print/cups/patches/patch-ah
@@ -0,0 +1,65 @@
+$NetBSD: patch-ah,v 1.7 2001/02/27 17:37:54 jlam Exp $
+
+--- scheduler/job.c.orig	Tue Feb 27 00:20:56 2001
++++ scheduler/job.c
+@@ -189,6 +189,8 @@
+         free(current->filetypes);
+ 
+         free(current);
++
++	NumJobs --;
+       }
+ 
+       return;
+@@ -563,6 +565,8 @@
+ 	prev->next = job;
+       else
+ 	Jobs = job;
++
++      NumJobs ++;
+     }
+ 
+  /*
+@@ -619,6 +623,12 @@
+   closedir(dir);
+ 
+  /*
++  * Clean out old jobs as needed...
++  */
++
++  CleanJobs();
++
++ /*
+   * Check to see if we need to start any jobs...
+   */
+ 
+@@ -1714,6 +1724,7 @@
+ 
+       StopJob(job->id);
+       job->state->values[0].integer = IPP_JOB_PENDING;
++      SaveJob(job->id);
+     }
+     else if (job->status > 0)
+     {
+@@ -1728,7 +1739,10 @@
+         CancelJob(job->id, 0);
+ 
+         if (JobHistory)
++        {
+           job->state->values[0].integer = IPP_JOB_ABORTED;
++          SaveJob(job->id);
++        }
+ 
+         CheckJobs();
+       }
+@@ -1749,7 +1763,10 @@
+ 	CancelJob(job->id, 0);
+ 
+ 	if (JobHistory)
++	{
+           job->state->values[0].integer = IPP_JOB_COMPLETED;
++          SaveJob(job->id);
++	}
+ 
+ 	CheckJobs();
+       }