cups-systemd-socket.patch

   1 diff -up cups-2.2.12/scheduler/main.c.systemd-socket cups-2.2.12/scheduler/main.c
   2 --- cups-2.2.12/scheduler/main.c.systemd-socket 2019-08-16 00:35:30.000000000 +0200
   3 +++ cups-2.2.12/scheduler/main.c        2019-08-19 09:31:09.703370325 +0200
   4 @@ -674,8 +674,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.12/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.path.in
  23 --- cups-2.2.12/scheduler/org.cups.cupsd.path.in.systemd-socket 2019-08-16 00:35:30.000000000 +0200
  24 +++ cups-2.2.12/scheduler/org.cups.cupsd.path.in        2019-08-19 09:31:09.703370325 +0200
  25 @@ -1,6 +1,6 @@
  26  [Unit]
  27  Description=CUPS Scheduler
  28 -PartOf=org.cups.cupsd.service
  29 +PartOf=cups.service
  30
  31  [Path]
  32  PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
  33 diff -up cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.service.in
  34 --- cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket      2019-08-19 09:31:09.703370325 +0200
  35 +++ cups-2.2.12/scheduler/org.cups.cupsd.service.in     2019-08-19 09:54:58.890036404 +0200
  36 @@ -1,13 +1,13 @@
  37  [Unit]
  38  Description=CUPS Scheduler
  39  Documentation=man:cupsd(8)
  40 -After=sssd.service
  41 +After=sssd.service network.target
  42
  43  [Service]
  44  ExecStart=@sbindir@/cupsd -l
  45 -Type=simple
  46 +Type=notify
  47  Restart=on-failure
  48
  49  [Install]
  50 -Also=org.cups.cupsd.socket org.cups.cupsd.path
  51 +Also=cups.socket cups.path
  52  WantedBy=printer.target
  53 diff -up cups-2.2.12/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.socket.in
  54 --- cups-2.2.12/scheduler/org.cups.cupsd.socket.in.systemd-socket       2019-08-16 00:35:30.000000000 +0200
  55 +++ cups-2.2.12/scheduler/org.cups.cupsd.socket.in      2019-08-19 09:31:09.703370325 +0200
  56 @@ -1,6 +1,6 @@
  57  [Unit]
  58  Description=CUPS Scheduler
  59 -PartOf=org.cups.cupsd.service
  60 +PartOf=cups.service
  61
  62  [Socket]
  63  ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
  64 diff -up cups-2.2.12/scheduler/org.cups.cups-lpd.socket.systemd-socket cups-2.2.12/scheduler/org.cups.cups-lpd.socket
  65 --- cups-2.2.12/scheduler/org.cups.cups-lpd.socket.systemd-socket       2019-08-16 00:35:30.000000000 +0200
  66 +++ cups-2.2.12/scheduler/org.cups.cups-lpd.socket      2019-08-19 09:31:09.703370325 +0200
  67 @@ -1,6 +1,6 @@
  68  [Unit]
  69  Description=CUPS LPD Server Socket
  70 -PartOf=org.cups.cups-lpd.service
  71 +PartOf=cups-lpd.service
  72
  73  [Socket]
  74  ListenStream=515