diff options
Diffstat (limited to 'source/ap')
-rw-r--r-- | source/ap/cups/455c52a027ab3548953372a0b7bdb0008420e9ba.patch | 61 | ||||
-rwxr-xr-x | source/ap/cups/cups.SlackBuild | 5 | ||||
-rw-r--r-- | source/ap/cups/cups.url | 2 | ||||
-rw-r--r-- | source/ap/sysstat/sysstat.url | 2 |
4 files changed, 3 insertions, 67 deletions
diff --git a/source/ap/cups/455c52a027ab3548953372a0b7bdb0008420e9ba.patch b/source/ap/cups/455c52a027ab3548953372a0b7bdb0008420e9ba.patch deleted file mode 100644 index 7f60ed254..000000000 --- a/source/ap/cups/455c52a027ab3548953372a0b7bdb0008420e9ba.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 455c52a027ab3548953372a0b7bdb0008420e9ba Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Fri, 8 Jun 2018 22:29:50 +0200 -Subject: [PATCH] Fix validation rejecting all NAME and TEXT attrs - -When the UTF-8 validation loop finishes successfully, `*ptr` points at -the `'\0'` at the end of the string. The code misinterpreted this as a -control character (`*ptr < ' '`) and failed the validation. - -Fixes https://github.com/apple/cups/issues/5325 ---- - cups/ipp.c | 24 ++++++++++-------------- - 1 file changed, 10 insertions(+), 14 deletions(-) - -diff --git a/cups/ipp.c b/cups/ipp.c -index 95d53cc44..204c71fcd 100644 ---- a/cups/ipp.c -+++ b/cups/ipp.c -@@ -5030,15 +5030,13 @@ ippValidateAttribute( - else if (*ptr & 0x80) - break; - else if ((*ptr < ' ' && *ptr != '\n' && *ptr != '\r' && *ptr != '\t') || *ptr == 0x7f) -- break; -+ { -+ 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); -+ } - } - -- 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) -+ 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); -@@ -5088,15 +5086,13 @@ ippValidateAttribute( - else if (*ptr & 0x80) - break; - else if (*ptr < ' ' || *ptr == 0x7f) -- break; -+ { -+ 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); -+ } - } - -- 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); - diff --git a/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild index 1cc92b54b..4f9444c66 100755 --- a/source/ap/cups/cups.SlackBuild +++ b/source/ap/cups/cups.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cups VERSION=${VERSION:-$(echo $PKGNAM-*-source.tar.?z | cut -f 2 -d -)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -81,9 +81,6 @@ cd cups-$VERSION || exit 1 sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure -# Upstream patch to fix high CPU usage: -zcat $CWD/455c52a027ab3548953372a0b7bdb0008420e9ba.patch.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/ap/cups/cups.url b/source/ap/cups/cups.url index 1b693d7e0..8dbffaf03 100644 --- a/source/ap/cups/cups.url +++ b/source/ap/cups/cups.url @@ -1 +1 @@ -https://github.com/apple/cups/releases/download/v2.2.8/cups-2.2.8-source.tar.gz +https://github.com/apple/cups diff --git a/source/ap/sysstat/sysstat.url b/source/ap/sysstat/sysstat.url index 0b57f29e9..cd8c37f3f 100644 --- a/source/ap/sysstat/sysstat.url +++ b/source/ap/sysstat/sysstat.url @@ -1 +1 @@ -http://perso.orange.fr/sebastien.godard/sysstat-11.6.6.tar.xz +http://perso.orange.fr/sebastien.godard |