From 361a90ac3848751dafc72ce04cac26dfeebbed30 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 26 Nov 2020 16:26:00 +0000
Subject: [PATCH] extra/cups to 2.3.3+121+g63ffc5cd7-1

---
 extra/cups/PKGBUILD                   | 13 +++++----
 extra/cups/cups-systemd-service.patch | 14 ++++++++++
 extra/cups/cups-systemd-socket.patch  | 40 ---------------------------
 3 files changed, 21 insertions(+), 46 deletions(-)
 create mode 100644 extra/cups/cups-systemd-service.patch
 delete mode 100644 extra/cups/cups-systemd-socket.patch

diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index e6bcccb4b..705c8d359 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-_commit=a72b0140ee9ad72f7ffc1f46fbe962bde159cbb8 # master 2020-11-15
-pkgver=2.3.3+106+ga72b0140e
+_commit=63ffc5cd75e474e475bb3bcd70fb4e62bd836770 # master 2020-11-25
+pkgver=2.3.3+121+g63ffc5cd7
 pkgrel=1
 arch=('x86_64')
 license=('Apache' 'custom')
@@ -27,7 +27,7 @@ source=(#https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgve
         cups-no-export-ssllibs.patch
         cups-1.6.2-statedir.patch
         # bugfixes
-        cups-systemd-socket.patch
+        cups-systemd-service.patch
         guid.patch)
 sha256sums=(#'261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee'
             'SKIP'
@@ -36,7 +36,7 @@ sha256sums=(#'261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee'
             '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2'
             'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
             '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-            '5fb8b1df744ddff3652d9940fe2c084f4146b22a60b95a7eb97a2ed29e0d3a10'
+            '2abd918d5a5e38762ae7c2a3a443a7b9e8d9980fbe693a4b60415b18a80ebd83'
             'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security@cups.org>
 validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org <security@cups.org>"
@@ -59,8 +59,9 @@ prepare() {
   patch -Np1 -i "${srcdir}"/cups-1.6.2-statedir.patch
 
   # bug fixes
-  # make sure network is up when starting and notify systemd - FC
-  patch -Np1 -i "${srcdir}"/cups-systemd-socket.patch
+  # make sure network is online or cups would ne a restart to be reachable over network
+  # https://github.com/OpenPrinting/cups/issues/53
+  patch -Np1 -i "${srcdir}"/cups-systemd-service.patch
 
   # FS#56818 - https://github.com/apple/cups/issues/5236
   patch -Np1 -i "${srcdir}"/guid.patch
diff --git a/extra/cups/cups-systemd-service.patch b/extra/cups/cups-systemd-service.patch
new file mode 100644
index 000000000..d68cad703
--- /dev/null
+++ b/extra/cups/cups-systemd-service.patch
@@ -0,0 +1,14 @@
+--- cups-2.3.0/scheduler/cups.service.in	2019-08-23 17:19:38.000000000 +0200
++++ cups-2.3.0/scheduler/cups.service.in.new	2019-08-25 20:20:25.805339727 +0200
+@@ -1,8 +1,9 @@
+ [Unit]
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+-After=network.target sssd.service ypbind.service
++After=network-online.target sssd.service ypbind.service
+ Requires=cups.socket
++Wants=network-online.target
+
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
+ 
diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch
deleted file mode 100644
index ea8e6a032..000000000
--- a/extra/cups/cups-systemd-socket.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
---- cups-2.0.2/scheduler/main.c.ustTJg	2015-02-10 13:40:24.121547526 +0100
-+++ cups-2.0.2/scheduler/main.c	2015-02-10 13:40:24.295545063 +0100
-@@ -690,8 +690,15 @@ main(int  argc,				/* I - Number of comm
- 
- #if defined(HAVE_ONDEMAND)
-   if (OnDemand)
-+  {
-     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
--  else
-+# ifdef HAVE_SYSTEMD
-+    sd_notifyf(0, "READY=1\n"
-+               "STATUS=Scheduler is running...\n"
-+               "MAINPID=%lu",
-+               (unsigned long) getpid());
-+# endif /* HAVE_SYSTEMD */
-+  } else
- #endif /* HAVE_ONDEMAND */
-   if (fg)
-     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
-diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
---- cups-2.3.0/scheduler/cups.service.in	2019-08-23 17:19:38.000000000 +0200
-+++ cups-2.3.0/scheduler/cups.service.in.new	2019-08-25 20:20:25.805339727 +0200
-@@ -1,12 +1,13 @@
- [Unit]
- Description=CUPS Scheduler
- Documentation=man:cupsd(8)
--After=sssd.service
-+After=sssd.service network-online.target
- Requires=cups.socket
-+Wants=network-online.target
-
- [Service]
- ExecStart=@sbindir@/cupsd -l
--Type=simple
-+Type=notify
- Restart=on-failure
-
- [Install]
-