[arch-commits] Commit in cups/repos (24 files)
Andreas Radke
andyrtr at archlinux.org
Fri Jul 7 18:45:59 UTC 2017
Date: Friday, July 7, 2017 @ 18:45:58
Author: andyrtr
Revision: 299812
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
cups/repos/testing-i686/
cups/repos/testing-i686/PKGBUILD
(from rev 299811, cups/trunk/PKGBUILD)
cups/repos/testing-i686/cups-1.6.2-statedir.patch
(from rev 299811, cups/trunk/cups-1.6.2-statedir.patch)
cups/repos/testing-i686/cups-fix-install-perms.patch
(from rev 299811, cups/trunk/cups-fix-install-perms.patch)
cups/repos/testing-i686/cups-no-export-ssllibs.patch
(from rev 299811, cups/trunk/cups-no-export-ssllibs.patch)
cups/repos/testing-i686/cups-no-gcrypt.patch
(from rev 299811, cups/trunk/cups-no-gcrypt.patch)
cups/repos/testing-i686/cups-no-gzip-man.patch
(from rev 299811, cups/trunk/cups-no-gzip-man.patch)
cups/repos/testing-i686/cups-systemd-socket.patch
(from rev 299811, cups/trunk/cups-systemd-socket.patch)
cups/repos/testing-i686/cups.install
(from rev 299811, cups/trunk/cups.install)
cups/repos/testing-i686/cups.logrotate
(from rev 299811, cups/trunk/cups.logrotate)
cups/repos/testing-i686/cups.pam
(from rev 299811, cups/trunk/cups.pam)
cups/repos/testing-i686/cupsGetDests.diff
(from rev 299811, cups/trunk/cupsGetDests.diff)
cups/repos/testing-x86_64/
cups/repos/testing-x86_64/PKGBUILD
(from rev 299811, cups/trunk/PKGBUILD)
cups/repos/testing-x86_64/cups-1.6.2-statedir.patch
(from rev 299811, cups/trunk/cups-1.6.2-statedir.patch)
cups/repos/testing-x86_64/cups-fix-install-perms.patch
(from rev 299811, cups/trunk/cups-fix-install-perms.patch)
cups/repos/testing-x86_64/cups-no-export-ssllibs.patch
(from rev 299811, cups/trunk/cups-no-export-ssllibs.patch)
cups/repos/testing-x86_64/cups-no-gcrypt.patch
(from rev 299811, cups/trunk/cups-no-gcrypt.patch)
cups/repos/testing-x86_64/cups-no-gzip-man.patch
(from rev 299811, cups/trunk/cups-no-gzip-man.patch)
cups/repos/testing-x86_64/cups-systemd-socket.patch
(from rev 299811, cups/trunk/cups-systemd-socket.patch)
cups/repos/testing-x86_64/cups.install
(from rev 299811, cups/trunk/cups.install)
cups/repos/testing-x86_64/cups.logrotate
(from rev 299811, cups/trunk/cups.logrotate)
cups/repos/testing-x86_64/cups.pam
(from rev 299811, cups/trunk/cups.pam)
cups/repos/testing-x86_64/cupsGetDests.diff
(from rev 299811, cups/trunk/cupsGetDests.diff)
---------------------------------------------+
testing-i686/PKGBUILD | 168 ++++++++++++++++++++++++++
testing-i686/cups-1.6.2-statedir.patch | 12 +
testing-i686/cups-fix-install-perms.patch | 23 +++
testing-i686/cups-no-export-ssllibs.patch | 12 +
testing-i686/cups-no-gcrypt.patch | 11 +
testing-i686/cups-no-gzip-man.patch | 18 ++
testing-i686/cups-systemd-socket.patch | 48 +++++++
testing-i686/cups.install | 6
testing-i686/cups.logrotate | 5
testing-i686/cups.pam | 3
testing-i686/cupsGetDests.diff | 167 +++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 168 ++++++++++++++++++++++++++
testing-x86_64/cups-1.6.2-statedir.patch | 12 +
testing-x86_64/cups-fix-install-perms.patch | 23 +++
testing-x86_64/cups-no-export-ssllibs.patch | 12 +
testing-x86_64/cups-no-gcrypt.patch | 11 +
testing-x86_64/cups-no-gzip-man.patch | 18 ++
testing-x86_64/cups-systemd-socket.patch | 48 +++++++
testing-x86_64/cups.install | 6
testing-x86_64/cups.logrotate | 5
testing-x86_64/cups.pam | 3
testing-x86_64/cupsGetDests.diff | 167 +++++++++++++++++++++++++
22 files changed, 946 insertions(+)
Copied: cups/repos/testing-i686/PKGBUILD (from rev 299811, cups/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,168 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase="cups"
+pkgname=('libcups' 'cups')
+pkgver=2.2.4
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL')
+url="https://www.cups.org/"
+makedepends=('libtiff' 'libpng' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls'
+ 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus'
+ 'avahi' 'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 'valgrind')
+source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
+ 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'
+ 'SKIP'
+ 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
+ '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
+ 'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
+ '1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1'
+ 'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
+ '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
+ '2496b683920417c922d58c1f70807f7a0f0c818db9ce75fe182104bd4484027b'
+ 'cdad3c266cb2abb0f90af3113420fa47a09e3ed974a2ffa9fb6a642e11971d65'
+ '25c1f212d0055848c9d46195d74ade64514675c83b2098e41ba1144bd6b8a05d')
+validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security at cups.org>
+
+prepare() {
+
+ cd ${pkgbase}-${pkgver}
+
+ # 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
+ patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
+ # fix permissions on some files (by Gentoo) - alternative: cups-0755.patch by FC
+ patch -Np0 -i ${srcdir}/cups-fix-install-perms.patch
+
+ # bug fixes
+ # make sure network is up when starting and notify systemd - FC
+ patch -Np1 -i ${srcdir}/cups-systemd-socket.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
+ 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
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --libdir=/usr/lib \
+ --with-logdir=/var/log/cups \
+ --with-docdir=/usr/share/cups/doc \
+ --with-cups-user=daemon \
+ --with-cups-group=lp \
+ --enable-pam=yes \
+ --enable-raw-printing \
+ --enable-dbus --with-dbusdir=/etc/dbus-1 \
+ --enable-ssl=yes \
+ --enable-threads \
+ --enable-avahi\
+ --enable-libpaper \
+ --with-php=/usr/bin/php-cgi \
+ --with-optim="$CFLAGS" #--help
+ make
+}
+
+check() {
+ cd ${pkgbase}-${pkgver}
+ #make -k check || /bin/true
+}
+
+package_libcups() {
+pkgdesc="The CUPS Printing System - client libraries and headers"
+depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb')
+
+ cd ${pkgbase}-${pkgver}
+ make BUILDROOT=${pkgdir} install-headers install-libs
+ # put this into the libs pkg to make other software find the libs(no pkg-config file included)
+ mkdir -p ${pkgdir}/usr/bin
+ install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
+}
+
+package_cups() {
+pkgdesc="The CUPS Printing System - daemon package"
+install=cups.install
+backup=(etc/cups/cupsd.conf
+ etc/cups/snmp.conf
+ etc/cups/printers.conf
+ etc/cups/classes.conf
+ etc/cups/cups-files.conf
+ etc/cups/subscriptions.conf
+ etc/dbus-1/system.d/cups.conf
+ etc/logrotate.d/cups
+ etc/pam.d/cups)
+depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc'
+ 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
+optdepends=('xdg-utils: xdg .desktop file support'
+ 'colord: for ICC color profile support')
+
+ cd ${pkgbase}-${pkgver}
+ make BUILDROOT=${pkgdir} install-data install-exec
+
+ # this one we ship in the libcups pkg
+ rm -f ${pkgdir}/usr/bin/cups-config
+
+ # kill the sysv stuff
+ rm -rf ${pkgdir}/etc/rc*.d
+ rm -rf ${pkgdir}/etc/init.d
+ install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
+ install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
+
+ # fix perms on /var/spool and /etc
+ chmod 755 ${pkgdir}/var/spool
+ chmod 755 ${pkgdir}/etc
+
+ # install ssl directory where to store the certs, solves some samba issues
+ install -dm700 -g lp ${pkgdir}/etc/cups/ssl
+ # remove directory from package, it will be recreated at each server start
+ rm -rf ${pkgdir}/run
+
+ # install some more configuration files that will get filled by cupsd
+ touch ${pkgdir}/etc/cups/printers.conf
+ touch ${pkgdir}/etc/cups/classes.conf
+ touch ${pkgdir}/etc/cups/subscriptions.conf
+ chgrp -R lp ${pkgdir}/etc/cups
+
+ # fix .desktop file
+ sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
+
+ # compress some driver files, adopted from Fedora
+ find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
+
+ # remove client.conf man page
+ rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
+
+ # comment out all conversion rules which use any of the removed filters that are now part of cups-filters
+ perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' $pkgdir/usr/share/cups/mime/mime.convs
+
+ # comment out unnecessary PageLogFormat entry
+ sed -i -e 's:PageLogFormat:#PageLogFormat:' $pkgdir/etc/cups/cupsd.conf*
+}
Copied: cups/repos/testing-i686/cups-1.6.2-statedir.patch (from rev 299811, cups/trunk/cups-1.6.2-statedir.patch)
===================================================================
--- testing-i686/cups-1.6.2-statedir.patch (rev 0)
+++ testing-i686/cups-1.6.2-statedir.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +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
+@@ -420,7 +420,7 @@
+ ;;
+ *)
+ # All others
+- CUPS_STATEDIR="$localstatedir/run/cups"
++ CUPS_STATEDIR="/run/cups"
+ ;;
+ esac])
+ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
Copied: cups/repos/testing-i686/cups-fix-install-perms.patch (from rev 299811, cups/trunk/cups-fix-install-perms.patch)
===================================================================
--- testing-i686/cups-fix-install-perms.patch (rev 0)
+++ testing-i686/cups-fix-install-perms.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,23 @@
+--- Makedefs.in 2017-06-30 17:44:38.000000000 +0200
++++ Makedefs.in.new 2017-07-01 17:59:28.075942932 +0200
+@@ -38,14 +38,14 @@
+ # Installation programs...
+ #
+
+-INSTALL_BIN = $(LIBTOOL) $(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_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_MAN = $(INSTALL) -c -m 444
+-INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
++INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_MAN = $(INSTALL) -c -m 644
++INSTALL_SCRIPT = $(INSTALL) -c -m 755
+
+ #
+ # Default user, group, and system groups for the scheduler...
Copied: cups/repos/testing-i686/cups-no-export-ssllibs.patch (from rev 299811, cups/trunk/cups-no-export-ssllibs.patch)
===================================================================
--- testing-i686/cups-no-export-ssllibs.patch (rev 0)
+++ testing-i686/cups-no-export-ssllibs.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,12 @@
+diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
+--- cups-1.6.2/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200
+@@ -180,7 +180,7 @@
+ AC_SUBST(SSLFLAGS)
+ AC_SUBST(SSLLIBS)
+
+-EXPORT_SSLLIBS="$SSLLIBS"
++EXPORT_SSLLIBS=""
+ AC_SUBST(EXPORT_SSLLIBS)
+
+ dnl
Copied: cups/repos/testing-i686/cups-no-gcrypt.patch (from rev 299811, cups/trunk/cups-no-gcrypt.patch)
===================================================================
--- testing-i686/cups-no-gcrypt.patch (rev 0)
+++ testing-i686/cups-no-gcrypt.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,11 @@
+diff -up cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry cups-2.0rc1/config-scripts/cups-ssl.m4
+--- cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry 2014-09-12 15:41:23.324760213 +0200
++++ cups-2.0rc1/config-scripts/cups-ssl.m4 2014-09-12 15:43:13.124203363 +0200
+@@ -60,7 +60,6 @@ if test x$enable_ssl != xno; then
+ dnl Then look for GNU TLS...
+ if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
+ AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
+- AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config)
+ if $PKGCONFIG --exists gnutls; then
+ have_ssl=1
+ SSLLIBS=`$PKGCONFIG --libs gnutls`
Copied: cups/repos/testing-i686/cups-no-gzip-man.patch (from rev 299811, cups/trunk/cups-no-gzip-man.patch)
===================================================================
--- testing-i686/cups-no-gzip-man.patch (rev 0)
+++ testing-i686/cups-no-gzip-man.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,18 @@
+diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4
+--- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man 2011-05-12 07:21:56.000000000 +0200
++++ cups-1.5b1/config-scripts/cups-manpages.m4 2011-05-23 17:25:50.000000000 +0200
+@@ -69,10 +69,10 @@ case "$uname" in
+ ;;
+ Linux* | GNU* | Darwin*)
+ # Linux, GNU Hurd, and macOS
+- MAN1EXT=1.gz
+- MAN5EXT=5.gz
+- MAN7EXT=7.gz
+- MAN8EXT=8.gz
++ MAN1EXT=1
++ MAN5EXT=5
++ MAN7EXT=7
++ MAN8EXT=8
+ MAN8DIR=8
+ ;;
+ *)
Copied: cups/repos/testing-i686/cups-systemd-socket.patch (from rev 299811, cups/trunk/cups-systemd-socket.patch)
===================================================================
--- testing-i686/cups-systemd-socket.patch (rev 0)
+++ testing-i686/cups-systemd-socket.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,48 @@
+diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
+--- cups-2.0.2/scheduler/main.c.ustTJg 2015-02-10 13:40:24.121547526 +0100
++++ cups-2.0.2/scheduler/main.c 2015-02-10 13:40:24.295545063 +0100
+@@ -690,8 +690,15 @@ main(int argc, /* I - Number of comm
+
+ #if defined(HAVE_ONDEMAND)
+ if (OnDemand)
++ {
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
+- else
++# ifdef HAVE_SYSTEMD
++ sd_notifyf(0, "READY=1\n"
++ "STATUS=Scheduler is running...\n"
++ "MAINPID=%lu",
++ (unsigned long) getpid());
++# endif /* HAVE_SYSTEMD */
++ } else
+ #endif /* HAVE_ONDEMAND */
+ if (fg)
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
+diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
+--- cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg 2014-03-21 15:50:24.000000000 +0100
++++ cups-2.0.2/scheduler/org.cups.cupsd.path.in 2015-02-10 13:40:24.295545063 +0100
+@@ -2,7 +2,7 @@
+ Description=CUPS Scheduler
+
+ [Path]
+-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
++PathExistsGlob=@CUPS_REQUESTS@/d*
+
+ [Install]
+ WantedBy=multi-user.target
+diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.service.in
+--- cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg 2014-10-21 13:55:01.000000000 +0200
++++ cups-2.0.2/scheduler/org.cups.cupsd.service.in 2015-02-10 13:40:24.296545049 +0100
+@@ -1,10 +1,11 @@
+ [Unit]
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
++After=network.target
+
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
+-Type=simple
++Type=notify
+
+ [Install]
+ Also=org.cups.cupsd.socket org.cups.cupsd.path
Copied: cups/repos/testing-i686/cups.install (from rev 299811, cups/trunk/cups.install)
===================================================================
--- testing-i686/cups.install (rev 0)
+++ testing-i686/cups.install 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,6 @@
+post_install() {
+ echo ">> If you use an HTTPS connection to CUPS, the first time you access"
+ echo ">> the interface it may take a very long time before the site comes up."
+ echo ">> This is because the first request triggers the generation of the CUPS"
+ echo ">> SSL certificates which can be a very time-consuming job."
+}
Copied: cups/repos/testing-i686/cups.logrotate (from rev 299811, cups/trunk/cups.logrotate)
===================================================================
--- testing-i686/cups.logrotate (rev 0)
+++ testing-i686/cups.logrotate 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,5 @@
+/var/log/cups/*_log {
+ missingok
+ notifempty
+ sharedscripts
+}
Copied: cups/repos/testing-i686/cups.pam (from rev 299811, cups/trunk/cups.pam)
===================================================================
--- testing-i686/cups.pam (rev 0)
+++ testing-i686/cups.pam 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
Copied: cups/repos/testing-i686/cupsGetDests.diff (from rev 299811, cups/trunk/cupsGetDests.diff)
===================================================================
--- testing-i686/cupsGetDests.diff (rev 0)
+++ testing-i686/cupsGetDests.diff 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,167 @@
+diff --git a/cups/dest.c b/cups/dest.c
+index fc57ed342..9d7426ed3 100644
+--- a/cups/dest.c
++++ b/cups/dest.c
+@@ -1015,6 +1015,8 @@ cupsEnumDests(
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+
+
++ DEBUG_printf(("cupsEnumDests(flags=%x, msec=%d, cancel=%p, type=%x, mask=%x, cb=%p, user_data=%p)", flags, msec, (void *)cancel, type, mask, (void *)cb, (void *)user_data));
++
+ /*
+ * Range check input...
+ */
+@@ -1022,7 +1024,10 @@ cupsEnumDests(
+ (void)flags;
+
+ if (!cb)
++ {
++ DEBUG_puts("1cupsEnumDests: No callback, returning 0.");
+ return (0);
++ }
+
+ /*
+ * Get ready to enumerate...
+@@ -1141,7 +1146,10 @@ cupsEnumDests(
+
+ # ifdef HAVE_DNSSD
+ if (DNSServiceCreateConnection(&data.main_ref) != kDNSServiceErr_NoError)
++ {
++ DEBUG_puts("1cupsEnumDests: Unable to create service browser, returning 0.");
+ return (0);
++ }
+
+ main_fd = DNSServiceRefSockFD(data.main_ref);
+
+@@ -1172,8 +1180,8 @@ cupsEnumDests(
+ # else /* HAVE_AVAHI */
+ if ((data.simple_poll = avahi_simple_poll_new()) == NULL)
+ {
+- DEBUG_puts("cupsEnumDests: Unable to create Avahi simple poll object.");
+- return (1);
++ DEBUG_puts("1cupsEnumDests: Unable to create Avahi poll, returning 0.");
++ return (0);
+ }
+
+ avahi_simple_poll_set_func(data.simple_poll, cups_dnssd_poll_cb, &data);
+@@ -1183,9 +1191,9 @@ cupsEnumDests(
+ &error);
+ if (!data.client)
+ {
+- DEBUG_puts("cupsEnumDests: Unable to create Avahi client.");
++ DEBUG_puts("1cupsEnumDests: Unable to create Avahi client, returning 0.");
+ avahi_simple_poll_free(data.simple_poll);
+- return (1);
++ return (0);
+ }
+
+ data.browsers = 1;
+@@ -1374,6 +1382,8 @@ cupsEnumDests(
+ # endif /* HAVE_DNSSD */
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+
++ DEBUG_puts("1cupsEnumDests: Returning 1.");
++
+ return (1);
+ }
+
+@@ -2040,13 +2050,16 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
+ _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
+
+
+- /*
++ DEBUG_printf(("cupsGetDests2(http=%p, dests=%p)", (void *)http, (void *)dests));
++
++/*
+ * Range check the input...
+ */
+
+ if (!dests)
+ {
+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad NULL dests pointer"), 1);
++ DEBUG_puts("1cupsGetDests2: NULL dests pointer, returning 0.");
+ return (0);
+ }
+
+@@ -2061,6 +2074,8 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
+
+ if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
+ {
++ DEBUG_printf(("1cupsGetDests2: cupsLastError() is %s, returning 0.", cupsLastErrorString()));
++
+ cupsFreeDests(data.num_dests, data.dests);
+
+ *dests = (cups_dest_t *)0;
+@@ -2178,6 +2193,8 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
+ if (data.num_dests > 0)
+ _cupsSetError(IPP_STATUS_OK, NULL, 0);
+
++ DEBUG_printf(("1cupsGetDests2: Returning %d destinations.", data.num_dests));
++
+ return (data.num_dests);
+ }
+
+diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
+index 2edef8343..bdbb62d19 100644
+--- a/xcode/CUPS.xcodeproj/project.pbxproj
++++ b/xcode/CUPS.xcodeproj/project.pbxproj
+@@ -11049,8 +11049,6 @@
+ buildSettings = {
+ ASSETCATALOG_COMPRESSION = lossless;
+ CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
+- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+- CLANG_WARN_COMMA = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+@@ -11067,7 +11065,7 @@
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+- GCC_TREAT_WARNINGS_AS_ERRORS = YES;
++ GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+@@ -11096,8 +11094,6 @@
+ buildSettings = {
+ ASSETCATALOG_COMPRESSION = "respect-asset-catalog";
+ CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
+- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+- CLANG_WARN_COMMA = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+@@ -11112,7 +11108,7 @@
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+- GCC_TREAT_WARNINGS_AS_ERRORS = YES;
++ GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+
+diff --git a/cups/dest.c b/cups/dest.c
+index 9d7426ed3..09bb76b73 100644
+--- a/cups/dest.c
++++ b/cups/dest.c
+@@ -2072,17 +2072,6 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
+
+ cupsEnumDests(0, 1000, NULL, 0, 0, (cups_dest_cb_t)cups_get_cb, &data);
+
+- if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
+- {
+- DEBUG_printf(("1cupsGetDests2: cupsLastError() is %s, returning 0.", cupsLastErrorString()));
+-
+- cupsFreeDests(data.num_dests, data.dests);
+-
+- *dests = (cups_dest_t *)0;
+-
+- return (0);
+- }
+-
+ /*
+ * Make a copy of the "real" queues for a later sanity check...
+ */
+
Copied: cups/repos/testing-x86_64/PKGBUILD (from rev 299811, cups/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,168 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase="cups"
+pkgname=('libcups' 'cups')
+pkgver=2.2.4
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL')
+url="https://www.cups.org/"
+makedepends=('libtiff' 'libpng' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls'
+ 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus'
+ 'avahi' 'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 'valgrind')
+source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
+ 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'
+ 'SKIP'
+ 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
+ '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
+ 'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
+ '1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1'
+ 'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
+ '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
+ '2496b683920417c922d58c1f70807f7a0f0c818db9ce75fe182104bd4484027b'
+ 'cdad3c266cb2abb0f90af3113420fa47a09e3ed974a2ffa9fb6a642e11971d65'
+ '25c1f212d0055848c9d46195d74ade64514675c83b2098e41ba1144bd6b8a05d')
+validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security at cups.org>
+
+prepare() {
+
+ cd ${pkgbase}-${pkgver}
+
+ # 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
+ patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
+ # fix permissions on some files (by Gentoo) - alternative: cups-0755.patch by FC
+ patch -Np0 -i ${srcdir}/cups-fix-install-perms.patch
+
+ # bug fixes
+ # make sure network is up when starting and notify systemd - FC
+ patch -Np1 -i ${srcdir}/cups-systemd-socket.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
+ 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
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --libdir=/usr/lib \
+ --with-logdir=/var/log/cups \
+ --with-docdir=/usr/share/cups/doc \
+ --with-cups-user=daemon \
+ --with-cups-group=lp \
+ --enable-pam=yes \
+ --enable-raw-printing \
+ --enable-dbus --with-dbusdir=/etc/dbus-1 \
+ --enable-ssl=yes \
+ --enable-threads \
+ --enable-avahi\
+ --enable-libpaper \
+ --with-php=/usr/bin/php-cgi \
+ --with-optim="$CFLAGS" #--help
+ make
+}
+
+check() {
+ cd ${pkgbase}-${pkgver}
+ #make -k check || /bin/true
+}
+
+package_libcups() {
+pkgdesc="The CUPS Printing System - client libraries and headers"
+depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb')
+
+ cd ${pkgbase}-${pkgver}
+ make BUILDROOT=${pkgdir} install-headers install-libs
+ # put this into the libs pkg to make other software find the libs(no pkg-config file included)
+ mkdir -p ${pkgdir}/usr/bin
+ install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
+}
+
+package_cups() {
+pkgdesc="The CUPS Printing System - daemon package"
+install=cups.install
+backup=(etc/cups/cupsd.conf
+ etc/cups/snmp.conf
+ etc/cups/printers.conf
+ etc/cups/classes.conf
+ etc/cups/cups-files.conf
+ etc/cups/subscriptions.conf
+ etc/dbus-1/system.d/cups.conf
+ etc/logrotate.d/cups
+ etc/pam.d/cups)
+depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc'
+ 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
+optdepends=('xdg-utils: xdg .desktop file support'
+ 'colord: for ICC color profile support')
+
+ cd ${pkgbase}-${pkgver}
+ make BUILDROOT=${pkgdir} install-data install-exec
+
+ # this one we ship in the libcups pkg
+ rm -f ${pkgdir}/usr/bin/cups-config
+
+ # kill the sysv stuff
+ rm -rf ${pkgdir}/etc/rc*.d
+ rm -rf ${pkgdir}/etc/init.d
+ install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
+ install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
+
+ # fix perms on /var/spool and /etc
+ chmod 755 ${pkgdir}/var/spool
+ chmod 755 ${pkgdir}/etc
+
+ # install ssl directory where to store the certs, solves some samba issues
+ install -dm700 -g lp ${pkgdir}/etc/cups/ssl
+ # remove directory from package, it will be recreated at each server start
+ rm -rf ${pkgdir}/run
+
+ # install some more configuration files that will get filled by cupsd
+ touch ${pkgdir}/etc/cups/printers.conf
+ touch ${pkgdir}/etc/cups/classes.conf
+ touch ${pkgdir}/etc/cups/subscriptions.conf
+ chgrp -R lp ${pkgdir}/etc/cups
+
+ # fix .desktop file
+ sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
+
+ # compress some driver files, adopted from Fedora
+ find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
+
+ # remove client.conf man page
+ rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
+
+ # comment out all conversion rules which use any of the removed filters that are now part of cups-filters
+ perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' $pkgdir/usr/share/cups/mime/mime.convs
+
+ # comment out unnecessary PageLogFormat entry
+ sed -i -e 's:PageLogFormat:#PageLogFormat:' $pkgdir/etc/cups/cupsd.conf*
+}
Copied: cups/repos/testing-x86_64/cups-1.6.2-statedir.patch (from rev 299811, cups/trunk/cups-1.6.2-statedir.patch)
===================================================================
--- testing-x86_64/cups-1.6.2-statedir.patch (rev 0)
+++ testing-x86_64/cups-1.6.2-statedir.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +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
+@@ -420,7 +420,7 @@
+ ;;
+ *)
+ # All others
+- CUPS_STATEDIR="$localstatedir/run/cups"
++ CUPS_STATEDIR="/run/cups"
+ ;;
+ esac])
+ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
Copied: cups/repos/testing-x86_64/cups-fix-install-perms.patch (from rev 299811, cups/trunk/cups-fix-install-perms.patch)
===================================================================
--- testing-x86_64/cups-fix-install-perms.patch (rev 0)
+++ testing-x86_64/cups-fix-install-perms.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,23 @@
+--- Makedefs.in 2017-06-30 17:44:38.000000000 +0200
++++ Makedefs.in.new 2017-07-01 17:59:28.075942932 +0200
+@@ -38,14 +38,14 @@
+ # Installation programs...
+ #
+
+-INSTALL_BIN = $(LIBTOOL) $(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_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_MAN = $(INSTALL) -c -m 444
+-INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
++INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_MAN = $(INSTALL) -c -m 644
++INSTALL_SCRIPT = $(INSTALL) -c -m 755
+
+ #
+ # Default user, group, and system groups for the scheduler...
Copied: cups/repos/testing-x86_64/cups-no-export-ssllibs.patch (from rev 299811, cups/trunk/cups-no-export-ssllibs.patch)
===================================================================
--- testing-x86_64/cups-no-export-ssllibs.patch (rev 0)
+++ testing-x86_64/cups-no-export-ssllibs.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,12 @@
+diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
+--- cups-1.6.2/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200
+@@ -180,7 +180,7 @@
+ AC_SUBST(SSLFLAGS)
+ AC_SUBST(SSLLIBS)
+
+-EXPORT_SSLLIBS="$SSLLIBS"
++EXPORT_SSLLIBS=""
+ AC_SUBST(EXPORT_SSLLIBS)
+
+ dnl
Copied: cups/repos/testing-x86_64/cups-no-gcrypt.patch (from rev 299811, cups/trunk/cups-no-gcrypt.patch)
===================================================================
--- testing-x86_64/cups-no-gcrypt.patch (rev 0)
+++ testing-x86_64/cups-no-gcrypt.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,11 @@
+diff -up cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry cups-2.0rc1/config-scripts/cups-ssl.m4
+--- cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry 2014-09-12 15:41:23.324760213 +0200
++++ cups-2.0rc1/config-scripts/cups-ssl.m4 2014-09-12 15:43:13.124203363 +0200
+@@ -60,7 +60,6 @@ if test x$enable_ssl != xno; then
+ dnl Then look for GNU TLS...
+ if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
+ AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
+- AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config)
+ if $PKGCONFIG --exists gnutls; then
+ have_ssl=1
+ SSLLIBS=`$PKGCONFIG --libs gnutls`
Copied: cups/repos/testing-x86_64/cups-no-gzip-man.patch (from rev 299811, cups/trunk/cups-no-gzip-man.patch)
===================================================================
--- testing-x86_64/cups-no-gzip-man.patch (rev 0)
+++ testing-x86_64/cups-no-gzip-man.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,18 @@
+diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4
+--- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man 2011-05-12 07:21:56.000000000 +0200
++++ cups-1.5b1/config-scripts/cups-manpages.m4 2011-05-23 17:25:50.000000000 +0200
+@@ -69,10 +69,10 @@ case "$uname" in
+ ;;
+ Linux* | GNU* | Darwin*)
+ # Linux, GNU Hurd, and macOS
+- MAN1EXT=1.gz
+- MAN5EXT=5.gz
+- MAN7EXT=7.gz
+- MAN8EXT=8.gz
++ MAN1EXT=1
++ MAN5EXT=5
++ MAN7EXT=7
++ MAN8EXT=8
+ MAN8DIR=8
+ ;;
+ *)
Copied: cups/repos/testing-x86_64/cups-systemd-socket.patch (from rev 299811, cups/trunk/cups-systemd-socket.patch)
===================================================================
--- testing-x86_64/cups-systemd-socket.patch (rev 0)
+++ testing-x86_64/cups-systemd-socket.patch 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,48 @@
+diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
+--- cups-2.0.2/scheduler/main.c.ustTJg 2015-02-10 13:40:24.121547526 +0100
++++ cups-2.0.2/scheduler/main.c 2015-02-10 13:40:24.295545063 +0100
+@@ -690,8 +690,15 @@ main(int argc, /* I - Number of comm
+
+ #if defined(HAVE_ONDEMAND)
+ if (OnDemand)
++ {
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
+- else
++# ifdef HAVE_SYSTEMD
++ sd_notifyf(0, "READY=1\n"
++ "STATUS=Scheduler is running...\n"
++ "MAINPID=%lu",
++ (unsigned long) getpid());
++# endif /* HAVE_SYSTEMD */
++ } else
+ #endif /* HAVE_ONDEMAND */
+ if (fg)
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
+diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
+--- cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg 2014-03-21 15:50:24.000000000 +0100
++++ cups-2.0.2/scheduler/org.cups.cupsd.path.in 2015-02-10 13:40:24.295545063 +0100
+@@ -2,7 +2,7 @@
+ Description=CUPS Scheduler
+
+ [Path]
+-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
++PathExistsGlob=@CUPS_REQUESTS@/d*
+
+ [Install]
+ WantedBy=multi-user.target
+diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.service.in
+--- cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg 2014-10-21 13:55:01.000000000 +0200
++++ cups-2.0.2/scheduler/org.cups.cupsd.service.in 2015-02-10 13:40:24.296545049 +0100
+@@ -1,10 +1,11 @@
+ [Unit]
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
++After=network.target
+
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
+-Type=simple
++Type=notify
+
+ [Install]
+ Also=org.cups.cupsd.socket org.cups.cupsd.path
Copied: cups/repos/testing-x86_64/cups.install (from rev 299811, cups/trunk/cups.install)
===================================================================
--- testing-x86_64/cups.install (rev 0)
+++ testing-x86_64/cups.install 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,6 @@
+post_install() {
+ echo ">> If you use an HTTPS connection to CUPS, the first time you access"
+ echo ">> the interface it may take a very long time before the site comes up."
+ echo ">> This is because the first request triggers the generation of the CUPS"
+ echo ">> SSL certificates which can be a very time-consuming job."
+}
Copied: cups/repos/testing-x86_64/cups.logrotate (from rev 299811, cups/trunk/cups.logrotate)
===================================================================
--- testing-x86_64/cups.logrotate (rev 0)
+++ testing-x86_64/cups.logrotate 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,5 @@
+/var/log/cups/*_log {
+ missingok
+ notifempty
+ sharedscripts
+}
Copied: cups/repos/testing-x86_64/cups.pam (from rev 299811, cups/trunk/cups.pam)
===================================================================
--- testing-x86_64/cups.pam (rev 0)
+++ testing-x86_64/cups.pam 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
Copied: cups/repos/testing-x86_64/cupsGetDests.diff (from rev 299811, cups/trunk/cupsGetDests.diff)
===================================================================
--- testing-x86_64/cupsGetDests.diff (rev 0)
+++ testing-x86_64/cupsGetDests.diff 2017-07-07 18:45:58 UTC (rev 299812)
@@ -0,0 +1,167 @@
+diff --git a/cups/dest.c b/cups/dest.c
+index fc57ed342..9d7426ed3 100644
+--- a/cups/dest.c
++++ b/cups/dest.c
+@@ -1015,6 +1015,8 @@ cupsEnumDests(
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+
+
++ DEBUG_printf(("cupsEnumDests(flags=%x, msec=%d, cancel=%p, type=%x, mask=%x, cb=%p, user_data=%p)", flags, msec, (void *)cancel, type, mask, (void *)cb, (void *)user_data));
++
+ /*
+ * Range check input...
+ */
+@@ -1022,7 +1024,10 @@ cupsEnumDests(
+ (void)flags;
+
+ if (!cb)
++ {
++ DEBUG_puts("1cupsEnumDests: No callback, returning 0.");
+ return (0);
++ }
+
+ /*
+ * Get ready to enumerate...
+@@ -1141,7 +1146,10 @@ cupsEnumDests(
+
+ # ifdef HAVE_DNSSD
+ if (DNSServiceCreateConnection(&data.main_ref) != kDNSServiceErr_NoError)
++ {
++ DEBUG_puts("1cupsEnumDests: Unable to create service browser, returning 0.");
+ return (0);
++ }
+
+ main_fd = DNSServiceRefSockFD(data.main_ref);
+
+@@ -1172,8 +1180,8 @@ cupsEnumDests(
+ # else /* HAVE_AVAHI */
+ if ((data.simple_poll = avahi_simple_poll_new()) == NULL)
+ {
+- DEBUG_puts("cupsEnumDests: Unable to create Avahi simple poll object.");
+- return (1);
++ DEBUG_puts("1cupsEnumDests: Unable to create Avahi poll, returning 0.");
++ return (0);
+ }
+
+ avahi_simple_poll_set_func(data.simple_poll, cups_dnssd_poll_cb, &data);
+@@ -1183,9 +1191,9 @@ cupsEnumDests(
+ &error);
+ if (!data.client)
+ {
+- DEBUG_puts("cupsEnumDests: Unable to create Avahi client.");
++ DEBUG_puts("1cupsEnumDests: Unable to create Avahi client, returning 0.");
+ avahi_simple_poll_free(data.simple_poll);
+- return (1);
++ return (0);
+ }
+
+ data.browsers = 1;
+@@ -1374,6 +1382,8 @@ cupsEnumDests(
+ # endif /* HAVE_DNSSD */
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+
++ DEBUG_puts("1cupsEnumDests: Returning 1.");
++
+ return (1);
+ }
+
+@@ -2040,13 +2050,16 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
+ _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
+
+
+- /*
++ DEBUG_printf(("cupsGetDests2(http=%p, dests=%p)", (void *)http, (void *)dests));
++
++/*
+ * Range check the input...
+ */
+
+ if (!dests)
+ {
+ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad NULL dests pointer"), 1);
++ DEBUG_puts("1cupsGetDests2: NULL dests pointer, returning 0.");
+ return (0);
+ }
+
+@@ -2061,6 +2074,8 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
+
+ if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
+ {
++ DEBUG_printf(("1cupsGetDests2: cupsLastError() is %s, returning 0.", cupsLastErrorString()));
++
+ cupsFreeDests(data.num_dests, data.dests);
+
+ *dests = (cups_dest_t *)0;
+@@ -2178,6 +2193,8 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
+ if (data.num_dests > 0)
+ _cupsSetError(IPP_STATUS_OK, NULL, 0);
+
++ DEBUG_printf(("1cupsGetDests2: Returning %d destinations.", data.num_dests));
++
+ return (data.num_dests);
+ }
+
+diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
+index 2edef8343..bdbb62d19 100644
+--- a/xcode/CUPS.xcodeproj/project.pbxproj
++++ b/xcode/CUPS.xcodeproj/project.pbxproj
+@@ -11049,8 +11049,6 @@
+ buildSettings = {
+ ASSETCATALOG_COMPRESSION = lossless;
+ CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
+- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+- CLANG_WARN_COMMA = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+@@ -11067,7 +11065,7 @@
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+- GCC_TREAT_WARNINGS_AS_ERRORS = YES;
++ GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+@@ -11096,8 +11094,6 @@
+ buildSettings = {
+ ASSETCATALOG_COMPRESSION = "respect-asset-catalog";
+ CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
+- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+- CLANG_WARN_COMMA = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+@@ -11112,7 +11108,7 @@
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+- GCC_TREAT_WARNINGS_AS_ERRORS = YES;
++ GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+
+diff --git a/cups/dest.c b/cups/dest.c
+index 9d7426ed3..09bb76b73 100644
+--- a/cups/dest.c
++++ b/cups/dest.c
+@@ -2072,17 +2072,6 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
+
+ cupsEnumDests(0, 1000, NULL, 0, 0, (cups_dest_cb_t)cups_get_cb, &data);
+
+- if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
+- {
+- DEBUG_printf(("1cupsGetDests2: cupsLastError() is %s, returning 0.", cupsLastErrorString()));
+-
+- cupsFreeDests(data.num_dests, data.dests);
+-
+- *dests = (cups_dest_t *)0;
+-
+- return (0);
+- }
+-
+ /*
+ * Make a copy of the "real" queues for a later sanity check...
+ */
+
More information about the arch-commits
mailing list