Release 4 (by relup.sh)

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

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 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.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
 
 [Path]
-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+PathExistsGlob=@CUPS_REQUESTS@/d*
 
 [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
@@ -1,10 +1,11 @@
 [Unit]
 Description=CUPS Scheduler
 Documentation=man:cupsd(8)
+After=network.target
 
 [Service]
 ExecStart=@sbindir@/cupsd -l
-Type=simple
+Type=notify
 
 [Install]
 Also=org.cups.cupsd.socket org.cups.cupsd.path