version 2.2.8-1

3 files changed, 80 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec29306ba0a..5a8b8ed02dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Apr 17 05:23:37 UTC 2018
+# Sat Jun 23 06:28:34 UTC 2018
 pkgbase = cups-nosystemd
 	pkgdesc = The CUPS Printing System - daemon package
-	pkgver = 2.2.7
-	pkgrel = 2
+	pkgver = 2.2.8
+	pkgrel = 1
 	url = https://www.cups.org/
 	install = cups-nosystemd.install
 	arch = i686
@@ -22,7 +22,7 @@ pkgbase = cups-nosystemd
 	makedepends = inetutils
 	depends = acl
 	depends = pam
-	depends = libcups>=2.2.7
+	depends = libcups>=2.2.8
 	depends = cups-filters
 	depends = bc
 	depends = dbus
@@ -31,7 +31,7 @@ pkgbase = cups-nosystemd
 	optdepends = xdg-utils: xdg .desktop file support
 	optdepends = colord: for ICC color profile support
 	optdepends = cups-openrc: cups openrc initscript
-	provides = cups=2.2.7
+	provides = cups=2.2.8
 	conflicts = cups
 	conflicts = cups-eudev
 	replaces = cups
@@ -45,22 +45,22 @@ pkgbase = cups-nosystemd
 	backup = etc/dbus-1/system.d/cups.conf
 	backup = etc/logrotate.d/cups
 	backup = etc/pam.d/cups
-	source = https://github.com/apple/cups/releases/download/v2.2.7/cups-2.2.7-source.tar.gz
+	source = https://github.com/apple/cups/releases/download/v2.2.8/cups-2.2.8-source.tar.gz
 	source = cups
 	source = cups.logrotate
 	source = cups.pam
 	source = cups-no-export-ssllibs.patch
 	source = cups-no-gzip-man.patch
 	source = cups-1.6.2-statedir.patch
-	source = auth-workaround-for-certain-web-browsers.patch
-	sha256sums = 3c4b637b737077565ccdfbd5f61785d03f49461ae736fcc2c0ffaf41d2c6ea6a
+	source = cups-2.2.8-5325.patch
+	sha256sums = 3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4
 	sha256sums = 87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b
 	sha256sums = d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
 	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
 	sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
 	sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
 	sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
-	sha256sums = e5ad0e967c2ae9a9780211acb41980e4aa203df1dacff49d14d75a6ab6c8b8ed
+	sha256sums = b1daf250e16d34539149535c68a241f32223b1f34d142d0ee369fde019340de9
 
 pkgname = cups-nosystemd
 
diff --git a/PKGBUILD b/PKGBUILD
index 145a1dcd3bf..aea6664308b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname="cups-nosystemd"
-pkgver=2.2.7
-pkgrel=2
+pkgver=2.2.8
+pkgrel=1
 pkgdesc="The CUPS Printing System - daemon package"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -37,16 +37,16 @@ source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver
         cups-no-gzip-man.patch
         cups-1.6.2-statedir.patch
         # bugfixes
-        auth-workaround-for-certain-web-browsers.patch
+        cups-2.2.8-5325.patch
         )
-sha256sums=('3c4b637b737077565ccdfbd5f61785d03f49461ae736fcc2c0ffaf41d2c6ea6a'
+sha256sums=('3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4'
             '87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b'
             'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
             'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
             '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-            'e5ad0e967c2ae9a9780211acb41980e4aa203df1dacff49d14d75a6ab6c8b8ed')
+            'b1daf250e16d34539149535c68a241f32223b1f34d142d0ee369fde019340de9')
 
 prepare() {
   cd cups-${pkgver}
@@ -62,7 +62,8 @@ prepare() {
   patch -Np1 -i "$srcdir"/cups-1.6.2-statedir.patch
 
   # bugfixes
-  patch -Np1 -i "$srcdir"/auth-workaround-for-certain-web-browsers.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
diff --git a/cups-2.2.8-5325.patch b/cups-2.2.8-5325.patch
new file mode 100644
index 00000000000..7e7a6530c62
--- /dev/null
+++ b/cups-2.2.8-5325.patch
@@ -0,0 +1,64 @@
+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))
+ 	  {
+