diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 26bd0c035..6def5d176 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,4 +1,3 @@ -# $Id$ # Maintainer: Andreas Radke # ALARM: Kevin Mihelich @@ -6,8 +5,8 @@ pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=2.2.8 -pkgrel=3 +pkgver=2.2.9 +pkgrel=1 arch=('x86_64') license=('GPL') url="https://www.cups.org/" @@ -24,9 +23,8 @@ source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver cups-1.6.2-statedir.patch # bugfixes cups-systemd-socket.patch - guid.patch - cups-2.2.8-5325.patch) -sha256sums=('3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4' + guid.patch) +sha256sums=('6d22d5da253b97643320da0bf95574acd85ff2abe3ec1a51d36093841d891156' 'SKIP' 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' @@ -35,8 +33,7 @@ sha256sums=('3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4' 'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b' '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af' 'f909719e2595e016c320afa421cad74ccda285ac59b11749ddac58e707d4330a' - 'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d' - 'b1daf250e16d34539149535c68a241f32223b1f34d142d0ee369fde019340de9') + 'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d') validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org " validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet " @@ -59,9 +56,6 @@ prepare() { # FS#56818 - https://github.com/apple/cups/issues/5236 patch -Np1 -i ${srcdir}/guid.patch - # https://github.com/apple/cups/issues/5325 - patch -Np1 -i ${srcdir}/cups-2.2.8-5325.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 diff --git a/extra/cups/cups-2.2.8-5325.patch b/extra/cups/cups-2.2.8-5325.patch deleted file mode 100644 index 7e7a6530c..000000000 --- a/extra/cups/cups-2.2.8-5325.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/cups/ipp.c b/cups/ipp.c -index 9346b201f..d6e39d5d8 100644 ---- a/cups/ipp.c -+++ b/cups/ipp.c -@@ -5101,16 +5101,19 @@ ippValidateAttribute( - break; - } - -- if (*ptr < ' ' || *ptr == 0x7f) -- { -- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text); -- return (0); -- } -- else if (*ptr) -- { -- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text); -- return (0); -- } -+ if (*ptr) -+ { -+ if (*ptr < ' ' || *ptr == 0x7f) -+ { -+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text); -+ return (0); -+ } -+ else -+ { -+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text); -+ return (0); -+ } -+ } - - if ((ptr - attr->values[i].string.text) > (IPP_MAX_TEXT - 1)) - { -@@ -5163,16 +5166,19 @@ ippValidateAttribute( - break; - } - -- if (*ptr < ' ' || *ptr == 0x7f) -- { -- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text); -- return (0); -- } -- else if (*ptr) -+ if (*ptr) - { -- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text); -- return (0); -- } -+ if (*ptr < ' ' || *ptr == 0x7f) -+ { -+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text); -+ return (0); -+ } -+ else -+ { -+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text); -+ return (0); -+ } -+ } - - if ((ptr - attr->values[i].string.text) > (IPP_MAX_NAME - 1)) - { -