- up to 2.3.1

[packages/cups.git] / cups-systemd-socket.patch

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 03c21b8219da7bd8580bee23f4e2f96d4a20be73..260ac29d7d5568e8c3608adf7d826f064494cca4 100644 (file)
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,9 +1,9 @@
-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
-@@ -658,8 +658,15 @@ main(int  argc,                           /* I - Number of comm
+diff -up cups-2.2.12/scheduler/main.c.systemd-socket cups-2.2.12/scheduler/main.c
+--- cups-2.2.12/scheduler/main.c.systemd-socket        2019-08-16 00:35:30.000000000 +0200
++++ cups-2.2.12/scheduler/main.c       2019-08-19 09:31:09.703370325 +0200
+@@ -674,8 +674,16 @@ main(int  argc,                           /* I - Number of comm
  
- #if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+ #ifdef HAVE_ONDEMAND
    if (OnDemand)
 +  {
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
@@ -15,34 +15,60 @@ diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
 +               (unsigned long) getpid());
 +# endif /* HAVE_SYSTEMD */
 +  } else
- #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
++
+ #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.0.2/scheduler/org.cups.cupsd.path.in.ustTJg 2014-03-21 15:50:24.000000000 +0100
-+++ cups-2.0.2/scheduler/org.cups.cupsd.path.in        2015-02-10 13:40:24.295545063 +0100
-@@ -2,7 +2,7 @@
+diff -up cups-2.2.12/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.path.in
+--- cups-2.2.12/scheduler/org.cups.cupsd.path.in.systemd-socket        2019-08-16 00:35:30.000000000 +0200
++++ cups-2.2.12/scheduler/org.cups.cupsd.path.in       2019-08-19 09:31:09.703370325 +0200
+@@ -1,6 +1,6 @@
+ [Unit]
  Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
  
  [Path]
--PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
-+PathExistsGlob=@CUPS_REQUESTS@/d*
- 
- [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 @@
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff -up cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.service.in
+--- cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket     2019-08-19 09:31:09.703370325 +0200
++++ cups-2.2.12/scheduler/org.cups.cupsd.service.in    2019-08-19 09:54:58.890036404 +0200
+@@ -1,13 +1,13 @@
  [Unit]
  Description=CUPS Scheduler
  Documentation=man:cupsd(8)
-+After=network.target
+-After=sssd.service
++After=sssd.service network.target
  
  [Service]
  ExecStart=@sbindir@/cupsd -l
 -Type=simple
 +Type=notify
+ Restart=on-failure
  
  [Install]
- Also=org.cups.cupsd.socket org.cups.cupsd.path
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff -up cups-2.2.12/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.socket.in
+--- cups-2.2.12/scheduler/org.cups.cupsd.socket.in.systemd-socket      2019-08-16 00:35:30.000000000 +0200
++++ cups-2.2.12/scheduler/org.cups.cupsd.socket.in     2019-08-19 09:31:09.703370325 +0200
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
+diff -up cups-2.2.12/scheduler/org.cups.cups-lpd.socket.systemd-socket cups-2.2.12/scheduler/org.cups.cups-lpd.socket
+--- cups-2.2.12/scheduler/org.cups.cups-lpd.socket.systemd-socket      2019-08-16 00:35:30.000000000 +0200
++++ cups-2.2.12/scheduler/org.cups.cups-lpd.socket     2019-08-19 09:31:09.703370325 +0200
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515