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

Make cups.service Type=notify (bug #1088918).

Browse Source
This commit is contained in:
Jiri Popelka 2014-04-17 16:59:54 +02:00
parent 5e0ad60bcb
commit 52c42a0a13
2 changed files with 66 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
cups-systemd-socket.patch
View File

@ -1,6 +1,6 @@
diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in diff -up cups-1.7.2/config.h.in.systemd-socket cups-1.7.2/config.h.in
--- cups-1.7rc1/config.h.in.systemd-socket 2013-05-29 13:51:34.000000000 +0200 --- cups-1.7.2/config.h.in.systemd-socket 2014-02-27 16:57:59.000000000 +0100
+++ cups-1.7rc1/config.h.in 2013-07-12 11:16:53.257546263 +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,9 +15,9 @@ diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in
* Various scripting languages... * Various scripting languages...
*/ */
diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/config-scripts/cups-systemd.m4 diff -up cups-1.7.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.7.2/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.7.2/config-scripts/cups-systemd.m4.systemd-socket 2014-04-17 14:05:04.104472016 +0200
+++ cups-1.7rc1/config-scripts/cups-systemd.m4 2013-07-12 11:16:53.257546263 +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 @@
+dnl +dnl
+dnl "$Id$" +dnl "$Id$"
@ -55,9 +55,9 @@ diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/c
+dnl +dnl
+dnl "$Id$" +dnl "$Id$"
+dnl +dnl
diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in diff -up cups-1.7.2/configure.in.systemd-socket cups-1.7.2/configure.in
--- cups-1.7rc1/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.7rc1/configure.in 2013-07-12 11:16:53.257546263 +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)
sinclude(config-scripts/cups-largefile.m4) sinclude(config-scripts/cups-largefile.m4)
sinclude(config-scripts/cups-dnssd.m4) sinclude(config-scripts/cups-dnssd.m4)
@ -76,10 +76,10 @@ diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/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.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c diff -up cups-1.7.2/cups/usersys.c.systemd-socket cups-1.7.2/cups/usersys.c
--- cups-1.7rc1/cups/usersys.c.systemd-socket 2013-07-10 16:08:39.000000000 +0200 --- cups-1.7.2/cups/usersys.c.systemd-socket 2014-03-05 22:22:12.000000000 +0100
+++ cups-1.7rc1/cups/usersys.c 2013-07-12 11:16:53.258546249 +0200 +++ cups-1.7.2/cups/usersys.c 2014-04-17 14:05:04.105472002 +0200
@@ -1046,7 +1046,7 @@ cups_read_client_conf( @@ -1050,7 +1050,7 @@ cups_read_client_conf(
struct stat sockinfo; /* Domain socket information */ struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
@ -88,9 +88,9 @@ diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/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.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path.in diff -up cups-1.7.2/data/cups.path.in.systemd-socket cups-1.7.2/data/cups.path.in
--- cups-1.7rc1/data/cups.path.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200 --- cups-1.7.2/data/cups.path.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200
+++ cups-1.7rc1/data/cups.path.in 2013-07-12 11:16:53.258546249 +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 @@
+[Unit] +[Unit]
+Description=CUPS Printer Service Spool +Description=CUPS Printer Service Spool
@ -100,23 +100,24 @@ diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path
+ +
+[Install] +[Install]
+WantedBy=multi-user.target +WantedBy=multi-user.target
diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.service.in diff -up cups-1.7.2/data/cups.service.in.systemd-socket cups-1.7.2/data/cups.service.in
--- cups-1.7rc1/data/cups.service.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200 --- cups-1.7.2/data/cups.service.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200
+++ cups-1.7rc1/data/cups.service.in 2013-07-12 11:16:53.258546249 +0200 +++ cups-1.7.2/data/cups.service.in 2014-04-17 14:05:04.105472002 +0200
@@ -0,0 +1,10 @@ @@ -0,0 +1,11 @@
+[Unit] +[Unit]
+Description=CUPS Printing Service +Description=CUPS Printing Service
+ +
+[Service] +[Service]
+Type=notify
+ExecStart=@sbindir@/cupsd -f +ExecStart=@sbindir@/cupsd -f
+PrivateTmp=true +PrivateTmp=true
+ +
+[Install] +[Install]
+Also=cups.socket cups.path +Also=cups.socket cups.path
+WantedBy=printer.target +WantedBy=printer.target
diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in diff -up cups-1.7.2/data/cups.socket.in.systemd-socket cups-1.7.2/data/cups.socket.in
--- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200 --- cups-1.7.2/data/cups.socket.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200
+++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +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 @@
+[Unit] +[Unit]
+Description=CUPS Printing Service Sockets +Description=CUPS Printing Service Sockets
@ -126,9 +127,9 @@ diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.so
+ +
+[Install] +[Install]
+WantedBy=sockets.target +WantedBy=sockets.target
diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile diff -up cups-1.7.2/data/Makefile.systemd-socket cups-1.7.2/data/Makefile
--- cups-1.7rc1/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.7rc1/data/Makefile 2013-07-12 11:16:53.259546235 +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:
$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \ $(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
done done
@ -152,9 +153,9 @@ 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 diff -up cups-1.7.2/Makedefs.in.systemd-socket cups-1.7.2/Makedefs.in
--- cups-1.7rc1/Makedefs.in.systemd-socket 2013-07-12 11:16:53.246546416 +0200 --- cups-1.7.2/Makedefs.in.systemd-socket 2014-04-17 14:05:04.092472182 +0200
+++ cups-1.7rc1/Makedefs.in 2013-07-12 11:17:49.327768742 +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@
CXXLIBS = @CXXLIBS@ CXXLIBS = @CXXLIBS@
DBUS_NOTIFIER = @DBUS_NOTIFIER@ DBUS_NOTIFIER = @DBUS_NOTIFIER@
@ -171,7 +172,7 @@ diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
-L../scheduler @LDARCHFLAGS@ \ -L../scheduler @LDARCHFLAGS@ \
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
@@ -231,6 +233,7 @@ PAMFILE = @PAMFILE@ @@ -232,6 +234,7 @@ PAMFILE = @PAMFILE@
DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@ DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@
DBUSDIR = @DBUSDIR@ DBUSDIR = @DBUSDIR@
@ -179,10 +180,10 @@ 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 diff -up cups-1.7.2/scheduler/client.h.systemd-socket cups-1.7.2/scheduler/client.h
--- cups-1.7rc1/scheduler/client.h.systemd-socket 2013-05-29 13:51:34.000000000 +0200 --- cups-1.7.2/scheduler/client.h.systemd-socket 2013-08-02 00:23:18.000000000 +0200
+++ cups-1.7rc1/scheduler/client.h 2013-07-12 11:16:53.260546222 +0200 +++ cups-1.7.2/scheduler/client.h 2014-04-17 14:05:04.106471988 +0200
@@ -77,6 +77,9 @@ typedef struct @@ -79,6 +79,9 @@ typedef struct
int fd; /* File descriptor for this server */ int fd; /* File descriptor for this server */
http_addr_t address; /* Bind address of socket */ http_addr_t address; /* Bind address of socket */
http_encryption_t encryption; /* To encrypt or not to encrypt... */ http_encryption_t encryption; /* To encrypt or not to encrypt... */
@ -192,9 +193,9 @@ diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/cli
} cupsd_listener_t; } cupsd_listener_t;
diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/listen.c diff -up cups-1.7.2/scheduler/listen.c.systemd-socket cups-1.7.2/scheduler/listen.c
--- cups-1.7rc1/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.7rc1/scheduler/listen.c 2013-07-12 11:16:53.260546222 +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)
lis; lis;
lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
@ -208,10 +209,10 @@ diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/lis
{ {
#ifdef WIN32 #ifdef WIN32
closesocket(lis->fd); closesocket(lis->fd);
diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c diff -up cups-1.7.2/scheduler/main.c.systemd-socket cups-1.7.2/scheduler/main.c
--- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200 --- cups-1.7.2/scheduler/main.c.systemd-socket 2014-04-17 14:05:04.052472738 +0200
+++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200 +++ cups-1.7.2/scheduler/main.c 2014-04-17 14:09:39.102634667 +0200
@@ -62,6 +64,10 @@ @@ -39,6 +39,10 @@
# endif /* !LAUNCH_JOBKEY_SERVICEIPC */ # endif /* !LAUNCH_JOBKEY_SERVICEIPC */
#endif /* HAVE_LAUNCH_H */ #endif /* HAVE_LAUNCH_H */
@ -222,7 +223,7 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
# include <malloc.h> # include <malloc.h>
#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
@@ -83,6 +89,9 @@ @@ -64,6 +68,9 @@
static void launchd_checkin(void); static void launchd_checkin(void);
static void launchd_checkout(void); static void launchd_checkout(void);
#endif /* HAVE_LAUNCHD */ #endif /* HAVE_LAUNCHD */
@ -232,7 +233,7 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
static void parent_handler(int sig); static void parent_handler(int sig);
static void process_children(void); static void process_children(void);
static void sigchld_handler(int sig); static void sigchld_handler(int sig);
@@ -574,6 +583,13 @@ main(int argc, /* I - Number of comm @@ -563,6 +570,13 @@ main(int argc, /* I - Number of comm
} }
#endif /* HAVE_LAUNCHD */ #endif /* HAVE_LAUNCHD */
@ -246,7 +247,20 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
/* /*
* Startup the server... * Startup the server...
*/ */
@@ -762,6 +778,15 @@ main(int argc, /* I - Number of comm @@ -654,6 +668,12 @@ main(int argc, /* I - Number of comm
"Scheduler started via launchd.");
else
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_SYSTEMD
+ sd_notifyf(0, "READY=1\n"
+ "STATUS=Scheduler is running...\n"
+ "MAINPID=%lu",
+ (unsigned long) getpid());
+#endif /* HAVE_SYSTEMD */
if (fg)
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
"Scheduler started in foreground.");
@@ -751,6 +771,15 @@ main(int argc, /* I - Number of comm
} }
#endif /* HAVE_LAUNCHD */ #endif /* HAVE_LAUNCHD */
@ -262,7 +276,7 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
/* /*
* Startup the server... * Startup the server...
*/ */
@@ -1511,6 +1536,102 @@ launchd_checkout(void) @@ -1500,6 +1529,102 @@ launchd_checkout(void)
} }
#endif /* HAVE_LAUNCHD */ #endif /* HAVE_LAUNCHD */
@ -365,9 +379,9 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
/* /*
* 'parent_handler()' - Catch USR1/CHLD signals... * 'parent_handler()' - Catch USR1/CHLD signals...
diff -up cups-1.7rc1/scheduler/Makefile.systemd-socket cups-1.7rc1/scheduler/Makefile diff -up cups-1.7.2/scheduler/Makefile.systemd-socket cups-1.7.2/scheduler/Makefile
--- cups-1.7rc1/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.7rc1/scheduler/Makefile 2013-07-12 11:16:53.261546208 +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
$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \

5
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7.2 Version: 1.7.2
Release: 1%{?dist} Release: 2%{?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
@ -667,6 +667,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Thu Apr 17 2014 Jiri Popelka <jpopelka@redhat.com> - 1:1.7.2-2
- Make cups.service Type=notify (bug #1088918).
* Mon Apr 14 2014 Jiri Popelka <jpopelka@redhat.com> - 1:1.7.2-1 * Mon Apr 14 2014 Jiri Popelka <jpopelka@redhat.com> - 1:1.7.2-1
- 1.7.2 - 1.7.2