diff --git a/extra/cups/0001_fix_missing_bracket.patch b/extra/cups/0001_fix_missing_bracket.patch new file mode 100644 index 000000000..185d83ed5 --- /dev/null +++ b/extra/cups/0001_fix_missing_bracket.patch @@ -0,0 +1,40 @@ +From aa2507530076eaff042b096de55442dc8b665abb Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Wed, 1 Dec 2021 12:00:16 +0100 +Subject: [PATCH] de/index.html: Fix missing bracket (fixes issue #299) + +The bracket was unintentionally removed by commit b76a97a. +--- + CHANGES.md | 5 +++++ + doc/de/index.html.in | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CHANGES.md b/CHANGES.md +index d4eb9aae0..c49b902f5 100644 +--- a/CHANGES.md ++++ b/CHANGES.md +@@ -1,6 +1,11 @@ + CHANGES - OpenPrinting CUPS 2.4.0 - 2021-11-29 + ============================================== + ++Changes in CUPS v2.4.1 (TBA) ++---------------------------- ++ ++- Fixed missing bracket in de/index.html (Issue #299) ++ + Changes in CUPS v2.4.0 (29th November 2021) + ------------------------------------------- + +diff --git a/doc/de/index.html.in b/doc/de/index.html.in +index 30f7d288e..2b3f3a6b1 100644 +--- a/doc/de/index.html.in ++++ b/doc/de/index.html.in +@@ -7,7 +7,7 @@ + + + +- Startseite - CUPS @CUPS_VERSION@/title> ++ <title>Startseite - CUPS @CUPS_VERSION@ + + +
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index a300cc83f..85b7a6ae3 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -6,63 +6,47 @@ pkgbase="cups" pkgname=('libcups' 'cups') -#_commit=be75d5d99a54c5f62608f7b9e98748d4c7045ec1 # master 2020-11-27 -pkgver=2.3.3op2 +pkgver=2.4.0 pkgrel=4 epoch=1 arch=('x86_64') license=('Apache' 'custom') -#url="https://www.cups.org/" -url="https://github.com/OpenPrinting/cups" +url="https://openprinting.github.io/cups/" options=(!distcc) makedepends=('libtiff' 'libpng' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls' 'cups-filters' 'bc' 'colord' 'gzip' 'autoconf' 'libusb' 'dbus' 'avahi' 'hicolor-icon-theme' 'systemd' 'libxcrypt' 'inetutils' 'libpaper' '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" +source=(https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig} cups.logrotate cups.pam cups.sysusers - # improve build and linking - cups-no-export-ssllibs.patch - cups-1.6.2-statedir.patch + cups-2.4.0-statedir.patch # bugfixes cups-freebind.patch guid.patch - # upstream fixes - increase_timeout.patch + 0001_fix_missing_bracket.patch ) -sha256sums=('deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df' +sha256sums=('9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de' 'SKIP' 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2' - 'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832' - '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af' + 'f0b15192952c151b1843742c87850ff3a7d0f3ba5dd236ed16623ef908472ad7' '3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d' - 'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d' - '72a04cb74c4b6240affbc32cf759562cca94efccc213210780b1e7b98f00dfd5') -validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) -validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org " -validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet " - - -#pkgver() { -# cd $pkgbase -# git describe --tags | sed 's/-/+/g' | sed 's/v//' -#} + '0bf6a75ba1b051771f155d9a5d36b307a6d40c6857d645b250fe93f3fb713474' + '0ad9d8342c0d453355a9cb84976f11f05f77364c899216e0a2a2ff133a356ccd') +#validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) +#validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org " +#validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet " +validpgpkeys=('7ADB58203CA5F046F28025B215AA6A7F4D4227D7') # "Zdenek Dohnal (Associate Software Engineer) " +#options=(!makeflags) 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 + patch -Np1 -i "${srcdir}"/cups-2.4.0-statedir.patch # bug fixes @@ -73,10 +57,11 @@ prepare() { # FS#56818 - https://github.com/apple/cups/issues/5236 patch -Np1 -i "${srcdir}"/guid.patch - # FS#70382 - https://github.com/OpenPrinting/cups/pull/174 - patch -Np1 -i "${srcdir}"/increase_timeout.patch + # fix german webinterface not opening + # 0001_fix_missing_bracket.patch + patch -Np1 -i ../0001_fix_missing_bracket.patch - # Rebuild configure script for not zipping man-pages. + # Rebuild configure script aclocal -I config-scripts autoconf -I config-scripts } @@ -103,10 +88,7 @@ build() { --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 @@ -127,7 +109,6 @@ depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb' 'libx # 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} diff --git a/extra/cups/cups-1.6.2-statedir.patch b/extra/cups/cups-1.6.2-statedir.patch deleted file mode 100644 index c44ebed07..000000000 --- a/extra/cups/cups-1.6.2-statedir.patch +++ /dev/null @@ -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") diff --git a/extra/cups/cups-2.4.0-statedir.patch b/extra/cups/cups-2.4.0-statedir.patch new file mode 100644 index 000000000..c6d030346 --- /dev/null +++ b/extra/cups/cups-2.4.0-statedir.patch @@ -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.]) diff --git a/extra/cups/cups-no-export-ssllibs.patch b/extra/cups/cups-no-export-ssllibs.patch deleted file mode 100644 index e227bd182..000000000 --- a/extra/cups/cups-no-export-ssllibs.patch +++ /dev/null @@ -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 diff --git a/extra/cups/guid.patch b/extra/cups/guid.patch index ce28e024f..b1bd19232 100644 --- a/extra/cups/guid.patch +++ b/extra/cups/guid.patch @@ -1,12 +1,11 @@ -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); - +--- 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 + struct passwd * pwd = getpwuid(uid); + if(initgroups(pwd->pw_name,pwd->pw_gid)) @@ -14,14 +13,13 @@ index aab43a797..46c549075 100644 + fprintf(stderr, "DEBUG: initgroups failed\n"); exit(errno + 100); + } ++# endif /* CUPS_SNAP */ 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 */ +--- 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) @@ -39,4 +37,3 @@ index 19ebf069b..4638562bd 100644 if ((fd = open("/dev/null", O_RDONLY)) > 0) { - diff --git a/extra/cups/increase_timeout.patch b/extra/cups/increase_timeout.patch deleted file mode 100644 index ff7baee62..000000000 --- a/extra/cups/increase_timeout.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c37d71b1a31d26a4790166e2508822b18934a5c0 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Tue, 13 Apr 2021 15:44:14 +0200 -Subject: [PATCH 1/2] backend/usb-libusb.c: Use 60s timeout for reading at - backchannel - -Some older models malfunction if timeout is too short. ---- - backend/usb-libusb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c -index d6b0eb423..fbb0d9d89 100644 ---- a/backend/usb-libusb.c -+++ b/backend/usb-libusb.c -@@ -1704,7 +1704,7 @@ static void *read_thread(void *reference) - readstatus = libusb_bulk_transfer(g.printer->handle, - g.printer->read_endp, - readbuffer, rbytes, -- &rbytes, 250); -+ &rbytes, 60000); - if (readstatus == LIBUSB_SUCCESS && rbytes > 0) - { - fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n", (int)rbytes); - -From 4cb6f6806cdbe040d478b266a1d351b19341dd79 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Tue, 13 Apr 2021 15:47:37 +0200 -Subject: [PATCH 2/2] backend/usb-libusb.c: Revert enforcing read limits - -This commit reverts the change introduced by 2.2.12 [1] - its -implementation caused a regression with Lexmark filters. - -[1] -https://github.com/apple/cups/commit/35e927f83529cd9b4bc37bcd418c50e307fced35 ---- - backend/usb-libusb.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c -index fbb0d9d89..89b5182f7 100644 ---- a/backend/usb-libusb.c -+++ b/backend/usb-libusb.c -@@ -1721,7 +1721,8 @@ static void *read_thread(void *reference) - * Make sure this loop executes no more than once every 250 miliseconds... - */ - -- if ((g.wait_eof || !g.read_thread_stop)) -+ if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) && -+ (g.wait_eof || !g.read_thread_stop)) - usleep(250000); - } - while (g.wait_eof || !g.read_thread_stop);