|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in
|
|
|
|
|
--- cups-1.6b1/config.h.in.systemd-socket 2012-05-17 00:57:03.000000000 +0200
|
|
|
|
|
+++ cups-1.6b1/config.h.in 2012-05-28 11:16:35.657250584 +0200
|
|
|
|
|
@@ -506,6 +506,13 @@
|
|
|
|
|
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,9 +15,9 @@ diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in
|
|
|
|
|
* Various scripting languages...
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4
|
|
|
|
|
--- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket 2012-05-28 11:16:35.658250577 +0200
|
|
|
|
|
+++ cups-1.6b1/config-scripts/cups-systemd.m4 2012-05-28 11:16:35.658250577 +0200
|
|
|
|
|
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 @@
|
|
|
|
|
+dnl
|
|
|
|
|
+dnl "$Id$"
|
|
|
|
@ -55,9 +55,9 @@ diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/con
|
|
|
|
|
+dnl
|
|
|
|
|
+dnl "$Id$"
|
|
|
|
|
+dnl
|
|
|
|
|
diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in
|
|
|
|
|
--- cups-1.6b1/configure.in.systemd-socket 2012-04-23 19:26:57.000000000 +0200
|
|
|
|
|
+++ cups-1.6b1/configure.in 2012-05-28 11:16:35.658250577 +0200
|
|
|
|
|
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)
|
|
|
|
|
sinclude(config-scripts/cups-largefile.m4)
|
|
|
|
|
sinclude(config-scripts/cups-dnssd.m4)
|
|
|
|
@ -66,20 +66,20 @@ diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in
|
|
|
|
|
sinclude(config-scripts/cups-defaults.m4)
|
|
|
|
|
sinclude(config-scripts/cups-scripting.m4)
|
|
|
|
|
|
|
|
|
|
@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs
|
|
|
|
|
@@ -67,6 +68,9 @@ AC_OUTPUT(Makedefs
|
|
|
|
|
conf/snmp.conf
|
|
|
|
|
cups-config
|
|
|
|
|
data/testprint
|
|
|
|
|
+ data/cups.service
|
|
|
|
|
+ data/cups.socket
|
|
|
|
|
+ data/cups.path
|
|
|
|
|
+ data/cups.service
|
|
|
|
|
+ data/cups.socket
|
|
|
|
|
+ data/cups.path
|
|
|
|
|
desktop/cups.desktop
|
|
|
|
|
doc/help/ref-cups-files-conf.html
|
|
|
|
|
doc/help/ref-cupsd-conf.html
|
|
|
|
|
doc/help/standard.html
|
|
|
|
|
diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c
|
|
|
|
|
--- cups-1.6b1/cups/usersys.c.systemd-socket 2012-04-23 19:26:57.000000000 +0200
|
|
|
|
|
+++ cups-1.6b1/cups/usersys.c 2012-05-28 11:16:35.659250570 +0200
|
|
|
|
|
@@ -975,7 +975,7 @@ cups_read_client_conf(
|
|
|
|
|
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(
|
|
|
|
|
struct stat sockinfo; /* Domain socket information */
|
|
|
|
|
|
|
|
|
|
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
|
|
|
|
@ -88,9 +88,9 @@ diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c
|
|
|
|
|
cups_server = CUPS_DEFAULT_DOMAINSOCKET;
|
|
|
|
|
else
|
|
|
|
|
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
|
|
|
|
|
diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in
|
|
|
|
|
--- cups-1.6b1/data/cups.path.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200
|
|
|
|
|
+++ cups-1.6b1/data/cups.path.in 2012-05-28 11:16:35.659250570 +0200
|
|
|
|
|
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 @@
|
|
|
|
|
+[Unit]
|
|
|
|
|
+Description=CUPS Printer Service Spool
|
|
|
|
@ -100,9 +100,9 @@ diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.i
|
|
|
|
|
+
|
|
|
|
|
+[Install]
|
|
|
|
|
+WantedBy=multi-user.target
|
|
|
|
|
diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in
|
|
|
|
|
--- cups-1.6b1/data/cups.service.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200
|
|
|
|
|
+++ cups-1.6b1/data/cups.service.in 2012-05-28 11:16:35.659250570 +0200
|
|
|
|
|
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 @@
|
|
|
|
|
+[Unit]
|
|
|
|
|
+Description=CUPS Printing Service
|
|
|
|
@ -114,21 +114,23 @@ diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.ser
|
|
|
|
|
+[Install]
|
|
|
|
|
+Also=cups.socket cups.path
|
|
|
|
|
+WantedBy=printer.target
|
|
|
|
|
diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in
|
|
|
|
|
--- cups-1.6b1/data/cups.socket.in.systemd-socket 2012-05-28 11:16:35.660250563 +0200
|
|
|
|
|
+++ cups-1.6b1/data/cups.socket.in 2012-05-28 11:16:35.660250563 +0200
|
|
|
|
|
@@ -0,0 +1,8 @@
|
|
|
|
|
diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in
|
|
|
|
|
--- 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,10 @@
|
|
|
|
|
+[Unit]
|
|
|
|
|
+Description=CUPS Printing Service Sockets
|
|
|
|
|
+
|
|
|
|
|
+[Socket]
|
|
|
|
|
+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
|
|
|
|
|
+ListenStream=@DEFAULT_IPP_PORT@
|
|
|
|
|
+BindIPv6Only=ipv6-only
|
|
|
|
|
+
|
|
|
|
|
+[Install]
|
|
|
|
|
+WantedBy=sockets.target
|
|
|
|
|
diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile
|
|
|
|
|
--- cups-1.6b1/data/Makefile.systemd-socket 2011-08-27 11:23:01.000000000 +0200
|
|
|
|
|
+++ cups-1.6b1/data/Makefile 2012-05-28 11:16:35.660250563 +0200
|
|
|
|
|
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:
|
|
|
|
|
$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
|
|
|
|
|
done
|
|
|
|
@ -152,10 +154,10 @@ diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
|
|
|
|
|
--- cups-1.6b1/Makedefs.in.systemd-socket 2012-05-28 11:16:35.648250647 +0200
|
|
|
|
|
+++ cups-1.6b1/Makedefs.in 2012-05-28 11:16:35.660250563 +0200
|
|
|
|
|
@@ -134,11 +134,13 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
|
|
|
|
|
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@
|
|
|
|
|
CXXLIBS = @CXXLIBS@
|
|
|
|
|
DBUS_NOTIFIER = @DBUS_NOTIFIER@
|
|
|
|
|
DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@
|
|
|
|
@ -163,13 +165,15 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
|
|
|
|
|
DNSSD_BACKEND = @DNSSD_BACKEND@
|
|
|
|
|
DSOFLAGS = -L../cups @DSOFLAGS@
|
|
|
|
|
DSOLIBS = @DSOLIBS@ $(COMMONLIBS)
|
|
|
|
|
DNSSDLIBS = @DNSSDLIBS@
|
|
|
|
|
@@ -141,6 +142,7 @@ DNSSDLIBS = @DNSSDLIBS@
|
|
|
|
|
IPPFIND_BIN = @IPPFIND_BIN@
|
|
|
|
|
IPPFIND_MAN = @IPPFIND_MAN@
|
|
|
|
|
LAUNCHDLIBS = @LAUNCHDLIBS@
|
|
|
|
|
+SDLIBS = @SDLIBS@
|
|
|
|
|
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
|
|
|
|
|
-L../scheduler @LDARCHFLAGS@ \
|
|
|
|
|
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
|
|
|
|
|
@@ -229,6 +231,7 @@ PAMFILE = @PAMFILE@
|
|
|
|
|
@@ -231,6 +233,7 @@ PAMFILE = @PAMFILE@
|
|
|
|
|
|
|
|
|
|
DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@
|
|
|
|
|
DBUSDIR = @DBUSDIR@
|
|
|
|
@ -177,9 +181,9 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h
|
|
|
|
|
--- cups-1.6b1/scheduler/client.h.systemd-socket 2012-03-22 21:30:20.000000000 +0100
|
|
|
|
|
+++ cups-1.6b1/scheduler/client.h 2012-05-28 11:16:35.661250556 +0200
|
|
|
|
|
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
|
|
|
|
|
int fd; /* File descriptor for this server */
|
|
|
|
|
http_addr_t address; /* Bind address of socket */
|
|
|
|
@ -190,9 +194,9 @@ diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/clien
|
|
|
|
|
} cupsd_listener_t;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c
|
|
|
|
|
--- cups-1.6b1/scheduler/listen.c.systemd-socket 2011-04-16 01:38:13.000000000 +0200
|
|
|
|
|
+++ cups-1.6b1/scheduler/listen.c 2012-05-28 11:16:35.661250556 +0200
|
|
|
|
|
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)
|
|
|
|
|
lis;
|
|
|
|
|
lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
|
|
|
|
@ -206,9 +210,9 @@ diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/liste
|
|
|
|
|
{
|
|
|
|
|
#ifdef WIN32
|
|
|
|
|
closesocket(lis->fd);
|
|
|
|
|
diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
|
|
|
|
|
--- cups-1.6b1/scheduler/main.c.systemd-socket 2012-05-28 11:16:35.612250897 +0200
|
|
|
|
|
+++ cups-1.6b1/scheduler/main.c 2012-05-28 12:49:32.698375139 +0200
|
|
|
|
|
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
|
|
|
|
|
@@ -26,6 +26,8 @@
|
|
|
|
|
* launchd_checkin() - Check-in with launchd and collect the listening
|
|
|
|
|
* fds.
|
|
|
|
@ -229,7 +233,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
|
|
|
|
|
#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
|
|
|
|
|
# include <malloc.h>
|
|
|
|
|
#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
|
|
|
|
|
@@ -78,6 +84,9 @@
|
|
|
|
|
@@ -83,6 +89,9 @@
|
|
|
|
|
static void launchd_checkin(void);
|
|
|
|
|
static void launchd_checkout(void);
|
|
|
|
|
#endif /* HAVE_LAUNCHD */
|
|
|
|
@ -239,7 +243,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
|
|
|
|
|
static void parent_handler(int sig);
|
|
|
|
|
static void process_children(void);
|
|
|
|
|
static void sigchld_handler(int sig);
|
|
|
|
|
@@ -528,6 +537,13 @@ main(int argc, /* I - Number of comm
|
|
|
|
|
@@ -574,6 +583,13 @@ main(int argc, /* I - Number of comm
|
|
|
|
|
}
|
|
|
|
|
#endif /* HAVE_LAUNCHD */
|
|
|
|
|
|
|
|
|
@ -253,7 +257,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
|
|
|
|
|
/*
|
|
|
|
|
* Startup the server...
|
|
|
|
|
*/
|
|
|
|
|
@@ -738,6 +754,15 @@ main(int argc, /* I - Number of comm
|
|
|
|
|
@@ -762,6 +778,15 @@ main(int argc, /* I - Number of comm
|
|
|
|
|
}
|
|
|
|
|
#endif /* HAVE_LAUNCHD */
|
|
|
|
|
|
|
|
|
@ -269,7 +273,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
|
|
|
|
|
/*
|
|
|
|
|
* Startup the server...
|
|
|
|
|
*/
|
|
|
|
|
@@ -1516,6 +1541,102 @@ launchd_checkout(void)
|
|
|
|
|
@@ -1511,6 +1536,102 @@ launchd_checkout(void)
|
|
|
|
|
}
|
|
|
|
|
#endif /* HAVE_LAUNCHD */
|
|
|
|
|
|
|
|
|
@ -372,10 +376,10 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* 'parent_handler()' - Catch USR1/CHLD signals...
|
|
|
|
|
diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile
|
|
|
|
|
--- cups-1.6b1/scheduler/Makefile.systemd-socket 2012-05-21 19:40:22.000000000 +0200
|
|
|
|
|
+++ cups-1.6b1/scheduler/Makefile 2012-05-28 11:16:35.663250542 +0200
|
|
|
|
|
@@ -371,7 +371,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu
|
|
|
|
|
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
|
|
|
|
|
$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
|
|
|
|
|
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
|
|
|
|
|
$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
|
|
|
|
@ -384,7 +388,7 @@ diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makef
|
|
|
|
|
|
|
|
|
|
cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
|
|
|
|
|
echo Linking $@...
|
|
|
|
|
@@ -379,7 +379,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a
|
|
|
|
|
@@ -389,7 +389,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a
|
|
|
|
|
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
|
|
|
|
|
../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
|
|
|
|
|
$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
|