Date: Tuesday, June 19, 2018 @ 04:43:31
Author: andyrtr
Revision: 327215
upgpkg: cups 2.2.8-3
use upstream fix for FS#58910
Modified:
cups/trunk/PKGBUILD
cups/trunk/cups-2.2.8-5325.patch
-----------------------+
PKGBUILD | 4 +-
cups-2.2.8-5325.patch | 67 ++++++++++++++++++++++++++++++------------------
2 files changed, 45 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-18 22:29:09 UTC (rev 327214)
+++ PKGBUILD 2018-06-19 04:43:31 UTC (rev 327215)
@@ -4,7 +4,7 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=2.2.8
-pkgrel=2
+pkgrel=3
arch=('x86_64')
license=('GPL')
url="https://www.cups.org/";
@@ -33,7 +33,7 @@
'23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
'f909719e2595e016c320afa421cad74ccda285ac59b11749ddac58e707d4330a'
'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d'
- '118698d5225d0f481fb9294d26c446abcdaa7891f1a449391db6fe16b5bdd660')
+ 'b1daf250e16d34539149535c68a241f32223b1f34d142d0ee369fde019340de9')
validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org
PGP key) <[email protected]>
validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org
<[email protected]>"
validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet
<[email protected]>"
Modified: cups-2.2.8-5325.patch
===================================================================
--- cups-2.2.8-5325.patch 2018-06-18 22:29:09 UTC (rev 327214)
+++ cups-2.2.8-5325.patch 2018-06-19 04:43:31 UTC (rev 327215)
@@ -1,15 +1,9 @@
-diff -u -r cups-2.2.8/cups/ipp.c cups-2.2.8-fix/cups/ipp.c
---- cups-2.2.8/cups/ipp.c 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8-fix/cups/ipp.c 2018-06-08 22:06:24.850309110 +0200
-@@ -5094,15 +5094,13 @@
- else if (*ptr & 0x80)
+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;
- 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)
@@ -18,19 +12,28 @@
- 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);
+- }
++ 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))
{
- 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);
-@@ -5156,15 +5154,13 @@
- else if (*ptr & 0x80)
+@@ -5163,16 +5166,19 @@ ippValidateAttribute(
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)
@@ -41,5 +44,21 @@
- 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);
+- 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))
+ {
+
