Date: Thursday, May 18, 2023 @ 10:42:06
Author: andyrtr
Revision: 478003
archrelease: copy trunk to extra-x86_64
Added:
cups/repos/extra-x86_64/0001_Fix_OpenSSL_crash_bug.patch
(from rev 478002, cups/trunk/0001_Fix_OpenSSL_crash_bug.patch)
cups/repos/extra-x86_64/0002_do_not_set_RGB_default_on_monochrome_printers.patch
(from rev 478002,
cups/trunk/0002_do_not_set_RGB_default_on_monochrome_printers.patch)
cups/repos/extra-x86_64/PKGBUILD
(from rev 478002, cups/trunk/PKGBUILD)
cups/repos/extra-x86_64/cups-2.4.0-statedir.patch
(from rev 478002, cups/trunk/cups-2.4.0-statedir.patch)
cups/repos/extra-x86_64/cups-freebind.patch
(from rev 478002, cups/trunk/cups-freebind.patch)
cups/repos/extra-x86_64/cups.install
(from rev 478002, cups/trunk/cups.install)
cups/repos/extra-x86_64/cups.logrotate
(from rev 478002, cups/trunk/cups.logrotate)
cups/repos/extra-x86_64/cups.pam
(from rev 478002, cups/trunk/cups.pam)
cups/repos/extra-x86_64/cups.sysusers
(from rev 478002, cups/trunk/cups.sysusers)
cups/repos/extra-x86_64/guid.patch
(from rev 478002, cups/trunk/guid.patch)
cups/repos/extra-x86_64/keys/
Deleted:
cups/repos/extra-x86_64/0001_Fix_OpenSSL_crash_bug.patch
cups/repos/extra-x86_64/PKGBUILD
cups/repos/extra-x86_64/cups-2.4.0-statedir.patch
cups/repos/extra-x86_64/cups-freebind.patch
cups/repos/extra-x86_64/cups.install
cups/repos/extra-x86_64/cups.logrotate
cups/repos/extra-x86_64/cups.pam
cups/repos/extra-x86_64/cups.sysusers
cups/repos/extra-x86_64/guid.patch
cups/repos/extra-x86_64/keys/
----------------------------------------------------------+
0001_Fix_OpenSSL_crash_bug.patch | 34 -
0002_do_not_set_RGB_default_on_monochrome_printers.patch | 33 +
PKGBUILD | 370 ++++++-------
cups-2.4.0-statedir.patch | 22
cups-freebind.patch | 30 -
cups.install | 56 -
cups.logrotate | 10
cups.pam | 6
cups.sysusers | 4
guid.patch | 78 +-
10 files changed, 341 insertions(+), 302 deletions(-)
Deleted: 0001_Fix_OpenSSL_crash_bug.patch
===================================================================
--- 0001_Fix_OpenSSL_crash_bug.patch 2023-05-18 10:41:45 UTC (rev 478002)
+++ 0001_Fix_OpenSSL_crash_bug.patch 2023-05-18 10:42:06 UTC (rev 478003)
@@ -1,17 +0,0 @@
-From c0c403744b1bf4a9790a8fcaabcd60970cbefe06 Mon Sep 17 00:00:00 2001
-From: Michael R Sweet <michael.r.sw...@gmail.com>
-Date: Tue, 7 Jun 2022 13:45:29 -0400
-Subject: [PATCH] Fix OpenSSL crash bug - "tls" pointer wasn't cleared after
- freeing it (Issue #409)
-
-diff --git a/cups/tls-openssl.c b/cups/tls-openssl.c
-index c3e57742e..6db9f8a9c 100644
---- a/cups/tls-openssl.c
-+++ b/cups/tls-openssl.c
-@@ -1152,6 +1152,8 @@ _httpTLSStop(http_t *http) // I -
Connection to server
- SSL_shutdown(http->tls);
- SSL_CTX_free(context);
- SSL_free(http->tls);
-+
-+ http->tls = NULL;
- }
Copied: cups/repos/extra-x86_64/0001_Fix_OpenSSL_crash_bug.patch (from rev
478002, cups/trunk/0001_Fix_OpenSSL_crash_bug.patch)
===================================================================
--- 0001_Fix_OpenSSL_crash_bug.patch (rev 0)
+++ 0001_Fix_OpenSSL_crash_bug.patch 2023-05-18 10:42:06 UTC (rev 478003)
@@ -0,0 +1,17 @@
+From c0c403744b1bf4a9790a8fcaabcd60970cbefe06 Mon Sep 17 00:00:00 2001
+From: Michael R Sweet <michael.r.sw...@gmail.com>
+Date: Tue, 7 Jun 2022 13:45:29 -0400
+Subject: [PATCH] Fix OpenSSL crash bug - "tls" pointer wasn't cleared after
+ freeing it (Issue #409)
+
+diff --git a/cups/tls-openssl.c b/cups/tls-openssl.c
+index c3e57742e..6db9f8a9c 100644
+--- a/cups/tls-openssl.c
++++ b/cups/tls-openssl.c
+@@ -1152,6 +1152,8 @@ _httpTLSStop(http_t *http) // I -
Connection to server
+ SSL_shutdown(http->tls);
+ SSL_CTX_free(context);
+ SSL_free(http->tls);
++
++ http->tls = NULL;
+ }
Copied:
cups/repos/extra-x86_64/0002_do_not_set_RGB_default_on_monochrome_printers.patch
(from rev 478002,
cups/trunk/0002_do_not_set_RGB_default_on_monochrome_printers.patch)
===================================================================
--- 0002_do_not_set_RGB_default_on_monochrome_printers.patch
(rev 0)
+++ 0002_do_not_set_RGB_default_on_monochrome_printers.patch 2023-05-18
10:42:06 UTC (rev 478003)
@@ -0,0 +1,33 @@
+From ebf3bb82593e5f49093ed7b9e52452333240d225 Mon Sep 17 00:00:00 2001
+From: Till Kamppeter <till.kamppe...@gmail.com>
+Date: Wed, 15 Feb 2023 22:01:05 +0100
+Subject: [PATCH] In auto-generated PPDs do not set RGB default on mono
+ printers
+
+When a PPD for a driverless printer is generated by the
+_ppdCreateFromIPP2() function and the get-printer-attributes IPP
+response gives "print-color-mode-default=auto" the PPD's default
+setting for "ColorModel" is always "RGB", even on monochrome printers,
+which makes printing fail on most devices.
+
+Now we ignore the "print-color-mode-default" if set to "auto" and
+proceed as if no default was given, finding the default by selecting
+the most desirable of the existing "ColorModel" choices.
+---
+ cups/ppd-cache.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
+index 3c53f510d..2489ee313 100644
+--- a/cups/ppd-cache.c
++++ b/cups/ppd-cache.c
+@@ -4129,7 +4129,8 @@ _ppdCreateFromIPP2(
+ int wrote_color = 0;
+ const char *default_color = NULL; /* Default */
+
+- if ((keyword = ippGetString(defattr, 0, NULL)) != NULL)
++ if ((keyword = ippGetString(defattr, 0, NULL)) != NULL &&
++ strcmp(keyword, "auto"))
+ {
+ if (!strcmp(keyword, "bi-level"))
+ default_color = "FastGray";
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-05-18 10:41:45 UTC (rev 478002)
+++ PKGBUILD 2023-05-18 10:42:06 UTC (rev 478003)
@@ -1,182 +0,0 @@
-# Maintainer: Andreas Radke <andy...@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=2.4.2
-pkgrel=6
-epoch=1
-arch=('x86_64')
-license=('Apache' 'custom')
-url="https://openprinting.github.io/cups/";
-makedepends=('acl' 'pam' 'gnutls' 'cups-filters' 'colord'
- 'libusb' 'avahi' 'systemd' 'libpaper')
-#checkdepends=('valgrind')
-source=(https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
- cups.logrotate
- cups.pam
- cups.sysusers
- cups-2.4.0-statedir.patch
- # bugfixes
- cups-freebind.patch
- guid.patch
- 0001_Fix_OpenSSL_crash_bug.patch
-)
-sha256sums=('f03ccb40b087d1e30940a40e0141dcbba263f39974c20eb9f2521066c9c6c908'
- 'SKIP'
- 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
- '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
- '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2'
- 'f0b15192952c151b1843742c87850ff3a7d0f3ba5dd236ed16623ef908472ad7'
- '3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d'
- '0bf6a75ba1b051771f155d9a5d36b307a6d40c6857d645b250fe93f3fb713474'
- '632faf08bfd1863e9ad6807aff766983e84030a0e4df441167f17de7266ca152')
-#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>"
-#validpgpkeys=('7ADB58203CA5F046F28025B215AA6A7F4D4227D7') # "Zdenek Dohnal
(Associate Software Engineer) <zdoh...@redhat.com>"
-validpgpkeys=('7082A0A50A2E92640F3880E0E4522DCC9B246FF7') # Zdenek Dohnal (The
old 4D4227D7 key revoked) <zdoh...@redhat.com>
-#options=(!makeflags)
-
-prepare() {
- cd "${pkgbase}"-${pkgver}
-
- # move /var/run -> /run for pid file
- patch -Np1 -i "${srcdir}"/cups-2.4.0-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
-
- # FS#75005 - Fix OpenSSL crash bug - "tls" pointer wasn't cleared after
- # Fix OpenSSL crash bug - "tls" pointer wasn't cleared after
- patch -Np1 -i "${srcdir}"/0001_Fix_OpenSSL_crash_bug.patch
-
- # Rebuild configure script
- 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-tls=gnutls \
- --with-dbusdir=/usr/share/dbus-1 \
- --enable-relro \
- --enable-libpaper \
- --with-optim="$CFLAGS" #--help
- make
-}
-
-# don't run tests - they take ages
-#check() {
-# cd "${pkgbase}"-${pkgver}
-## make -k check || /bin/true
-# make check
-#}
-
-package_libcups() {
-pkgdesc="OpenPrinting CUPS - client libraries and headers"
-depends=('gnutls' 'avahi')
-
- 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
-
- # add license + exception
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" {LICENSE,NOTICE}
-}
-
-package_cups() {
-pkgdesc="OpenPrinting CUPS - 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'
- 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
-optdepends=('libusb: for usb printer backend'
- '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*
-
- # no more xinetd support
- rm -rf "${pkgdir}"/etc/xinetd.d
-}
Copied: cups/repos/extra-x86_64/PKGBUILD (from rev 478002, cups/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-05-18 10:42:06 UTC (rev 478003)
@@ -0,0 +1,188 @@
+# Maintainer: Andreas Radke <andy...@archlinux.org>
+
+pkgbase="cups"
+pkgname=('libcups' 'cups')
+pkgver=2.4.2
+pkgrel=7
+epoch=1
+arch=('x86_64')
+license=('Apache' 'custom')
+url="https://openprinting.github.io/cups/";
+makedepends=('acl' 'pam' 'gnutls' 'cups-filters' 'colord'
+ 'libusb' 'avahi' 'systemd' 'libpaper')
+#checkdepends=('valgrind')
+source=(https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
+ cups.logrotate
+ cups.pam
+ cups.sysusers
+ cups-2.4.0-statedir.patch
+ # bugfixes
+ cups-freebind.patch
+ guid.patch
+ 0001_Fix_OpenSSL_crash_bug.patch
+ 0002_do_not_set_RGB_default_on_monochrome_printers.patch
+)
+sha256sums=('f03ccb40b087d1e30940a40e0141dcbba263f39974c20eb9f2521066c9c6c908'
+ 'SKIP'
+ 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
+ '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
+ '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2'
+ 'f0b15192952c151b1843742c87850ff3a7d0f3ba5dd236ed16623ef908472ad7'
+ '3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d'
+ '0bf6a75ba1b051771f155d9a5d36b307a6d40c6857d645b250fe93f3fb713474'
+ '632faf08bfd1863e9ad6807aff766983e84030a0e4df441167f17de7266ca152'
+ 'f7e2c6dfcdf882f0f54c95728a3e2c63309ee73f9d2efc8e5b8a758fb2c7f429')
+#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>"
+#validpgpkeys=('7ADB58203CA5F046F28025B215AA6A7F4D4227D7') # "Zdenek Dohnal
(Associate Software Engineer) <zdoh...@redhat.com>"
+validpgpkeys=('7082A0A50A2E92640F3880E0E4522DCC9B246FF7') # Zdenek Dohnal (The
old 4D4227D7 key revoked) <zdoh...@redhat.com>
+#options=(!makeflags)
+
+prepare() {
+ cd "${pkgbase}"-${pkgver}
+
+ # move /var/run -> /run for pid file
+ patch -Np1 -i "${srcdir}"/cups-2.4.0-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
+
+ # FS#75005 - Fix OpenSSL crash bug - "tls" pointer wasn't cleared after
+ # Fix OpenSSL crash bug - "tls" pointer wasn't cleared after
+ patch -Np1 -i "${srcdir}"/0001_Fix_OpenSSL_crash_bug.patch
+
+ # In auto-generated PPDs do not set RGB default on mono printers - FS#78150
+ #
https://github.com/OpenPrinting/cups/commit/ebf3bb82593e5f49093ed7b9e52452333240d225
+ patch -Np1 -i
"${srcdir}"/0002_do_not_set_RGB_default_on_monochrome_printers.patch
+
+ # Rebuild configure script
+ 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-tls=gnutls \
+ --with-dbusdir=/usr/share/dbus-1 \
+ --enable-relro \
+ --enable-libpaper \
+ --with-optim="$CFLAGS" #--help
+ make
+}
+
+# don't run tests - they take ages
+#check() {
+# cd "${pkgbase}"-${pkgver}
+## make -k check || /bin/true
+# make check
+#}
+
+package_libcups() {
+pkgdesc="OpenPrinting CUPS - client libraries and headers"
+depends=('gnutls' 'avahi')
+
+ 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
+
+ # add license + exception
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" {LICENSE,NOTICE}
+}
+
+package_cups() {
+pkgdesc="OpenPrinting CUPS - 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'
+ 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
+optdepends=('libusb: for usb printer backend'
+ '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*
+
+ # no more xinetd support
+ rm -rf "${pkgdir}"/etc/xinetd.d
+}
Deleted: cups-2.4.0-statedir.patch
===================================================================
--- cups-2.4.0-statedir.patch 2023-05-18 10:41:45 UTC (rev 478002)
+++ cups-2.4.0-statedir.patch 2023-05-18 10:42:06 UTC (rev 478003)
@@ -1,11 +0,0 @@
---- cups-2.4.0/config-scripts/cups-directories.m4 2021-11-29
16:12:17.094244942 +0100
-+++ cups-2.4.0/config-scripts/cups-directories.m4.new 2021-11-29
16:15:16.958747398 +0100
-@@ -268,7 +268,7 @@
- CUPS_STATEDIR="$CUPS_SERVERROOT"
- ], [*], [
- # All others
-- CUPS_STATEDIR="$localstatedir/run/cups"
-+ CUPS_STATEDIR="/run/cups"
- ])
- ])
- AC_DEFINE_UNQUOTED([CUPS_STATEDIR], ["$CUPS_STATEDIR"], [Location of
transient state files.])
Copied: cups/repos/extra-x86_64/cups-2.4.0-statedir.patch (from rev 478002,
cups/trunk/cups-2.4.0-statedir.patch)
===================================================================
--- cups-2.4.0-statedir.patch (rev 0)
+++ cups-2.4.0-statedir.patch 2023-05-18 10:42:06 UTC (rev 478003)
@@ -0,0 +1,11 @@
+--- cups-2.4.0/config-scripts/cups-directories.m4 2021-11-29
16:12:17.094244942 +0100
++++ cups-2.4.0/config-scripts/cups-directories.m4.new 2021-11-29
16:15:16.958747398 +0100
+@@ -268,7 +268,7 @@
+ CUPS_STATEDIR="$CUPS_SERVERROOT"
+ ], [*], [
+ # All others
+- CUPS_STATEDIR="$localstatedir/run/cups"
++ CUPS_STATEDIR="/run/cups"
+ ])
+ ])
+ AC_DEFINE_UNQUOTED([CUPS_STATEDIR], ["$CUPS_STATEDIR"], [Location of
transient state files.])
Deleted: cups-freebind.patch
===================================================================
--- cups-freebind.patch 2023-05-18 10:41:45 UTC (rev 478002)
+++ cups-freebind.patch 2023-05-18 10:42:06 UTC (rev 478003)
@@ -1,15 +0,0 @@
-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/extra-x86_64/cups-freebind.patch (from rev 478002,
cups/trunk/cups-freebind.patch)
===================================================================
--- cups-freebind.patch (rev 0)
+++ cups-freebind.patch 2023-05-18 10:42:06 UTC (rev 478003)
@@ -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
Deleted: cups.install
===================================================================
--- cups.install 2023-05-18 10:41:45 UTC (rev 478002)
+++ cups.install 2023-05-18 10:42:06 UTC (rev 478003)
@@ -1,28 +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."
-}
-
-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/extra-x86_64/cups.install (from rev 478002,
cups/trunk/cups.install)
===================================================================
--- cups.install (rev 0)
+++ cups.install 2023-05-18 10:42:06 UTC (rev 478003)
@@ -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
+}
Deleted: cups.logrotate
===================================================================
--- cups.logrotate 2023-05-18 10:41:45 UTC (rev 478002)
+++ cups.logrotate 2023-05-18 10:42:06 UTC (rev 478003)
@@ -1,5 +0,0 @@
-/var/log/cups/*_log {
- missingok
- notifempty
- sharedscripts
-}
Copied: cups/repos/extra-x86_64/cups.logrotate (from rev 478002,
cups/trunk/cups.logrotate)
===================================================================
--- cups.logrotate (rev 0)
+++ cups.logrotate 2023-05-18 10:42:06 UTC (rev 478003)
@@ -0,0 +1,5 @@
+/var/log/cups/*_log {
+ missingok
+ notifempty
+ sharedscripts
+}
Deleted: cups.pam
===================================================================
--- cups.pam 2023-05-18 10:41:45 UTC (rev 478002)
+++ cups.pam 2023-05-18 10:42:06 UTC (rev 478003)
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
Copied: cups/repos/extra-x86_64/cups.pam (from rev 478002, cups/trunk/cups.pam)
===================================================================
--- cups.pam (rev 0)
+++ cups.pam 2023-05-18 10:42:06 UTC (rev 478003)
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
Deleted: cups.sysusers
===================================================================
--- cups.sysusers 2023-05-18 10:41:45 UTC (rev 478002)
+++ cups.sysusers 2023-05-18 10:42:06 UTC (rev 478003)
@@ -1,2 +0,0 @@
-u cups 209 "cups helper user"
-m cups lp
Copied: cups/repos/extra-x86_64/cups.sysusers (from rev 478002,
cups/trunk/cups.sysusers)
===================================================================
--- cups.sysusers (rev 0)
+++ cups.sysusers 2023-05-18 10:42:06 UTC (rev 478003)
@@ -0,0 +1,2 @@
+u cups 209 "cups helper user"
+m cups lp
Deleted: guid.patch
===================================================================
--- guid.patch 2023-05-18 10:41:45 UTC (rev 478002)
+++ guid.patch 2023-05-18 10:42:06 UTC (rev 478003)
@@ -1,39 +0,0 @@
---- cups-2.4.0/scheduler/cups-exec.c 2021-11-29 16:19:34.235186064 +0100
-+++ cups-2.4.0/scheduler/cups-exec.c.new 2021-11-29 16:25:30.764049649
+0100
-@@ -134,9 +134,14 @@ main(int argc, /* I - Number
of command-line args */
- # if CUPS_SNAP
- if (setgroups(0, NULL))
- # else
-- if (setgroups(1, &gid))
--# endif /* CUPS_SNAP */
-+#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);
-+ }
-+# endif /* CUPS_SNAP */
-
- if (uid && setuid(uid))
- exit(errno + 100);
---- cups-2.4.0/scheduler/util.c 2021-11-29 15:27:31.000000000 +0100
-+++ cups-2.4.0/scheduler/util.c.new 2021-11-29 16:29:58.810719066 +0100
-@@ -296,7 +296,16 @@
- */
-
- 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)
- {
Copied: cups/repos/extra-x86_64/guid.patch (from rev 478002,
cups/trunk/guid.patch)
===================================================================
--- guid.patch (rev 0)
+++ guid.patch 2023-05-18 10:42:06 UTC (rev 478003)
@@ -0,0 +1,39 @@
+--- cups-2.4.0/scheduler/cups-exec.c 2021-11-29 16:19:34.235186064 +0100
++++ cups-2.4.0/scheduler/cups-exec.c.new 2021-11-29 16:25:30.764049649
+0100
+@@ -134,9 +134,14 @@ main(int argc, /* I - Number
of command-line args */
+ # if CUPS_SNAP
+ if (setgroups(0, NULL))
+ # else
+- if (setgroups(1, &gid))
+-# endif /* CUPS_SNAP */
++#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);
++ }
++# endif /* CUPS_SNAP */
+
+ if (uid && setuid(uid))
+ exit(errno + 100);
+--- cups-2.4.0/scheduler/util.c 2021-11-29 15:27:31.000000000 +0100
++++ cups-2.4.0/scheduler/util.c.new 2021-11-29 16:29:58.810719066 +0100
+@@ -296,7 +296,16 @@
+ */
+
+ 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)
+ {
