cups/cups-systemd-socket.patch

396 lines
12 KiB
Diff
Raw Normal View History

2012-08-08 11:28:28 +00:00
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 @@
/*
+ * Do we have systemd support?
+ */
+
+#undef HAVE_SYSTEMD
+
+
+/*
* Various scripting languages...
*/
2012-08-08 11:28:28 +00:00
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
@@ -0,0 +1,36 @@
2011-07-04 20:04:49 +00:00
+dnl
+dnl "$Id$"
+dnl
+dnl systemd stuff for CUPS.
+
+dnl Find whether systemd is available
+
+SDLIBS=""
2011-07-04 20:04:49 +00:00
+AC_ARG_WITH([systemdsystemunitdir],
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
+if test "x$with_systemdsystemunitdir" != xno; then
+ AC_MSG_CHECKING(for libsystemd-daemon)
+ if $PKGCONFIG --exists libsystemd-daemon; then
+ AC_MSG_RESULT(yes)
+ SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
+ SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+ AC_DEFINE(HAVE_SYSTEMD)
+ else
+ AC_MSG_RESULT(no)
+ fi
2011-07-04 20:04:49 +00:00
+fi
+
+if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then
+ SYSTEMD_UNITS="cups.service cups.socket cups.path"
+else
+ SYSTEMD_UNITS=""
+fi
+
+AC_SUBST(SYSTEMD_UNITS)
+AC_SUBST(SDLIBS)
2011-07-04 20:04:49 +00:00
+
+dnl
+dnl "$Id$"
+dnl
2012-08-08 11:28:28 +00:00
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
@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
2011-07-04 20:04:49 +00:00
sinclude(config-scripts/cups-largefile.m4)
sinclude(config-scripts/cups-dnssd.m4)
sinclude(config-scripts/cups-launchd.m4)
+sinclude(config-scripts/cups-systemd.m4)
sinclude(config-scripts/cups-defaults.m4)
sinclude(config-scripts/cups-scripting.m4)
2012-08-08 11:28:28 +00:00
@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs
2011-07-04 20:04:49 +00:00
conf/snmp.conf
cups-config
data/testprint
+ data/cups.service
+ data/cups.socket
+ data/cups.path
desktop/cups.desktop
doc/help/ref-cupsd-conf.html
doc/help/standard.html
2012-08-08 11:28:28 +00:00
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(
struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
- (sockinfo.st_mode & S_IRWXO) == S_IRWXO)
+ (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
cups_server = CUPS_DEFAULT_DOMAINSOCKET;
else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
2012-08-08 11:28:28 +00:00
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
2011-07-04 20:04:49 +00:00
@@ -0,0 +1,8 @@
+[Unit]
+Description=CUPS Printer Service Spool
+
+[Path]
+PathExistsGlob=@CUPS_REQUESTS@/d*
2011-07-04 20:04:49 +00:00
+
+[Install]
+WantedBy=multi-user.target
2012-08-08 11:28:28 +00:00
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
@@ -0,0 +1,10 @@
2011-07-04 20:04:49 +00:00
+[Unit]
+Description=CUPS Printing Service
+
+[Service]
+ExecStart=@sbindir@/cupsd -f
+PrivateTmp=true
2011-07-04 20:04:49 +00:00
+
+[Install]
+Also=cups.socket cups.path
+WantedBy=printer.target
2012-08-08 11:28:28 +00:00
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 @@
2011-07-04 20:04:49 +00:00
+[Unit]
+Description=CUPS Printing Service Sockets
+
+[Socket]
+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
+
+[Install]
+WantedBy=sockets.target
2012-08-08 11:28:28 +00:00
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
@@ -100,6 +100,12 @@ install-data:
2011-08-05 14:11:04 +00:00
$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
done
$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
+ if test "x$(SYSTEMD_UNITS)" != "x" ; then \
+ $(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \
+ for file in $(SYSTEMD_UNITS); do \
+ $(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \
+ done; \
+ fi
2011-07-04 20:04:49 +00:00
#
2012-08-08 11:28:28 +00:00
@@ -143,6 +149,9 @@ uninstall:
-$(RMDIR) $(DATADIR)/data
2011-08-05 14:11:04 +00:00
-$(RMDIR) $(DATADIR)/banners
-$(RMDIR) $(DATADIR)
+ for file in $(SYSTEMD_UNITS); do \
+ $(RM) $(SYSTEMDUNITDIR)/$$file; \
+ done
2011-07-04 20:04:49 +00:00
#
2012-08-08 11:28:28 +00:00
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@
2011-08-05 14:11:04 +00:00
CXXLIBS = @CXXLIBS@
DBUS_NOTIFIER = @DBUS_NOTIFIER@
DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@
+SYSTEMD_UNITS = @SYSTEMD_UNITS@
DNSSD_BACKEND = @DNSSD_BACKEND@
DSOFLAGS = -L../cups @DSOFLAGS@
DSOLIBS = @DSOLIBS@ $(COMMONLIBS)
2012-08-08 11:28:28 +00:00
DNSSDLIBS = @DNSSDLIBS@
LAUNCHDLIBS = @LAUNCHDLIBS@
+SDLIBS = @SDLIBS@
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
-L../scheduler @LDARCHFLAGS@ \
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
2012-08-08 11:28:28 +00:00
@@ -229,6 +231,7 @@ PAMFILE = @PAMFILE@
2011-07-04 20:04:49 +00:00
2011-08-05 14:11:04 +00:00
DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@
DBUSDIR = @DBUSDIR@
+SYSTEMDUNITDIR = $(BUILDROOT)@systemdsystemunitdir@
#
2012-08-08 11:28:28 +00:00
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
@@ -77,6 +77,9 @@ typedef struct
int fd; /* File descriptor for this server */
http_addr_t address; /* Bind address of socket */
http_encryption_t encryption; /* To encrypt or not to encrypt... */
+#ifdef HAVE_SYSTEMD
+ int is_systemd; /* Is this a systemd socket? */
+#endif /* HAVE_SYSTEMD */
} cupsd_listener_t;
2012-08-08 11:28:28 +00:00
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
@@ -401,7 +401,11 @@ cupsdStopListening(void)
lis;
lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
{
- if (lis->fd != -1)
+ if (lis->fd != -1
+#ifdef HAVE_SYSTEMD
+ && !lis->is_systemd
+#endif /* HAVE_SYSTEMD */
+ )
{
#ifdef WIN32
closesocket(lis->fd);
2012-08-08 11:28:28 +00:00
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
2011-07-04 20:04:49 +00:00
@@ -26,6 +26,8 @@
* launchd_checkin() - Check-in with launchd and collect the listening
* fds.
* launchd_checkout() - Update the launchd KeepAlive file as needed.
+ * systemd_checkin() - Check-in with systemd and collect the
+ * listening fds.
* parent_handler() - Catch USR1/CHLD signals...
* process_children() - Process all dead children...
* select_timeout() - Calculate the select timeout value.
@@ -62,6 +64,10 @@
2011-07-04 20:04:49 +00:00
# endif /* !LAUNCH_JOBKEY_SERVICEIPC */
#endif /* HAVE_LAUNCH_H */
+#ifdef HAVE_SYSTEMD
+#include <systemd/sd-daemon.h>
+#endif /* HAVE_SYSTEMD */
2011-07-04 20:04:49 +00:00
+
#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
# include <malloc.h>
#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
@@ -78,6 +84,9 @@
2011-07-04 20:04:49 +00:00
static void launchd_checkin(void);
static void launchd_checkout(void);
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_SYSTEMD
2011-07-04 20:04:49 +00:00
+static void systemd_checkin(void);
+#endif /* HAVE_SYSTEMD */
2011-07-04 20:04:49 +00:00
static void parent_handler(int sig);
static void process_children(void);
static void sigchld_handler(int sig);
2012-08-08 11:28:28 +00:00
@@ -528,6 +537,13 @@ main(int argc, /* I - Number of comm
}
2011-07-04 20:04:49 +00:00
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_SYSTEMD
+ /*
2011-07-04 20:04:49 +00:00
+ * If we were started by systemd get the listen sockets file descriptors...
+ */
+ systemd_checkin();
+#endif /* HAVE_SYSTEMD */
2011-07-04 20:04:49 +00:00
+
/*
2011-07-04 20:04:49 +00:00
* Startup the server...
*/
2012-08-08 11:28:28 +00:00
@@ -738,6 +754,15 @@ main(int argc, /* I - Number of comm
}
2011-07-04 20:04:49 +00:00
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_SYSTEMD
+ /*
+ * If we were started by systemd get the listen sockets file
+ * descriptors...
2011-07-04 20:04:49 +00:00
+ */
+
+ systemd_checkin();
+#endif /* HAVE_SYSTEMD */
2011-07-04 20:04:49 +00:00
+
/*
2011-07-04 20:04:49 +00:00
* Startup the server...
*/
2012-08-08 11:28:28 +00:00
@@ -1516,6 +1541,102 @@ launchd_checkout(void)
2011-07-04 20:04:49 +00:00
}
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_SYSTEMD
2011-07-04 20:04:49 +00:00
+static void
+systemd_checkin(void)
+{
+ int n, fd;
+
+ n = sd_listen_fds(0);
2011-07-04 20:04:49 +00:00
+ if (n < 0)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "systemd_checkin: Failed to acquire sockets from systemd - %s",
+ strerror(-n));
+ exit(EXIT_FAILURE);
+ return;
+ }
+
+ if (n == 0)
+ return;
+
+ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++)
+ {
+ http_addr_t addr;
+ socklen_t addrlen = sizeof (addr);
2011-07-04 20:04:49 +00:00
+ int r;
+ cupsd_listener_t *lis;
+ char s[256];
+
+ r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1);
+ if (r < 0)
+ {
2011-07-04 20:04:49 +00:00
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "systemd_checkin: Unable to verify socket type - %s",
+ strerror(-r));
+ continue;
+ }
+
+ if (!r)
+ {
2011-07-04 20:04:49 +00:00
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "systemd_checkin: Socket not of the right type");
+ continue;
+ }
+
+ if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "systemd_checkin: Unable to get local address - %s",
+ strerror(errno));
+ continue;
+ }
+
+ /*
2011-07-04 20:04:49 +00:00
+ * Try to match the systemd socket address to one of the listeners...
+ */
+
+ for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
+ lis;
+ lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
+ if (httpAddrEqual(&lis->address, &addr))
+ break;
2011-07-04 20:04:49 +00:00
+
+ if (lis)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "systemd_checkin: Matched existing listener %s with fd %d...",
+ httpAddrString(&(lis->address), s, sizeof(s)), fd);
+ }
+ else
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "systemd_checkin: Adding new listener %s with fd %d...",
+ httpAddrString(&addr, s, sizeof(s)), fd);
+
+ if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "systemd_checkin: Unable to allocate listener - "
+ "%s.", strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+
+ cupsArrayAdd(Listeners, lis);
+
+ memcpy(&lis->address, &addr, sizeof(lis->address));
+ }
+
+ lis->fd = fd;
+ lis->is_systemd = 1;
2011-07-04 20:04:49 +00:00
+
+# ifdef HAVE_SSL
+ if (_httpAddrPort(&(lis->address)) == 443)
+ lis->encryption = HTTP_ENCRYPT_ALWAYS;
+# endif /* HAVE_SSL */
+ }
+}
+#endif /* HAVE_SYSTEMD */
2011-07-04 20:04:49 +00:00
/*
* 'parent_handler()' - Catch USR1/CHLD signals...
2012-08-08 11:28:28 +00:00
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
$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
- $(LIBGSSAPI) $(LIBWRAP)
+ $(LIBGSSAPI) $(LIBWRAP) $(SDLIBS)
2011-08-05 14:11:04 +00:00
cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
echo Linking $@...
2012-08-08 11:28:28 +00:00
@@ -379,7 +379,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
- $(LIBWRAP)
2012-08-08 11:28:28 +00:00
+ $(LIBWRAP) $(SDLIBS)
2011-08-05 14:11:04 +00:00
2012-08-08 11:28:28 +00:00
tls.o: tls-darwin.c tls-gnutls.c tls-openssl.c
2011-08-05 14:11:04 +00:00