cups-systemd-socket.patch

   1 diff -up cups-2.2.8/scheduler/main.c.systemd-socket cups-2.2.8/scheduler/main.c
   2 --- cups-2.2.8/scheduler/main.c.systemd-socket  2018-06-05 18:06:54.000000000 +0200
   3 +++ cups-2.2.8/scheduler/main.c 2018-06-08 17:32:39.417600671 +0200
   4 @@ -681,8 +681,16 @@ main(int  argc,                            /* I - Number of comm
   5
   6  #ifdef HAVE_ONDEMAND
   7    if (OnDemand)
   8 +  {
   9      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
  10 -  else
  11 +# ifdef HAVE_SYSTEMD
  12 +    sd_notifyf(0, "READY=1\n"
  13 +               "STATUS=Scheduler is running...\n"
  14 +               "MAINPID=%lu",
  15 +               (unsigned long) getpid());
  16 +# endif /* HAVE_SYSTEMD */
  17 +  } else
  18 +
  19  #endif /* HAVE_ONDEMAND */
  20    if (fg)
  21      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
  22 diff -up cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.path.in
  23 --- cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket  2018-06-05 18:06:54.000000000 +0200
  24 +++ cups-2.2.8/scheduler/org.cups.cupsd.path.in 2018-06-08 17:32:39.417600671 +0200
  25 @@ -3,7 +3,7 @@ Description=CUPS Scheduler
  26  PartOf=org.cups.cupsd.service
  27
  28  [Path]
  29 -PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
  30 +PathExistsGlob=@CUPS_REQUESTS@/d*
  31
  32  [Install]
  33  WantedBy=multi-user.target
  34 diff -up cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.service.in
  35 --- cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket       2018-06-08 17:32:39.417600671 +0200
  36 +++ cups-2.2.8/scheduler/org.cups.cupsd.service.in      2018-06-08 17:34:09.091888847 +0200
  37 @@ -1,10 +1,11 @@
  38  [Unit]
  39  Description=CUPS Scheduler
  40  Documentation=man:cupsd(8)
  41 +After=network.target
  42
  43  [Service]
  44  ExecStart=@sbindir@/cupsd -l
  45 -Type=simple
  46 +Type=notify
  47  Restart=on-failure
  48
  49  [Install]