cups-systemd-socket.patch

   1 diff -up cups-2.2b2/scheduler/main.c.systemd-socket cups-2.2b2/scheduler/main.c
   2 --- cups-2.2b2/scheduler/main.c.systemd-socket  2016-06-27 15:12:24.930881404 +0200
   3 +++ cups-2.2b2/scheduler/main.c 2016-06-27 15:19:38.118234985 +0200
   4 @@ -690,8 +690,15 @@ main(int  argc,                            /* I - Number of comm
   5
   6  #if defined(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  #endif /* HAVE_ONDEMAND */
  19    if (fg)
  20      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
  21 diff -up cups-2.2b2/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2b2/scheduler/org.cups.cupsd.path.in
  22 --- cups-2.2b2/scheduler/org.cups.cupsd.path.in.systemd-socket  2016-06-24 17:43:35.000000000 +0200
  23 +++ cups-2.2b2/scheduler/org.cups.cupsd.path.in 2016-06-27 15:12:24.930881404 +0200
  24 @@ -2,7 +2,7 @@
  25  Description=CUPS Scheduler
  26
  27  [Path]
  28 -PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
  29 +PathExistsGlob=@CUPS_REQUESTS@/d*
  30
  31  [Install]
  32  WantedBy=multi-user.target
  33 diff -up cups-2.2b2/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2b2/scheduler/org.cups.cupsd.service.in
  34 --- cups-2.2b2/scheduler/org.cups.cupsd.service.in.systemd-socket       2016-06-24 17:43:35.000000000 +0200
  35 +++ cups-2.2b2/scheduler/org.cups.cupsd.service.in      2016-06-27 15:12:24.930881404 +0200
  36 @@ -1,10 +1,11 @@
  37  [Unit]
  38  Description=CUPS Scheduler
  39  Documentation=man:cupsd(8)
  40 +After=network.target
  41
  42  [Service]
  43  ExecStart=@sbindir@/cupsd -l
  44 -Type=simple
  45 +Type=notify
  46
  47  [Install]
  48  Also=org.cups.cupsd.socket org.cups.cupsd.path