cups{,-base}: Update to 2.3.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: cups{,-base}: Update to 2.3.0
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Sun, 17 Nov 2019 13:49:56 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Nov 17 14:49:56 2019 +0100
Changeset:	558e02dcafd1b8b8df5532d3c8bb62093eeeca91

Modified Files:
	cups-base/Makefile
	cups-base/PLIST
	cups-base/distinfo
	cups-base/patches/patch-ae
	cups-base/patches/patch-airprint-scheduler_printers.c
	cups-base/patches/patch-man-cups-files.conf.man.in
	cups-base/patches/patch-scheduler-conf.c
	cups/Makefile.common
Removed Files:
	cups-base/patches/patch-airprint-scheduler_conf.c
	cups-base/patches/patch-airprint-scheduler_dirsvc.c
	cups-base/patches/patch-config-scripts_cups-manpages.m4
	cups-base/patches/patch-config-scripts_cups-opsys.m4
	cups-base/patches/patch-test_ippfind.c

Log Message:
cups{,-base}: Update to 2.3.0

Still fails to install, the DESTDIR seems to not be properly populated.
Investigate further about that.

Changes:
Changes in CUPS v2.3.0
----------------------
- CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows
  (rdar://51685251)
- Added a GPL2/LGPL2 exception to the new CUPS license terms.
- Documentation updates (Issue #5604)
- Localization updates (Issue #5637)
- Fixed a bug in the scheduler job cleanup code (Issue #5588)
- Fixed builds when there is no TLS library (Issue #5590)
- Eliminated some new GCC compiler warnings (Issue #5591)
- Removed dead code from the scheduler (Issue #5593)
- "make" failed with GZIP options (Issue #5595)
- Fixed potential excess logging from the scheduler when removing job files
  (Issue #5597)
- Fixed a NULL pointer dereference bug in `httpGetSubField2` (Issue #5598)
- Added FIPS-140 workarounds for GNU TLS (Issue #5601, Issue #5622)
- The scheduler no longer provides a default value for the description
  (Issue #5603)
- The scheduler now logs jobs held for authentication using the error level so
  it is clear what happened (Issue #5604)
- The `lpadmin` command did not always update the PPD file for changes to the
  `cupsIPPSupplies` and `cupsSNMPSupplies` keywords (Issue #5610)
- The scheduler now uses both the group's membership list as well as the
  various OS-specific membership functions to determine whether a user belongs
  to a named group (Issue #5613)
- Added USB quirks rule for HP LaserJet 1015 (Issue #5617)
- Fixed some PPD parser issues (Issue #5623, Issue #5624)
- The IPP parser no longer allows invalid member attributes in collections
  (Issue #5630)
- The configure script now treats the "wheel" group as a potential system
  group (Issue #5638)
- Fixed a USB printing issue on macOS (rdar://31433931)
- Fixed IPP buffer overflow (rdar://50035411)
- Fixed memory disclosure issue in the scheduler (rdar://51373853)
- Fixed DoS issues in the scheduler (rdar://51373929)
- Fixed an issue with unsupported "sides" values in the IPP backend
  (rdar://51775322)
- The scheduler would restart continuously when idle and printers were not
  shared (rdar://52561199)
- Fixed an issue with `EXPECT !name WITH-VALUE ...` tests.
- Fixed a command ordering issue in the Zebra ZPL driver.
- Fixed a memory leak in `ppdOpen`.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=558e02dcafd1b8b8df5532d3c8bb62093eeeca91

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cups-base/Makefile                                 |  3 +-
 cups-base/PLIST                                    |  2 +-
 cups-base/distinfo                                 | 21 +++-----
 cups-base/patches/patch-ae                         | 10 ++--
 cups-base/patches/patch-airprint-scheduler_conf.c  | 36 -------------
 .../patches/patch-airprint-scheduler_dirsvc.c      | 40 --------------
 .../patches/patch-airprint-scheduler_printers.c    | 40 +++-----------
 .../patches/patch-config-scripts_cups-manpages.m4  | 62 ----------------------
 .../patches/patch-config-scripts_cups-opsys.m4     | 16 ------
 cups-base/patches/patch-man-cups-files.conf.man.in |  4 +-
 cups-base/patches/patch-scheduler-conf.c           | 15 ++++--
 cups-base/patches/patch-test_ippfind.c             | 16 ------
 cups/Makefile.common                               |  2 +-
 13 files changed, 37 insertions(+), 230 deletions(-)

diffs:
diff --git a/cups-base/Makefile b/cups-base/Makefile
index 5d723f0056..9bafdc169b 100644
--- a/cups-base/Makefile
+++ b/cups-base/Makefile
@@ -36,7 +36,6 @@ CONFIGURE_ARGS+=	--with-system-groups=${CUPS_SYSTEM_GROUPS:Q}
 CONFIGURE_ARGS+=	--with-exe-file-perm=0755
 CONFIGURE_ARGS+=	--enable-libpaper
 CONFIGURE_ARGS+=	--enable-ssl
-CONFIGURE_ARGS+=	--with-manext=bsd
 CONFIGURE_ARGS+=	--without-bundledir
 CONFIGURE_ARGS+=	--without-icondir
 CONFIGURE_ARGS+=	--without-menudir
@@ -143,7 +142,7 @@ post-extract:
 	${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
 
 post-install:
-	set -e; for file in LICENSE.txt README.md; do			\
+	set -e; for file in LICENSE README.md; do			\
 		${INSTALL_DATA} ${WRKSRC}/$${file}			\
 		     ${DESTDIR}${DOCDIR}/$${file}; \
 	done
diff --git a/cups-base/PLIST b/cups-base/PLIST
index 227125afe5..8ea971fb20 100644
--- a/cups-base/PLIST
+++ b/cups-base/PLIST
@@ -678,7 +678,7 @@ share/cups/templates/test-page.tmpl
 share/cups/templates/trailer.tmpl
 share/cups/templates/users.tmpl
 ${PLIST.libusb}share/cups/usb/org.cups.usb-quirks
-share/doc/cups/LICENSE.txt
+share/doc/cups/LICENSE
 share/doc/cups/README.md
 share/doc/cups/apple-touch-icon.png
 share/doc/cups/cups-printable.css
diff --git a/cups-base/distinfo b/cups-base/distinfo
index 834e77cb0b..5169afe08f 100644
--- a/cups-base/distinfo
+++ b/cups-base/distinfo
@@ -1,16 +1,14 @@
 $NetBSD: distinfo,v 1.15 2019/08/16 21:19:30 leot Exp $
 
-SHA1 (cups-2.2.12-source.tar.gz) = a6a89bd1dd3b7122913651698a89d795e3bfea80
-RMD160 (cups-2.2.12-source.tar.gz) = e9bcc54ad693f77f482c1fcef63d5c2fa538a722
-SHA512 (cups-2.2.12-source.tar.gz) = b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6
-Size (cups-2.2.12-source.tar.gz) = 10409313 bytes
-SHA1 (patch-ae) = f34ec899f4816bdcf96ff315e001e3ac5a960200
+SHA1 (cups-2.3.0-source.tar.gz) = ccdce595a90d768968b1e908684594738eba3a91
+RMD160 (cups-2.3.0-source.tar.gz) = d7a0cd359441d1b30095c04986f500010aae4c9c
+SHA512 (cups-2.3.0-source.tar.gz) = c51f173b5fbae1554a3f4a3786fb3b5566e50d9f775473788ee3553922ac7e02e4785492c87c93fd46f159f50d97cc10ff6feafb3397cd9c1840840f3a9cdfae
+Size (cups-2.3.0-source.tar.gz) = 8129049 bytes
+SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881
 SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56
 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
 SHA1 (patch-airprint-conf_mime.convs.in) = 413a5ef448ab42858db804cfbfc1b8ff5b6bbf77
-SHA1 (patch-airprint-scheduler_conf.c) = f54ba16cc32dc09cd5bd8e864e1510ed2a84d6ed
-SHA1 (patch-airprint-scheduler_dirsvc.c) = bef4ea8e898dffc67c4866baa701e12570eb6fca
-SHA1 (patch-airprint-scheduler_printers.c) = 7fc0157f990a6e4dfa04c0b2c5684422229af725
+SHA1 (patch-airprint-scheduler_printers.c) = 1794cd3ea6a32ce6376aa86e89f945de036036eb
 SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f
 SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
 SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0
@@ -18,15 +16,12 @@ SHA1 (patch-config-scripts_cups-compiler.m4) = 26f2ed2ef45d922f47e5e0ac87ccc278f
 SHA1 (patch-config-scripts_cups-directories.m4) = 8a6c2f962dafdde20f913fac2e172ae9f8760c3e
 SHA1 (patch-config-scripts_cups-gssapi.m4) = ac2df3e82bc844630af8462a461c7efe1da4b354
 SHA1 (patch-config-scripts_cups-libtool.m4) = a6139fbbbee7038d11654c0a2387af21f48b7412
-SHA1 (patch-config-scripts_cups-manpages.m4) = 5cc943738df29f11fc366557938b82c1e9162344
-SHA1 (patch-config-scripts_cups-opsys.m4) = 2bbacc401d4d8dbc157889b6a6cf66684c52357b
 SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511
 SHA1 (patch-cups_thread.c) = e625a2b81f3d831d2a0c02bc0fa9a9d31c1097a7
 SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876
-SHA1 (patch-man-cups-files.conf.man.in) = 820da58aa3f854018a48b68256d0cf0dc75b986e
-SHA1 (patch-scheduler-conf.c) = 179964f8d251be3c21f4cfc7b67f3196beda29dc
+SHA1 (patch-man-cups-files.conf.man.in) = 08c0322fd233c724b7df238df01988500130d1c6
+SHA1 (patch-scheduler-conf.c) = c6fc372a8f83b17f171fc532ed504d4198682467
 SHA1 (patch-scheduler-conf.h) = d11f3b789af096dcaca13a38f6484727ff895bee
 SHA1 (patch-scheduler-main.c) = cb31fa7427b497108ce7724bbfee1b784b9330ab
 SHA1 (patch-scheduler_auth.c) = 8c9a5338c9eb84336db0d487008795227fa9e7f0
 SHA1 (patch-scheduler_dirsvc.c) = aae5b924fb8fb39007cf04d8b83747e8724485cf
-SHA1 (patch-test_ippfind.c) = 70403f5e7d5bd56772616f64fc2dff1482994b79
diff --git a/cups-base/patches/patch-ae b/cups-base/patches/patch-ae
index d8fb583172..0b1fce6308 100644
--- a/cups-base/patches/patch-ae
+++ b/cups-base/patches/patch-ae
@@ -3,9 +3,9 @@ $NetBSD: patch-ae,v 1.1 2017/11/12 14:10:15 khorben Exp $
 - Do not pass `-z' option to install(1)
 - Honor optimization flags.
 
---- Makedefs.in.orig	2017-10-13 18:22:26.000000000 +0000
+--- Makedefs.in.orig	2019-08-23 15:19:38.000000000 +0000
 +++ Makedefs.in
-@@ -49,7 +49,7 @@ SHELL		=	/bin/sh
+@@ -46,7 +46,7 @@ SHELL		=	/bin/sh
  #
  
  INSTALL_BIN	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
@@ -14,12 +14,12 @@ $NetBSD: patch-ae,v 1.1 2017/11/12 14:10:15 khorben Exp $
  INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
  INSTALL_DATA	=	$(INSTALL) -c -m 444
  INSTALL_DIR	=	$(INSTALL) -d
-@@ -151,7 +151,7 @@ CXXLIBS		=	@CXXLIBS@
+@@ -167,7 +167,7 @@ CXXLIBS		=	@CXXLIBS@
  DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
  DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
  DNSSD_BACKEND	=	@DNSSD_BACKEND@
--DSOFLAGS	=	-L../cups @DSOFLAGS@
+-DSOFLAGS	=	@DSOFLAGS@
 +DSOFLAGS	=	-L../cups @DSOFLAGS@ $(OPTIM)
- DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
  DNSSDLIBS	=	@DNSSDLIBS@
  IPPFIND_BIN	=	@IPPFIND_BIN@
+ IPPFIND_MAN	=	@IPPFIND_MAN@
diff --git a/cups-base/patches/patch-airprint-scheduler_conf.c b/cups-base/patches/patch-airprint-scheduler_conf.c
deleted file mode 100644
index 3fa80423d4..0000000000
--- a/cups-base/patches/patch-airprint-scheduler_conf.c
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-airprint-scheduler_conf.c,v 1.1 2018/07/24 12:19:21 bouyer Exp $
-
-From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter%gmail.com@localhost>
-Date: Tue, 9 Aug 2016 18:11:29 +0200
-Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
- Touch to a CUPS server)
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
-Bug-Debian: http://bugs.debian.org/700961
-Bug: https://cups.org/str.php?L4341
-Last-Update: 2015-02-10
-
-Patch-Name: airprint-support.patch
----
- conf/mime.convs.in   | 3 +++
- conf/mime.types      | 3 +++
- scheduler/conf.c     | 2 +-
- scheduler/dirsvc.c   | 6 ++++++
- scheduler/printers.c | 4 +++-
- 5 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/scheduler/conf.c b/scheduler/conf.c
-index 9c1be7089..52f2a6d35 100644
---- scheduler/conf.c.orig
-+++ scheduler/conf.c
-@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
-   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
- 
- #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
--  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
-+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
- #endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
diff --git a/cups-base/patches/patch-airprint-scheduler_dirsvc.c b/cups-base/patches/patch-airprint-scheduler_dirsvc.c
deleted file mode 100644
index 9b35a5c2d2..0000000000
--- a/cups-base/patches/patch-airprint-scheduler_dirsvc.c
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-airprint-scheduler_dirsvc.c,v 1.1 2018/07/24 12:19:21 bouyer Exp $
-
-From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter%gmail.com@localhost>
-Date: Tue, 9 Aug 2016 18:11:29 +0200
-Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
- Touch to a CUPS server)
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
-Bug-Debian: http://bugs.debian.org/700961
-Bug: https://cups.org/str.php?L4341
-Last-Update: 2015-02-10
-
-Patch-Name: airprint-support.patch
----
- conf/mime.convs.in   | 3 +++
- conf/mime.types      | 3 +++
- scheduler/conf.c     | 2 +-
- scheduler/dirsvc.c   | 6 ++++++
- scheduler/printers.c | 4 +++-
- 5 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
-index 3dab90ca9..f21942af3 100644
---- scheduler/dirsvc.c.orig
-+++ scheduler/dirsvc.c
-@@ -443,6 +443,12 @@ dnssdBuildTxtRecord(
-     keyvalue[count  ][0] = "pdl";
-     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
- 
-+    /* iOS 6 does not accept this printer as AirPrint printer if there is
-+       no URF txt record or "URF=none", "DM3" is the minimum needed found
-+       by try and error */
-+    keyvalue[count  ][0] = "URF";
-+    keyvalue[count++][1] = "DM3";
-+
-     if (get_auth_info_required(p, air_str, sizeof(air_str)))
-     {
-       keyvalue[count  ][0] = "air";
diff --git a/cups-base/patches/patch-airprint-scheduler_printers.c b/cups-base/patches/patch-airprint-scheduler_printers.c
index 15c1db47c0..5bd9e87a5d 100644
--- a/cups-base/patches/patch-airprint-scheduler_printers.c
+++ b/cups-base/patches/patch-airprint-scheduler_printers.c
@@ -18,9 +18,9 @@ Patch-Name: pwg-raster-attributes.patch
 
 diff --git a/scheduler/printers.c b/scheduler/printers.c
 index bb99907ad..a0ebcbd3e 100644
---- scheduler/printers.c.orig
+--- scheduler/printers.c.orig	2019-11-17 12:21:47.966025953 +0000
 +++ scheduler/printers.c
-@@ -2199,9 +2199,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
+@@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
    cupsd_location_t *auth;		/* Pointer to authentication element */
    const char	*auth_supported;	/* Authentication supported */
    ipp_t		*oldattrs;		/* Old printer attributes */
@@ -31,10 +31,10 @@ index bb99907ad..a0ebcbd3e 100644
 +  mime_type_t   *type;
  
  
-   DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -2538,6 +2539,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
-   DEBUG_printf(("cupsdSetPrinterAttrs: leaving name = %s, type = %x\n", p->name,
-                 p->type));
+  /*
+@@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+ 
+   add_printer_formats(p);
  
 +  /* 
 +   * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input
@@ -113,33 +113,7 @@ index bb99907ad..a0ebcbd3e 100644
   /*
    * Add name-default attributes...
    */
-
-From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter%gmail.com@localhost>
-Date: Tue, 9 Aug 2016 18:11:29 +0200
-Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
- Touch to a CUPS server)
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
-Bug-Debian: http://bugs.debian.org/700961
-Bug: https://cups.org/str.php?L4341
-Last-Update: 2015-02-10
-
-Patch-Name: airprint-support.patch
----
- conf/mime.convs.in   | 3 +++
- conf/mime.types      | 3 +++
- scheduler/conf.c     | 2 +-
- scheduler/dirsvc.c   | 6 ++++++
- scheduler/printers.c | 4 +++-
- 5 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/scheduler/printers.c b/scheduler/printers.c
-index a0ebcbd3e..b5fe9e031 100644
---- scheduler/printers.c.orig
-+++ scheduler/printers.c
-@@ -3765,7 +3765,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+@@ -3731,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p)	
        }
        else if (!_cups_strcasecmp(type->super, "image"))
        {
diff --git a/cups-base/patches/patch-config-scripts_cups-manpages.m4 b/cups-base/patches/patch-config-scripts_cups-manpages.m4
deleted file mode 100644
index 590f60c818..0000000000
--- a/cups-base/patches/patch-config-scripts_cups-manpages.m4
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-config-scripts_cups-manpages.m4,v 1.1 2017/11/12 14:10:15 khorben Exp $
-
-Add '--with-manext' configure option.
-
---- config-scripts/cups-manpages.m4.orig	2017-06-30 15:44:38.000000000 +0000
-+++ config-scripts/cups-manpages.m4
-@@ -11,6 +11,8 @@ dnl which should have been included with
- dnl missing or damaged, see the license at "http://www.cups.org/";.
- dnl
- 
-+AC_ARG_WITH(manext, [  --with-manext           set man page extension style (bsd,irix,sysv,none)],manext="$withval",manext="")
-+
- dnl Fix "mandir" variable...
- if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
- 	# New GNU "standards" break previous ones, so make sure we use
-@@ -42,7 +44,27 @@ AC_SUBST(AMANDIR)
- AC_SUBST(PMANDIR)
- 
- dnl Setup manpage extensions...
--case "$host_os_name" in
-+if test x$manext = x; then
-+	case "$host_os_name" in
-+		*bsd* | dragonfly*)
-+			# *BSD and Darwin (MacOS X)
-+			manext=bsd
-+			;;
-+		sunos* | hp-ux*)
-+			# Solaris and HP-UX
-+			manext=sysv
-+			;;
-+		linux* | gnu* | darwin*)
-+			# Linux and GNU Hurd
-+			manext=linux
-+			;;
-+		*)
-+			# All others
-+			;;
-+	esac
-+fi
-+
-+case "$manext" in
- 	sunos*)
- 		# Solaris
- 		MAN1EXT=1
-@@ -51,7 +73,7 @@ case "$host_os_name" in
- 		MAN8EXT=1m
- 		MAN8DIR=1m
- 		;;
--	linux* | gnu* | darwin*)
-+	linux)
- 		# Linux, GNU Hurd, and macOS
- 		MAN1EXT=1.gz
- 		MAN5EXT=5.gz
-@@ -59,7 +81,7 @@ case "$host_os_name" in
- 		MAN8EXT=8.gz
- 		MAN8DIR=8
- 		;;
--	*)
-+	none|*)
- 		# All others
- 		MAN1EXT=1
- 		MAN5EXT=5
diff --git a/cups-base/patches/patch-config-scripts_cups-opsys.m4 b/cups-base/patches/patch-config-scripts_cups-opsys.m4
deleted file mode 100644
index e99eeeb315..0000000000
--- a/cups-base/patches/patch-config-scripts_cups-opsys.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-config-scripts_cups-opsys.m4,v 1.2 2018/04/05 16:31:45 leot Exp $
-
-Fix building on newer macOS.
-
---- config-scripts/cups-opsys.m4.orig	2018-03-23 03:48:36.000000000 +0000
-+++ config-scripts/cups-opsys.m4
-@@ -22,9 +22,6 @@ if test "x$host_os_version" = x; then
-         host_os_version="0"
- fi
- 
--if test "$host_os_name" = darwin -a $host_os_version -lt 120; then
--        AC_MSG_ERROR([Sorry, this version of CUPS requires macOS 10.8 or higher.])
--fi
- 
- dnl Determine whether we are cross-compiling...
- if test "$build" = "$host"; then
diff --git a/cups-base/patches/patch-man-cups-files.conf.man.in b/cups-base/patches/patch-man-cups-files.conf.man.in
index 91f87acb44..26784712a2 100644
--- a/cups-base/patches/patch-man-cups-files.conf.man.in
+++ b/cups-base/patches/patch-man-cups-files.conf.man.in
@@ -2,8 +2,8 @@ $NetBSD: patch-man-cups-files.conf.man.in,v 1.2 2018/06/11 10:04:25 adam Exp $
 
 Add a PidFile configuration directive to write a PID file.
 
---- man/cups-files.conf.man.in.orig	2018-06-05 16:06:54.000000000 +0000
-+++ man/cups-files.conf.man.in
+--- man/cups-files.conf.5.orig	2018-06-05 16:06:54.000000000 +0000
++++ man/cups-files.conf.5
 @@ -157,6 +157,12 @@ The server name may be included in filen
  
  .fi
diff --git a/cups-base/patches/patch-scheduler-conf.c b/cups-base/patches/patch-scheduler-conf.c
index 8ec5f6d7ed..5dcd1bd05d 100644
--- a/cups-base/patches/patch-scheduler-conf.c
+++ b/cups-base/patches/patch-scheduler-conf.c
@@ -2,8 +2,8 @@ $NetBSD: patch-scheduler-conf.c,v 1.1 2017/11/12 14:10:15 khorben Exp $
 
 Add a PidFile configuration directive to write a PID file.
 
---- scheduler/conf.c.orig	2017-03-28 20:26:53.000000000 +0200
-+++ scheduler/conf.c	2017-07-17 18:04:23.000000000 +0200
+--- scheduler/conf.c.orig	2019-11-17 12:21:47.927540703 +0000
++++ scheduler/conf.c
 @@ -142,6 +142,7 @@ static const cupsd_var_t	cupsfiles_vars[
    { "CreateSelfSignedCerts",	&CreateSelfSignedCerts,	CUPSD_VARTYPE_BOOLEAN },
  #endif /* HAVE_SSL */
@@ -20,7 +20,16 @@ Add a PidFile configuration directive to write a PID file.
    cupsdSetString(&DocumentRoot, CUPS_DOCROOT);
    cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log");
    cupsdClearString(&ErrorLog);
-@@ -3402,6 +3404,7 @@ read_cupsd_conf(cups_file_t *fp)	/* I - 
+@@ -745,7 +747,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+@@ -3375,6 +3377,7 @@ read_cupsd_conf(cups_file_t *fp)	/* I - 
               !_cups_strcasecmp(line, "CacheDir") ||
               !_cups_strcasecmp(line, "ConfigFilePerm") ||
               !_cups_strcasecmp(line, "DataDir") ||
diff --git a/cups-base/patches/patch-test_ippfind.c b/cups-base/patches/patch-test_ippfind.c
deleted file mode 100644
index ca55a51c9d..0000000000
--- a/cups-base/patches/patch-test_ippfind.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-test_ippfind.c,v 1.2 2018/11/10 19:51:12 leot Exp $
-
---- test/ippfind.c.orig	2018-11-08 13:49:36.000000000 +0000
-+++ test/ippfind.c
-@@ -1765,11 +1765,6 @@ dnssd_error_string(int error)		/* I - Er
- 
-     case kDNSServiceErr_PollingMode :
-         return ("Service polling mode error.");
--
--#ifndef _WIN32
--    case kDNSServiceErr_Timeout :
--        return ("Service timeout.");
--#endif /* !_WIN32 */
-   }
- 
- #  elif defined(HAVE_AVAHI)
diff --git a/cups/Makefile.common b/cups/Makefile.common
index 9fcbad1ea9..41bdacdd22 100644
--- a/cups/Makefile.common
+++ b/cups/Makefile.common
@@ -3,7 +3,7 @@
 # used by wip/cups/Makefile
 # used by wip/cups-base/Makefile
 
-CUPS_VERS=	2.2.12
+CUPS_VERS=	2.3.0
 DISTNAME=	cups-${CUPS_VERS}-source
 CATEGORIES=	print
Prev by Date: cups*: Import cups-2.2.12 as wip/cups{,-base}
Next by Date: cups-base: Add a TODO trying to describe the installation problem
Previous by Thread: cups*: Import cups-2.2.12 as wip/cups{,-base}
Next by Thread: cups-base: Add a TODO trying to describe the installation problem
Indexes:
Home | Main Index | Thread Index | Old Index