diff options
| -rw-r--r-- | print/cups/Makefile | 3 | ||||
| -rw-r--r-- | print/cups/distinfo | 6 | ||||
| -rw-r--r-- | print/cups/files/patch-cups_ipp.c | 60 | ||||
| -rw-r--r-- | print/cups/pkg-plist | 6 |
4 files changed, 4 insertions, 71 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 41e76fd12ad4..310e8b0c3eaf 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= cups -PORTVERSION= 2.2.8 +PORTVERSION= 2.2.10 DISTVERSIONPREFIX=v -PORTREVISION= 1 CATEGORIES= print MAINTAINER= tijl@FreeBSD.org diff --git a/print/cups/distinfo b/print/cups/distinfo index f8119be114c1..ac46e30ef317 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1528290622 -SHA256 (apple-cups-v2.2.8_GH0.tar.gz) = 8f87157960b9d80986f52989781d9de79235aa060e05008e4cf4c0a6ef6bca72 -SIZE (apple-cups-v2.2.8_GH0.tar.gz) = 10334321 +TIMESTAMP = 1544806439 +SHA256 (apple-cups-v2.2.10_GH0.tar.gz) = 50b672db6bab90bc71040ebedbfa3691cb8b5e9f0fbb13e38ced2a7610435584 +SIZE (apple-cups-v2.2.10_GH0.tar.gz) = 10362636 diff --git a/print/cups/files/patch-cups_ipp.c b/print/cups/files/patch-cups_ipp.c deleted file mode 100644 index f731b746bb49..000000000000 --- a/print/cups/files/patch-cups_ipp.c +++ /dev/null @@ -1,60 +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 ---- cups/ipp.c -+++ 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/print/cups/pkg-plist b/print/cups/pkg-plist index e0138291df55..db724a3a5846 100644 --- a/print/cups/pkg-plist +++ b/print/cups/pkg-plist @@ -49,14 +49,8 @@ include/cups/transcode.h include/cups/versioning.h lib/libcups.so lib/libcups.so.2 -lib/libcupscgi.so -lib/libcupscgi.so.1 lib/libcupsimage.so lib/libcupsimage.so.2 -lib/libcupsmime.so -lib/libcupsmime.so.1 -lib/libcupsppdc.so -lib/libcupsppdc.so.1 libexec/cups/backend/http %%GNUTLS%%libexec/cups/backend/https libexec/cups/backend/ipp |