Update print/cups to 2.1.2.

Changes:
CHANGES IN CUPS V2.1.2
- Re-release of CUPS 2.1.1 as CUPS 2.1.2 due to error in tagging of the
  2.1.1 release (pulled content from the 2.2.x tree instead)

CHANGES IN CUPS V2.1.1
- Security hardening fixes (<rdar://problem/23131948>,
  <rdar://problem/23132108>, <rdar://problem/23132353>,
  <rdar://problem/23132803>, <rdar://problem/23133230>,
  <rdar://problem/23133393>, <rdar://problem/23133466>,
  <rdar://problem/23133833>, <rdar://problem/23133998>,
  <rdar://problem/23134228>, <rdar://problem/23134299>,
  <rdar://problem/23134356>, <rdar://problem/23134415>,
  <rdar://problem/23134506>, <rdar://problem/23135066>,
  <rdar://problem/23135122>, <rdar://problem/23135207>,
  <rdar://problem/23144290>, <rdar://problem/23144358>,
  <rdar://problem/23144461>)
- The cupsGetPPD* functions did not work with IPP printers (STR #4725)
- Some older HP LaserJet printers need a delayed close when printing
  using the libusb-based USB backend (STR #4549)
- The libusb-based USB backend did not unload the kernel usblp module
  if it was preventing the backend from accessing the printer
  (STR #4707)
- Current Primera printers were incorrectly reported as Fargo printers
  (STR #4708)
- The IPP backend did not always handle jobs getting canceled at the
  printer (<rdar://problem/22716820>)
- Scheduler logging change (STR #4728)
- Added USB quirk for Canon MP530 (STR #4730)
- The scheduler did not deliver job notifications for jobs submitted to
  classes (STR #4733)
- Changing the printer-is-shared value for a remote queue did not
  produce an error (STR #4738)
- The IPP backend incorrectly included the job-password attribute in
  Validate-Job requests (<rdar://problem/23531939>)
- Updated localizations (STR #4709)

15 files changed, 82 insertions, 83 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 4f04329b83e..92ed447ef3a 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.223 2015/09/03 21:15:41 wiz Exp $
+# $NetBSD: Makefile,v 1.224 2015/12/02 21:14:16 leot 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,7 +6,7 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${DIST_VERS:S/-/./g}
-BASE_VERS=	2.1.0
+BASE_VERS=	2.1.2
 DIST_VERS=	${BASE_VERS}
 CATEGORIES=	print
 MASTER_SITES=	http://www.cups.org/software/${BASE_VERS}/
diff --git a/print/cups/distinfo b/print/cups/distinfo
index a89e2fca1df..119b5bd7f65 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,22 +1,21 @@
-$NetBSD: distinfo,v 1.113 2015/11/04 01:01:31 agc Exp $
+$NetBSD: distinfo,v 1.114 2015/12/02 21:14:16 leot Exp $
 
-SHA1 (cups-2.1.0-source.tar.bz2) = 92332b6785471b388929913be780d557ac00b7d0
-RMD160 (cups-2.1.0-source.tar.bz2) = 862a977ffa4e3cfb94ec011ff03d5ef1c55dde74
-SHA512 (cups-2.1.0-source.tar.bz2) = af5bbd8da43ad1c66beaeb93d91e42e4ce5a25cc1c09f1715aa85b71e92ca768c9b3f3f05c72d2197e8a2ff2b9e18fbaed3092e43b3ac9d7c08d9269a3bca59c
-Size (cups-2.1.0-source.tar.bz2) = 8829764 bytes
-SHA1 (patch-ae) = e8f4bbbbbe43cd5f6f9236e10d7241caeaedc3a3
-SHA1 (patch-af) = 1bac8b3ae3c44034be6fa6d2878f10d7f89cd1ce
+SHA1 (cups-2.1.2-source.tar.bz2) = 7b5bcd0da7a11185ab01f5ab5cd8d1168c7c8b3f
+RMD160 (cups-2.1.2-source.tar.bz2) = 91307395a9d027d10f9bb89d8c8326c54b27cdf4
+SHA512 (cups-2.1.2-source.tar.bz2) = c1bd15acdd8ac55a731c9267f0dcf9159a02c3a895d4b032b0e0d0bbb1189eb4b3b4600a9f025a8359a55ce93a5911014058f361f2bc954d1fb2cdbf219e183d
+Size (cups-2.1.2-source.tar.bz2) = 8831726 bytes
+SHA1 (patch-ae) = 04f314bbbb05538b67a0f68adc241a09e836a4e2
+SHA1 (patch-af) = 7f026ca33f3dcf1fc9d741a47afb0f0581cbbcf0
 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
-SHA1 (patch-at) = 66222cb2ab84d5889cd6d42fa08827e1a4e8c178
+SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f
 SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0
-SHA1 (patch-config-scripts_cups-compiler.m4) = 00dac129c55ad8428923f051766d6b2d26d6958d
-SHA1 (patch-config-scripts_cups-directories.m4) = 58c7b5d452c1dd67b754c7dcf0a3b5bb5a8e2768
-SHA1 (patch-config-scripts_cups-gssapi.m4) = 7c8b0dd893b9d21597088062711cc50f13031338
-SHA1 (patch-config-scripts_cups-manpages.m4) = fc82b6da8f678359cedf80afff1615669d1b6ac7
-SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 2754c4fb4e10ce148785a1c3423fcd981c67b416
-SHA1 (patch-configure.ac) = 7bb171c959aa72e92efd04394751460727b0ca7d
-SHA1 (patch-cups-tls.c) = 055d24956b7ddcd04799642c2893e8e16b70391a
-SHA1 (patch-data_Makefile) = da39a3ee5e6b4b0d3255bfef95601890afd80709
-SHA1 (patch-ppdc_Makefile) = a45af3310e706dd6433f029c55cf62e492de3448
-SHA1 (patch-scheduler_auth.c) = 1e2b837647e2d943585cc5f9dae86fc2c0c5d98a
-SHA1 (patch-scheduler_dirsvc.c) = 4d1a3945401c03a8f1b557129b73c57459703b69
+SHA1 (patch-config-scripts_cups-compiler.m4) = 5984c94c154ac732d97c0af26fc4099a7889096f
+SHA1 (patch-config-scripts_cups-directories.m4) = 3750c110eb6599870ce68a34586a442f630a11c7
+SHA1 (patch-config-scripts_cups-gssapi.m4) = 0f7e4c35473e6117d2fe103750eda820b6fade55
+SHA1 (patch-config-scripts_cups-manpages.m4) = 58148287a64e52007ace5d9659912261aa3ea611
+SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 5b95da8f91de0aaab8b3f826ce0a2662cee3f63a
+SHA1 (patch-configure.ac) = 0e48669372badc477db7d6f26c8180062f4e78de
+SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511
+SHA1 (patch-ppdc_Makefile) = 575ab7d75bebf086cde52956679164c9f01fd37e
+SHA1 (patch-scheduler_auth.c) = ca675a6e903d4b41cd69a0cab27180653e11f501
+SHA1 (patch-scheduler_dirsvc.c) = aae5b924fb8fb39007cf04d8b83747e8724485cf
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
index fd6267b0cde..9cae5a503dd 100644
--- a/print/cups/patches/patch-ae
+++ b/print/cups/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.32 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-ae,v 1.33 2015/12/02 21:14:16 leot 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	2013-07-17 15:21:18.000000000 +0000
+--- Makedefs.in.orig	2015-02-17 13:10:19.000000000 +0000
 +++ Makedefs.in
 @@ -19,9 +19,11 @@
  
@@ -46,7 +46,7 @@ Same for CXX.
  DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
  DNSSDLIBS	=	@DNSSDLIBS@
  IPPFIND_BIN	=	@IPPFIND_BIN@
-@@ -243,11 +245,11 @@ DBUSDIR		=	@DBUSDIR@
+@@ -246,11 +248,11 @@ USBQUIRKS	=	@USBQUIRKS@
  
  .c.o:
  	echo Compiling $<...
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
index e12f05edc31..4c52076c1cd 100644
--- a/print/cups/patches/patch-af
+++ b/print/cups/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.22 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-af,v 1.23 2015/12/02 21:14:16 leot Exp $
 
 * Remove unneeded $(LIBTOOL), it's now in $(INSTALL_BIN).
 
---- backend/Makefile.orig	2013-07-17 15:21:18.000000000 +0000
+--- backend/Makefile.orig	2014-05-08 22:42:44.000000000 +0000
 +++ backend/Makefile
-@@ -124,7 +124,7 @@ install-exec:	$(INSTALLXPC)
+@@ -126,7 +126,7 @@ install-exec:	$(INSTALLXPC)
  	echo Installing backends in $(SERVERBIN)/backend
  	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
  	for file in $(RBACKENDS); do \
diff --git a/print/cups/patches/patch-at b/print/cups/patches/patch-at
index 46bbf3a78ae..4bd3d4e6ddb 100644
--- a/print/cups/patches/patch-at
+++ b/print/cups/patches/patch-at
@@ -1,10 +1,10 @@
-$NetBSD: patch-at,v 1.13 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-at,v 1.14 2015/12/02 21:14:16 leot Exp $
 
 Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS
 
---- scheduler/Makefile.orig	2013-05-29 11:51:34.000000000 +0000
+--- scheduler/Makefile.orig	2015-02-17 13:10:19.000000000 +0000
 +++ scheduler/Makefile
-@@ -146,6 +146,8 @@ install:	all install-data install-header
+@@ -145,6 +145,8 @@ install:	all install-data install-header
  #
  
  install-data:
diff --git a/print/cups/patches/patch-config-scripts_cups-compiler.m4 b/print/cups/patches/patch-config-scripts_cups-compiler.m4
index 7a186bca5ef..90bec10ee37 100644
--- a/print/cups/patches/patch-config-scripts_cups-compiler.m4
+++ b/print/cups/patches/patch-config-scripts_cups-compiler.m4
@@ -1,11 +1,11 @@
-$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.1 2015/01/02 02:03:42 christos Exp $
+$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.2 2015/12/02 21:14:16 leot Exp $
 
 Some builds of gcc seem to support this for compiling but then fail during
 linking with undefined reference to `__stack_chk_fail_local'
 
---- config-scripts/cups-compiler.m4.orig	2014-08-28 08:55:52.000000000 -0400
-+++ config-scripts/cups-compiler.m4	2014-12-24 14:20:36.000000000 -0500
-@@ -113,12 +113,13 @@
+--- config-scripts/cups-compiler.m4.orig	2015-06-23 14:48:53.000000000 +0000
++++ config-scripts/cups-compiler.m4
+@@ -113,12 +113,13 @@ if test -n "$GCC"; then
  	AC_MSG_CHECKING(whether compiler supports -fstack-protector)
  	OLDCFLAGS="$CFLAGS"
  	CFLAGS="$CFLAGS -fstack-protector"
diff --git a/print/cups/patches/patch-config-scripts_cups-directories.m4 b/print/cups/patches/patch-config-scripts_cups-directories.m4
index 1eda469a177..0cfe1abc311 100644
--- a/print/cups/patches/patch-config-scripts_cups-directories.m4
+++ b/print/cups/patches/patch-config-scripts_cups-directories.m4
@@ -1,4 +1,4 @@
-$NetBSD: patch-config-scripts_cups-directories.m4,v 1.1 2015/01/02 02:03:42 christos Exp $
+$NetBSD: patch-config-scripts_cups-directories.m4,v 1.2 2015/12/02 21:14:16 leot Exp $
 
 The '$' while loops expand the variables as long as possible so that no
 references to other variables occur. This is necessary because fontpath
@@ -9,9 +9,9 @@ loop.
 I'm also sure that this is not the Right Way to fix it, but at least it
 works.
 
---- config-scripts/cups-directories.m4.orig	2014-03-21 12:42:53.000000000 -0400
-+++ config-scripts/cups-directories.m4	2014-12-24 14:25:53.000000000 -0500
-@@ -103,7 +103,7 @@
+--- config-scripts/cups-directories.m4.orig	2014-03-21 16:42:53.000000000 +0000
++++ config-scripts/cups-directories.m4
+@@ -103,7 +103,7 @@ dnl Fix "libdir" variable...
  if test "$libdir" = "\${exec_prefix}/lib"; then
  	case "$uname" in
  		Linux*)
@@ -20,7 +20,7 @@ works.
  				libdir="$exec_prefix/lib64"
  			fi
  			;;
-@@ -180,7 +180,15 @@
+@@ -180,7 +180,15 @@ AC_SUBST(CUPS_CACHEDIR)
  
  # Data files
  CUPS_DATADIR="$datadir/cups"
@@ -37,7 +37,7 @@ works.
  AC_SUBST(CUPS_DATADIR)
  
  # Icon directory
-@@ -189,7 +197,11 @@
+@@ -189,7 +197,11 @@ AC_ARG_WITH(icondir, [  --with-icondir  
  if test "x$icondir" = x -a -d /usr/share/icons; then
  	ICONDIR="/usr/share/icons"
  else
@@ -50,7 +50,7 @@ works.
  fi
  
  AC_SUBST(ICONDIR)
-@@ -200,7 +212,11 @@
+@@ -200,7 +212,11 @@ AC_ARG_WITH(menudir, [  --with-menudir  
  if test "x$menudir" = x -a -d /usr/share/applications; then
  	MENUDIR="/usr/share/applications"
  else
@@ -63,7 +63,7 @@ works.
  fi
  
  AC_SUBST(MENUDIR)
-@@ -215,7 +231,15 @@
+@@ -215,7 +231,15 @@ else
  	CUPS_DOCROOT="$docdir"
  fi
  
@@ -80,7 +80,7 @@ works.
  AC_SUBST(CUPS_DOCROOT)
  
  # Fonts
-@@ -227,8 +251,16 @@
+@@ -227,8 +251,16 @@ else
  	CUPS_FONTPATH="$fontpath"
  fi
  
@@ -98,7 +98,7 @@ works.
  
  # Locale data
  if test "$localedir" = "\${datarootdir}/locale"; then
-@@ -246,6 +278,14 @@
+@@ -246,6 +278,14 @@ else
  	CUPS_LOCALEDIR="$localedir"
  fi
  
@@ -113,7 +113,7 @@ works.
  AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
  AC_SUBST(CUPS_LOCALEDIR)
  
-@@ -254,7 +294,6 @@
+@@ -254,7 +294,6 @@ AC_ARG_WITH(logdir, [  --with-logdir    
  
  if test x$logdir = x; then
  	CUPS_LOGDIR="$localstatedir/log/cups"
@@ -121,7 +121,7 @@ works.
  else
  	CUPS_LOGDIR="$logdir"
  fi
-@@ -263,10 +302,13 @@
+@@ -263,10 +302,13 @@ AC_SUBST(CUPS_LOGDIR)
  
  # Longer-term spool data
  CUPS_REQUESTS="$localstatedir/spool/cups"
@@ -136,7 +136,7 @@ works.
  case "$uname" in
  	*BSD* | Darwin*)
  		# *BSD and Darwin (MacOS X)
-@@ -279,6 +321,10 @@
+@@ -279,6 +321,10 @@ case "$uname" in
  		CUPS_SERVERBIN="$exec_prefix/lib/cups"
  		;;
  esac
@@ -147,7 +147,7 @@ works.
  
  AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
  AC_SUBST(CUPS_SERVERBIN)
-@@ -286,7 +332,7 @@
+@@ -286,7 +332,7 @@ AC_SUBST(INSTALL_SYSV)
  
  # Configuration files
  CUPS_SERVERROOT="$sysconfdir/cups"
diff --git a/print/cups/patches/patch-config-scripts_cups-gssapi.m4 b/print/cups/patches/patch-config-scripts_cups-gssapi.m4
index 840b53636ce..fa40c847d2f 100644
--- a/print/cups/patches/patch-config-scripts_cups-gssapi.m4
+++ b/print/cups/patches/patch-config-scripts_cups-gssapi.m4
@@ -1,9 +1,9 @@
-$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.4 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.5 2015/12/02 21:14:16 leot Exp $
 
 builtin krb5-config in platforms such as solaris do not support
 the gssapi option, and need an explicit -lgss
 
---- config-scripts/cups-gssapi.m4.orig	2014-03-28 13:52:05.000000000 +0000
+--- config-scripts/cups-gssapi.m4.orig	2014-06-10 13:54:53.000000000 +0000
 +++ config-scripts/cups-gssapi.m4
 @@ -36,19 +36,18 @@ if test x$enable_gssapi != xno; then
  					AC_MSG_RESULT(no)
diff --git a/print/cups/patches/patch-config-scripts_cups-manpages.m4 b/print/cups/patches/patch-config-scripts_cups-manpages.m4
index 191c5495a3a..7cd23bed8bb 100644
--- a/print/cups/patches/patch-config-scripts_cups-manpages.m4
+++ b/print/cups/patches/patch-config-scripts_cups-manpages.m4
@@ -1,10 +1,10 @@
-$NetBSD: patch-config-scripts_cups-manpages.m4,v 1.1 2015/01/02 02:03:42 christos Exp $
+$NetBSD: patch-config-scripts_cups-manpages.m4,v 1.2 2015/12/02 21:14:16 leot Exp $
 
 Add '--with-manext' configure option.
 
---- config-scripts/cups-manpages.m4.orig	2013-10-18 16:36:01.000000000 -0400
-+++ config-scripts/cups-manpages.m4	2014-12-24 14:30:03.000000000 -0500
-@@ -13,6 +13,8 @@
+--- config-scripts/cups-manpages.m4.orig	2013-10-18 20:36:01.000000000 +0000
++++ config-scripts/cups-manpages.m4
+@@ -13,6 +13,8 @@ dnl which should have been included with
  dnl file is missing or damaged, see the license at "http://www.cups.org/".
  dnl
  
@@ -13,7 +13,7 @@ Add '--with-manext' configure option.
  dnl Fix "mandir" variable...
  if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
  	# New GNU "standards" break previous ones, so make sure we use
-@@ -44,7 +46,27 @@
+@@ -44,7 +46,27 @@ AC_SUBST(AMANDIR)
  AC_SUBST(PMANDIR)
  
  dnl Setup manpage extensions...
@@ -42,7 +42,7 @@ Add '--with-manext' configure option.
  	SunOS*)
  		# Solaris
  		MAN1EXT=1
-@@ -53,7 +75,7 @@
+@@ -53,7 +75,7 @@ case "$uname" in
  		MAN8EXT=1m
  		MAN8DIR=1m
  		;;
@@ -51,7 +51,7 @@ Add '--with-manext' configure option.
  		# Linux, GNU Hurd, and OS X
  		MAN1EXT=1.gz
  		MAN5EXT=5.gz
-@@ -61,7 +83,7 @@
+@@ -61,7 +83,7 @@ case "$uname" in
  		MAN8EXT=8.gz
  		MAN8DIR=8
  		;;
diff --git a/print/cups/patches/patch-config-scripts_cups-sharedlibs.m4 b/print/cups/patches/patch-config-scripts_cups-sharedlibs.m4
index 14248f2ee17..f49222af31d 100644
--- a/print/cups/patches/patch-config-scripts_cups-sharedlibs.m4
+++ b/print/cups/patches/patch-config-scripts_cups-sharedlibs.m4
@@ -1,10 +1,10 @@
-$NetBSD: patch-config-scripts_cups-sharedlibs.m4,v 1.1 2015/01/02 02:03:42 christos Exp $
+$NetBSD: patch-config-scripts_cups-sharedlibs.m4,v 1.2 2015/12/02 21:14:16 leot Exp $
 
 libtoolize.
 
---- config-scripts/cups-sharedlibs.m4.orig	2013-10-18 16:36:01.000000000 -0400
-+++ config-scripts/cups-sharedlibs.m4	2014-12-24 14:33:48.000000000 -0500
-@@ -22,6 +22,24 @@
+--- config-scripts/cups-sharedlibs.m4.orig	2013-10-18 20:36:01.000000000 +0000
++++ config-scripts/cups-sharedlibs.m4
+@@ -22,6 +22,24 @@ cupsbase="cups"
  LIBCUPSBASE="lib$cupsbase"
  LIBCUPSSTATIC="lib$cupsbase.a"
  
@@ -29,7 +29,7 @@ libtoolize.
  if test x$enable_shared != xno; then
  	case "$uname" in
  		SunOS*)
-@@ -67,6 +85,15 @@
+@@ -67,6 +85,15 @@ if test x$enable_shared != xno; then
  			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
  			;;
  	esac
@@ -45,7 +45,7 @@ libtoolize.
  else
  	PICFLAG=0
  	LIBCUPS="lib$cupsbase.a"
-@@ -90,8 +117,13 @@
+@@ -90,8 +117,13 @@ AC_SUBST(LIBCUPSPPDC)
  AC_SUBST(LIBCUPSSTATIC)
  
  if test x$enable_shared = xno; then
@@ -61,7 +61,7 @@ libtoolize.
  
  	EXTLINKCUPS="-lcups"
  	EXTLINKCUPSIMAGE="-lcupsimage"
-@@ -119,10 +151,11 @@
+@@ -119,10 +151,11 @@ if test "$DSO" != ":"; then
  	DSOLIBS="\$(LIBZ)"
  	IMGLIBS=""
  
@@ -77,7 +77,7 @@ libtoolize.
                  SunOS*)
                  	# Solaris...
  			if test $exec_prefix != /usr; then
-@@ -147,7 +180,8 @@
+@@ -147,7 +180,8 @@ if test "$DSO" != ":"; then
  				EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
  			fi
  			;;
diff --git a/print/cups/patches/patch-configure.ac b/print/cups/patches/patch-configure.ac
index d4af11194e4..b10de562adb 100644
--- a/print/cups/patches/patch-configure.ac
+++ b/print/cups/patches/patch-configure.ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure.ac,v 1.1 2015/01/02 02:03:42 christos Exp $
+$NetBSD: patch-configure.ac,v 1.2 2015/12/02 21:14:16 leot Exp $
 
 libtoolize.
 
---- configure.ac.orig	2013-07-08 21:15:13.000000000 +0000
+--- configure.ac.orig	2015-12-02 15:09:04.000000000 +0000
 +++ configure.ac
-@@ -21,7 +21,6 @@ sinclude(config-scripts/cups-directories
+@@ -25,7 +25,6 @@ sinclude(config-scripts/cups-directories
  sinclude(config-scripts/cups-manpages.m4)
  
  sinclude(config-scripts/cups-sharedlibs.m4)
diff --git a/print/cups/patches/patch-cups-tls.c b/print/cups/patches/patch-cups-tls.c
index 3fc151eea51..f186c1f35cc 100644
--- a/print/cups/patches/patch-cups-tls.c
+++ b/print/cups/patches/patch-cups-tls.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-cups-tls.c,v 1.1 2015/01/02 02:03:42 christos Exp $
+$NetBSD: patch-cups-tls.c,v 1.2 2015/12/02 21:14:16 leot Exp $
 
 Add missing stub.
 
---- cups/tls.c.orig	2014-08-29 11:19:40.000000000 -0400
-+++ cups/tls.c	2014-12-24 14:59:52.000000000 -0500
+--- cups/tls.c.orig	2014-08-29 15:19:40.000000000 +0000
++++ cups/tls.c
 @@ -50,6 +50,13 @@
  #    include "tls-sspi.c"
  #  endif /* HAVE_GNUTLS */
diff --git a/print/cups/patches/patch-ppdc_Makefile b/print/cups/patches/patch-ppdc_Makefile
index 20bc65e53f0..5f33f76e933 100644
--- a/print/cups/patches/patch-ppdc_Makefile
+++ b/print/cups/patches/patch-ppdc_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-ppdc_Makefile,v 1.2 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-ppdc_Makefile,v 1.3 2015/12/02 21:14:16 leot Exp $
 
---- ppdc/Makefile.orig	2013-03-11 13:57:36.000000000 +0000
+--- ppdc/Makefile.orig	2015-05-06 20:21:51.000000000 +0000
 +++ ppdc/Makefile
-@@ -380,7 +380,7 @@ libcupsppdc_s.a:	$(LIBOBJS) ../cups/$(LI
+@@ -366,7 +366,7 @@ libcupsppdc.1.dylib:	$(LIBOBJS) ../cups/
  libcupsppdc.la:    $(LIBOBJS) ../cups/$(LIBCUPS)
  	echo Linking $@...
  	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
diff --git a/print/cups/patches/patch-scheduler_auth.c b/print/cups/patches/patch-scheduler_auth.c
index aef2055559a..36110418de5 100644
--- a/print/cups/patches/patch-scheduler_auth.c
+++ b/print/cups/patches/patch-scheduler_auth.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-scheduler_auth.c,v 1.4 2015/01/02 02:03:42 christos Exp $
+$NetBSD: patch-scheduler_auth.c,v 1.5 2015/12/02 21:14:16 leot Exp $
 
 Don't pull in sys/ucred.h on Solaris as it results in procfs.h being
 included and conflicts between _FILE_OFFSET_BITS=64 and 32-bit procfs.
 
 OpenBSD defines SO_PEERCRED, but it is different from Linux's one.
 
---- scheduler/auth.c.orig	2014-08-28 11:37:22.000000000 -0400
-+++ scheduler/auth.c	2014-12-24 14:17:35.000000000 -0500
-@@ -49,7 +49,7 @@
+--- scheduler/auth.c.orig	2015-10-26 19:46:02.000000000 +0000
++++ scheduler/auth.c
+@@ -49,7 +49,7 @@ extern const char *cssmErrorString(int e
  #ifdef HAVE_SYS_PARAM_H
  #  include <sys/param.h>
  #endif /* HAVE_SYS_PARAM_H */
@@ -16,7 +16,7 @@ OpenBSD defines SO_PEERCRED, but it is different from Linux's one.
  #  include <sys/ucred.h>
  typedef struct xucred cupsd_ucred_t;
  #  define CUPSD_UCRED_UID(c) (c).cr_uid
-@@ -435,7 +435,7 @@
+@@ -404,7 +404,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
      con->type = CUPSD_AUTH_BASIC;
    }
  #endif /* HAVE_AUTHORIZATION_H */
@@ -25,7 +25,7 @@ OpenBSD defines SO_PEERCRED, but it is different from Linux's one.
    else if (!strncmp(authorization, "PeerCred ", 9) &&
             con->http->hostaddr->addr.sa_family == AF_LOCAL && con->best)
    {
-@@ -940,7 +940,7 @@
+@@ -841,7 +841,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
  
      gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER);
  
diff --git a/print/cups/patches/patch-scheduler_dirsvc.c b/print/cups/patches/patch-scheduler_dirsvc.c
index ca245965313..d214aa4a45d 100644
--- a/print/cups/patches/patch-scheduler_dirsvc.c
+++ b/print/cups/patches/patch-scheduler_dirsvc.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-scheduler_dirsvc.c,v 1.5 2014/07/29 11:38:40 wiz Exp $
+$NetBSD: patch-scheduler_dirsvc.c,v 1.6 2015/12/02 21:14:16 leot Exp $
 
 o net/mDNSResponder-258.14 does not define kDNSServiceErr_Timeout, just threat
  it like kDNSServiceErr_Unknown.
 
---- scheduler/dirsvc.c.orig	2014-06-09 18:33:24.000000000 +0000
+--- scheduler/dirsvc.c.orig	2015-01-30 16:15:53.000000000 +0000
 +++ scheduler/dirsvc.c
-@@ -831,9 +833,6 @@ dnssdErrorString(int error)		/* I - Erro
+@@ -831,9 +831,6 @@ dnssdErrorString(int error)		/* I - Erro
  
      case kDNSServiceErr_PollingMode :
          return ("Service polling mode error.");