summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGicu GORODENCO2018-08-19 21:27:20 +0200
committerGicu GORODENCO2018-08-19 21:27:20 +0200
commitecb99361d968af0ab79b33e531667f71b26d6131 (patch)
tree1df78bb6a80fbbe5bff63d9ee685db24699f35fb
parent7ce179f235f4519a2fe5b4f5cf04dc11a1f9ef04 (diff)
downloadaur-libcups-ipp14.tar.gz
Update to 2.2.8 version
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD19
-rw-r--r--cups-2.2.8-5325.patch64
-rw-r--r--cups-systemd-socket.patch3
4 files changed, 93 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 55e76022447..31150d1f872 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libcups-ipp14
- pkgver = 2.2.6
- pkgrel = 4
+ pkgver = 2.2.8
+ pkgrel = 3
url = https://www.cups.org/
arch = i686
arch = x86_64
@@ -26,11 +26,11 @@ pkgbase = libcups-ipp14
makedepends = inetutils
makedepends = libpaper
makedepends = valgrind
- provides = libcups=2.2.6-4
+ provides = libcups=2.2.8-3
conflicts = libcups
replaces = libcups
- source = https://github.com/apple/cups/releases/download/v2.2.6/cups-2.2.6-source.tar.gz
- source = https://github.com/apple/cups/releases/download/v2.2.6/cups-2.2.6-source.tar.gz.sig
+ source = https://github.com/apple/cups/releases/download/v2.2.8/cups-2.2.8-source.tar.gz
+ source = https://github.com/apple/cups/releases/download/v2.2.8/cups-2.2.8-source.tar.gz.sig
source = cups.logrotate
source = cups.pam
source = cups.sysusers
@@ -39,9 +39,13 @@ pkgbase = libcups-ipp14
source = cups-no-gzip-man.patch
source = cups-1.6.2-statedir.patch
source = cups-systemd-socket.patch
+ source = guid.patch
+ source = cups-2.2.8-5325.patch
source = add-ipp-backend-of-cups-1.4.patch
validpgpkeys = 3737FD0D0E63B30172440D2DDBA3A7AB08D76223
- sha256sums = 40385778c2b3bdf55030d1c999734e22774c79e3425d91339ce677825620169b
+ validpgpkeys = 45D083946E3035282B3CCA9AF434104235DA97EB
+ validpgpkeys = 845464660B686AAB36540B6F999559A027815955
+ sha256sums = 3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4
sha256sums = SKIP
sha256sums = d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
@@ -50,7 +54,9 @@ pkgbase = libcups-ipp14
sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
- sha256sums = cdad3c266cb2abb0f90af3113420fa47a09e3ed974a2ffa9fb6a642e11971d65
+ sha256sums = f909719e2595e016c320afa421cad74ccda285ac59b11749ddac58e707d4330a
+ sha256sums = d4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d
+ sha256sums = b1daf250e16d34539149535c68a241f32223b1f34d142d0ee369fde019340de9
sha256sums = 375614399e38ddb7af9375472a75e8a83eb3c587595ee079286cbc45094e3c26
pkgname = libcups-ipp14
diff --git a/PKGBUILD b/PKGBUILD
index a11200f29b1..5774eafe7f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,10 +7,10 @@ pkgbase="libcups-ipp14"
### Commenting the "split packages sections - unsupported by AUR apparently ###
#pkgname=('libcups-ipp14' 'cups-ipp14')
pkgname=(${pkgbase})
-pkgver=2.2.6
-pkgrel=4
+pkgver=2.2.8
+pkgrel=3
arch=('i686' 'x86_64')
-provides=('libcups=2.2.6-4')
+provides=('libcups=2.2.8-3')
replaces=('libcups')
conflicts=('libcups')
license=('GPL')
@@ -27,10 +27,12 @@ source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver
cups-1.6.2-statedir.patch
# bugfixes
cups-systemd-socket.patch
+ guid.patch
+ cups-2.2.8-5325.patch
# IPP 1.4
add-ipp-backend-of-cups-1.4.patch)
-sha256sums=('40385778c2b3bdf55030d1c999734e22774c79e3425d91339ce677825620169b'
+sha256sums=('3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4'
'SKIP'
'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
@@ -39,10 +41,14 @@ sha256sums=('40385778c2b3bdf55030d1c999734e22774c79e3425d91339ce677825620169b'
'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
'23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
- 'cdad3c266cb2abb0f90af3113420fa47a09e3ed974a2ffa9fb6a642e11971d65'
+ 'f909719e2595e016c320afa421cad74ccda285ac59b11749ddac58e707d4330a'
+ 'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d'
+ 'b1daf250e16d34539149535c68a241f32223b1f34d142d0ee369fde019340de9'
'375614399e38ddb7af9375472a75e8a83eb3c587595ee079286cbc45094e3c26')
validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <security@cups.org>
+validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org <security@cups.org>"
+validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet <michael.r.sweet@gmail.com>"
prepare() {
@@ -66,6 +72,9 @@ prepare() {
# FS#56818 - https://github.com/apple/cups/issues/5236
patch -Np1 -i ${srcdir}/guid.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
sed -i -e '6i# Disable cups internal logging - use logrotate instead' 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))
+ {
+
diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 035fde10d17..3369ceb57ce 100644
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -43,6 +43,7 @@ diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/schedu
ExecStart=@sbindir@/cupsd -l
-Type=simple
+Type=notify
+ Restart=on-failure
[Install]
- Also=org.cups.cupsd.socket org.cups.cupsd.path
+