summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey D2019-08-17 09:03:27 +0300
committerAlexey D2019-08-17 09:04:49 +0300
commitfe0d47d6b7f3408a3d79fc22fab267759afafecd (patch)
tree0f3c821658b2ead30faf2d96801e4b5ab609ca1b
parent1a5a6552478f98e5a1f0118b0010d197014b6ee2 (diff)
downloadaur-fe0d47d6b7f3408a3d79fc22fab267759afafecd.tar.gz
version 2.2.12-1
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD13
-rw-r--r--auth-workaround-for-certain-web-browsers.patch59
-rw-r--r--samsung-printer-workaround.patch30
4 files changed, 11 insertions, 107 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 350f88fc538..bab05924065 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Apr 17 06:03:51 UTC 2019
+# Sat Aug 17 06:03:05 UTC 2019
pkgbase = cups-nosystemd
pkgdesc = The CUPS Printing System - daemon package
- pkgver = 2.2.11
- pkgrel = 2
+ pkgver = 2.2.12
+ 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.11
+ depends = libcups>=2.2.12
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.11
+ provides = cups=2.2.12
conflicts = cups
conflicts = cups-eudev
replaces = cups
@@ -44,22 +44,20 @@ pkgbase = cups-nosystemd
backup = etc/cups/subscriptions.conf
backup = etc/logrotate.d/cups
backup = etc/pam.d/cups
- source = https://github.com/apple/cups/releases/download/v2.2.11/cups-2.2.11-source.tar.gz
+ source = https://github.com/apple/cups/releases/download/v2.2.12/cups-2.2.12-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 = samsung-printer-workaround.patch
- sha256sums = f58010813fd6903f690cdb0c0b91e4d1bc9e5b9570c28734229ba3ed2908b76c
+ sha256sums = 0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8
sha256sums = 87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b
sha256sums = d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
- sha256sums = ae3e154b8382f3412c73d863f4db095e722eb5255e15f0684b2bb9e02e5438af
pkgname = cups-nosystemd
diff --git a/PKGBUILD b/PKGBUILD
index c42b34fc381..62459a9f016 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname="cups-nosystemd"
-pkgver=2.2.11
-pkgrel=2
+pkgver=2.2.12
+pkgrel=1
pkgdesc="The CUPS Printing System - daemon package"
arch=('i686' 'x86_64')
license=('GPL')
@@ -35,16 +35,14 @@ source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver
cups-no-export-ssllibs.patch
cups-no-gzip-man.patch
cups-1.6.2-statedir.patch
- samsung-printer-workaround.patch
)
-sha256sums=('f58010813fd6903f690cdb0c0b91e4d1bc9e5b9570c28734229ba3ed2908b76c'
+sha256sums=('0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8'
'87cd833e7c07a36298341e35d5ce0534ce68fdf76ce3e9eda697e5455b963d1b'
'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
- '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
- 'ae3e154b8382f3412c73d863f4db095e722eb5255e15f0684b2bb9e02e5438af')
+ '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af')
prepare() {
cd cups-${pkgver}
@@ -59,9 +57,6 @@ prepare() {
# move /var/run -> /run for pid file
patch -Np1 -i "$srcdir"/cups-1.6.2-statedir.patch
- # FS#62360 / https://github.com/apple/cups/issues/5562
- patch -Np1 -i "$srcdir"/samsung-printer-workaround.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/auth-workaround-for-certain-web-browsers.patch b/auth-workaround-for-certain-web-browsers.patch
deleted file mode 100644
index 9b5af9eb4cd..00000000000
--- a/auth-workaround-for-certain-web-browsers.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 4feb1fe2e5bb9f418f51f5f517f70b451159baa2 Mon Sep 17 00:00:00 2001
-From: Michael R Sweet <michael.r.sweet@gmail.com>
-Date: Mon, 16 Apr 2018 17:16:31 -0400
-Subject: [PATCH] - Added a workaround for certain web browsers that do not
- support multiple authentication schemes in a single response header (Issue
- #5289)
-
----
- scheduler/client.c | 22 +++++++++++++++++-----
- scheduler/client.h | 8 +++++---
- 2 files changed, 22 insertions(+), 8 deletions(-)
-
-diff --git a/scheduler/client.c b/scheduler/client.c
-index f388499dc..95c34877d 100644
---- a/scheduler/client.c
-+++ b/scheduler/client.c
-@@ -813,6 +814,18 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */
-
- if (status == HTTP_STATUS_OK)
- {
-+ /*
-+ * Record whether the client is a web browser. "Mozilla" was the original
-+ * and it seems that every web browser in existence now uses that as the
-+ * prefix with additional information identifying *which* browser.
-+ *
-+ * Chrome (at least) has problems with multiple WWW-Authenticate values in
-+ * a single header, so we only report Basic or Negotiate to web browsers and
-+ * leave the multiple choices to the native CUPS client...
-+ */
-+
-+ con->is_browser = !strncmp(httpGetField(con->http, HTTP_FIELD_USER_AGENT), "Mozilla/", 8);
-+
- if (httpGetField(con->http, HTTP_FIELD_ACCEPT_LANGUAGE)[0])
- {
- /*
-@@ -2103,8 +2116,7 @@ cupsdSendHeader(
- strlcpy(auth_str, "Negotiate", sizeof(auth_str));
- }
-
-- if (con->best && auth_type != CUPSD_AUTH_NEGOTIATE &&
-- !_cups_strcasecmp(httpGetHostname(con->http, NULL, 0), "localhost"))
-+ if (con->best && auth_type != CUPSD_AUTH_NEGOTIATE && !con->is_browser && !_cups_strcasecmp(httpGetHostname(con->http, NULL, 0), "localhost"))
- {
- /*
- * Add a "trc" (try root certification) parameter for local non-Kerberos
-diff --git a/scheduler/client.h b/scheduler/client.h
-index aaca8279a..fc7af5400 100644
---- a/scheduler/client.h
-+++ b/scheduler/client.h
-@@ -26,6 +27,7 @@ struct cupsd_client_s
- struct timeval start; /* Request start time */
- http_state_t operation; /* Request operation */
- off_t bytes; /* Bytes transferred for this request */
-+ int is_browser; /* Is the client a web browser? */
- int type; /* AuthType for username */
- char username[HTTP_MAX_VALUE],
- /* Username from Authorization: line */
---
-2.17.0
diff --git a/samsung-printer-workaround.patch b/samsung-printer-workaround.patch
deleted file mode 100644
index f4259ff061c..00000000000
--- a/samsung-printer-workaround.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/cups/ppd.c b/cups/ppd.c
-index 435b992f4..29456d97a 100644
---- a/cups/ppd.c
-+++ b/cups/ppd.c
-@@ -1182,6 +1182,24 @@ _ppdOpen(
- else if (!strcmp(string, "Plus90"))
- ppd->landscape = 90;
- }
-+ else if (!strcmp(keyword, "Emulators") && string && ppd->num_emulations == 0)
-+ {
-+ /*
-+ * Issue #5562: Samsung printer drivers incorrectly use Emulators keyword
-+ * to configure themselves
-+ *
-+ * The Emulators keyword was loaded but never used by anything in CUPS,
-+ * and has no valid purpose in CUPS. The old code was removed due to a
-+ * memory leak (Issue #5475), so the following (new) code supports a single
-+ * name for the Emulators keyword, allowing these drivers to work until we
-+ * remove PPD and driver support entirely in a future version of CUPS.
-+ */
-+
-+ ppd->num_emulations = 1;
-+ ppd->emulations = calloc(1, sizeof(ppd_emul_t));
-+
-+ strlcpy(ppd->emulations[0].name, string, sizeof(ppd->emulations[0].name));
-+ }
- else if (!strcmp(keyword, "JobPatchFile"))
- {
- /*
-