rpms/cups
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Start cups.service after network.target (bug #1153660).

Browse Source 
Resolves: rhbz#1153660
This commit is contained in:
Tim Waugh 2014-10-16 14:25:30 +01:00
parent 5b29618af3
commit a52574af07
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cups-systemd-socket.patch
View File

@ -1,4 +1,3 @@
diff -up cups-1.7.2/config.h.in.systemd-socket cups-1.7.2/config.h.in
--- cups-1.7.2/config.h.in.systemd-socket 2014-02-27 16:57:59.000000000 +0100 --- cups-1.7.2/config.h.in.systemd-socket 2014-02-27 16:57:59.000000000 +0100
+++ cups-1.7.2/config.h.in 2014-04-17 14:05:04.104472016 +0200 +++ cups-1.7.2/config.h.in 2014-04-17 14:05:04.104472016 +0200
@@ -451,6 +451,13 @@ @@ -451,6 +451,13 @@
@ -15,7 +14,6 @@ diff -up cups-1.7.2/config.h.in.systemd-socket cups-1.7.2/config.h.in
* Various scripting languages... * Various scripting languages...
*/ */
diff -up cups-1.7.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.7.2/config-scripts/cups-systemd.m4
--- cups-1.7.2/config-scripts/cups-systemd.m4.systemd-socket 2014-04-17 14:05:04.104472016 +0200 --- cups-1.7.2/config-scripts/cups-systemd.m4.systemd-socket 2014-04-17 14:05:04.104472016 +0200
+++ cups-1.7.2/config-scripts/cups-systemd.m4 2014-04-17 14:05:04.104472016 +0200 +++ cups-1.7.2/config-scripts/cups-systemd.m4 2014-04-17 14:05:04.104472016 +0200
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
@ -55,7 +53,6 @@ diff -up cups-1.7.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.7.2/con
+dnl +dnl
+dnl "$Id$" +dnl "$Id$"
+dnl +dnl
diff -up cups-1.7.2/configure.in.systemd-socket cups-1.7.2/configure.in
--- cups-1.7.2/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200 --- cups-1.7.2/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200
+++ cups-1.7.2/configure.in 2014-04-17 14:05:04.104472016 +0200 +++ cups-1.7.2/configure.in 2014-04-17 14:05:04.104472016 +0200
@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4) @@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
@ -76,7 +73,6 @@ diff -up cups-1.7.2/configure.in.systemd-socket cups-1.7.2/configure.in
desktop/cups.desktop desktop/cups.desktop
doc/help/ref-cups-files-conf.html doc/help/ref-cups-files-conf.html
doc/help/ref-cupsd-conf.html doc/help/ref-cupsd-conf.html
diff -up cups-1.7.2/cups/usersys.c.systemd-socket cups-1.7.2/cups/usersys.c
--- cups-1.7.2/cups/usersys.c.systemd-socket 2014-03-05 22:22:12.000000000 +0100 --- cups-1.7.2/cups/usersys.c.systemd-socket 2014-03-05 22:22:12.000000000 +0100
+++ cups-1.7.2/cups/usersys.c 2014-04-17 14:05:04.105472002 +0200 +++ cups-1.7.2/cups/usersys.c 2014-04-17 14:05:04.105472002 +0200
@@ -1050,7 +1050,7 @@ cups_read_client_conf( @@ -1050,7 +1050,7 @@ cups_read_client_conf(
@ -88,7 +84,6 @@ diff -up cups-1.7.2/cups/usersys.c.systemd-socket cups-1.7.2/cups/usersys.c
cups_server = CUPS_DEFAULT_DOMAINSOCKET; cups_server = CUPS_DEFAULT_DOMAINSOCKET;
else else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */ #endif /* CUPS_DEFAULT_DOMAINSOCKET */
diff -up cups-1.7.2/data/cups.path.in.systemd-socket cups-1.7.2/data/cups.path.in
--- cups-1.7.2/data/cups.path.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200 --- cups-1.7.2/data/cups.path.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200
+++ cups-1.7.2/data/cups.path.in 2014-04-17 14:05:04.105472002 +0200 +++ cups-1.7.2/data/cups.path.in 2014-04-17 14:05:04.105472002 +0200
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
@ -100,10 +95,9 @@ diff -up cups-1.7.2/data/cups.path.in.systemd-socket cups-1.7.2/data/cups.path.i
+ +
+[Install] +[Install]
+WantedBy=multi-user.target +WantedBy=multi-user.target
diff -up cups-1.7.2/data/cups.service.in.systemd-socket cups-1.7.2/data/cups.service.in --- cups-1.7.2/data/cups.service.in 2014-04-17 14:05:04.105472002 +0200
--- cups-1.7.2/data/cups.service.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200 +++ cups-1.7.5/data/cups.service.in 2014-10-16 14:14:52.829881779 +0100
+++ cups-1.7.2/data/cups.service.in 2014-04-17 14:05:04.105472002 +0200 @@ -0,0 +1,12 @@
@@ -0,0 +1,11 @@
+[Unit] +[Unit]
+Description=CUPS Printing Service +Description=CUPS Printing Service
+ +
@ -115,7 +109,7 @@ diff -up cups-1.7.2/data/cups.service.in.systemd-socket cups-1.7.2/data/cups.ser
+[Install] +[Install]
+Also=cups.socket cups.path +Also=cups.socket cups.path
+WantedBy=printer.target +WantedBy=printer.target
diff -up cups-1.7.2/data/cups.socket.in.systemd-socket cups-1.7.2/data/cups.socket.in +After=network.target
--- cups-1.7.2/data/cups.socket.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200 --- cups-1.7.2/data/cups.socket.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200
+++ cups-1.7.2/data/cups.socket.in 2014-04-17 14:05:04.105472002 +0200 +++ cups-1.7.2/data/cups.socket.in 2014-04-17 14:05:04.105472002 +0200
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
@ -127,7 +121,6 @@ diff -up cups-1.7.2/data/cups.socket.in.systemd-socket cups-1.7.2/data/cups.sock
+ +
+[Install] +[Install]
+WantedBy=sockets.target +WantedBy=sockets.target
diff -up cups-1.7.2/data/Makefile.systemd-socket cups-1.7.2/data/Makefile
--- cups-1.7.2/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200 --- cups-1.7.2/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7.2/data/Makefile 2014-04-17 14:05:04.106471988 +0200 +++ cups-1.7.2/data/Makefile 2014-04-17 14:05:04.106471988 +0200
@@ -100,6 +100,12 @@ install-data: @@ -100,6 +100,12 @@ install-data:
@ -153,7 +146,6 @@ diff -up cups-1.7.2/data/Makefile.systemd-socket cups-1.7.2/data/Makefile
# #
diff -up cups-1.7.2/Makedefs.in.systemd-socket cups-1.7.2/Makedefs.in
--- cups-1.7.2/Makedefs.in.systemd-socket 2014-04-17 14:05:04.092472182 +0200 --- cups-1.7.2/Makedefs.in.systemd-socket 2014-04-17 14:05:04.092472182 +0200
+++ cups-1.7.2/Makedefs.in 2014-04-17 14:05:04.106471988 +0200 +++ cups-1.7.2/Makedefs.in 2014-04-17 14:05:04.106471988 +0200
@@ -134,6 +134,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @@ -134,6 +134,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
@ -180,7 +172,6 @@ diff -up cups-1.7.2/Makedefs.in.systemd-socket cups-1.7.2/Makedefs.in
# #
diff -up cups-1.7.2/scheduler/client.h.systemd-socket cups-1.7.2/scheduler/client.h
--- cups-1.7.2/scheduler/client.h.systemd-socket 2013-08-02 00:23:18.000000000 +0200 --- cups-1.7.2/scheduler/client.h.systemd-socket 2013-08-02 00:23:18.000000000 +0200
+++ cups-1.7.2/scheduler/client.h 2014-04-17 14:05:04.106471988 +0200 +++ cups-1.7.2/scheduler/client.h 2014-04-17 14:05:04.106471988 +0200
@@ -79,6 +79,9 @@ typedef struct @@ -79,6 +79,9 @@ typedef struct
@ -193,7 +184,6 @@ diff -up cups-1.7.2/scheduler/client.h.systemd-socket cups-1.7.2/scheduler/clien
} cupsd_listener_t; } cupsd_listener_t;
diff -up cups-1.7.2/scheduler/listen.c.systemd-socket cups-1.7.2/scheduler/listen.c
--- cups-1.7.2/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200 --- cups-1.7.2/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7.2/scheduler/listen.c 2014-04-17 14:05:04.107471974 +0200 +++ cups-1.7.2/scheduler/listen.c 2014-04-17 14:05:04.107471974 +0200
@@ -401,7 +401,11 @@ cupsdStopListening(void) @@ -401,7 +401,11 @@ cupsdStopListening(void)
@ -209,7 +199,6 @@ diff -up cups-1.7.2/scheduler/listen.c.systemd-socket cups-1.7.2/scheduler/liste
{ {
#ifdef WIN32 #ifdef WIN32
closesocket(lis->fd); closesocket(lis->fd);
diff -up cups-1.7.2/scheduler/main.c.systemd-socket cups-1.7.2/scheduler/main.c
--- cups-1.7.2/scheduler/main.c.systemd-socket 2014-04-17 14:05:04.052472738 +0200 --- cups-1.7.2/scheduler/main.c.systemd-socket 2014-04-17 14:05:04.052472738 +0200
+++ cups-1.7.2/scheduler/main.c 2014-04-17 14:09:39.102634667 +0200 +++ cups-1.7.2/scheduler/main.c 2014-04-17 14:09:39.102634667 +0200
@@ -39,6 +39,10 @@ @@ -39,6 +39,10 @@
@ -379,7 +368,6 @@ diff -up cups-1.7.2/scheduler/main.c.systemd-socket cups-1.7.2/scheduler/main.c
/* /*
* 'parent_handler()' - Catch USR1/CHLD signals... * 'parent_handler()' - Catch USR1/CHLD signals...
diff -up cups-1.7.2/scheduler/Makefile.systemd-socket cups-1.7.2/scheduler/Makefile
--- cups-1.7.2/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200 --- cups-1.7.2/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7.2/scheduler/Makefile 2014-04-17 14:05:04.108471960 +0200 +++ cups-1.7.2/scheduler/Makefile 2014-04-17 14:05:04.108471960 +0200
@@ -381,7 +381,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu @@ -381,7 +381,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu

5
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7.5 Version: 1.7.5
Release: 9%{?dist} Release: 10%{?dist}
License: GPLv2 License: GPLv2
Url: http://www.cups.org/ Url: http://www.cups.org/
Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@ -684,6 +684,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Thu Oct 16 2014 Tim Waugh <twaugh@redhat.com> - 1:1.7.5-10
- Start cups.service after network.target (bug #1153660).
* Wed Oct 15 2014 Tim Waugh <twaugh@redhat.com> - 1:1.7.5-9 * Wed Oct 15 2014 Tim Waugh <twaugh@redhat.com> - 1:1.7.5-9
- Fix cupsGetPPD3() so it doesn't give the caller an unreadable file - Fix cupsGetPPD3() so it doesn't give the caller an unreadable file
(bug #1150917, STR #4500). (bug #1150917, STR #4500).