cups-systemd-socket.patch

   1 diff -up cups-2.0.0/cups/usersys.c.systemd-socket cups-2.0.0/cups/usersys.c
   2 --- cups-2.0.0/cups/usersys.c.systemd-socket    2014-08-28 16:37:22.000000000 +0100
   3 +++ cups-2.0.0/cups/usersys.c   2014-10-16 14:39:05.839530224 +0100
   4 @@ -1028,7 +1028,7 @@ cups_read_client_conf(
   5      struct stat        sockinfo;               /* Domain socket information */
   6
   7      if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
   8 -       (sockinfo.st_mode & S_IRWXO) == S_IRWXO)
   9 +       (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
  10        cups_server = CUPS_DEFAULT_DOMAINSOCKET;
  11      else
  12  #endif /* CUPS_DEFAULT_DOMAINSOCKET */
  13 diff -up cups-2.0.0/scheduler/main.c.systemd-socket cups-2.0.0/scheduler/main.c
  14 --- cups-2.0.0/scheduler/main.c.systemd-socket  2014-10-16 14:39:05.811530076 +0100
  15 +++ cups-2.0.0/scheduler/main.c 2014-10-16 14:39:05.839530224 +0100
  16 @@ -653,6 +653,12 @@ main(int  argc,                            /* I - Number of comm
  17      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
  18    else
  19  #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
  20 +#ifdef HAVE_SYSTEMD
  21 +  sd_notifyf(0, "READY=1\n"
  22 +             "STATUS=Scheduler is running...\n"
  23 +             "MAINPID=%lu",
  24 +             (unsigned long) getpid());
  25 +#endif /* HAVE_SYSTEMD */
  26    if (fg)
  27      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
  28    else
  29 diff -up cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.path.in
  30 --- cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket  2014-03-21 14:50:24.000000000 +0000
  31 +++ cups-2.0.0/scheduler/org.cups.cupsd.path.in 2014-10-16 14:39:05.839530224 +0100
  32 @@ -2,7 +2,7 @@
  33  Description=CUPS Scheduler
  34
  35  [Path]
  36 -PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
  37 +PathExistsGlob=@CUPS_REQUESTS@/d*
  38
  39  [Install]
  40  WantedBy=multi-user.target
  41 diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.service.in
  42 --- cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket       2014-03-21 14:50:24.000000000 +0000
  43 +++ cups-2.0.0/scheduler/org.cups.cupsd.service.in      2014-10-16 14:39:28.636650224 +0100
  44 @@ -2,9 +2,10 @@
  45  Description=CUPS Scheduler
  46 +After=network.target
  47
  48  [Service]
  49 -ExecStart=@sbindir@/cupsd -l
  50 -Type=simple
  51 +ExecStart=@sbindir@/cupsd -f
  52 +Type=notify
  53
  54  [Install]
  55  Also=org.cups.cupsd.socket org.cups.cupsd.path
  56  WantedBy=printer.target