Release 4 (by relup.sh)

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

diff -urNp -x '*.orig' cups-2.3.3.org/scheduler/main.c cups-2.3.3/scheduler/main.c
--- cups-2.3.3.org/scheduler/main.c	2020-04-27 20:04:29.000000000 +0200
+++ cups-2.3.3/scheduler/main.c	2021-04-20 22:45:51.479823429 +0200
@@ -681,8 +681,16 @@ main(int  argc,				/* I - Number of comm
 
 #ifdef 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 -urNp -x '*.orig' cups-2.3.3.org/scheduler/org.cups.cupsd.service.in cups-2.3.3/scheduler/org.cups.cupsd.service.in
--- cups-2.3.3.org/scheduler/org.cups.cupsd.service.in	2020-04-27 20:04:29.000000000 +0200
+++ cups-2.3.3/scheduler/org.cups.cupsd.service.in	2021-04-20 22:45:51.479823429 +0200
@@ -1,11 +1,11 @@
 [Unit]
 Description=CUPS Scheduler
 Documentation=man:cupsd(8)
-After=sssd.service
+After=sssd.service network.target
 
 [Service]
 ExecStart=@sbindir@/cupsd -l
-Type=simple
+Type=notify
 Restart=on-failure
 
 [Install]