From 24d583ff4c76c62e1b4f1414123b116c24884074 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 19 Sep 2018 11:59:44 +0200 Subject: [PATCH] 1618018 - Make cups systemd unit files more upstream-like --- cups-systemd-socket.patch | 48 +++++++++++++++++++++++++++++---------- cups.spec | 8 +++++-- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch index 44228ee..cacd19f 100644 --- a/cups-systemd-socket.patch +++ b/cups-systemd-socket.patch @@ -1,6 +1,6 @@ diff -up cups-2.2.8/scheduler/main.c.systemd-socket cups-2.2.8/scheduler/main.c --- cups-2.2.8/scheduler/main.c.systemd-socket 2018-06-05 18:06:54.000000000 +0200 -+++ cups-2.2.8/scheduler/main.c 2018-06-08 17:32:39.417600671 +0200 ++++ cups-2.2.8/scheduler/main.c 2018-09-19 10:38:09.285892238 +0200 @@ -681,8 +681,16 @@ main(int argc, /* I - Number of comm #ifdef HAVE_ONDEMAND @@ -21,20 +21,19 @@ diff -up cups-2.2.8/scheduler/main.c.systemd-socket cups-2.2.8/scheduler/main.c cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground."); diff -up cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.path.in --- cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket 2018-06-05 18:06:54.000000000 +0200 -+++ cups-2.2.8/scheduler/org.cups.cupsd.path.in 2018-06-08 17:32:39.417600671 +0200 -@@ -3,7 +3,7 @@ Description=CUPS Scheduler - PartOf=org.cups.cupsd.service ++++ cups-2.2.8/scheduler/org.cups.cupsd.path.in 2018-09-19 10:46:11.246666713 +0200 +@@ -1,6 +1,6 @@ + [Unit] + Description=CUPS Scheduler +-PartOf=org.cups.cupsd.service ++PartOf=cups.service [Path] --PathExists=@CUPS_CACHEDIR@/org.cups.cupsd -+PathExistsGlob=@CUPS_REQUESTS@/d* - - [Install] - WantedBy=multi-user.target + PathExists=@CUPS_CACHEDIR@/org.cups.cupsd diff -up cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.service.in ---- cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket 2018-06-08 17:32:39.417600671 +0200 -+++ cups-2.2.8/scheduler/org.cups.cupsd.service.in 2018-06-08 17:34:09.091888847 +0200 -@@ -1,10 +1,11 @@ +--- cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket 2018-06-05 18:06:54.000000000 +0200 ++++ cups-2.2.8/scheduler/org.cups.cupsd.service.in 2018-09-19 10:41:11.378295760 +0200 +@@ -1,12 +1,13 @@ [Unit] Description=CUPS Scheduler Documentation=man:cupsd(8) @@ -47,3 +46,28 @@ diff -up cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2. Restart=on-failure [Install] +-Also=org.cups.cupsd.socket org.cups.cupsd.path ++Also=cups.socket cups.path + WantedBy=printer.target +diff -up cups-2.2.8/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.socket.in +--- cups-2.2.8/scheduler/org.cups.cupsd.socket.in.systemd-socket 2018-09-19 10:42:21.411681757 +0200 ++++ cups-2.2.8/scheduler/org.cups.cupsd.socket.in 2018-09-19 10:42:44.819476530 +0200 +@@ -1,6 +1,6 @@ + [Unit] + Description=CUPS Scheduler +-PartOf=org.cups.cupsd.service ++PartOf=cups.service + + [Socket] + ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ +diff -up cups-2.2.8/scheduler/org.cups.cups-lpd.socket.systemd-socket cups-2.2.8/scheduler/org.cups.cups-lpd.socket +--- cups-2.2.8/scheduler/org.cups.cups-lpd.socket.systemd-socket 2018-09-19 10:53:59.222563802 +0200 ++++ cups-2.2.8/scheduler/org.cups.cups-lpd.socket 2018-09-19 10:54:16.483412464 +0200 +@@ -1,6 +1,6 @@ + [Unit] + Description=CUPS LPD Server Socket +-PartOf=org.cups.cups-lpd.service ++PartOf=cups-lpd.service + + [Socket] + ListenStream=515 diff --git a/cups.spec b/cups.spec index 19a2301..e2413e2 100644 --- a/cups.spec +++ b/cups.spec @@ -15,7 +15,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 2.2.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ with exceptions and AML Url: http://www.cups.org/ Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz @@ -65,7 +65,8 @@ Patch22: cups-hp-deviceid-oid.patch # same as HP OID Patch24: cups-ricoh-deviceid-oid.patch # change to notify type, because when it fails to start, it gives a error -# message +# message + renaming org.cups.cupsd names, because we have cups units in +# in older Fedoras Patch25: cups-systemd-socket.patch # use IP_FREEBIND, because cupsd cannot bind to not yet existing IP address # by default @@ -740,6 +741,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Wed Sep 19 2018 Zdenek Dohnal - 1:2.2.8-4 +- 1618018 - Make cups systemd unit files more upstream-like + * Tue Jul 24 2018 Zdenek Dohnal - 1:2.2.8-3 - correcting license