- up to 2.2.5

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

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index c6c3506956762a71e33747fd2083c5ac2bbcd3c9..a1ee6de661091e387b23d4ea10839695c29be17a 100644 (file)
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,9 +1,9 @@
-diff -up cups-2.2b2/scheduler/main.c.systemd-socket cups-2.2b2/scheduler/main.c
---- cups-2.2b2/scheduler/main.c.systemd-socket 2016-06-27 15:12:24.930881404 +0200
-+++ cups-2.2b2/scheduler/main.c        2016-06-27 15:19:38.118234985 +0200
-@@ -690,8 +690,15 @@ main(int  argc,                           /* I - Number of comm
+diff -up cups-2.2.5/scheduler/main.c.systemd-socket cups-2.2.5/scheduler/main.c
+--- cups-2.2.5/scheduler/main.c.systemd-socket 2017-10-17 18:59:53.732431498 +0200
++++ cups-2.2.5/scheduler/main.c        2017-10-17 19:02:13.132275861 +0200
+@@ -691,8 +691,16 @@ main(int  argc,                           /* I - Number of comm
  
- #if defined(HAVE_ONDEMAND)
+ #ifdef HAVE_ONDEMAND
    if (OnDemand)
 +  {
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
@@ -15,14 +15,15 @@ diff -up cups-2.2b2/scheduler/main.c.systemd-socket cups-2.2b2/scheduler/main.c
 +               (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.2b2/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2b2/scheduler/org.cups.cupsd.path.in
---- cups-2.2b2/scheduler/org.cups.cupsd.path.in.systemd-socket 2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/org.cups.cupsd.path.in        2016-06-27 15:12:24.930881404 +0200
-@@ -2,7 +2,7 @@
- Description=CUPS Scheduler
+diff -up cups-2.2.5/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.5/scheduler/org.cups.cupsd.path.in
+--- cups-2.2.5/scheduler/org.cups.cupsd.path.in.systemd-socket 2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/org.cups.cupsd.path.in        2017-10-17 18:59:53.732431498 +0200
+@@ -3,7 +3,7 @@ Description=CUPS Scheduler
+ PartOf=org.cups.cupsd.service
  
  [Path]
 -PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
@@ -30,9 +31,9 @@ diff -up cups-2.2b2/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2b2/s
  
  [Install]
  WantedBy=multi-user.target
-diff -up cups-2.2b2/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2b2/scheduler/org.cups.cupsd.service.in
---- cups-2.2b2/scheduler/org.cups.cupsd.service.in.systemd-socket      2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/org.cups.cupsd.service.in     2016-06-27 15:12:24.930881404 +0200
+diff -up cups-2.2.5/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.5/scheduler/org.cups.cupsd.service.in
+--- cups-2.2.5/scheduler/org.cups.cupsd.service.in.systemd-socket      2017-10-13 20:22:26.000000000 +0200
++++ cups-2.2.5/scheduler/org.cups.cupsd.service.in     2017-10-17 18:59:53.732431498 +0200
 @@ -1,10 +1,11 @@
  [Unit]
  Description=CUPS Scheduler