Sync up with portage

4 files changed, 409 insertions, 3 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 395fc1c..cfea41b 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cups-1.5.0-r4 (28 Jan 2012)
+
+  28 Jan 2012; Daniel Solano Gómez <gentoo@sattvik.com> -cups-1.5.0-r3.ebuild,
+  +cups-1.5.0-r4.ebuild, +files/cups-1.5.0-systemd-socket.patch:
+  Sync with portage
+
   28 Jan 2012; Daniel Solano Gómez <gentoo@sattvik.com> cups-1.4.8-r1.ebuild,
   -cups-1.4.8-r22.ebuild, cups-1.4.8-r23.ebuild, -cups-1.5.0-r2.ebuild,
   cups-1.5.0-r3.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index dd9bb0c..51fbf84 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -11,12 +11,13 @@ AUX cups-1.4.6-serialize-gnutls.patch 3625 RMD160 873b2806cfec732c4a4f3f2981f666
 AUX cups-1.4.8-CVE-2011-3170.patch 1045 RMD160 9a27eb1ec34ced57da5bbe7c55261d8aa35b01c0 SHA1 6155d7c4b34ff6447a93aa56fa4b5958eb943202 SHA256 c94d49c3ff980b830874dae4158768554f87f429ae400838a605505aae350af6
 AUX cups-1.4.8-largeimage.patch 572 RMD160 62e0a92fb1dc62adff43bcdc22f201da426d8916 SHA1 1528f2b1f67e7c532418dd7f495db1788ae7d2d4 SHA256 364a3ed3e161ad75836e6bc56746c25207680ab6f44563219c93146f0cf74541
 AUX cups-1.5.0-group_fix.patch 1774 RMD160 cd6b98deecbc8e6f92fdf24f6682c3426a4512b2 SHA1 501ada69a9607c7831f827277c5691b34392d519 SHA256 88a7d41298a43fd2004ef6d40690333c6a1e9c1da4251ac9f23b659e91a6559f
+AUX cups-1.5.0-systemd-socket.patch 12829 RMD160 d4ca24c299daf65f2621568443a339f82bd03a2a SHA1 f45e18ba92d3afbca6a26ac676f2f42738032c10 SHA256 350eb1bdb76618dd082e9cda26c5b1400f4f870ffd521186f4d74940d15b4cd5
 AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea48170f3369486792ed9f98fe7d1c53487b455c SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
 DIST cups-1.5.0-source.tar.bz2 4090210 RMD160 e7be9b6b44428561609c59abaea8fa31a11aefff SHA1 628f549867751e373fc20c7558fec422f9eb942b SHA256 c6f99b68a558f4d626e9a5076d664f38e9925715dc541b07f0328c9aeb02ec33
 EBUILD cups-1.4.8-r1.ebuild 7312 RMD160 c05be205bbc05df5034bf57880adfaa8c58be907 SHA1 ce80b4276953ed364583762b659b2e52c29645ee SHA256 d9ad745fe8312f307b5b13979a6ae000ac6e10216d8779466af99b14a60a30a9
 EBUILD cups-1.4.8-r23.ebuild 8922 RMD160 1ef9e2c1f6f52a7adb8b30b2d4c43b74e74fcf59 SHA1 a24491edffbc09ab0a2e010593677d22dcc138b7 SHA256 d7c2bdd62e77815a7bfe2aef62107fc03d3bae7fa81cbf6bd1b89268c4db0300
-EBUILD cups-1.5.0-r3.ebuild 7763 RMD160 5170da0d135cc3d64772516bacfc21bf19760e05 SHA1 99033f759654789f0eb9adbd1f7976ca163c6a06 SHA256 54f42b20ed56ab2db8e5d83a7d314d010eec85d18a873d9d5bfd60b6ee472ccd
-MISC ChangeLog 4482 RMD160 1a94ea1e86f47db8a2e7baa7e759e25af0729d73 SHA1 03bd3f32989450e73b082eae40af1837d88b2cf8 SHA256 5eeedf94306cb365fe464036763c4c79bc2ebc051a231ebdbfe23d971116dc3a
+EBUILD cups-1.5.0-r4.ebuild 7838 RMD160 6a79405c885dca4211d607b309b5995a11272345 SHA1 2074e17bc1c8cfad89a62cf784842ac45751b33a SHA256 fd4703c2d5b85a6f3a29a05784a0180434e063d9b0f8091c3f4e65cac8cfe95a
+MISC ChangeLog 4678 RMD160 bbe7586cc8c02c79552c1e7f16816a4abb08c15c SHA1 7736397b4c3d0603f03a96895d0baf87689b15b6 SHA256 2ba64cf7aa50fe6c3f5e40bcdea2f7b1d278ff3c2eaa4d4743bd6309ab087ab7
 MISC metadata.xml 691 RMD160 2a77a55b3ba142202c16f7c9e5710107cdd7565f SHA1 0fedf6ebd837708cd218a4a03741a20091714950 SHA256 3d89754273130856a7433fb325a132b07b86f7c0391284ab2c7dc8a2fa46fec7
diff --git a/net-print/cups/cups-1.5.0-r3.ebuild b/net-print/cups/cups-1.5.0-r4.ebuild
index e8f2155..926b575 100644
--- a/net-print/cups/cups-1.5.0-r3.ebuild
+++ b/net-print/cups/cups-1.5.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v 1.8 2012/01/27 22:18:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r4.ebuild,v 1.1 2012/01/28 20:43:10 dilfridge Exp $
 
 EAPI=4
 
@@ -131,6 +131,9 @@ src_prepare() {
 	# security fixes
 	epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-3170.patch"
 
+	# systemd support
+	epatch "${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"
+
 	# Dan's group fix
 	epatch "${FILESDIR}/${PN}-1.5.0-group_fix.patch"
 
diff --git a/net-print/cups/files/cups-1.5.0-systemd-socket.patch b/net-print/cups/files/cups-1.5.0-systemd-socket.patch
new file mode 100644
index 0000000..60918b3
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.0-systemd-socket.patch
@@ -0,0 +1,396 @@
+diff -up cups-1.5.0/config.h.in.systemd-socket cups-1.5.0/config.h.in
+--- cups-1.5.0/config.h.in.systemd-socket	2011-10-18 15:32:40.741672460 +0100
++++ cups-1.5.0/config.h.in	2011-10-18 15:32:40.843670530 +0100
+@@ -503,6 +503,13 @@
+ 
+ 
+ /*
++ * Do we have systemd support?
++ */
++
++#undef HAVE_SYSTEMD
++
++
++/*
+  * Various scripting languages...
+  */
+ 
+diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/config-scripts/cups-systemd.m4
+--- cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket	2011-10-18 15:32:40.844670511 +0100
++++ cups-1.5.0/config-scripts/cups-systemd.m4	2011-10-18 15:33:16.861989058 +0100
+@@ -0,0 +1,36 @@
++dnl
++dnl "$Id: cups-1.5.0-systemd-socket.patch,v 1.1 2012/01/28 20:43:10 dilfridge Exp $"
++dnl
++dnl   systemd stuff for CUPS.
++
++dnl Find whether systemd is available
++
++SDLIBS=""
++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
++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)
++
++dnl
++dnl "$Id: cups-1.5.0-systemd-socket.patch,v 1.1 2012/01/28 20:43:10 dilfridge Exp $"
++dnl
+diff -up cups-1.5.0/configure.in.systemd-socket cups-1.5.0/configure.in
+--- cups-1.5.0/configure.in.systemd-socket	2010-11-20 01:03:46.000000000 +0000
++++ cups-1.5.0/configure.in	2011-10-18 15:32:40.844670511 +0100
+@@ -37,6 +37,7 @@ sinclude(config-scripts/cups-pam.m4)
+ 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-pdf.m4)
+ sinclude(config-scripts/cups-scripting.m4)
+@@ -71,6 +72,9 @@ AC_OUTPUT(Makedefs
+ 	  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
+diff -up cups-1.5.0/cups/usersys.c.systemd-socket cups-1.5.0/cups/usersys.c
+--- cups-1.5.0/cups/usersys.c.systemd-socket	2011-10-18 15:32:40.645674277 +0100
++++ cups-1.5.0/cups/usersys.c	2011-10-18 15:32:40.845670492 +0100
+@@ -770,7 +770,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 */
+diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.in
+--- cups-1.5.0/data/cups.path.in.systemd-socket	2011-10-18 15:32:40.846670473 +0100
++++ cups-1.5.0/data/cups.path.in	2011-10-18 15:32:40.846670473 +0100
+@@ -0,0 +1,8 @@
++[Unit]
++Description=CUPS Printer Service Spool
++
++[Path]
++PathExistsGlob=@CUPS_REQUESTS@/d*
++
++[Install]
++WantedBy=multi-user.target
+diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.service.in
+--- cups-1.5.0/data/cups.service.in.systemd-socket	2011-10-18 15:32:40.846670473 +0100
++++ cups-1.5.0/data/cups.service.in	2011-10-18 15:32:40.846670473 +0100
+@@ -0,0 +1,9 @@
++[Unit]
++Description=CUPS Printing Service
++
++[Service]
++ExecStart=@sbindir@/cupsd -f
++
++[Install]
++Also=cups.socket cups.path
++WantedBy=printer.target
+diff -up cups-1.5.0/data/cups.socket.in.systemd-socket cups-1.5.0/data/cups.socket.in
+--- cups-1.5.0/data/cups.socket.in.systemd-socket	2011-10-18 15:32:40.847670454 +0100
++++ cups-1.5.0/data/cups.socket.in	2011-10-18 15:32:40.847670454 +0100
+@@ -0,0 +1,10 @@
++[Unit]
++Description=CUPS Printing Service Sockets
++
++[Socket]
++ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
++ListenStream=631
++BindIPv6Only=ipv6-only
++
++[Install]
++WantedBy=sockets.target
+diff -up cups-1.5.0/data/Makefile.systemd-socket cups-1.5.0/data/Makefile
+--- cups-1.5.0/data/Makefile.systemd-socket	2011-05-12 06:21:56.000000000 +0100
++++ cups-1.5.0/data/Makefile	2011-10-18 15:32:40.847670454 +0100
+@@ -112,6 +112,12 @@ install-data:
+ 		$(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
+ 
+ 
+ #
+@@ -159,6 +165,9 @@ uninstall:
+ 	-$(RMDIR) $(DATADIR)/charsets
+ 	-$(RMDIR) $(DATADIR)/banners
+ 	-$(RMDIR) $(DATADIR)
++	for file in $(SYSTEMD_UNITS); do \
++		$(RM) $(SYSTEMDUNITDIR)/$$file; \
++	done
+ 
+ 
+ #
+diff -up cups-1.5.0/Makedefs.in.systemd-socket cups-1.5.0/Makedefs.in
+--- cups-1.5.0/Makedefs.in.systemd-socket	2011-10-18 15:32:40.719672876 +0100
++++ cups-1.5.0/Makedefs.in	2011-10-18 15:32:40.848670435 +0100
+@@ -143,6 +143,7 @@ CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
+ 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)
+@@ -151,6 +152,7 @@ FONTS		=	@FONTS@
+ IMGLIBS		=	@IMGLIBS@
+ IMGFILTERS	=	@IMGFILTERS@
+ LAUNCHDLIBS	=	@LAUNCHDLIBS@
++SDLIBS		=	@SDLIBS@
+ LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
+ 			-L../scheduler @LDARCHFLAGS@ \
+ 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
+@@ -267,6 +269,7 @@ PAMFILE		=	@PAMFILE@
+ 
+ DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
+ DBUSDIR		=	@DBUSDIR@
++SYSTEMDUNITDIR  =       $(BUILDROOT)@systemdsystemunitdir@
+ 
+ 
+ #
+diff -up cups-1.5.0/scheduler/client.h.systemd-socket cups-1.5.0/scheduler/client.h
+--- cups-1.5.0/scheduler/client.h.systemd-socket	2011-03-25 21:25:38.000000000 +0000
++++ cups-1.5.0/scheduler/client.h	2011-10-18 15:32:40.848670435 +0100
+@@ -75,6 +75,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;
+ 
+ 
+diff -up cups-1.5.0/scheduler/listen.c.systemd-socket cups-1.5.0/scheduler/listen.c
+--- cups-1.5.0/scheduler/listen.c.systemd-socket	2011-04-16 00:38:13.000000000 +0100
++++ cups-1.5.0/scheduler/listen.c	2011-10-18 15:32:40.849670416 +0100
+@@ -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);
+diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c
+--- cups-1.5.0/scheduler/main.c.systemd-socket	2011-10-18 15:32:40.802671306 +0100
++++ cups-1.5.0/scheduler/main.c	2011-10-18 15:32:40.851670379 +0100
+@@ -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 @@
+ #  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
+ #endif /* HAVE_LAUNCH_H */
+ 
++#ifdef HAVE_SYSTEMD
++#include <systemd/sd-daemon.h>
++#endif /* HAVE_SYSTEMD */
++
+ #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
+ #  include <malloc.h>
+ #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
+@@ -78,6 +84,9 @@
+ static void		launchd_checkin(void);
+ static void		launchd_checkout(void);
+ #endif /* HAVE_LAUNCHD */
++#ifdef HAVE_SYSTEMD
++static void		systemd_checkin(void);
++#endif /* HAVE_SYSTEMD */
+ static void		parent_handler(int sig);
+ static void		process_children(void);
+ static void		sigchld_handler(int sig);
+@@ -537,6 +546,13 @@ main(int  argc,				/* I - Number of comm
+   }
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++ /*
++  * If we were started by systemd get the listen sockets file descriptors...
++  */
++  systemd_checkin();
++#endif /* HAVE_SYSTEMD */
++
+  /*
+   * Startup the server...
+   */
+@@ -759,6 +775,15 @@ main(int  argc,				/* I - Number of comm
+ 	}
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++       /*
++	* If we were started by systemd get the listen sockets file
++	* descriptors...
++        */
++
++        systemd_checkin();
++#endif /* HAVE_SYSTEMD */
++
+        /*
+         * Startup the server...
+         */
+@@ -1584,6 +1609,100 @@ launchd_checkout(void)
+ }
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++static void
++systemd_checkin(void)
++{
++  int n, fd;
++
++  n = sd_listen_fds(0);
++  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);
++    int r;
++    cupsd_listener_t *lis;
++    char s[256];
++
++    r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1);
++    if (r < 0) {
++      cupsdLogMessage(CUPSD_LOG_ERROR,
++             "systemd_checkin: Unable to verify socket type - %s",
++             strerror(-r));
++      continue;
++    }
++
++    if (!r) {
++      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;
++    }
++
++     /*
++    * 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;
++
++    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;
++
++#  ifdef HAVE_SSL
++    if (_httpAddrPort(&(lis->address)) == 443)
++      lis->encryption = HTTP_ENCRYPT_ALWAYS;
++#  endif /* HAVE_SSL */
++  }
++}
++#endif /* HAVE_SYSTEMD */
+ 
+ /*
+  * 'parent_handler()' - Catch USR1/CHLD signals...
+diff -up cups-1.5.0/scheduler/Makefile.systemd-socket cups-1.5.0/scheduler/Makefile
+--- cups-1.5.0/scheduler/Makefile.systemd-socket	2011-10-18 15:32:40.817671022 +0100
++++ cups-1.5.0/scheduler/Makefile	2011-10-18 15:32:40.852670360 +0100
+@@ -382,7 +382,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)
+ 
+ cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
+ 	echo Linking $@...
+@@ -390,7 +390,7 @@ cupsd-static:	$(CUPSDOBJS) libcupsmime.a
+ 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
+ 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
+ 		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
+-		$(LIBWRAP)
++		$(LIBWRAP) $(SDLIBS)
+ 
+ 
+ #