net-print/cups: Revbumps to fix high system load. Removed old.

Bug: https://bugs.gentoo.org/657526
Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/net-print/cups/cups-2.2.8.ebuild b/net-print/cups/cups-2.2.8-r1.ebuild
similarity index 99%
rename from net-print/cups/cups-2.2.8.ebuild
rename to net-print/cups/cups-2.2.8-r1.ebuild
index 55a2084618d014e4ba8fe68be6729cbc579a50f5..d9adea70fc405368f047ef0b35a23fb67c8cb027 100644 (file)
--- a/net-print/cups/cups-2.2.8.ebuild
+++ b/net-print/cups/cups-2.2.8-r1.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
        "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
        "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+       "${FILESDIR}/${PN}-2.2.8-validation_fixes.patch" #657526
 )
 
 MULTILIB_CHOST_TOOLS=(

diff --git a/net-print/cups/cups-2.3_beta5.ebuild b/net-print/cups/cups-2.3_beta5-r1.ebuild
similarity index 99%
rename from net-print/cups/cups-2.3_beta5.ebuild
rename to net-print/cups/cups-2.3_beta5-r1.ebuild
index 608055933fa80e3a9fd022a3474e3ae24ff5a9cb..ee8375c1474a96a8baa6f5af190230dd9b839ba9 100644 (file)
--- a/net-print/cups/cups-2.3_beta5.ebuild
+++ b/net-print/cups/cups-2.3_beta5-r1.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
        "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
        "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+       "${FILESDIR}/${PN}-2.2.8-validation_fixes.patch" #657526
 )
 
 MULTILIB_CHOST_TOOLS=(

diff --git a/net-print/cups/files/cups-2.2.8-validation_fixes.patch b/net-print/cups/files/cups-2.2.8-validation_fixes.patch
new file mode 100644 (file)
index 0000000..ef87b6a
--- /dev/null
+++ b/net-print/cups/files/cups-2.2.8-validation_fixes.patch
@@ -0,0 +1,60 @@
+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);