- up to 2.0.1; https/ipps is back (cups 2.0 dropped openssl support; only gnutls...

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

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 619f3af8c73874faa8a74763f4a80d42f99cf220..7f1b0b2b49f6091b981d5126f57404298f05f89e 100644 (file)
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,7 +1,7 @@
-diff -up cups-2.0.0/cups/usersys.c.systemd-socket cups-2.0.0/cups/usersys.c
---- cups-2.0.0/cups/usersys.c.systemd-socket   2014-08-28 16:37:22.000000000 +0100
-+++ cups-2.0.0/cups/usersys.c  2014-10-16 14:39:05.839530224 +0100
-@@ -1028,7 +1028,7 @@ cups_read_client_conf(
+diff -up cups-2.0.1/cups/usersys.c.systemd-socket cups-2.0.1/cups/usersys.c
+--- cups-2.0.1/cups/usersys.c.systemd-socket   2014-10-20 20:24:56.000000000 +0200
++++ cups-2.0.1/cups/usersys.c  2014-11-15 15:19:11.108125832 +0100
+@@ -1078,7 +1078,7 @@ cups_read_client_conf(
      struct stat       sockinfo;               /* Domain socket information */
  
      if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
@@ -10,10 +10,10 @@ diff -up cups-2.0.0/cups/usersys.c.systemd-socket cups-2.0.0/cups/usersys.c
        cups_server = CUPS_DEFAULT_DOMAINSOCKET;
      else
  #endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-2.0.0/scheduler/main.c.systemd-socket cups-2.0.0/scheduler/main.c
---- cups-2.0.0/scheduler/main.c.systemd-socket 2014-10-16 14:39:05.811530076 +0100
-+++ cups-2.0.0/scheduler/main.c        2014-10-16 14:39:05.839530224 +0100
-@@ -653,6 +653,12 @@ main(int  argc,                           /* I - Number of comm
+diff -up cups-2.0.1/scheduler/main.c.systemd-socket cups-2.0.1/scheduler/main.c
+--- cups-2.0.1/scheduler/main.c.systemd-socket 2014-11-15 15:19:11.057126510 +0100
++++ cups-2.0.1/scheduler/main.c        2014-11-15 15:19:11.108125832 +0100
+@@ -661,6 +661,12 @@ main(int  argc,                           /* I - Number of comm
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
    else
  #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
@@ -26,9 +26,9 @@ diff -up cups-2.0.0/scheduler/main.c.systemd-socket cups-2.0.0/scheduler/main.c
    if (fg)
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
    else
-diff -up cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.path.in
---- cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket 2014-03-21 14:50:24.000000000 +0000
-+++ cups-2.0.0/scheduler/org.cups.cupsd.path.in        2014-10-16 14:39:05.839530224 +0100
+diff -up cups-2.0.1/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.1/scheduler/org.cups.cupsd.path.in
+--- cups-2.0.1/scheduler/org.cups.cupsd.path.in.systemd-socket 2014-03-21 15:50:24.000000000 +0100
++++ cups-2.0.1/scheduler/org.cups.cupsd.path.in        2014-11-15 15:19:11.108125832 +0100
 @@ -2,7 +2,7 @@
  Description=CUPS Scheduler
  
@@ -38,11 +38,13 @@ diff -up cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.0/s
  
  [Install]
  WantedBy=multi-user.target
-diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.service.in
---- cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket      2014-03-21 14:50:24.000000000 +0000
-+++ cups-2.0.0/scheduler/org.cups.cupsd.service.in     2014-10-16 14:39:28.636650224 +0100
-@@ -2,9 +2,10 @@
+diff -up cups-2.0.1/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.1/scheduler/org.cups.cupsd.service.in
+--- cups-2.0.1/scheduler/org.cups.cupsd.service.in.systemd-socket      2014-11-15 15:19:11.109125818 +0100
++++ cups-2.0.1/scheduler/org.cups.cupsd.service.in     2014-11-15 15:19:56.480528155 +0100
+@@ -1,10 +1,11 @@
+ [Unit]
  Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
 +After=network.target
  
  [Service]
@@ -53,4 +55,3 @@ diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.
  
  [Install]
  Also=org.cups.cupsd.socket org.cups.cupsd.path
- WantedBy=printer.target