[cups/f20] Start cups.service after network.target (bug #1153660).
Tim Waugh
twaugh at fedoraproject.org
Thu Oct 16 13:47:38 UTC 2014
commit 088161376a2863853282df420222ef9205ec7f6b
Author: Tim Waugh <twaugh at redhat.com>
Date: Thu Oct 16 14:25:30 2014 +0100
Start cups.service after network.target (bug #1153660).
Resolves: rhbz#1153660
(cherry picked from commit a52574af07ff039fa4d3336c6042325e00a19975)
cups-systemd-socket.patch | 20 ++++----------------
cups.spec | 5 ++++-
2 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 8199de0..15858d3 100644
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,4 +1,3 @@
-diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in
--- cups-1.7rc1/config.h.in.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7rc1/config.h.in 2013-07-12 11:16:53.257546263 +0200
@@ -451,6 +451,13 @@
@@ -15,7 +14,6 @@ diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in
* Various scripting languages...
*/
-diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/config-scripts/cups-systemd.m4
--- cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket 2013-07-12 11:16:53.257546263 +0200
+++ cups-1.7rc1/config-scripts/cups-systemd.m4 2013-07-12 11:16:53.257546263 +0200
@@ -0,0 +1,36 @@
@@ -55,7 +53,6 @@ diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/c
+dnl
+dnl "$Id$"
+dnl
-diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in
--- cups-1.7rc1/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200
+++ cups-1.7rc1/configure.in 2013-07-12 11:16:53.257546263 +0200
@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
@@ -76,7 +73,6 @@ diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in
desktop/cups.desktop
doc/help/ref-cups-files-conf.html
doc/help/ref-cupsd-conf.html
-diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c
--- cups-1.7rc1/cups/usersys.c.systemd-socket 2013-07-10 16:08:39.000000000 +0200
+++ cups-1.7rc1/cups/usersys.c 2013-07-12 11:16:53.258546249 +0200
@@ -1046,7 +1046,7 @@ cups_read_client_conf(
@@ -88,7 +84,6 @@ diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c
cups_server = CUPS_DEFAULT_DOMAINSOCKET;
else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path.in
--- cups-1.7rc1/data/cups.path.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
+++ cups-1.7rc1/data/cups.path.in 2013-07-12 11:16:53.258546249 +0200
@@ -0,0 +1,8 @@
@@ -100,10 +95,9 @@ diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path
+
+[Install]
+WantedBy=multi-user.target
-diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.service.in
---- cups-1.7rc1/data/cups.service.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
-+++ cups-1.7rc1/data/cups.service.in 2013-07-12 11:16:53.258546249 +0200
-@@ -0,0 +1,10 @@
+--- cups-1.7rc1/data/cups.service.in 2013-07-12 11:16:53.258546249 +0200
++++ cups-1.7.5/data/cups.service.in 2014-10-16 14:14:52.829881779 +0100
+@@ -0,0 +1,11 @@
+[Unit]
+Description=CUPS Printing Service
+
@@ -114,7 +108,7 @@ diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.s
+[Install]
+Also=cups.socket cups.path
+WantedBy=printer.target
-diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in
++After=network.target
--- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200
+++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +0200
@@ -0,0 +1,8 @@
@@ -126,7 +120,6 @@ diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.so
+
+[Install]
+WantedBy=sockets.target
-diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile
--- cups-1.7rc1/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7rc1/data/Makefile 2013-07-12 11:16:53.259546235 +0200
@@ -100,6 +100,12 @@ install-data:
@@ -152,7 +145,6 @@ diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile
#
-diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
--- cups-1.7rc1/Makedefs.in.systemd-socket 2013-07-12 11:16:53.246546416 +0200
+++ cups-1.7rc1/Makedefs.in 2013-07-12 11:17:49.327768742 +0200
@@ -134,6 +134,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
@@ -179,7 +171,6 @@ diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
#
-diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/client.h
--- cups-1.7rc1/scheduler/client.h.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7rc1/scheduler/client.h 2013-07-12 11:16:53.260546222 +0200
@@ -77,6 +77,9 @@ typedef struct
@@ -192,7 +183,6 @@ diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/cli
} cupsd_listener_t;
-diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/listen.c
--- cups-1.7rc1/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7rc1/scheduler/listen.c 2013-07-12 11:16:53.260546222 +0200
@@ -401,7 +401,11 @@ cupsdStopListening(void)
@@ -208,7 +198,6 @@ diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/lis
{
#ifdef WIN32
closesocket(lis->fd);
-diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c
--- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200
+++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200
@@ -62,6 +64,10 @@
@@ -365,7 +354,6 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
/*
* 'parent_handler()' - Catch USR1/CHLD signals...
-diff -up cups-1.7rc1/scheduler/Makefile.systemd-socket cups-1.7rc1/scheduler/Makefile
--- cups-1.7rc1/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7rc1/scheduler/Makefile 2013-07-12 11:16:53.261546208 +0200
@@ -381,7 +381,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu
diff --git a/cups.spec b/cups.spec
index d00bdab..e0d0f55 100644
--- a/cups.spec
+++ b/cups.spec
@@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups
Epoch: 1
Version: 1.7.5
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2
Url: http://www.cups.org/
Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@@ -653,6 +653,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
+* Thu Oct 16 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-8
+- Start cups.service after network.target (bug #1153660).
+
* Wed Oct 15 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-7
- Fix cupsGetPPD3() so it doesn't give the caller an unreadable file
(bug #1150917, STR #4500).
More information about the scm-commits
mailing list