[arch-commits] Commit in cups/trunk (PKGBUILD cups-systemd-socket.patch)

[Andreas Radke]

    Date: Friday, April 11, 2014 @ 14:23:15
  Author: andyrtr
Revision: 210200

upgpkg: cups 1.7.2-1

upstream update 1.7.2

Modified:
  cups/trunk/PKGBUILD
  cups/trunk/cups-systemd-socket.patch

---------------------------+
 PKGBUILD                  |   13 +++++++------
 cups-systemd-socket.patch |   15 +++------------
 2 files changed, 10 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-11 11:22:52 UTC (rev 210199)
+++ PKGBUILD	2014-04-11 12:23:15 UTC (rev 210200)
@@ -3,8 +3,8 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.7.1
-pkgrel=4
+pkgver=1.7.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -12,7 +12,7 @@
              'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus' 
              'avahi'  'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 'valgrind')
 source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-        http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
+        http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2{,.sig}
         cups.logrotate cups.pam
         # improve build and linking
         cups-no-export-ssllibs.patch
@@ -31,13 +31,14 @@
         cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
         get-ppd-file-for-statically-configured-ipp-shared-queues.patch
         ppd-poll-with-client-conf.patch)
-md5sums=('55277c40fd4b7183dc3671d39c5c42b7'
+md5sums=('f06a997d4b71b81b23324e27174f93e7'
+         'SKIP'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17'
          '3ba9e3410df1dc3015463d615ef91b3b'
          'cc4101beccb5ed6deb1c92707a575925'
          '90c30380d4c8cd48a908cfdadae1ea24'
-         'cf2f881967b0531ec49bcb5d0e9573a8'
+         '7088c0123c06bce280925aa39ebd79c6'
          '8fe27d4248cacbc02824e7937cab4088'
          'df0c367c0022e3c7d8e01827e8a6c5e7'
          'f30c2a161caaf27854581507cde8cac6'
@@ -51,7 +52,7 @@
 prepare() {
 
   cd ${pkgbase}-${pkgver}
-	
+#return 1	
   # add systemd socket support - Fedora patch, also used in Gentoo
   # modified now to the changes done by Gentoo in their svn ebuild
   # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1

Modified: cups-systemd-socket.patch
===================================================================
--- cups-systemd-socket.patch	2014-04-11 11:22:52 UTC (rev 210199)
+++ cups-systemd-socket.patch	2014-04-11 12:23:15 UTC (rev 210200)
@@ -32,11 +32,11 @@
 +        [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
 +if test "x$with_systemdsystemunitdir" != xno; then
 +        AC_MSG_CHECKING(for libsystemd-daemon)
++        AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
 +        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)
@@ -213,15 +213,6 @@
 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.
-  *   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 */
@@ -238,7 +229,7 @@
  static void		launchd_checkout(void);
  #endif /* HAVE_LAUNCHD */
 +#ifdef HAVE_SYSTEMD
-+static void		systemd_checkin(void);
++static int		systemd_checkin(void);
 +#endif /* HAVE_SYSTEMD */
  static void		parent_handler(int sig);
  static void		process_children(void);
@@ -278,7 +269,7 @@
  #endif /* HAVE_LAUNCHD */
  
 +#ifdef HAVE_SYSTEMD
-+static void
++static int
 +systemd_checkin(void)
 +{
 +  int n, fd;