diff --git a/extra/cups/0001_fix_missing_bracket.patch b/extra/cups/0001_fix_missing_bracket.patch deleted file mode 100644 index 185d83ed5..000000000 --- a/extra/cups/0001_fix_missing_bracket.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 85b7a6ae3..56dfddb32 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -6,8 +6,8 @@ pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=2.4.0 -pkgrel=4 +pkgver=2.4.1 +pkgrel=1 epoch=1 arch=('x86_64') license=('Apache' 'custom') @@ -25,21 +25,20 @@ source=(https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-$ # bugfixes cups-freebind.patch guid.patch - 0001_fix_missing_bracket.patch ) -sha256sums=('9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de' +sha256sums=('c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178' 'SKIP' 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2' 'f0b15192952c151b1843742c87850ff3a7d0f3ba5dd236ed16623ef908472ad7' '3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d' - '0bf6a75ba1b051771f155d9a5d36b307a6d40c6857d645b250fe93f3fb713474' - '0ad9d8342c0d453355a9cb84976f11f05f77364c899216e0a2a2ff133a356ccd') + '0bf6a75ba1b051771f155d9a5d36b307a6d40c6857d645b250fe93f3fb713474') #validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) #validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org " #validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet " -validpgpkeys=('7ADB58203CA5F046F28025B215AA6A7F4D4227D7') # "Zdenek Dohnal (Associate Software Engineer) " +#validpgpkeys=('7ADB58203CA5F046F28025B215AA6A7F4D4227D7') # "Zdenek Dohnal (Associate Software Engineer) " +validpgpkeys=('7082A0A50A2E92640F3880E0E4522DCC9B246FF7') # Zdenek Dohnal (The old 4D4227D7 key revoked) #options=(!makeflags) prepare() { @@ -57,10 +56,6 @@ prepare() { # FS#56818 - https://github.com/apple/cups/issues/5236 patch -Np1 -i "${srcdir}"/guid.patch - # fix german webinterface not opening - # 0001_fix_missing_bracket.patch - patch -Np1 -i ../0001_fix_missing_bracket.patch - # Rebuild configure script aclocal -I config-scripts autoconf -I config-scripts