Date: Saturday, September 17, 2016 @ 12:52:50 Author: andyrtr Revision: 276650
archrelease: copy trunk to testing-i686, testing-x86_64 Added: cups/repos/testing-i686/PKGBUILD (from rev 276649, cups/trunk/PKGBUILD) cups/repos/testing-i686/cups-1.6.0-fix-install-perms.patch (from rev 276649, cups/trunk/cups-1.6.0-fix-install-perms.patch) cups/repos/testing-i686/cups-1.6.2-statedir.patch (from rev 276649, cups/trunk/cups-1.6.2-statedir.patch) cups/repos/testing-i686/cups-no-export-ssllibs.patch (from rev 276649, cups/trunk/cups-no-export-ssllibs.patch) cups/repos/testing-i686/cups-no-gcrypt.patch (from rev 276649, cups/trunk/cups-no-gcrypt.patch) cups/repos/testing-i686/cups-no-gzip-man.patch (from rev 276649, cups/trunk/cups-no-gzip-man.patch) cups/repos/testing-i686/cups-systemd-socket.patch (from rev 276649, cups/trunk/cups-systemd-socket.patch) cups/repos/testing-i686/cups.install (from rev 276649, cups/trunk/cups.install) cups/repos/testing-i686/cups.logrotate (from rev 276649, cups/trunk/cups.logrotate) cups/repos/testing-i686/cups.pam (from rev 276649, cups/trunk/cups.pam) cups/repos/testing-i686/start_cups_by_port631.diff (from rev 276649, cups/trunk/start_cups_by_port631.diff) cups/repos/testing-x86_64/PKGBUILD (from rev 276649, cups/trunk/PKGBUILD) cups/repos/testing-x86_64/cups-1.6.0-fix-install-perms.patch (from rev 276649, cups/trunk/cups-1.6.0-fix-install-perms.patch) cups/repos/testing-x86_64/cups-1.6.2-statedir.patch (from rev 276649, cups/trunk/cups-1.6.2-statedir.patch) cups/repos/testing-x86_64/cups-no-export-ssllibs.patch (from rev 276649, cups/trunk/cups-no-export-ssllibs.patch) cups/repos/testing-x86_64/cups-no-gcrypt.patch (from rev 276649, cups/trunk/cups-no-gcrypt.patch) cups/repos/testing-x86_64/cups-no-gzip-man.patch (from rev 276649, cups/trunk/cups-no-gzip-man.patch) cups/repos/testing-x86_64/cups-systemd-socket.patch (from rev 276649, cups/trunk/cups-systemd-socket.patch) cups/repos/testing-x86_64/cups.install (from rev 276649, cups/trunk/cups.install) cups/repos/testing-x86_64/cups.logrotate (from rev 276649, cups/trunk/cups.logrotate) cups/repos/testing-x86_64/cups.pam (from rev 276649, cups/trunk/cups.pam) cups/repos/testing-x86_64/start_cups_by_port631.diff (from rev 276649, cups/trunk/start_cups_by_port631.diff) Deleted: cups/repos/testing-i686/PKGBUILD cups/repos/testing-i686/cups-1.6.0-fix-install-perms.patch cups/repos/testing-i686/cups-1.6.2-statedir.patch cups/repos/testing-i686/cups-no-export-ssllibs.patch cups/repos/testing-i686/cups-no-gcrypt.patch cups/repos/testing-i686/cups-no-gzip-man.patch cups/repos/testing-i686/cups-systemd-socket.patch cups/repos/testing-i686/cups.install cups/repos/testing-i686/cups.logrotate cups/repos/testing-i686/cups.pam cups/repos/testing-x86_64/PKGBUILD cups/repos/testing-x86_64/cups-1.6.0-fix-install-perms.patch cups/repos/testing-x86_64/cups-1.6.2-statedir.patch cups/repos/testing-x86_64/cups-no-export-ssllibs.patch cups/repos/testing-x86_64/cups-no-gcrypt.patch cups/repos/testing-x86_64/cups-no-gzip-man.patch cups/repos/testing-x86_64/cups-systemd-socket.patch cups/repos/testing-x86_64/cups.install cups/repos/testing-x86_64/cups.logrotate cups/repos/testing-x86_64/cups.pam ---------------------------------------------------+ /PKGBUILD | 340 ++++++++++++++++++++ /cups-1.6.0-fix-install-perms.patch | 50 ++ /cups-1.6.2-statedir.patch | 24 + /cups-no-export-ssllibs.patch | 24 + /cups-no-gcrypt.patch | 22 + /cups-no-gzip-man.patch | 36 ++ /cups-systemd-socket.patch | 96 +++++ /cups.install | 12 /cups.logrotate | 10 /cups.pam | 6 testing-i686/PKGBUILD | 166 --------- testing-i686/cups-1.6.0-fix-install-perms.patch | 25 - testing-i686/cups-1.6.2-statedir.patch | 12 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/start_cups_by_port631.diff | 10 testing-x86_64/PKGBUILD | 166 --------- testing-x86_64/cups-1.6.0-fix-install-perms.patch | 25 - testing-x86_64/cups-1.6.2-statedir.patch | 12 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/start_cups_by_port631.diff | 10 32 files changed, 640 insertions(+), 612 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-i686/PKGBUILD 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,166 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgbase="cups" -pkgname=('libcups' 'cups') -pkgver=2.2.0 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL') -url="http://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 - 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-1.6.0-fix-install-perms.patch - # bugfixes - cups-systemd-socket.patch -) -md5sums=('e22d943cff300411d3616dc2ee86272c' - 'fc8286f185e2cc5f7e1f6843bf193e2b' - '96f82c38f3f540b53f3e5144900acf17' - '3ba9e3410df1dc3015463d615ef91b3b' - '1beb4896f217bc241bc08a422274ec0c' - '39dd3141991c3052b73f59ece70e1ea6' - '451609db34f95209d64c38474de27ce1' - '5117f65342fcc69c6a506529e4daca9e' - '53bb3c80ee6823d36f9ab499373edfc5') -validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <secur...@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-1.6.0-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 - - # 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 - - # install client.conf man page and config file - install -dm755 ${pkgdir}/usr/share/man/man5 - install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/ -} - -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' 'colord' - 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme') -optdepends=('xdg-utils: xdg .desktop file 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/PKGBUILD (from rev 276649, cups/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2016-09-17 12:52:50 UTC (rev 276650) @@ -0,0 +1,170 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase="cups" +pkgname=('libcups' 'cups') +pkgver=2.2.0 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL') +url="http://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 + 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-1.6.0-fix-install-perms.patch + # bugfixes + cups-systemd-socket.patch + start_cups_by_port631.diff +) +md5sums=('e22d943cff300411d3616dc2ee86272c' + 'fc8286f185e2cc5f7e1f6843bf193e2b' + '96f82c38f3f540b53f3e5144900acf17' + '3ba9e3410df1dc3015463d615ef91b3b' + '1beb4896f217bc241bc08a422274ec0c' + '39dd3141991c3052b73f59ece70e1ea6' + '451609db34f95209d64c38474de27ce1' + '5117f65342fcc69c6a506529e4daca9e' + '53bb3c80ee6823d36f9ab499373edfc5' + 'f75c17b1b2d446a27b629f63622b9468') +validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <secur...@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-1.6.0-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 + # make sure cupsd starts when requested via web interface + patch -Np1 -i ${srcdir}/start_cups_by_port631.diff + + # 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 + + # 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 + + # install client.conf man page and config file + install -dm755 ${pkgdir}/usr/share/man/man5 + install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/ +} + +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' 'colord' + 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme') +optdepends=('xdg-utils: xdg .desktop file 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* +} Deleted: testing-i686/cups-1.6.0-fix-install-perms.patch =================================================================== --- testing-i686/cups-1.6.0-fix-install-perms.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-i686/cups-1.6.0-fix-install-perms.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,25 +0,0 @@ -Index: Makedefs.in -=================================================================== ---- Makedefs.in (Revision 10520) -+++ Makedefs.in (Arbeitskopie) -@@ -40,14 +40,14 @@ - # Installation programs... - # - --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @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 555 @INSTALL_STRIP@ --INSTALL_MAN = $(INSTALL) -c -m 444 --INSTALL_SCRIPT = $(INSTALL) -c -m 555 -+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-1.6.0-fix-install-perms.patch (from rev 276649, cups/trunk/cups-1.6.0-fix-install-perms.patch) =================================================================== --- testing-i686/cups-1.6.0-fix-install-perms.patch (rev 0) +++ testing-i686/cups-1.6.0-fix-install-perms.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -0,0 +1,25 @@ +Index: Makedefs.in +=================================================================== +--- Makedefs.in (Revision 10520) ++++ Makedefs.in (Arbeitskopie) +@@ -40,14 +40,14 @@ + # Installation programs... + # + +-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @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 555 @INSTALL_STRIP@ +-INSTALL_MAN = $(INSTALL) -c -m 444 +-INSTALL_SCRIPT = $(INSTALL) -c -m 555 ++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... Deleted: testing-i686/cups-1.6.2-statedir.patch =================================================================== --- testing-i686/cups-1.6.2-statedir.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-i686/cups-1.6.2-statedir.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,12 +0,0 @@ -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-1.6.2-statedir.patch (from rev 276649, 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 2016-09-17 12:52:50 UTC (rev 276650) @@ -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") Deleted: testing-i686/cups-no-export-ssllibs.patch =================================================================== --- testing-i686/cups-no-export-ssllibs.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-i686/cups-no-export-ssllibs.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,12 +0,0 @@ -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-export-ssllibs.patch (from rev 276649, cups/trunk/cups-no-export-ssllibs.patch) =================================================================== --- testing-i686/cups-no-export-ssllibs.patch (rev 0) +++ testing-i686/cups-no-export-ssllibs.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -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 Deleted: testing-i686/cups-no-gcrypt.patch =================================================================== --- testing-i686/cups-no-gcrypt.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-i686/cups-no-gcrypt.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,11 +0,0 @@ -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-gcrypt.patch (from rev 276649, cups/trunk/cups-no-gcrypt.patch) =================================================================== --- testing-i686/cups-no-gcrypt.patch (rev 0) +++ testing-i686/cups-no-gcrypt.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -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` Deleted: testing-i686/cups-no-gzip-man.patch =================================================================== --- testing-i686/cups-no-gzip-man.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-i686/cups-no-gzip-man.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,18 +0,0 @@ -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-no-gzip-man.patch (from rev 276649, cups/trunk/cups-no-gzip-man.patch) =================================================================== --- testing-i686/cups-no-gzip-man.patch (rev 0) +++ testing-i686/cups-no-gzip-man.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -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 + ;; + *) Deleted: testing-i686/cups-systemd-socket.patch =================================================================== --- testing-i686/cups-systemd-socket.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-i686/cups-systemd-socket.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,48 +0,0 @@ -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-systemd-socket.patch (from rev 276649, cups/trunk/cups-systemd-socket.patch) =================================================================== --- testing-i686/cups-systemd-socket.patch (rev 0) +++ testing-i686/cups-systemd-socket.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -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 Deleted: testing-i686/cups.install =================================================================== --- testing-i686/cups.install 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-i686/cups.install 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,6 +0,0 @@ -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.install (from rev 276649, cups/trunk/cups.install) =================================================================== --- testing-i686/cups.install (rev 0) +++ testing-i686/cups.install 2016-09-17 12:52:50 UTC (rev 276650) @@ -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." +} Deleted: testing-i686/cups.logrotate =================================================================== --- testing-i686/cups.logrotate 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-i686/cups.logrotate 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,5 +0,0 @@ -/var/log/cups/*_log { - missingok - notifempty - sharedscripts -} Copied: cups/repos/testing-i686/cups.logrotate (from rev 276649, cups/trunk/cups.logrotate) =================================================================== --- testing-i686/cups.logrotate (rev 0) +++ testing-i686/cups.logrotate 2016-09-17 12:52:50 UTC (rev 276650) @@ -0,0 +1,5 @@ +/var/log/cups/*_log { + missingok + notifempty + sharedscripts +} Deleted: testing-i686/cups.pam =================================================================== --- testing-i686/cups.pam 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-i686/cups.pam 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so Copied: cups/repos/testing-i686/cups.pam (from rev 276649, cups/trunk/cups.pam) =================================================================== --- testing-i686/cups.pam (rev 0) +++ testing-i686/cups.pam 2016-09-17 12:52:50 UTC (rev 276650) @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so Copied: cups/repos/testing-i686/start_cups_by_port631.diff (from rev 276649, cups/trunk/start_cups_by_port631.diff) =================================================================== --- testing-i686/start_cups_by_port631.diff (rev 0) +++ testing-i686/start_cups_by_port631.diff 2016-09-17 12:52:50 UTC (rev 276650) @@ -0,0 +1,10 @@ +--- cups-2.2.0/scheduler/org.cups.cupsd.socket.in 2016-09-14 01:39:47.000000000 +0200 ++++ cups-2.2.0/scheduler/org.cups.cupsd.socket.in.new 2016-09-17 14:43:49.237741189 +0200 +@@ -3,6 +3,7 @@ + + [Socket] + ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ ++ListenStream=631 + + [Install] + WantedBy=sockets.target Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-x86_64/PKGBUILD 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,166 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgbase="cups" -pkgname=('libcups' 'cups') -pkgver=2.2.0 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL') -url="http://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 - 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-1.6.0-fix-install-perms.patch - # bugfixes - cups-systemd-socket.patch -) -md5sums=('e22d943cff300411d3616dc2ee86272c' - 'fc8286f185e2cc5f7e1f6843bf193e2b' - '96f82c38f3f540b53f3e5144900acf17' - '3ba9e3410df1dc3015463d615ef91b3b' - '1beb4896f217bc241bc08a422274ec0c' - '39dd3141991c3052b73f59ece70e1ea6' - '451609db34f95209d64c38474de27ce1' - '5117f65342fcc69c6a506529e4daca9e' - '53bb3c80ee6823d36f9ab499373edfc5') -validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <secur...@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-1.6.0-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 - - # 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 - - # install client.conf man page and config file - install -dm755 ${pkgdir}/usr/share/man/man5 - install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/ -} - -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' 'colord' - 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme') -optdepends=('xdg-utils: xdg .desktop file 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/PKGBUILD (from rev 276649, cups/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2016-09-17 12:52:50 UTC (rev 276650) @@ -0,0 +1,170 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase="cups" +pkgname=('libcups' 'cups') +pkgver=2.2.0 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL') +url="http://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 + 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-1.6.0-fix-install-perms.patch + # bugfixes + cups-systemd-socket.patch + start_cups_by_port631.diff +) +md5sums=('e22d943cff300411d3616dc2ee86272c' + 'fc8286f185e2cc5f7e1f6843bf193e2b' + '96f82c38f3f540b53f3e5144900acf17' + '3ba9e3410df1dc3015463d615ef91b3b' + '1beb4896f217bc241bc08a422274ec0c' + '39dd3141991c3052b73f59ece70e1ea6' + '451609db34f95209d64c38474de27ce1' + '5117f65342fcc69c6a506529e4daca9e' + '53bb3c80ee6823d36f9ab499373edfc5' + 'f75c17b1b2d446a27b629f63622b9468') +validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <secur...@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-1.6.0-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 + # make sure cupsd starts when requested via web interface + patch -Np1 -i ${srcdir}/start_cups_by_port631.diff + + # 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 + + # 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 + + # install client.conf man page and config file + install -dm755 ${pkgdir}/usr/share/man/man5 + install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/ +} + +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' 'colord' + 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme') +optdepends=('xdg-utils: xdg .desktop file 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* +} Deleted: testing-x86_64/cups-1.6.0-fix-install-perms.patch =================================================================== --- testing-x86_64/cups-1.6.0-fix-install-perms.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-x86_64/cups-1.6.0-fix-install-perms.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,25 +0,0 @@ -Index: Makedefs.in -=================================================================== ---- Makedefs.in (Revision 10520) -+++ Makedefs.in (Arbeitskopie) -@@ -40,14 +40,14 @@ - # Installation programs... - # - --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @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 555 @INSTALL_STRIP@ --INSTALL_MAN = $(INSTALL) -c -m 444 --INSTALL_SCRIPT = $(INSTALL) -c -m 555 -+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-1.6.0-fix-install-perms.patch (from rev 276649, cups/trunk/cups-1.6.0-fix-install-perms.patch) =================================================================== --- testing-x86_64/cups-1.6.0-fix-install-perms.patch (rev 0) +++ testing-x86_64/cups-1.6.0-fix-install-perms.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -0,0 +1,25 @@ +Index: Makedefs.in +=================================================================== +--- Makedefs.in (Revision 10520) ++++ Makedefs.in (Arbeitskopie) +@@ -40,14 +40,14 @@ + # Installation programs... + # + +-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @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 555 @INSTALL_STRIP@ +-INSTALL_MAN = $(INSTALL) -c -m 444 +-INSTALL_SCRIPT = $(INSTALL) -c -m 555 ++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... Deleted: testing-x86_64/cups-1.6.2-statedir.patch =================================================================== --- testing-x86_64/cups-1.6.2-statedir.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-x86_64/cups-1.6.2-statedir.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,12 +0,0 @@ -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-1.6.2-statedir.patch (from rev 276649, 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 2016-09-17 12:52:50 UTC (rev 276650) @@ -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") Deleted: testing-x86_64/cups-no-export-ssllibs.patch =================================================================== --- testing-x86_64/cups-no-export-ssllibs.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-x86_64/cups-no-export-ssllibs.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,12 +0,0 @@ -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-export-ssllibs.patch (from rev 276649, 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 2016-09-17 12:52:50 UTC (rev 276650) @@ -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 Deleted: testing-x86_64/cups-no-gcrypt.patch =================================================================== --- testing-x86_64/cups-no-gcrypt.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-x86_64/cups-no-gcrypt.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,11 +0,0 @@ -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-gcrypt.patch (from rev 276649, cups/trunk/cups-no-gcrypt.patch) =================================================================== --- testing-x86_64/cups-no-gcrypt.patch (rev 0) +++ testing-x86_64/cups-no-gcrypt.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -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` Deleted: testing-x86_64/cups-no-gzip-man.patch =================================================================== --- testing-x86_64/cups-no-gzip-man.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-x86_64/cups-no-gzip-man.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,18 +0,0 @@ -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-no-gzip-man.patch (from rev 276649, 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 2016-09-17 12:52:50 UTC (rev 276650) @@ -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 + ;; + *) Deleted: testing-x86_64/cups-systemd-socket.patch =================================================================== --- testing-x86_64/cups-systemd-socket.patch 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-x86_64/cups-systemd-socket.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,48 +0,0 @@ -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-systemd-socket.patch (from rev 276649, cups/trunk/cups-systemd-socket.patch) =================================================================== --- testing-x86_64/cups-systemd-socket.patch (rev 0) +++ testing-x86_64/cups-systemd-socket.patch 2016-09-17 12:52:50 UTC (rev 276650) @@ -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 Deleted: testing-x86_64/cups.install =================================================================== --- testing-x86_64/cups.install 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-x86_64/cups.install 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,6 +0,0 @@ -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.install (from rev 276649, cups/trunk/cups.install) =================================================================== --- testing-x86_64/cups.install (rev 0) +++ testing-x86_64/cups.install 2016-09-17 12:52:50 UTC (rev 276650) @@ -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." +} Deleted: testing-x86_64/cups.logrotate =================================================================== --- testing-x86_64/cups.logrotate 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-x86_64/cups.logrotate 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,5 +0,0 @@ -/var/log/cups/*_log { - missingok - notifempty - sharedscripts -} Copied: cups/repos/testing-x86_64/cups.logrotate (from rev 276649, cups/trunk/cups.logrotate) =================================================================== --- testing-x86_64/cups.logrotate (rev 0) +++ testing-x86_64/cups.logrotate 2016-09-17 12:52:50 UTC (rev 276650) @@ -0,0 +1,5 @@ +/var/log/cups/*_log { + missingok + notifempty + sharedscripts +} Deleted: testing-x86_64/cups.pam =================================================================== --- testing-x86_64/cups.pam 2016-09-17 12:52:20 UTC (rev 276649) +++ testing-x86_64/cups.pam 2016-09-17 12:52:50 UTC (rev 276650) @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so Copied: cups/repos/testing-x86_64/cups.pam (from rev 276649, cups/trunk/cups.pam) =================================================================== --- testing-x86_64/cups.pam (rev 0) +++ testing-x86_64/cups.pam 2016-09-17 12:52:50 UTC (rev 276650) @@ -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/start_cups_by_port631.diff (from rev 276649, cups/trunk/start_cups_by_port631.diff) =================================================================== --- testing-x86_64/start_cups_by_port631.diff (rev 0) +++ testing-x86_64/start_cups_by_port631.diff 2016-09-17 12:52:50 UTC (rev 276650) @@ -0,0 +1,10 @@ +--- cups-2.2.0/scheduler/org.cups.cupsd.socket.in 2016-09-14 01:39:47.000000000 +0200 ++++ cups-2.2.0/scheduler/org.cups.cupsd.socket.in.new 2016-09-17 14:43:49.237741189 +0200 +@@ -3,6 +3,7 @@ + + [Socket] + ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ ++ListenStream=631 + + [Install] + WantedBy=sockets.target