Date: Friday, October 25, 2013 @ 21:16:12
Author: andyrtr
Revision: 197423
upgpkg: cups 1.7.0-1
upstream update 1.7.0
Modified:
cups/trunk/PKGBUILD
cups/trunk/cups-1.6.2-statedir.patch
cups/trunk/cups-systemd-socket.patch
---------------------------+
PKGBUILD | 16 +++---
cups-1.6.2-statedir.patch | 16 +++---
cups-systemd-socket.patch | 112 ++++++++++++++++++++++----------------------
3 files changed, 73 insertions(+), 71 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-25 19:15:13 UTC (rev 197422)
+++ PKGBUILD 2013-10-25 19:16:12 UTC (rev 197423)
@@ -3,7 +3,7 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
-pkgver=1.6.4
+pkgver=1.7.0
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
@@ -11,7 +11,7 @@
makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5'
'gnutls>=2.8.3' 'cups-filters' 'bc'
'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'
'hicolor-icon-theme' 'systemd')
source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
- http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz
+ http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
cups.logrotate cups.pam
# improve build and linking
cups-no-export-ssllibs.patch
@@ -30,19 +30,19 @@
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=('17c948b442dfdb3c53f5c8b7eaa1442f'
+md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a'
'f861b18f4446c43918c8643dcbbd7f6d'
'96f82c38f3f540b53f3e5144900acf17'
'3ba9e3410df1dc3015463d615ef91b3b'
'cc4101beccb5ed6deb1c92707a575925'
'90c30380d4c8cd48a908cfdadae1ea24'
- 'b4868b83f7f2d6ec24a1be76509379f0'
+ '555a1c71151ce990e176315b46e3de2f'
'a2a88b3a3257c3b5fd3edcc169e6aca4'
'8fe27d4248cacbc02824e7937cab4088'
'df0c367c0022e3c7d8e01827e8a6c5e7'
'f30c2a161caaf27854581507cde8cac6'
'5117f65342fcc69c6a506529e4daca9e'
- '9247e218eea94ebda0aebc8ee0e77db8'
+ '451609db34f95209d64c38474de27ce1'
'cb58bf4e0b80eaee383712e5c84a1ab4'
'b578bcd17949a7203237ba1e31f78ef9'
'0becd6ab8782b97f19a02c1dc174c75e')
@@ -71,12 +71,12 @@
patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch
# Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused
by a wrong shutdown sequence for shutting down the Avahi threaded poll.
- patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
+# patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
# Applications could not get the PPD file for statically-configured
IPP-shared print queues
patch -Np1 -i
${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
# If an external server is used via client.conf and the DNS is inconsistent
(ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs
# for "noname") local PPDs can get polled for print queues instead of the
PPDs of the external server Bug: http://www.cups.org/str.php?L2763
- patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch
+# patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch
# fix permissions on some files - alternative: cups-0755.patch by FC
patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
# move /var/run -> /run for pid file
@@ -200,7 +200,7 @@
rm -v ${pkgdir}/usr/share/cups/banners/*
rm -v ${pkgdir}/usr/share/cups/data/testprint
# comment out all conversion rules which use any of the removed filters
- perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
+ perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:'
$pkgdir/usr/share/cups/mime/mime.convs
# Provide native service for arch-daemons generator
ln -s cups.service "$pkgdir/usr/lib/systemd/system/cupsd.service"
Modified: cups-1.6.2-statedir.patch
===================================================================
--- cups-1.6.2-statedir.patch 2013-10-25 19:15:13 UTC (rev 197422)
+++ cups-1.6.2-statedir.patch 2013-10-25 19:16:12 UTC (rev 197423)
@@ -1,12 +1,12 @@
diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4
cups-1.6.2/config-scripts/cups-directories.m4
--- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01
03:55:23.000000000 +0200
+++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02
00:11:41.000000000 +0200
-@@ -429,7 +429,7 @@
- ;;
- *)
- # All others
-- CUPS_STATEDIR="$localstatedir/run/cups"
-+ CUPS_STATEDIR="/run/cups"
- ;;
- esac
+@@ -420,7 +420,7 @@
+ ;;
+ *)
+ # All others
+- CUPS_STATEDIR="$localstatedir/run/cups"
++ CUPS_STATEDIR="/run/cups"
+ ;;
+ esac])
AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
Modified: cups-systemd-socket.patch
===================================================================
--- cups-systemd-socket.patch 2013-10-25 19:15:13 UTC (rev 197422)
+++ cups-systemd-socket.patch 2013-10-25 19:16:12 UTC (rev 197423)
@@ -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 @@
* 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 @@
+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 @@
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 @@
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 @@
+
+[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,9 +114,9 @@
+[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
+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,8 @@
+[Unit]
+Description=CUPS Printing Service Sockets
@@ -126,9 +126,9 @@
+
+[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 +152,10 @@
#
-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 +163,15 @@
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 +179,9 @@
#
-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 +192,9 @@
} 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 +208,9 @@
{
#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 +231,7 @@
#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 +241,7 @@
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 +255,7 @@
/*
* 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 +271,7 @@
/*
* Startup the server...
*/
-@@ -1516,6 +1541,102 @@ launchd_checkout(void)
+@@ -1511,6 +1536,102 @@ launchd_checkout(void)
}
#endif /* HAVE_LAUNCHD */
@@ -372,10 +374,10 @@
/*
* '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 +386,7 @@
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) \
