- up to 2.2.8

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

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 9466c367307e4cd47db6dbd54ad5741c272a4360..44228eef5170baab827bffa77bba7fac530069a1 100644 (file)
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,7 +1,7 @@
-diff -up cups-2.2.7/scheduler/main.c.systemd-socket cups-2.2.7/scheduler/main.c
---- cups-2.2.7/scheduler/main.c.systemd-socket 2018-04-03 14:23:12.128786025 +0200
-+++ cups-2.2.7/scheduler/main.c        2018-04-03 14:23:12.148785913 +0200
-@@ -691,8 +691,16 @@ main(int  argc,                           /* I - Number of comm
+diff -up cups-2.2.8/scheduler/main.c.systemd-socket cups-2.2.8/scheduler/main.c
+--- cups-2.2.8/scheduler/main.c.systemd-socket 2018-06-05 18:06:54.000000000 +0200
++++ cups-2.2.8/scheduler/main.c        2018-06-08 17:32:39.417600671 +0200
+@@ -681,8 +681,16 @@ main(int  argc,                           /* I - Number of comm
  
  #ifdef HAVE_ONDEMAND
    if (OnDemand)
@@ -19,9 +19,9 @@ diff -up cups-2.2.7/scheduler/main.c.systemd-socket cups-2.2.7/scheduler/main.c
  #endif /* HAVE_ONDEMAND */
    if (fg)
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
-diff -up cups-2.2.7/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.7/scheduler/org.cups.cupsd.path.in
---- cups-2.2.7/scheduler/org.cups.cupsd.path.in.systemd-socket 2018-03-23 04:48:36.000000000 +0100
-+++ cups-2.2.7/scheduler/org.cups.cupsd.path.in        2018-04-03 14:23:12.148785913 +0200
+diff -up cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.path.in
+--- cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket 2018-06-05 18:06:54.000000000 +0200
++++ cups-2.2.8/scheduler/org.cups.cupsd.path.in        2018-06-08 17:32:39.417600671 +0200
 @@ -3,7 +3,7 @@ Description=CUPS Scheduler
  PartOf=org.cups.cupsd.service
  
@@ -31,9 +31,9 @@ diff -up cups-2.2.7/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.7/s
  
  [Install]
  WantedBy=multi-user.target
-diff -up cups-2.2.7/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.7/scheduler/org.cups.cupsd.service.in
---- cups-2.2.7/scheduler/org.cups.cupsd.service.in.systemd-socket      2018-04-03 14:23:12.148785913 +0200
-+++ cups-2.2.7/scheduler/org.cups.cupsd.service.in     2018-04-03 14:25:16.312088802 +0200
+diff -up cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.service.in
+--- cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket      2018-06-08 17:32:39.417600671 +0200
++++ cups-2.2.8/scheduler/org.cups.cupsd.service.in     2018-06-08 17:34:09.091888847 +0200
 @@ -1,10 +1,11 @@
  [Unit]
  Description=CUPS Scheduler
@@ -44,6 +44,6 @@ diff -up cups-2.2.7/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.
  ExecStart=@sbindir@/cupsd -l
 -Type=simple
 +Type=notify
- Restart=always
+ Restart=on-failure
  
  [Install]