[arch-commits] Commit in cups/trunk (3 files)

[Andreas Radke]

    Date: Friday, August 16, 2019 @ 05:31:25
  Author: andyrtr
Revision: 359860

upgpkg: cups 2.2.12-1

upstream update 2.2.12

Modified:
  cups/trunk/PKGBUILD
  cups/trunk/cups-systemd-socket.patch
Deleted:
  cups/trunk/samsung-printer-workaround.patch

----------------------------------+
 PKGBUILD                         |   17 ++++++-----------
 cups-systemd-socket.patch        |   17 -----------------
 samsung-printer-workaround.patch |   30 ------------------------------
 3 files changed, 6 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-16 04:36:04 UTC (rev 359859)
+++ PKGBUILD	2019-08-16 05:31:25 UTC (rev 359860)
@@ -2,8 +2,8 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.2.11
-pkgrel=2
+pkgver=2.2.12
+pkgrel=1
 arch=('x86_64')
 license=('GPL')
 url="https://www.cups.org/"
@@ -20,9 +20,8 @@
         cups-1.6.2-statedir.patch
         # bugfixes
         cups-systemd-socket.patch
-        guid.patch
-	samsung-printer-workaround.patch)
-sha256sums=('f58010813fd6903f690cdb0c0b91e4d1bc9e5b9570c28734229ba3ed2908b76c'
+        guid.patch)
+sha256sums=('0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8'
             'SKIP'
             'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
@@ -30,9 +29,8 @@
             'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
             'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
             '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-            'f909719e2595e016c320afa421cad74ccda285ac59b11749ddac58e707d4330a'
-            'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d'
-            'ae3e154b8382f3412c73d863f4db095e722eb5255e15f0684b2bb9e02e5438af')
+            '9d6e9c46e009c54563e7c9e140484af83874747fe371569a982a082e6877a283'
+            'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security at cups.org>
 validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org <security at cups.org>"
 validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet <michael.r.sweet at gmail.com>"
@@ -56,9 +54,6 @@
   # FS#56818 - https://github.com/apple/cups/issues/5236
   patch -Np1 -i ${srcdir}/guid.patch
 
-  # FS#62360 / https://github.com/apple/cups/issues/5562
-  patch -Np1 -i  ${srcdir}/samsung-printer-workaround.patch
-
   # set MaxLogSize to 0 to prevent using cups internal log rotation
   sed -i -e '5i\ ' conf/cupsd.conf.in
   sed -i -e '6i# Disable cups internal logging - use logrotate instead' conf/cupsd.conf.in

Modified: cups-systemd-socket.patch
===================================================================
--- cups-systemd-socket.patch	2019-08-16 04:36:04 UTC (rev 359859)
+++ cups-systemd-socket.patch	2019-08-16 05:31:25 UTC (rev 359860)
@@ -30,20 +30,3 @@
  
  [Install]
  WantedBy=multi-user.target
-diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.service.in
---- cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg	2014-10-21 13:55:01.000000000 +0200
-+++ cups-2.0.2/scheduler/org.cups.cupsd.service.in	2015-02-10 13:40:24.296545049 +0100
-@@ -1,10 +1,11 @@
- [Unit]
- Description=CUPS Scheduler
- Documentation=man:cupsd(8)
-+After=network.target
- 
- [Service]
- ExecStart=@sbindir@/cupsd -l
--Type=simple
-+Type=notify
- Restart=on-failure
- 
- [Install]
-

Deleted: samsung-printer-workaround.patch
===================================================================
--- samsung-printer-workaround.patch	2019-08-16 04:36:04 UTC (rev 359859)
+++ samsung-printer-workaround.patch	2019-08-16 05:31:25 UTC (rev 359860)
@@ -1,30 +0,0 @@
-diff --git a/cups/ppd.c b/cups/ppd.c
-index 435b992f4..29456d97a 100644
---- a/cups/ppd.c
-+++ b/cups/ppd.c
-@@ -1182,6 +1182,24 @@ _ppdOpen(
-       else if (!strcmp(string, "Plus90"))
-         ppd->landscape = 90;
-     }
-+    else if (!strcmp(keyword, "Emulators") && string && ppd->num_emulations == 0)
-+    {
-+     /*
-+      * Issue #5562: Samsung printer drivers incorrectly use Emulators keyword
-+      *              to configure themselves
-+      *
-+      * The Emulators keyword was loaded but never used by anything in CUPS,
-+      * and has no valid purpose in CUPS.  The old code was removed due to a
-+      * memory leak (Issue #5475), so the following (new) code supports a single
-+      * name for the Emulators keyword, allowing these drivers to work until we
-+      * remove PPD and driver support entirely in a future version of CUPS.
-+      */
-+
-+      ppd->num_emulations = 1;
-+      ppd->emulations     = calloc(1, sizeof(ppd_emul_t));
-+
-+      strlcpy(ppd->emulations[0].name, string, sizeof(ppd->emulations[0].name));
-+    }
-     else if (!strcmp(keyword, "JobPatchFile"))
-     {
-      /*
-