[pkgsrc/trunk]: pkgsrc/print cups{,-base}: Update to 2.2.12

[leot <leot%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f069e36539e
branches:  trunk
changeset: 337991:4f069e36539e
user:      leot <leot%pkgsrc.org@localhost>
date:      Fri Aug 16 21:19:30 2019 +0000

description:
cups{,-base}: Update to 2.2.12

pkgsrc changes:
 - Remove patches/patch-5613 (already present)

Changes:
2.2.12
------
- CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows (rdar://51685251)
- The `cupsctl` command now prevents setting "cups-files.conf" directives
  (Issue #5530)
- Updated the systemd service file for cupsd (Issue #5551)
- The `cupsCheckDestSupported` function did not check octetString values
  correctly (Issue #5557)
- The scheduler did not encode octetString values like "job-password" correctly
  for the print filters (Issue #5558)
- Restored minimal support for the `Emulators` keyword in PPD files to allow
  old Samsung printer drivers to continue to work (Issue #5562)
- Timed out job submission now yields an error (Issue #5570)
- The footer in the web interface covered some content on small displays
  (Issue #5574)
- The libusb-based USB backend now enforces read limits, improving print speed
  in many cases (Issue #5583)
- Fixed some compatibility issues with old releases of CUPS (Issue #5587)
- Fixed a bug in the scheduler job cleanup code (Issue #5588)
- "make" failed with GZIP options (Issue #5595)
- 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 `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)
- Fixed IPP buffer overflow (rdar://50035411)
- Fixed memory disclosure issue in the scheduler (rdar://51373853)
- Fixed DoS issues in the scheduler (rdar://51373929)
- The scheduler would restart continuously when idle and printers were not
  shared (rdar://52561199)
- Fixed a command ordering issue in the Zebra ZPL driver.
- Fixed a memory leak in `ppdOpen`.

diffstat:

 print/cups-base/Makefile           |   3 +-
 print/cups-base/distinfo           |  11 +++----
 print/cups-base/patches/patch-5613 |  49 --------------------------------------
 print/cups/Makefile                |   3 +-
 print/cups/Makefile.common         |   4 +-
 5 files changed, 9 insertions(+), 61 deletions(-)

diffs (113 lines):

diff -r 54276c99980a -r 4f069e36539e print/cups-base/Makefile
--- a/print/cups-base/Makefile  Fri Aug 16 21:00:28 2019 +0000
+++ b/print/cups-base/Makefile  Fri Aug 16 21:19:30 2019 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2019/08/11 13:22:38 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/08/16 21:19:30 leot Exp $
 
 .include "../../print/cups/Makefile.common"
 
 DISTNAME=      cups-${CUPS_VERS}-source
 PKGNAME=       cups-base-${CUPS_VERS}
-PKGREVISION=   4
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=apple/}
 
diff -r 54276c99980a -r 4f069e36539e print/cups-base/distinfo
--- a/print/cups-base/distinfo  Fri Aug 16 21:00:28 2019 +0000
+++ b/print/cups-base/distinfo  Fri Aug 16 21:19:30 2019 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.14 2019/07/17 01:44:31 manu Exp $
+$NetBSD: distinfo,v 1.15 2019/08/16 21:19:30 leot Exp $
 
-SHA1 (cups-2.2.11-source.tar.gz) = b995f520becc6c3e74b89165f689fe8255c86ba5
-RMD160 (cups-2.2.11-source.tar.gz) = f40e35094287f229d3d3d9a06cf7d576d62a60d4
-SHA512 (cups-2.2.11-source.tar.gz) = 21a6916041b50044d336871f10d1192635458a3d318f19a18ad21d27027dd3839400601019e758424c218225a34aba148ba3a57f0ce3fe14c4df03bd1fde3403
-Size (cups-2.2.11-source.tar.gz) = 10405908 bytes
-SHA1 (patch-5613) = 0c04b22fea5efc558a1915eaf1c940f47b013f43
+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 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56
 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
diff -r 54276c99980a -r 4f069e36539e print/cups-base/patches/patch-5613
--- a/print/cups-base/patches/patch-5613        Fri Aug 16 21:00:28 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-$NetBSD: patch-5613,v 1.1 2019/07/17 01:44:31 manu Exp $
-
-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)
-
-From upstream
-https://github.com/apple/cups/commit/3c27d2a6ddf50a4cb02c0b7a464eaf7b6f1ea601
-
---- ./scheduler/auth.c
-+++ ./scheduler/auth.c
-@@ -1166,7 +1166,23 @@ cupsdCheckGroup(
- 
-     groupid = group->gr_gid;
- 
-+    for (i = 0; group->gr_mem[i]; i ++)
-+    {
-+     /*
-+      * User appears in the group membership...
-+      */
-+
-+      if (!_cups_strcasecmp(username, group->gr_mem[i]))
-+      return (1);
-+    }
-+
- #ifdef HAVE_GETGROUPLIST
-+   /*
-+    * If the user isn't in the group membership list, try the results from
-+    * getgrouplist() which is supposed to return the full list of groups a user
-+    * belongs to...
-+    */
-+
-     if (user)
-     {
-       int     ngroups;                /* Number of groups */
-@@ -1187,13 +1203,6 @@ cupsdCheckGroup(
-         if ((int)groupid == (int)groups[i])
-         return (1);
-     }
--
--#else
--    for (i = 0; group->gr_mem[i]; i ++)
--    {
--      if (!_cups_strcasecmp(username, group->gr_mem[i]))
--      return (1);
--    }
- #endif /* HAVE_GETGROUPLIST */
-   }
-   else
diff -r 54276c99980a -r 4f069e36539e print/cups/Makefile
--- a/print/cups/Makefile       Fri Aug 16 21:00:28 2019 +0000
+++ b/print/cups/Makefile       Fri Aug 16 21:19:30 2019 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.265 2019/07/21 22:25:36 wiz Exp $
+# $NetBSD: Makefile,v 1.266 2019/08/16 21:19:30 leot Exp $
 
-PKGREVISION= 2
 .include "../../print/cups/Makefile.common"
 
 PKGNAME=       cups-${CUPS_VERS}
diff -r 54276c99980a -r 4f069e36539e print/cups/Makefile.common
--- a/print/cups/Makefile.common        Fri Aug 16 21:00:28 2019 +0000
+++ b/print/cups/Makefile.common        Fri Aug 16 21:19:30 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2019/04/17 09:39:27 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2019/08/16 21:19:30 leot Exp $
 #
 # used by print/cups/Makefile
 # used by print/cups-base/Makefile
 
-CUPS_VERS=     2.2.11
+CUPS_VERS=     2.2.12
 DISTNAME=      cups-${CUPS_VERS}-source
 CATEGORIES=    print