Date: Tuesday, February 2, 2021 @ 06:24:36 Author: andyrtr Revision: 407031
archrelease: copy trunk to testing-x86_64 Added: cups/repos/testing-x86_64/ cups/repos/testing-x86_64/PKGBUILD (from rev 407030, cups/trunk/PKGBUILD) cups/repos/testing-x86_64/cups-1.6.2-statedir.patch (from rev 407030, cups/trunk/cups-1.6.2-statedir.patch) cups/repos/testing-x86_64/cups-freebind.patch (from rev 407030, cups/trunk/cups-freebind.patch) cups/repos/testing-x86_64/cups-no-export-ssllibs.patch (from rev 407030, cups/trunk/cups-no-export-ssllibs.patch) cups/repos/testing-x86_64/cups.install (from rev 407030, cups/trunk/cups.install) cups/repos/testing-x86_64/cups.logrotate (from rev 407030, cups/trunk/cups.logrotate) cups/repos/testing-x86_64/cups.pam (from rev 407030, cups/trunk/cups.pam) cups/repos/testing-x86_64/cups.sysusers (from rev 407030, cups/trunk/cups.sysusers) cups/repos/testing-x86_64/guid.patch (from rev 407030, cups/trunk/guid.patch) ------------------------------+ PKGBUILD | 188 +++++++++++++++++++++++++++++++++++++++++ cups-1.6.2-statedir.patch | 12 ++ cups-freebind.patch | 15 +++ cups-no-export-ssllibs.patch | 12 ++ cups.install | 28 ++++++ cups.logrotate | 5 + cups.pam | 3 cups.sysusers | 2 guid.patch | 42 +++++++++ 9 files changed, 307 insertions(+) Copied: cups/repos/testing-x86_64/PKGBUILD (from rev 407030, cups/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2021-02-02 06:24:36 UTC (rev 407031) @@ -0,0 +1,188 @@ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase="cups" +pkgname=('libcups' 'cups') +#_commit=be75d5d99a54c5f62608f7b9e98748d4c7045ec1 # master 2020-11-27 +pkgver=2.3.3op2 +pkgrel=1 +epoch=1 +arch=('x86_64') +license=('Apache' 'custom') +#url="https://www.cups.org/" +url="https://github.com/OpenPrinting/cups" +makedepends=('libtiff' 'libpng' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls' + 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus' + 'avahi' 'hicolor-icon-theme' 'systemd' 'libxcrypt' 'inetutils' 'libpaper' 'valgrind' + 'git') +source=(#https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig} + https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig} + #"git+https://github.com/OpenPrinting/cups#commit=$_commit" + cups.logrotate + cups.pam + cups.sysusers + # improve build and linking + cups-no-export-ssllibs.patch + cups-1.6.2-statedir.patch + # bugfixes + cups-freebind.patch + guid.patch) +sha256sums=('deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df' + 'SKIP' + 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9' + '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' + '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2' + 'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832' + '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af' + '3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d' + 'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d') +validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <secur...@cups.org> +validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org <secur...@cups.org>" +validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet <michael.r.sw...@gmail.com>" + + +#pkgver() { +# cd $pkgbase +# git describe --tags | sed 's/-/+/g' | sed 's/v//' +#} + +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 + # move /var/run -> /run for pid file + patch -Np1 -i "${srcdir}"/cups-1.6.2-statedir.patch + + # bug fixes + + # https://github.com/OpenPrinting/cups/issues/53 + # use IP_FREEBIND, because cupsd cannot bind to not yet existing IP address + patch -Np1 -i "${srcdir}"/cups-freebind.patch + + # FS#56818 - https://github.com/apple/cups/issues/5236 + patch -Np1 -i "${srcdir}"/guid.patch + + # Rebuild configure script for not zipping man-pages. + aclocal -I config-scripts + autoconf -I config-scripts +} + +build() { + cd "${pkgbase}"-${pkgver} + + # The build system uses only DSOFLAGS but not LDFLAGS to build some libraries. + export DSOFLAGS=${LDFLAGS} + + # use fixed cups user (id 209) since systemd adds "lp" group without a fixed id + ./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-exe-file-perm=0755 \ + --with-cups-user=209 \ + --with-cups-group=209 \ + --with-max-log-size=0 \ + --enable-pam=yes \ + --enable-raw-printing \ + --enable-dbus=yes \ + --with-dbusdir=/usr/share/dbus-1 \ + --enable-ssl=yes \ + --enable-relro \ + --enable-threads \ + --enable-avahi\ + --enable-libpaper \ + --with-optim="$CFLAGS" #--help + make +} + +check() { + cd "${pkgbase}"-${pkgver} +# make -k check || /bin/true +# make check +} + +package_libcups() { +pkgdesc="The CUPS Printing System - client libraries and headers" +depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb' 'libxcrypt') + + 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 -m755 "${srcdir}"/"${pkgbase}"/cups-config "${pkgdir}"/usr/bin/cups-config + + # add license + exception + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" {LICENSE,NOTICE} +} + +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/logrotate.d/cups + etc/pam.d/cups) +depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' + 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme') +optdepends=('ipp-usb: allows to send HTTP requests via a USB connection on devices without Ethernet or WiFi connections' + 'xdg-utils: xdg .desktop file support' + 'colord: for ICC color profile support' + 'logrotate: for logfile rotation 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 + + # use cups group FS#36769 + install -Dm644 "$srcdir"/cups.sysusers "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf" + sed -i "s:#User 209:User 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default} + sed -i "s:#Group 209:Group 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default} + + # install ssl directory where to store the certs, solves some samba issues + install -dm700 -g 209 "${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 209 "${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 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 407030, 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 2021-02-02 06:24:36 UTC (rev 407031) @@ -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-freebind.patch (from rev 407030, cups/trunk/cups-freebind.patch) =================================================================== --- testing-x86_64/cups-freebind.patch (rev 0) +++ testing-x86_64/cups-freebind.patch 2021-02-02 06:24:36 UTC (rev 407031) @@ -0,0 +1,15 @@ +diff -up cups-2.0.2/cups/http-addr.c.freebind cups-2.0.2/cups/http-addr.c +--- cups-2.0.2/cups/http-addr.c.freebind 2015-02-10 14:46:33.000000000 +0100 ++++ cups-2.0.2/cups/http-addr.c 2015-02-10 14:50:35.074759141 +0100 +@@ -186,6 +186,10 @@ httpAddrListen(http_addr_t *addr, /* I - + val = 1; + setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, CUPS_SOCAST &val, sizeof(val)); + ++#ifdef __linux ++ setsockopt(fd, IPPROTO_IP, IP_FREEBIND, CUPS_SOCAST &val, sizeof(val)); ++#endif /* __linux */ ++ + #ifdef IPV6_V6ONLY + if (addr->addr.sa_family == AF_INET6) + setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, CUPS_SOCAST &val, sizeof(val)); +diff -up cups-2.0.2/scheduler/listen.c.freebind cups-2.0.2/scheduler/listen.c Copied: cups/repos/testing-x86_64/cups-no-export-ssllibs.patch (from rev 407030, 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 2021-02-02 06:24:36 UTC (rev 407031) @@ -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.install (from rev 407030, cups/trunk/cups.install) =================================================================== --- testing-x86_64/cups.install (rev 0) +++ testing-x86_64/cups.install 2021-02-02 06:24:36 UTC (rev 407031) @@ -0,0 +1,28 @@ +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." +} + +post_upgrade() { + # FS#56818 - make sure we change the ownership to the new cups group + if [[ $(vercmp 2.2.6-3 $2) = 1 ]]; then + chgrp -R 209 /etc/cups + echo "Cups daemon is now running under \"cups\" user+group." + echo "Please make sure to enable the new user+group change in" + echo "/etc/cups/cups-files.conf or merge changes from" + echo "/etc/cups/cups-files.conf.default. After a service restart" + echo "make sure /etc/cups and all files within are owned by" + echo "cups group - run \"chgrp -R cups /etc/cups\"." + fi + + # upstream reverted back to common old naming scheme + if [[ $(vercmp 2.3.3+105+g59137acc1-1 $2) = 1 ]]; then + echo ">>> Cups systemd socket and service files have been" + echo ">>> renamed by upstream decision. Please make sure" + echo ">>> to disable/reenable the services to your need." + echo ">>> hint: \"pacman -Ql cups | grep systemd\" and" + echo ">>> \"ls -lR /etc/systemd/ | grep cups\" " + fi +} Copied: cups/repos/testing-x86_64/cups.logrotate (from rev 407030, cups/trunk/cups.logrotate) =================================================================== --- testing-x86_64/cups.logrotate (rev 0) +++ testing-x86_64/cups.logrotate 2021-02-02 06:24:36 UTC (rev 407031) @@ -0,0 +1,5 @@ +/var/log/cups/*_log { + missingok + notifempty + sharedscripts +} Copied: cups/repos/testing-x86_64/cups.pam (from rev 407030, cups/trunk/cups.pam) =================================================================== --- testing-x86_64/cups.pam (rev 0) +++ testing-x86_64/cups.pam 2021-02-02 06:24:36 UTC (rev 407031) @@ -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/cups.sysusers (from rev 407030, cups/trunk/cups.sysusers) =================================================================== --- testing-x86_64/cups.sysusers (rev 0) +++ testing-x86_64/cups.sysusers 2021-02-02 06:24:36 UTC (rev 407031) @@ -0,0 +1,2 @@ +u cups 209 "cups helper user" +m cups lp Copied: cups/repos/testing-x86_64/guid.patch (from rev 407030, cups/trunk/guid.patch) =================================================================== --- testing-x86_64/guid.patch (rev 0) +++ testing-x86_64/guid.patch 2021-02-02 06:24:36 UTC (rev 407031) @@ -0,0 +1,42 @@ +diff --git a/scheduler/cups-exec.c b/scheduler/cups-exec.c +index aab43a797..46c549075 100644 +--- a/scheduler/cups-exec.c ++++ b/scheduler/cups-exec.c +@@ -133,8 +133,13 @@ main(int argc, /* I - Number of command-line args */ + if (setgid(gid)) + exit(errno + 100); + +- if (setgroups(1, &gid)) ++#include <pwd.h> ++ struct passwd * pwd = getpwuid(uid); ++ if(initgroups(pwd->pw_name,pwd->pw_gid)) ++ { ++ fprintf(stderr, "DEBUG: initgroups failed\n"); + exit(errno + 100); ++ } + + if (uid && setuid(uid)) + exit(errno + 100); +diff --git a/scheduler/util.c b/scheduler/util.c +index 19ebf069b..4638562bd 100644 +--- a/scheduler/util.c ++++ b/scheduler/util.c +@@ -300,7 +300,16 @@ cupsdPipeCommand(int *pid, /* O - Process ID or 0 on error */ + */ + + if (!getuid() && user) +- setuid(user); /* Run as restricted user */ ++ { ++#include <pwd.h> ++ struct passwd * pwd = getpwuid(user); ++ if(initgroups(pwd->pw_name,pwd->pw_gid)) ++ { ++ fprintf(stderr, "DEBUG: initgroups failed\n"); ++ exit(errno + 100); ++ } ++ setuid(user); /* Run as restricted user */ ++ } + + if ((fd = open("/dev/null", O_RDONLY)) > 0) + { +