[arch-commits] Commit in cups/trunk (4 files)
Date: Friday, October 13, 2017 @ 19:44:21
Author: andyrtr
Revision: 307829
upgpkg: cups 2.2.5-1
upstream update 2.2.5
Modified:
cups/trunk/PKGBUILD
cups/trunk/cups-fix-install-perms.patch
Deleted:
cups/trunk/cups-no-gcrypt.patch
cups/trunk/cupsGetDests.diff
--+
PKGBUILD | 21 +
cups-fix-install-perms.patch | 14 +--
cups-no-gcrypt.patch | 11 --
cupsGetDests.diff| 167 -
4 files changed, 13 insertions(+), 200 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-10-13 16:55:31 UTC (rev 307828)
+++ PKGBUILD2017-10-13 19:44:21 UTC (rev 307829)
@@ -3,8 +3,8 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
-pkgver=2.2.4
-pkgrel=2
+pkgver=2.2.5
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
url="https://www.cups.org/";
@@ -15,24 +15,20 @@
cups.logrotate cups.pam
# improve build and linking
cups-no-export-ssllibs.patch
-cups-no-gcrypt.patch
cups-no-gzip-man.patch
cups-1.6.2-statedir.patch
cups-fix-install-perms.patch
# bugfixes
-cups-systemd-socket.patch
-cupsGetDests.diff)
-sha256sums=('596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc'
+cups-systemd-socket.patch)
+sha256sums=('a8795e2aa54dcfbdc9ff254a770f0d7154e35c981bca5b3369050c5193ab5a21'
'SKIP'
'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
-'1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1'
'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
'23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-'2496b683920417c922d58c1f70807f7a0f0c818db9ce75fe182104bd4484027b'
-'cdad3c266cb2abb0f90af3113420fa47a09e3ed974a2ffa9fb6a642e11971d65'
-'25c1f212d0055848c9d46195d74ade64514675c83b2098e41ba1144bd6b8a05d')
+'aa999532830b7f9f6e9f47e6fb15a4dccee5ac021abbcd2fff103dcf579cb4f7'
+'cdad3c266cb2abb0f90af3113420fa47a09e3ed974a2ffa9fb6a642e11971d65')
validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org
PGP key)
prepare() {
@@ -42,8 +38,6 @@
# improve build and linking
# Do not export SSL libs in cups-config
patch -Np1 -i ${srcdir}/cups-no-export-ssllibs.patch
- # https://www.cups.org/str.php?L4399
- patch -Np1 -i ${srcdir}/cups-no-gcrypt.patch
# don't zip man pages in make install, let makepkg do that / Fedora
patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
# move /var/run -> /run for pid file
@@ -60,9 +54,6 @@
sed -i -e '6i# Disable cups internal logging - use logrotate instead'
conf/cupsd.conf.in
sed -i -e '7iMaxLogSize 0' conf/cupsd.conf.in
- # upstream fix for https://bugs.archlinux.org/task/54695
- patch -Np1 -i ../cupsGetDests.diff
-
# Rebuild configure script for not zipping man-pages.
aclocal -I config-scripts
autoconf -I config-scripts
Modified: cups-fix-install-perms.patch
===
--- cups-fix-install-perms.patch2017-10-13 16:55:31 UTC (rev 307828)
+++ cups-fix-install-perms.patch2017-10-13 19:44:21 UTC (rev 307829)
@@ -1,21 +1,21 @@
Makedefs.in2017-06-30 17:44:38.0 +0200
-+++ Makedefs.in.new2017-07-01 17:59:28.075942932 +0200
-@@ -38,14 +38,14 @@
+--- Makedefs.in2017-10-13 20:22:26.0 +0200
Makedefs.in.new2017-10-13 21:35:07.435842127 +0200
+@@ -48,14 +48,14 @@
# Installation programs...
#
--INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
@INSTALL_STRIP@
+-INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
@INSTALL_STRIP@
-INSTALL_COMPDATA =$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_COMPDATA =$(INSTALL) -c -m 644 @INSTALL_GZIP@
INSTALL_CONFIG= $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
-INSTALL_DATA = $(INSTALL) -c -m 444
+INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_DIR = $(INSTALL) -d
--INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
@INSTALL_STRIP@
+-INSTALL_LIB = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
@INSTALL_STRIP@
-INSTALL_MAN = $(INSTALL) -c -m 444
-INSTALL_SCRIPT= $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
-+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_LIB = @LIBTOOL_INSTALL@ $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_MAN = $
[arch-commits] Commit in cups/trunk (4 files)
Date: Friday, November 14, 2014 @ 20:10:12
Author: andyrtr
Revision: 226255
upgpkg: cups 2.0.1-1
upstream update 2.0.1
Modified:
cups/trunk/PKGBUILD
Deleted:
cups/trunk/str4495.patch
cups/trunk/str4497.patch
cups/trunk/str4500.patch
---+
PKGBUILD | 30 +-
str4495.patch | 26 --
str4497.patch | 43 ---
str4500.patch | 17 -
4 files changed, 5 insertions(+), 111 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-11-14 18:58:14 UTC (rev 226254)
+++ PKGBUILD2014-11-14 19:10:12 UTC (rev 226255)
@@ -3,8 +3,8 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
-pkgver=2.0.0
-pkgrel=3
+pkgver=2.0.1
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/";
@@ -20,11 +20,8 @@
cups-1.6.2-statedir.patch
cups-1.6.0-fix-install-perms.patch
# bugfixes
-str4497.patch
-str4495.patch
-str4500.patch # FC
)
-md5sums=('2cdd81fea23e9e29555c24bdfd0d7c89'
+md5sums=('7f7c33071035fb20d0879929a42da711'
'SKIP'
'fc8286f185e2cc5f7e1f6843bf193e2b'
'96f82c38f3f540b53f3e5144900acf17'
@@ -32,10 +29,7 @@
'1beb4896f217bc241bc08a422274ec0c'
'90c30380d4c8cd48a908cfdadae1ea24'
'451609db34f95209d64c38474de27ce1'
- '5117f65342fcc69c6a506529e4daca9e'
- '5aab5a160482d89e5d2a4def1f83ef8f'
- '84da6459947d4fb62398e9bad7922a11'
- '8c0514e41c3b50b2b838b218f683e227')
+ '5117f65342fcc69c6a506529e4daca9e')
prepare() {
@@ -55,19 +49,6 @@
# bug fixes
- # https://www.cups.org/str.php?L4497 + https://www.cups.org/str.php?L4491
- # "Port 631" binds to localhost only (systemd regression)
- patch -Np0 -i ${srcdir}/str4497.patch
-
- # https://bugs.archlinux.org/task/40937 - https://www.cups.org/str.php?L4495
- # adds a warning to the config file and honors the FatalErrors directive
- patch -Np0 -i ${srcdir}/str4495.patch
-
- # https://www.cups.org/str.php?L4500
- # /etc/cups/ppd/*.ppd not world-readable, cupsGetPPD() returns symlink
- patch -Np1 -i ${srcdir}/str4500.patch
-
-
# set MaxLogSize to 0 to prevent using cups internal log rotation
sed -i -e '5i\ ' conf/cupsd.conf.in
sed -i -e '6i# Disable cups internal logging - use logrotate instead'
conf/cupsd.conf.in
@@ -138,8 +119,7 @@
etc/cups/subscriptions.conf
etc/dbus-1/system.d/cups.conf
etc/logrotate.d/cups
-etc/pam.d/cups
-etc/xinetd.d/cups-lpd)
+etc/pam.d/cups)
depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord'
'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
optdepends=('xdg-utils: xdg .desktop file support')
Deleted: str4495.patch
===
--- str4495.patch 2014-11-14 18:58:14 UTC (rev 226254)
+++ str4495.patch 2014-11-14 19:10:12 UTC (rev 226255)
@@ -1,26 +0,0 @@
-Index: conf/cups-files.conf.in
-===
conf/cups-files.conf.in(revision 12220)
-+++ conf/cups-files.conf.in(working copy)
-@@ -15,6 +15,7 @@
- #Group @CUPS_GROUP@
-
- # Administrator user group, used to match @SYSTEM in cupsd.conf policy
rules...
-+# This cannot contain the Group value for security reasons...
- SystemGroup @CUPS_SYSTEM_GROUPS@
- @CUPS_SYSTEM_AUTHKEY@
-
-Index: scheduler/conf.c
-===
scheduler/conf.c (revision 12220)
-+++ scheduler/conf.c (working copy)
-@@ -995,6 +995,9 @@
-
- cupsdLogMessage(CUPSD_LOG_NOTICE,
- "Group and SystemGroup cannot use the same groups.");
-+ if (FatalErrors & (CUPSD_FATAL_CONFIG | CUPSD_FATAL_PERMISSIONS))
-+return (0);
-+
- cupsdLogMessage(CUPSD_LOG_INFO, "Resetting Group to \"nobody\"...");
-
- group = getgrnam("nobody");
Deleted: str4497.patch
===
--- str4497.patch 2014-11-14 18:58:14 UTC (rev 226254)
+++ str4497.patch 2014-11-14 19:10:12 UTC (rev 226255)
@@ -1,43 +0,0 @@
-Index: scheduler/main.c
-===
scheduler/main.c (revision 12213)
-+++ scheduler/main.c (working copy)
-@@ -763,6 +763,9 @@
-
- if (timeout == 86400 && OnDemand && IdleExitTimeout &&
- !cupsArrayCount(ActiveJobs) &&
-+# ifdef HAVE_SYSTEMD
-+!WebInterface &&
-+# endif /* HAVE_SYSTEMD */
- (!Browsing || !BrowseLocalProtocols || !cupsArrayCount(Printers)))
- {
- timeout = IdleExitTimeout;
-@@ -2114,8 +2117,12 @@
- * jobs or shared printers to advertise...
- */
-
-- if (cupsArrayCount(ActiveJobs) ||
-+ if (cupsArrayCount(ActiveJobs) || /* Active jobs
[arch-commits] Commit in cups/trunk (4 files)
Date: Sunday, August 5, 2012 @ 04:30:04
Author: andyrtr
Revision: 164781
upgpkg: cups 1.6.1-2
fix some browsing related issues solved in upstream tracker
Added:
cups/trunk/avahi-missing-in-conditionals.patch
cups/trunk/cupsd-conf-remove-obsolete-browse-directives.patch
cups/trunk/recognize-remote-cups-queue-via-dnssd-uri.patch
Modified:
cups/trunk/PKGBUILD
+
PKGBUILD | 20 ++-
avahi-missing-in-conditionals.patch| 118 +++
cupsd-conf-remove-obsolete-browse-directives.patch | 12 +
recognize-remote-cups-queue-via-dnssd-uri.patch| 25
4 files changed, 172 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-08-04 21:55:24 UTC (rev 164780)
+++ PKGBUILD2012-08-05 08:30:04 UTC (rev 164781)
@@ -4,7 +4,7 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.6.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/";
@@ -15,7 +15,10 @@
cups-no-gcrypt.patch
cups-no-gzip-man.patch
cups-systemd-socket.patch
-cups cups.logrotate cups.pam)
+cups cups.logrotate cups.pam
+cupsd-conf-remove-obsolete-browse-directives.patch
+avahi-missing-in-conditionals.patch
+recognize-remote-cups-queue-via-dnssd-uri.patch)
#options=('!emptydirs')
md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
'9b8467a1e51d360096b70e2c3c081e6c'
@@ -24,7 +27,10 @@
'a81573a429b98e16670d7fea47e528c4'
'9657daa21760bb0b5fa3d8b51d5e01a1'
'f861b18f4446c43918c8643dcbbd7f6d'
- '96f82c38f3f540b53f3e5144900acf17')
+ '96f82c38f3f540b53f3e5144900acf17'
+ '6bef262b5081051e88cd2ae94fed1867'
+ '9c91b1319f4b20dc323986cb4abbe806'
+ 'dcef8dd5614461166cada8a706eebb49')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -40,6 +46,14 @@
patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
# don't zip man pages in make install, let makepkg do that / Fedora
patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
+
+ # upstream bugtracker patches
+ # http://www.cups.org/str.php?L4157 - fix broken default server config
+ patch -Np1 -i ${srcdir}/cupsd-conf-remove-obsolete-browse-directives.patch
+ # http://www.cups.org/str.php?L4156 - In many DNS-SD/Bonjour conditionals
Avahi is not considered
+ patch -Np1 -i ${srcdir}/avahi-missing-in-conditionals.patch
+ # http://www.cups.org/str.php?L4158 - DNS-SD-based print queues pointing to
CUPS server are not considered remote printers with driver on server
+ patch -Np1 -i ${srcdir}/recognize-remote-cups-queue-via-dnssd-uri.patch
# Rebuild configure script for not zipping man-pages.
aclocal -I config-scripts
Added: avahi-missing-in-conditionals.patch
===
--- avahi-missing-in-conditionals.patch (rev 0)
+++ avahi-missing-in-conditionals.patch 2012-08-05 08:30:04 UTC (rev 164781)
@@ -0,0 +1,118 @@
+diff -uraN cups/scheduler/client.c cups-new/scheduler/client.c
+--- cups/scheduler/client.c2012-05-25 15:28:49.0 +0200
cups-new/scheduler/client.c2012-08-04 20:13:17.082220961 +0200
+@@ -4021,7 +4021,7 @@
+ !strncmp(host, "[::1]:", 6));
+ }
+
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ /*
+ * Check if the hostname is something.local (Bonjour); if so, allow it.
+ */
+@@ -4040,7 +4040,7 @@
+ !_cups_strcasecmp(end, ".local.") ||
+ !_cups_strncasecmp(end, ".local.:", 8)))
+ return (1);
+-#endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+
+ /*
+ * Check if the hostname is an IP address...
+@@ -4101,7 +4101,7 @@
+ }
+ }
+
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ for (a = (cupsd_alias_t *)cupsArrayFirst(DNSSDAlias);
+a;
+a = (cupsd_alias_t *)cupsArrayNext(DNSSDAlias))
+@@ -4126,7 +4126,7 @@
+ return (1);
+ }
+ }
+-#endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+
+ /*
+ * Check for interface hostname matches...
+diff -uraN cups/scheduler/conf.c cups-new/scheduler/conf.c
+--- cups/scheduler/conf.c 2012-05-25 15:28:49.0 +0200
cups-new/scheduler/conf.c 2012-08-04 20:15:49.830978405 +0200
+@@ -89,9 +89,9 @@
+ {
+ { "AccessLog", &AccessLog, CUPSD_VARTYPE_STRING },
+ { "AutoPurgeJobs", &JobAutoPurge, CUPSD_VARTYPE_BOOLEAN },
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ { "BrowseDNSSDSubTypes",&DNSSDSubTypes, CUPSD_VARTYPE_STRING },
+-#endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+ { "BrowseWebIF",&BrowseWebIF, CUPSD_VARTYPE_BOOLEAN },
+ { "Browsing", &Browsing,
[arch-commits] Commit in cups/trunk (4 files)
Date: Monday, August 9, 2010 @ 15:00:26
Author: andyrtr
Revision: 87039
upgpkg: cups 1.4.4-2
reimplement full avahi/dnssd support
Modified:
cups/trunk/PKGBUILD
cups/trunk/cups-avahi.patch
Deleted:
cups/trunk/cups-1.3.7-peercred.patch
cups/trunk/fix-infinite-usb-loop.patch
-+
PKGBUILD| 11 +--
cups-1.3.7-peercred.patch | 11 ---
cups-avahi.patch|1 -
fix-infinite-usb-loop.patch | 35 ---
4 files changed, 5 insertions(+), 53 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-09 18:04:53 UTC (rev 87038)
+++ PKGBUILD2010-08-09 19:00:26 UTC (rev 87039)
@@ -4,7 +4,7 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.4.4
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/";
@@ -15,7 +15,7 @@
cups cups.logrotate cups.pam)
#options=('!emptydirs')
md5sums=('8776403ad60fea9e85eab9c04d88560d'
- '3388dbe3fc20f16f37912e60a8ec46bc'
+ 'fce500e3e6e244f5b77fe8eaad87e022'
'5c85b7d8d2ddd02c2c64955cebbf55ea'
'f861b18f4446c43918c8643dcbbd7f6d'
'96f82c38f3f540b53f3e5144900acf17')
@@ -27,21 +27,20 @@
# Rebuild configure script for --enable-avahi.
aclocal -I config-scripts
autoconf -I config-scripts
+
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \
--with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \
--disable-ldap --libdir=/usr/lib --enable-raw-printing \
- --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls
--disable-threads --enable-dnssd\
+ --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls
--disable-threads --enable-avahi\
--with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS"
make || return 1
}
package_libcups() {
pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1')
-optdepends=('avahi: for the "dnssd" CUPS backend')
+depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1'
'avahi')
-
cd ${srcdir}/${pkgbase}-${pkgver}
make BUILDROOT=${pkgdir} install-headers install-libs || return 1
# put this into the libs pkg to make other software find the libs(no
pkg-config file included)
Deleted: cups-1.3.7-peercred.patch
===
--- cups-1.3.7-peercred.patch 2010-08-09 18:04:53 UTC (rev 87038)
+++ cups-1.3.7-peercred.patch 2010-08-09 19:00:26 UTC (rev 87039)
@@ -1,11 +0,0 @@
-diff -Naur cups-1.3.7/scheduler/auth.c cups-1.3.7.new/scheduler/auth.c
cups-1.3.7/scheduler/auth.c2008-03-20 21:58:16.0 +0100
-+++ cups-1.3.7.new/scheduler/auth.c2008-06-09 14:53:45.535194741 +0200
-@@ -54,6 +54,7 @@
- * Include necessary headers...
- */
-
-+#define _GNU_SOURCE
- #include "cupsd.h"
- #include
- #ifdef HAVE_SHADOW_H
Modified: cups-avahi.patch
===
--- cups-avahi.patch2010-08-09 18:04:53 UTC (rev 87038)
+++ cups-avahi.patch2010-08-09 19:00:26 UTC (rev 87039)
@@ -1086,4 +1086,3 @@
/*
* End of "$Id: http-support.c 8705 2009-06-12 00:21:58Z mike $".
-
Deleted: fix-infinite-usb-loop.patch
===
--- fix-infinite-usb-loop.patch 2010-08-09 18:04:53 UTC (rev 87038)
+++ fix-infinite-usb-loop.patch 2010-08-09 19:00:26 UTC (rev 87039)
@@ -1,35 +0,0 @@
-diff -urNad cups-1.4.0~/backend/usb-libusb.c cups-1.4.0/backend/usb-libusb.c
cups-1.4.0~/backend/usb-libusb.c 2009-08-08 00:24:14.0 +0200
-+++ cups-1.4.0/backend/usb-libusb.c2009-09-02 16:37:31.0 +0200
-@@ -158,7 +158,7 @@
-
- while (poll(pfds, 2, -1) > 0)
- {
-- if (pfds[0].revents & POLLIN)
-+ if (pfds[0].revents & (POLLIN + POLLHUP))
- {
- if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0)
- {
-@@ -179,7 +179,12 @@
- }
-
- if (pfds[1].revents & POLLIN)
--tbytes += side_cb(printer, print_fd);
-+ {
-+if ((bytes = side_cb(printer, print_fd)) < 0)
-+pfds[1].events = 0; /* Filter has gone away... */
-+ else
-+ tbytes += bytes;
-+ }
- }
- }
-
-@@ -747,7 +752,7 @@
- if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
- {
- _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel
request!\n"));
--return (0);
-+return (-1);
- }
-
- switch (command)
