Update to 2.1.0:

CHANGES.txt - 2.1.0 - 2015-08-31
--------------------------------

CHANGES IN CUPS V2.1.0

	- Fixed more scheduler crash bugs in the new logging code (STR #4687,
	  STR #4690)
	- The scheduler did not use the ConfigFilePerm setting when copying PPD
	  files or interface scripts attached to a request (STR #4703)
	- Now support new Chinese locale IDs and their correct fallback locales
	  (<rdar://problem/22086642>, <rdar://problem/22130168>)
	- "make check" incorrectly reported an expectation of 18 warning
	  messages when 8 were expected (STR #4684)
	- The new PDF file type rule did not work (STR #4692)
	- The scheduler did not update the jobs.cache file when job files were
	  expired (STR #4706)
	- Fixed some configure script issues (STR #4694, STR #4695, STR #4698)
	- Documentation updates (STR #4691, STR #4693)


CHANGES IN CUPS V2.1rc1

	- Added support for 3D printers (basic types only, no built-in filters)
	  based on PWG white paper.
	- Fixed bugs in the new journald support (STR #4655, STR #4658,
	  STR #4661)
	- Fixed domain socket support on Linux (STR #4679)
	- Fixed signal handlers in the dnssd and usb backends (STR #4671)
	- <Limit All> in <Policy> sections now applies to all operations when
	  used by itself (STR #4659)
	- Configure script changes for systemd support (STR #4669)
	- Updated autoconf sources to use newer form of AC_INIT (STR #4664)


CHANGES IN CUPS V2.1b1

	- Improved speed of ppdMarkDefaults for complex/large PPDs
	  (<rdar://problem/15146999>)
	- The IPP backend now stops sending print data if the printer indicates
	  the job has been aborted or canceled (<rdar://problem/17837631>)
	- The IPP backend now sends the job-pages-per-set attribute when
	  printing multiple copy jobs with finishings
	  (<rdar://problem/16792757>)
	- The IPP backend now updates the cupsMandatory values when the printer
	  configuration changes (<rdar://problem/18126570>)
	- No longer install banner files since third-party banner filters now
	  supply their own (STR #4518)
	- Added support for EXPECT-ALL directive in ipptool test files
	  (STR #4469)
	- Added support for WITH-VALUE-FROM predicate in ipptool test files
	  (STR #4470)
	- The scheduler no longer listens on the loopback interface unless the
	  web interface or printer sharing are enabled
	  (<rdar://problem/9136448>)
	- Added a PPD generator for IPP Everywhere printers (STR #4258)
	- Now install "default" versions of more configuration files
	  (<rdar://problem/19024491>)
	- The cupstestppd program did not handle "maxsize(nnn)" entries in
	  cupsFilter/cupsFilter2 values (<rdar://problem/18974858>)
	- The scheduler now checks the return value of rename() calls
	  (STR #4589)
	- The scheduler now validates ErrorPolicy values in config files
	  (STR #4591)
	- Long cookies caused the web interface to stop working (STR #4619)
	- Added SSLOptions values to allow Diffie-Hellman key exchange and
	  disable TLS/1.0 support.
	- Updated the scheduler to support more IPP Everywhere attributes
	  (STR #4630)
	- The scheduler now supports advanced ASL and journald logging when
	  "syslog" output is configured (STR #4474)
	- The scheduler now supports logging to stderr when running in the
	  foreground (STR #4505)

5 files changed, 14 insertions, 40 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index bb8a2679bc8..4f04329b83e 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.222 2015/08/06 06:56:33 wiz Exp $
+# $NetBSD: Makefile,v 1.223 2015/09/03 21:15:41 wiz 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.0.4
+BASE_VERS=	2.1.0
 DIST_VERS=	${BASE_VERS}
 CATEGORIES=	print
 MASTER_SITES=	http://www.cups.org/software/${BASE_VERS}/
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 8cddf6bb431..adb91244225 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.49 2015/08/06 06:56:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.50 2015/09/03 21:15:41 wiz Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -228,6 +228,7 @@ share/cups/templates/de/error.tmpl
 share/cups/templates/de/header.tmpl
 share/cups/templates/de/help-header.tmpl
 share/cups/templates/de/help-printable.tmpl
+share/cups/templates/de/help-trailer.tmpl
 share/cups/templates/de/job-cancel.tmpl
 share/cups/templates/de/job-hold.tmpl
 share/cups/templates/de/job-move.tmpl
@@ -479,6 +480,7 @@ share/cups/templates/ru/error.tmpl
 share/cups/templates/ru/header.tmpl
 share/cups/templates/ru/help-header.tmpl
 share/cups/templates/ru/help-printable.tmpl
+share/cups/templates/ru/help-trailer.tmpl
 share/cups/templates/ru/job-cancel.tmpl
 share/cups/templates/ru/job-hold.tmpl
 share/cups/templates/ru/job-move.tmpl
diff --git a/print/cups/distinfo b/print/cups/distinfo
index eaad4c716b8..351a6409917 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.111 2015/08/06 06:56:33 wiz Exp $
+$NetBSD: distinfo,v 1.112 2015/09/03 21:15:41 wiz Exp $
 
-SHA1 (cups-2.0.4-source.tar.bz2) = adadff7ebf31a589651ca50567c8b4da7318dc19
-RMD160 (cups-2.0.4-source.tar.bz2) = ecb387686e4d216f63d68b59948d38492eeb404b
-Size (cups-2.0.4-source.tar.bz2) = 8799274 bytes
+SHA1 (cups-2.1.0-source.tar.bz2) = 92332b6785471b388929913be780d557ac00b7d0
+RMD160 (cups-2.1.0-source.tar.bz2) = 862a977ffa4e3cfb94ec011ff03d5ef1c55dde74
+Size (cups-2.1.0-source.tar.bz2) = 8829764 bytes
 SHA1 (patch-ae) = e8f4bbbbbe43cd5f6f9236e10d7241caeaedc3a3
 SHA1 (patch-af) = 1bac8b3ae3c44034be6fa6d2878f10d7f89cd1ce
 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
 SHA1 (patch-at) = 66222cb2ab84d5889cd6d42fa08827e1a4e8c178
-SHA1 (patch-conf_Makefile) = bb076cc51309477c95940bd437f0892e41337516
+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
@@ -15,7 +15,7 @@ SHA1 (patch-config-scripts_cups-manpages.m4) = fc82b6da8f678359cedf80afff1615669
 SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 2754c4fb4e10ce148785a1c3423fcd981c67b416
 SHA1 (patch-configure.ac) = 7bb171c959aa72e92efd04394751460727b0ca7d
 SHA1 (patch-cups-tls.c) = 055d24956b7ddcd04799642c2893e8e16b70391a
-SHA1 (patch-data_Makefile) = a35b07ed6b6e6103513efe5e6f5f3a13e449bda1
+SHA1 (patch-data_Makefile) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ppdc_Makefile) = a45af3310e706dd6433f029c55cf62e492de3448
 SHA1 (patch-scheduler_auth.c) = 1e2b837647e2d943585cc5f9dae86fc2c0c5d98a
 SHA1 (patch-scheduler_dirsvc.c) = 4d1a3945401c03a8f1b557129b73c57459703b69
diff --git a/print/cups/patches/patch-conf_Makefile b/print/cups/patches/patch-conf_Makefile
index 77a3052f160..a6c889b411a 100644
--- a/print/cups/patches/patch-conf_Makefile
+++ b/print/cups/patches/patch-conf_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-conf_Makefile,v 1.3 2014/06/07 07:34:05 wiz Exp $
+$NetBSD: patch-conf_Makefile,v 1.4 2015/09/03 21:15:41 wiz Exp $
 
 Don't install the config files (leave it up to pkgsrc).
 
---- conf/Makefile.orig	2013-05-29 11:51:34.000000000 +0000
+--- conf/Makefile.orig	2015-02-27 12:30:26.000000000 +0000
 +++ conf/Makefile
 @@ -70,22 +70,8 @@ install:	all install-data install-header
  #
@@ -14,8 +14,8 @@ Don't install the config files (leave it up to pkgsrc).
 -		else \
 -			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 -		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
 -	done
--	$(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default
  	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
  	for file in $(REPLACE); do \
 -		if test -r $(DATADIR)/mime/$$file ; then \
diff --git a/print/cups/patches/patch-data_Makefile b/print/cups/patches/patch-data_Makefile
deleted file mode 100644
index e93cf868738..00000000000
--- a/print/cups/patches/patch-data_Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-data_Makefile,v 1.2 2015/01/18 17:15:20 wiz Exp $
-
-Do not install banner files and testprint to avoid conflict with
-cups-filters, which installs them too.
-
-https://cups.org/str.php?L4518+P-1+S-2+C0+I0+E0+Q
-
---- data/Makefile.orig	2013-05-29 11:51:34.000000000 +0000
-+++ data/Makefile
-@@ -19,16 +19,9 @@ include ../Makedefs
- # Data files...
- #
- 
--BANNERS	=	\
--		classified \
--		confidential \
--		secret \
--		standard \
--		topsecret \
--		unclassified
-+BANNERS	=
- 
--DATAFILES =	\
--		testprint
-+DATAFILES =
- 
- PPDCFILES =	\
- 		epson.h \