- up to 2.2.1; FC patches refresh

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

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 619f3af8c73874faa8a74763f4a80d42f99cf220..c6c3506956762a71e33747fd2083c5ac2bbcd3c9 100644 (file)
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,34 +1,26 @@
-diff -up cups-2.0.0/cups/usersys.c.systemd-socket cups-2.0.0/cups/usersys.c
---- cups-2.0.0/cups/usersys.c.systemd-socket   2014-08-28 16:37:22.000000000 +0100
-+++ cups-2.0.0/cups/usersys.c  2014-10-16 14:39:05.839530224 +0100
-@@ -1028,7 +1028,7 @@ cups_read_client_conf(
-     struct stat       sockinfo;               /* Domain socket information */
+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
  
-     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
--      (sockinfo.st_mode & S_IRWXO) == S_IRWXO)
-+      (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
-       cups_server = CUPS_DEFAULT_DOMAINSOCKET;
-     else
- #endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-2.0.0/scheduler/main.c.systemd-socket cups-2.0.0/scheduler/main.c
---- cups-2.0.0/scheduler/main.c.systemd-socket 2014-10-16 14:39:05.811530076 +0100
-+++ cups-2.0.0/scheduler/main.c        2014-10-16 14:39:05.839530224 +0100
-@@ -653,6 +653,12 @@ 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
- #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
-+#ifdef HAVE_SYSTEMD
-+  sd_notifyf(0, "READY=1\n"
-+             "STATUS=Scheduler is running...\n"
-+             "MAINPID=%lu",
-+             (unsigned long) getpid());
-+#endif /* HAVE_SYSTEMD */
+-  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.");
-   else
-diff -up cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.path.in
---- cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket 2014-03-21 14:50:24.000000000 +0000
-+++ cups-2.0.0/scheduler/org.cups.cupsd.path.in        2014-10-16 14:39:05.839530224 +0100
+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
  
@@ -38,19 +30,19 @@ diff -up cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.0/s
  
  [Install]
  WantedBy=multi-user.target
-diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.service.in
---- cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket      2014-03-21 14:50:24.000000000 +0000
-+++ cups-2.0.0/scheduler/org.cups.cupsd.service.in     2014-10-16 14:39:28.636650224 +0100
-@@ -2,9 +2,10 @@
+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
+@@ -1,10 +1,11 @@
+ [Unit]
  Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
 +After=network.target
  
  [Service]
--ExecStart=@sbindir@/cupsd -l
+ ExecStart=@sbindir@/cupsd -l
 -Type=simple
-+ExecStart=@sbindir@/cupsd -f
 +Type=notify
  
  [Install]
  Also=org.cups.cupsd.socket org.cups.cupsd.path
- WantedBy=printer.target