[arch-commits] Commit in cups/trunk (3 files)

2020-11-27 Thread Andreas Radke via arch-commits 
Date: Friday, November 27, 2020 @ 20:06:44
  Author: andyrtr
Revision: 402337

upgpkg: cups 1:2.3.3op1-1: upstream update 2.3.3op1 - first release of the 
OpenPrinting fork; don't let the cupsd server wait for network-online.target - 
use IP_FREEBIND

Added:
  cups/trunk/cups-freebind.patch
Modified:
  cups/trunk/PKGBUILD
Deleted:
  cups/trunk/cups-systemd-service.patch

+
 PKGBUILD   |   46 ---
 cups-freebind.patch|   15 ++
 cups-systemd-service.patch |   14 -
 3 files changed, 37 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-27 18:45:55 UTC (rev 402336)
+++ PKGBUILD2020-11-27 20:06:44 UTC (rev 402337)
@@ -2,9 +2,10 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-_commit=63ffc5cd75e474e475bb3bcd70fb4e62bd836770 # master 2020-11-25
-pkgver=2.3.3+121+g63ffc5cd7
+#_commit=be75d5d99a54c5f62608f7b9e98748d4c7045ec1 # master 2020-11-27
+pkgver=2.3.3op1
 pkgrel=1
+epoch=1
 arch=('x86_64')
 license=('Apache' 'custom')
 #url="https://www.cups.org/;
@@ -14,7 +15,8 @@
  'avahi'  'hicolor-icon-theme' 'systemd' 'libxcrypt' 'inetutils' 
'libpaper' 'valgrind'
  'git')
 
source=(#https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
-"git+https://github.com/OpenPrinting/cups#commit=$_commit;
+
https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz{,.sig}
+#"git+https://github.com/OpenPrinting/cups#commit=$_commit;
 cups.logrotate
 cups.pam
 cups.sysusers
@@ -22,9 +24,9 @@
 cups-no-export-ssllibs.patch
 cups-1.6.2-statedir.patch
 # bugfixes
-cups-systemd-service.patch
+cups-freebind.patch
 guid.patch)
-sha256sums=(#'261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee'
+sha256sums=('5cf7988081d9003f589ba173b37bc2bbf81db43bb94e5e7d3e7d4c0afb0f9bc2'
 'SKIP'
 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
 '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
@@ -31,7 +33,7 @@
 '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2'
 'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
 '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-'2abd918d5a5e38762ae7c2a3a443a7b9e8d9980fbe693a4b60415b18a80ebd83'
+'3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d'
 'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org 
PGP key) 
 validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org 
"
@@ -38,14 +40,14 @@
 validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet 
"
 
 
-pkgver() {
-  cd $pkgbase
-  git describe --tags | sed 's/-/+/g' | sed 's/v//'
-}
+#pkgver() {
+#  cd $pkgbase
+#  git describe --tags | sed 's/-/+/g' | sed 's/v//'
+#}
 
 prepare() {
 
-  cd "${pkgbase}" #-${pkgver}
+  cd "${pkgbase}"-${pkgver}
 
   # improve build and linking
   # Do not export SSL libs in cups-config
@@ -54,18 +56,14 @@
   patch -Np1 -i "${srcdir}"/cups-1.6.2-statedir.patch
 
   # bug fixes
-  # make sure network is online or cups would ne a restart to be reachable 
over network
+
   # https://github.com/OpenPrinting/cups/issues/53
-  patch -Np1 -i "${srcdir}"/cups-systemd-service.patch
+  # use IP_FREEBIND, because cupsd cannot bind to not yet existing IP address
+  patch -Np1 -i "${srcdir}"/cups-freebind.patch
 
   # FS#56818 - https://github.com/apple/cups/issues/5236
   patch -Np1 -i "${srcdir}"/guid.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
-#  sed -i -e '7iMaxLogSize 0' conf/cupsd.conf.in
-
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
   autoconf -I config-scripts
@@ -72,7 +70,7 @@
 }
 
 build() {
-  cd "${pkgbase}" #-${pkgver}
+  cd "${pkgbase}"-${pkgver}
 
   # The build system uses only DSOFLAGS but not LDFLAGS to build some 
libraries.
   export DSOFLAGS=${LDFLAGS}
@@ -103,7 +101,7 @@
 }
 
 check() {
-  cd "${pkgbase}" #-${pkgver}
+  cd "${pkgbase}"-${pkgver}
 #  make -k check || /bin/true
 #  make check
 }
@@ -112,12 +110,12 @@
 pkgdesc="The CUPS Printing System - client libraries and headers"
 depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb' 
'libxcrypt')
 
-  cd ${pkgbase} #-${pkgver}
+  cd ${pkgbase}-${pkgver}
   make BUILDROOT="${pkgdir}" install-headers install-libs
   # put this into the libs pkg to make other software find the libs(no 
pkg-config

[arch-commits] Commit in cups/trunk (3 files)

2020-11-26 Thread Andreas Radke via arch-commits 
Date: Thursday, November 26, 2020 @ 15:20:14
  Author: andyrtr
Revision: 402087

upgpkg: cups 2.3.3+121+g63ffc5cd7-1: update to latest git commit

Added:
  cups/trunk/cups-systemd-service.patch
(from rev 402086, cups/trunk/cups-systemd-socket.patch)
Modified:
  cups/trunk/PKGBUILD
Deleted:
  cups/trunk/cups-systemd-socket.patch

+
 PKGBUILD   |   13 +++--
 cups-systemd-service.patch |   14 ++
 cups-systemd-socket.patch  |   40 
 3 files changed, 21 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-26 13:03:20 UTC (rev 402086)
+++ PKGBUILD2020-11-26 15:20:14 UTC (rev 402087)
@@ -2,8 +2,8 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-_commit=a72b0140ee9ad72f7ffc1f46fbe962bde159cbb8 # master 2020-11-15
-pkgver=2.3.3+106+ga72b0140e
+_commit=63ffc5cd75e474e475bb3bcd70fb4e62bd836770 # master 2020-11-25
+pkgver=2.3.3+121+g63ffc5cd7
 pkgrel=1
 arch=('x86_64')
 license=('Apache' 'custom')
@@ -22,7 +22,7 @@
 cups-no-export-ssllibs.patch
 cups-1.6.2-statedir.patch
 # bugfixes
-cups-systemd-socket.patch
+cups-systemd-service.patch
 guid.patch)
 sha256sums=(#'261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee'
 'SKIP'
@@ -31,7 +31,7 @@
 '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2'
 'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
 '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-'5fb8b1df744ddff3652d9940fe2c084f4146b22a60b95a7eb97a2ed29e0d3a10'
+'2abd918d5a5e38762ae7c2a3a443a7b9e8d9980fbe693a4b60415b18a80ebd83'
 'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org 
PGP key) 
 validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org 
"
@@ -54,8 +54,9 @@
   patch -Np1 -i "${srcdir}"/cups-1.6.2-statedir.patch
 
   # bug fixes
-  # make sure network is up when starting and notify systemd - FC
-  patch -Np1 -i "${srcdir}"/cups-systemd-socket.patch
+  # make sure network is online or cups would ne a restart to be reachable 
over network
+  # https://github.com/OpenPrinting/cups/issues/53
+  patch -Np1 -i "${srcdir}"/cups-systemd-service.patch
 
   # FS#56818 - https://github.com/apple/cups/issues/5236
   patch -Np1 -i "${srcdir}"/guid.patch

Copied: cups/trunk/cups-systemd-service.patch (from rev 402086, 
cups/trunk/cups-systemd-socket.patch)
===
--- cups-systemd-service.patch  (rev 0)
+++ cups-systemd-service.patch  2020-11-26 15:20:14 UTC (rev 402087)
@@ -0,0 +1,14 @@
+--- cups-2.3.0/scheduler/cups.service.in   2019-08-23 17:19:38.0 
+0200
 cups-2.3.0/scheduler/cups.service.in.new   2019-08-25 20:20:25.805339727 
+0200
+@@ -1,8 +1,9 @@
+ [Unit]
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+-After=network.target sssd.service ypbind.service
++After=network-online.target sssd.service ypbind.service
+ Requires=cups.socket
++Wants=network-online.target
+
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
+ 

Deleted: cups-systemd-socket.patch
===
--- cups-systemd-socket.patch   2020-11-26 13:03:20 UTC (rev 402086)
+++ cups-systemd-socket.patch   2020-11-26 15:20:14 UTC (rev 402087)
@@ -1,40 +0,0 @@
-diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
 cups-2.0.2/scheduler/main.c.ustTJg 2015-02-10 13:40:24.121547526 +0100
-+++ cups-2.0.2/scheduler/main.c2015-02-10 13:40:24.295545063 +0100
-@@ -690,8 +690,15 @@ main(int  argc,   /* I - Number 
of comm
- 
- #if defined(HAVE_ONDEMAND)
-   if (OnDemand)
-+  {
- cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started 
on demand.");
--  else
-+# ifdef HAVE_SYSTEMD
-+sd_notifyf(0, "READY=1\n"
-+   "STATUS=Scheduler is running...\n"
-+   "MAINPID=%lu",
-+   (unsigned long) getpid());
-+# endif /* HAVE_SYSTEMD */
-+  } else
- #endif /* HAVE_ONDEMAND */
-   if (fg)
- cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started 
in foreground.");
-diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg 
cups-2.0.2/scheduler/org.cups.cupsd.path.in
 cups-2.3.0/scheduler/cups.service.in   2019-08-23 17:19:38.0 
+0200
-+++ cups-2.3.0/scheduler/cups.service.in.new   2019-08-25 20:20:25.805339727 
+0200
-@@ -1,12 +1,13 @@
- [Unit]
- Description=CUPS Scheduler
- Documentation=man:cupsd(8)
--After=sssd.service
-+After=sssd.service network-online.target
- Requires=cups.socket
-+Wants=network-online.target
-
- [Service]
- ExecStart=@sbindir@/cupsd -l

[arch-commits] Commit in cups/trunk (3 files)

2019-08-15 Thread Andreas Radke via arch-commits 
Date: Friday, August 16, 2019 @ 05:31:25
  Author: andyrtr
Revision: 359860

upgpkg: cups 2.2.12-1

upstream update 2.2.12

Modified:
  cups/trunk/PKGBUILD
  cups/trunk/cups-systemd-socket.patch
Deleted:
  cups/trunk/samsung-printer-workaround.patch

--+
 PKGBUILD |   17 ++---
 cups-systemd-socket.patch|   17 -
 samsung-printer-workaround.patch |   30 --
 3 files changed, 6 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-16 04:36:04 UTC (rev 359859)
+++ PKGBUILD2019-08-16 05:31:25 UTC (rev 359860)
@@ -2,8 +2,8 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.2.11
-pkgrel=2
+pkgver=2.2.12
+pkgrel=1
 arch=('x86_64')
 license=('GPL')
 url="https://www.cups.org/;
@@ -20,9 +20,8 @@
 cups-1.6.2-statedir.patch
 # bugfixes
 cups-systemd-socket.patch
-guid.patch
-   samsung-printer-workaround.patch)
-sha256sums=('f58010813fd6903f690cdb0c0b91e4d1bc9e5b9570c28734229ba3ed2908b76c'
+guid.patch)
+sha256sums=('0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8'
 'SKIP'
 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
 '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
@@ -30,9 +29,8 @@
 'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
 'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
 '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-'f909719e2595e016c320afa421cad74ccda285ac59b11749ddac58e707d4330a'
-'d4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d'
-'ae3e154b8382f3412c73d863f4db095e722eb5255e15f0684b2bb9e02e5438af')
+'9d6e9c46e009c54563e7c9e140484af83874747fe371569a982a082e6877a283'
+'d4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org 
PGP key) 
 validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org 
"
 validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet 
"
@@ -56,9 +54,6 @@
   # FS#56818 - https://github.com/apple/cups/issues/5236
   patch -Np1 -i ${srcdir}/guid.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

Modified: cups-systemd-socket.patch
===
--- cups-systemd-socket.patch   2019-08-16 04:36:04 UTC (rev 359859)
+++ cups-systemd-socket.patch   2019-08-16 05:31:25 UTC (rev 359860)
@@ -30,20 +30,3 @@
  
  [Install]
  WantedBy=multi-user.target
-diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg 
cups-2.0.2/scheduler/org.cups.cupsd.service.in
 cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg  2014-10-21 
13:55:01.0 +0200
-+++ cups-2.0.2/scheduler/org.cups.cupsd.service.in 2015-02-10 
13:40:24.296545049 +0100
-@@ -1,10 +1,11 @@
- [Unit]
- Description=CUPS Scheduler
- Documentation=man:cupsd(8)
-+After=network.target
- 
- [Service]
- ExecStart=@sbindir@/cupsd -l
--Type=simple
-+Type=notify
- Restart=on-failure
- 
- [Install]
-

Deleted: samsung-printer-workaround.patch
===
--- samsung-printer-workaround.patch2019-08-16 04:36:04 UTC (rev 359859)
+++ samsung-printer-workaround.patch2019-08-16 05:31:25 UTC (rev 359860)
@@ -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,

[arch-commits] Commit in cups/trunk (3 files)

2018-06-05 Thread Andreas Radke via arch-commits 
Date: Tuesday, June 5, 2018 @ 20:30:24
  Author: andyrtr
Revision: 325947

upgpkg: cups 2.2.8-1

upstream update 2.2.8

Modified:
  cups/trunk/PKGBUILD
  cups/trunk/cups-systemd-socket.patch
Deleted:
  cups/trunk/auth-workaround-for-certain-web-browsers.patch

+
 PKGBUILD   |   13 +
 auth-workaround-for-certain-web-browsers.patch |   59 ---
 cups-systemd-socket.patch  |2 
 3 files changed, 6 insertions(+), 68 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-05 20:23:00 UTC (rev 325946)
+++ PKGBUILD2018-06-05 20:30:24 UTC (rev 325947)
@@ -3,8 +3,8 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.2.7
-pkgrel=2
+pkgver=2.2.8
+pkgrel=1
 arch=('x86_64')
 license=('GPL')
 url="https://www.cups.org/;
@@ -19,9 +19,8 @@
 cups-no-gzip-man.patch
 cups-1.6.2-statedir.patch
 # bugfixes
-auth-workaround-for-certain-web-browsers.patch
 cups-systemd-socket.patch)
-sha256sums=('3c4b637b737077565ccdfbd5f61785d03f49461ae736fcc2c0ffaf41d2c6ea6a'
+sha256sums=('3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4'
 'SKIP'
 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
 '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
@@ -30,10 +29,10 @@
 'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
 'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
 '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-'e5ad0e967c2ae9a9780211acb41980e4aa203df1dacff49d14d75a6ab6c8b8ed'
-'c04627383d66f19b78e78f960d4d46577111ec9789b937ac4efba4cf369c921f')
+'f909719e2595e016c320afa421cad74ccda285ac59b11749ddac58e707d4330a')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org 
PGP key) 
 validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org 
"
+validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet 
"
 
 prepare() {
 
@@ -48,8 +47,6 @@
   patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
 
   # bug fixes
-  # https://github.com/apple/cups/issues/5289
-  patch -Np1 -i ${srcdir}/auth-workaround-for-certain-web-browsers.patch
   # make sure network is up when starting and notify systemd - FC
   patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
 

Deleted: auth-workaround-for-certain-web-browsers.patch
===
--- auth-workaround-for-certain-web-browsers.patch  2018-06-05 20:23:00 UTC 
(rev 325946)
+++ auth-workaround-for-certain-web-browsers.patch  2018-06-05 20:30:24 UTC 
(rev 325947)
@@ -1,59 +0,0 @@
-From 4feb1fe2e5bb9f418f51f5f517f70b451159baa2 Mon Sep 17 00:00:00 2001
-From: Michael R Sweet 
-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;

[arch-commits] Commit in cups/trunk (3 files)

2017-07-01 Thread Andreas Radke 
Date: Saturday, July 1, 2017 @ 16:05:56
  Author: andyrtr
Revision: 299498

upgpkg: cups 2.2.4-1

upstream update 2.2.4

Added:
  cups/trunk/cups-fix-install-perms.patch
(from rev 299497, cups/trunk/cups-1.6.0-fix-install-perms.patch)
Modified:
  cups/trunk/PKGBUILD
Deleted:
  cups/trunk/cups-1.6.0-fix-install-perms.patch

+
 PKGBUILD   |   10 +-
 cups-1.6.0-fix-install-perms.patch |   25 -
 cups-fix-install-perms.patch   |   23 +++
 3 files changed, 28 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-01 14:39:30 UTC (rev 299497)
+++ PKGBUILD2017-07-01 16:05:56 UTC (rev 299498)
@@ -3,7 +3,7 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.2.3
+pkgver=2.2.4
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,11 +18,11 @@
 cups-no-gcrypt.patch
 cups-no-gzip-man.patch
 cups-1.6.2-statedir.patch
-cups-1.6.0-fix-install-perms.patch
+cups-fix-install-perms.patch
 # bugfixes
 cups-systemd-socket.patch
 )
-sha256sums=('66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f'
+sha256sums=('596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc'
 'SKIP'
 'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
 '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
@@ -30,7 +30,7 @@
 '1423673e16e374ed372c5b69aebc785b6674bf40601c74a5c08454f672ffa7f1'
 'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
 '23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
-'4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8'
+'2496b683920417c922d58c1f70807f7a0f0c818db9ce75fe182104bd4484027b'
 'cdad3c266cb2abb0f90af3113420fa47a09e3ed974a2ffa9fb6a642e11971d65')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org 
PGP key) 
 
@@ -48,7 +48,7 @@
   # move /var/run -> /run for pid file
   patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
   # fix permissions on some files (by Gentoo) - alternative: cups-0755.patch 
by FC
-  patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
+  patch -Np0 -i ${srcdir}/cups-fix-install-perms.patch
 
   # bug fixes
   # make sure network is up when starting and notify systemd - FC

Deleted: cups-1.6.0-fix-install-perms.patch
===
--- cups-1.6.0-fix-install-perms.patch  2017-07-01 14:39:30 UTC (rev 299497)
+++ cups-1.6.0-fix-install-perms.patch  2017-07-01 16:05:56 UTC (rev 299498)
@@ -1,25 +0,0 @@
-Index: Makedefs.in
-===
 Makedefs.in(Revision 10520)
-+++ Makedefs.in(Arbeitskopie)
-@@ -40,14 +40,14 @@
- # Installation programs...
- #
- 
--INSTALL_BIN   =   $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
--INSTALL_COMPDATA =$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_BIN   =   $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
-+INSTALL_COMPDATA =$(INSTALL) -c -m 644 @INSTALL_GZIP@
- INSTALL_CONFIG=   $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
--INSTALL_DATA  =   $(INSTALL) -c -m 444
-+INSTALL_DATA  =   $(INSTALL) -c -m 644
- INSTALL_DIR   =   $(INSTALL) -d
--INSTALL_LIB   =   $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
--INSTALL_MAN   =   $(INSTALL) -c -m 444
--INSTALL_SCRIPT=   $(INSTALL) -c -m 555
-+INSTALL_LIB   =   $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
-+INSTALL_MAN   =   $(INSTALL) -c -m 644
-+INSTALL_SCRIPT=   $(INSTALL) -c -m 755
- 
- #
- # Default user, group, and system groups for the scheduler...

Copied: cups/trunk/cups-fix-install-perms.patch (from rev 299497, 
cups/trunk/cups-1.6.0-fix-install-perms.patch)
===
--- cups-fix-install-perms.patch(rev 0)
+++ cups-fix-install-perms.patch2017-07-01 16:05:56 UTC (rev 299498)
@@ -0,0 +1,23 @@
+--- Makedefs.in2017-06-30 17:44:38.0 +0200
 Makedefs.in.new2017-07-01 17:59:28.075942932 +0200
+@@ -38,14 +38,14 @@
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN   =   $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ 
@INSTALL_STRIP@
+-INSTALL_COMPDATA =$(INSTALL) -c -m 444 @INSTALL_GZIP@
++INSTALL_BIN   =   $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_COMPDATA =$(INSTALL) -c -m 644 @INSTALL_GZIP@
+ INSTALL_CONFIG=   $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+-INSTALL_DATA  =   $(INSTALL) -c -m 444
++INSTALL_DATA  =   $(INSTALL) -c -m 644
+ INSTALL_DIR   =   $(INSTALL) -d
+-INSTALL_LIB   =   $(LIBTOOL) $(INSTALL) -c

[arch-commits] Commit in cups/trunk (3 files)

2016-09-15 Thread Andreas Radke 
Date: Thursday, September 15, 2016 @ 19:58:57
  Author: andyrtr
Revision: 276519

upgpkg: cups 2.2.0-1

upstream update 2.2.0; drop deprecated client.conf

Modified:
  cups/trunk/PKGBUILD
  cups/trunk/cups-no-gzip-man.patch
  cups/trunk/cups-systemd-socket.patch

---+
 PKGBUILD  |   22 --
 cups-no-gzip-man.patch|2 +-
 cups-systemd-socket.patch |6 +++---
 3 files changed, 12 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-09-15 19:39:38 UTC (rev 276518)
+++ PKGBUILD2016-09-15 19:58:57 UTC (rev 276519)
@@ -3,15 +3,15 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=2.1.4
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/;
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 
'gnutls'
+makedepends=('libtiff' 'libpng' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls'
  'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 
'dbus' 
  'avahi'  'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 
'valgrind')
-source=(https://github.com/apple/cups/releases/download/release-${pkgver}/cups-${pkgver}-source.tar.gz
+source=(https://github.com/apple/cups/releases/download/v${pkgver}/cups-${pkgver}-source.tar.gz
 cups.logrotate cups.pam
 # improve build and linking
 cups-no-export-ssllibs.patch
@@ -22,15 +22,15 @@
 # bugfixes
 cups-systemd-socket.patch
 )
-md5sums=('9f9bf6e3b9c20a3519b4dc409666d6e7'
+md5sums=('e22d943cff300411d3616dc2ee86272c'
  'fc8286f185e2cc5f7e1f6843bf193e2b'
  '96f82c38f3f540b53f3e5144900acf17'
  '3ba9e3410df1dc3015463d615ef91b3b'
  '1beb4896f217bc241bc08a422274ec0c'
- '90c30380d4c8cd48a908cfdadae1ea24'
+ '39dd3141991c3052b73f59ece70e1ea6'
  '451609db34f95209d64c38474de27ce1'
  '5117f65342fcc69c6a506529e4daca9e'
- '25a618201dd4bbc73ba800da425000f1')
+ '53bb3c80ee6823d36f9ab499373edfc5')
 validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org 
PGP key) 
 
 prepare() {
@@ -94,7 +94,6 @@
 package_libcups() {
 pkgdesc="The CUPS Printing System - client libraries and headers"
 depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb')
-backup=(etc/cups/client.conf)
 
   cd ${pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-headers install-libs
@@ -105,11 +104,6 @@
   # install client.conf man page and config file
   install -dm755 ${pkgdir}/usr/share/man/man5
   install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 
${pkgdir}/usr/share/man/man5/
-  install -dm755 -g lp ${pkgdir}/etc/cups
-  touch ${pkgdir}/etc/cups/client.conf
-  echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
-  echo "ServerName /run/cups/cups.sock #  alternative: ServerName 
hostname-or-ip-address[:port] of a remote server" >> 
${pkgdir}/etc/cups/client.conf
-  chgrp -R lp ${pkgdir}/etc/cups
 }
 
 package_cups() {
@@ -139,7 +133,7 @@
   rm -rf ${pkgdir}/etc/init.d
   install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
   install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-  
+
   # fix perms on /var/spool and /etc
   chmod 755 ${pkgdir}/var/spool
   chmod 755 ${pkgdir}/etc

Modified: cups-no-gzip-man.patch
===
--- cups-no-gzip-man.patch  2016-09-15 19:39:38 UTC (rev 276518)
+++ cups-no-gzip-man.patch  2016-09-15 19:58:57 UTC (rev 276519)
@@ -4,7 +4,7 @@
 @@ -69,10 +69,10 @@ case "$uname" in
;;
Linux* | GNU* | Darwin*)
-   # Linux, GNU Hurd, and OS X
+   # Linux, GNU Hurd, and macOS
 -  MAN1EXT=1.gz
 -  MAN5EXT=5.gz
 -  MAN7EXT=7.gz

Modified: cups-systemd-socket.patch
===
--- cups-systemd-socket.patch   2016-09-15 19:39:38 UTC (rev 276518)
+++ cups-systemd-socket.patch   2016-09-15 19:58:57 UTC (rev 276519)
@@ -1,9 +1,9 @@
 diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
 --- cups-2.0.2/scheduler/main.c.ustTJg 2015-02-10 13:40:24.121547526 +0100
 +++ cups-2.0.2/scheduler/main.c2015-02-10 13:40:24.295545063 +0100
-@@ -658,8 +658,15 @@ main(int  argc,   /* I - Number 
of comm
+@@ -690,8 +690,15 @@ main(int  argc,   /* I - Number 
of comm
  
- #if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+ #if defined(HAVE_ONDEMAND)
if (OnDemand)
 +  {
  cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started 
on demand.");
@@ -15,7 +15,7 @@
 +   (unsigned long) getpid());
 +# endif /* HAVE_SYSTEMD */
 +  } else
- #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+ #endif /* HAVE_ONDEMAND */
if (fg)

[arch-commits] Commit in cups/trunk (3 files)

2013-10-25 Thread Andreas Radke 
Date: Friday, October 25, 2013 @ 21:16:12
  Author: andyrtr
Revision: 197423

upgpkg: cups 1.7.0-1

upstream update 1.7.0

Modified:
  cups/trunk/PKGBUILD
  cups/trunk/cups-1.6.2-statedir.patch
  cups/trunk/cups-systemd-socket.patch

---+
 PKGBUILD  |   16 +++---
 cups-1.6.2-statedir.patch |   16 +++---
 cups-systemd-socket.patch |  112 ++--
 3 files changed, 73 insertions(+), 71 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-25 19:15:13 UTC (rev 197422)
+++ PKGBUILD2013-10-25 19:16:12 UTC (rev 197423)
@@ -3,7 +3,7 @@
 
 pkgbase=cups
 pkgname=('libcups' 'cups')
-pkgver=1.6.4
+pkgver=1.7.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -11,7 +11,7 @@
 makedepends=('libtiff=4.0.0' 'libpng=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 
'gnutls=2.8.3' 'cups-filters' 'bc'
  'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'  
'hicolor-icon-theme' 'systemd')
 
source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz
+http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
 cups.logrotate cups.pam
 # improve build and linking
 cups-no-export-ssllibs.patch
@@ -30,19 +30,19 @@
 cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
 get-ppd-file-for-statically-configured-ipp-shared-queues.patch
 ppd-poll-with-client-conf.patch)
-md5sums=('17c948b442dfdb3c53f5c8b7eaa1442f'
+md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a'
  'f861b18f4446c43918c8643dcbbd7f6d'
  '96f82c38f3f540b53f3e5144900acf17'
  '3ba9e3410df1dc3015463d615ef91b3b'
  'cc4101beccb5ed6deb1c92707a575925'
  '90c30380d4c8cd48a908cfdadae1ea24'
- 'b4868b83f7f2d6ec24a1be76509379f0'
+ '555a1c71151ce990e176315b46e3de2f'
  'a2a88b3a3257c3b5fd3edcc169e6aca4'
  '8fe27d4248cacbc02824e7937cab4088'
  'df0c367c0022e3c7d8e01827e8a6c5e7'
  'f30c2a161caaf27854581507cde8cac6'
  '5117f65342fcc69c6a506529e4daca9e'
- '9247e218eea94ebda0aebc8ee0e77db8'
+ '451609db34f95209d64c38474de27ce1'
  'cb58bf4e0b80eaee383712e5c84a1ab4'
  'b578bcd17949a7203237ba1e31f78ef9'
  '0becd6ab8782b97f19a02c1dc174c75e')
@@ -71,12 +71,12 @@
   patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch
 
   # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused 
by a wrong shutdown sequence for shutting down the Avahi threaded poll.
-  patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
+#  patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
   # Applications could not get the PPD file for statically-configured 
IPP-shared print queues
   patch -Np1 -i 
${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
   # If an external server is used via client.conf and the DNS is inconsistent 
(ex: DNS gives noname for many IPs, reverse DNS gives one of these IPs
   # for noname) local PPDs can get polled for print queues instead of the 
PPDs of the external server Bug: http://www.cups.org/str.php?L2763
-  patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch
+#  patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch
   # fix permissions on some files - alternative: cups-0755.patch by FC
   patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
   # move /var/run - /run for pid file
@@ -200,7 +200,7 @@
   rm -v ${pkgdir}/usr/share/cups/banners/*
   rm -v ${pkgdir}/usr/share/cups/data/testprint
   # comment out all conversion rules which use any of the removed filters
-  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
+  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' 
$pkgdir/usr/share/cups/mime/mime.convs
 
   # Provide native service for arch-daemons generator
   ln -s cups.service $pkgdir/usr/lib/systemd/system/cupsd.service

Modified: cups-1.6.2-statedir.patch
===
--- cups-1.6.2-statedir.patch   2013-10-25 19:15:13 UTC (rev 197422)
+++ cups-1.6.2-statedir.patch   2013-10-25 19:16:12 UTC (rev 197423)
@@ -1,12 +1,12 @@
 diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 
cups-1.6.2/config-scripts/cups-directories.m4
 --- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01 
03:55:23.0 +0200
 +++ cups-1.6.2/config-scripts/cups-directories.m4  2013-04-02 
00:11:41.0 +0200
-@@ -429,7 +429,7 @@
-   ;;
-   *)
-   # All others
--  CUPS_STATEDIR=$localstatedir/run/cups
-+  CUPS_STATEDIR=/run/cups
-   ;;
- esac
+@@ -420,7 +420,7 @@
+   ;;
+   *)
+   # All others
+-

[arch-commits] Commit in cups/trunk (3 files)

2013-07-12 Thread Andreas Radke 
Date: Friday, July 12, 2013 @ 15:35:09
  Author: andyrtr
Revision: 189982

upgpkg: cups 1.6.3-1

upstream update 1.6.3

Modified:
  cups/trunk/PKGBUILD
Deleted:
  cups/trunk/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
  cups/trunk/usb-backend-more-quirk-rules.patch

+
 PKGBUILD   |   36 +++-
 usb-backend-do-not-crash-if-usb-disabled-in-bios.patch |   54 
 usb-backend-more-quirk-rules.patch |   66 ---
 3 files changed, 15 insertions(+), 141 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-12 13:09:47 UTC (rev 189981)
+++ PKGBUILD2013-07-12 13:35:09 UTC (rev 189982)
@@ -3,8 +3,8 @@
 
 pkgbase=cups
 pkgname=('libcups' 'cups')
-pkgver=1.6.2
-pkgrel=3
+pkgver=1.6.3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.cups.org/;
@@ -27,13 +27,10 @@
 cups-1.6.0-fix-install-perms.patch
 cups-1.6.2-statedir.patch
 # Debian
-usb-backend-more-quirk-rules.patch
 cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
 get-ppd-file-for-statically-configured-ipp-shared-queues.patch
-ppd-poll-with-client-conf.patch
-usb-backend-do-not-crash-if-usb-disabled-in-bios.patch)
-#options=('!emptydirs')
-md5sums=('8b8e40560b67e28607b1f04dafd9a94d'
+ppd-poll-with-client-conf.patch)
+md5sums=('3c50d396fef2ba721224fe65880fe3c3'
  'f861b18f4446c43918c8643dcbbd7f6d'
  '96f82c38f3f540b53f3e5144900acf17'
  '3ba9e3410df1dc3015463d615ef91b3b'
@@ -46,15 +43,14 @@
  'f30c2a161caaf27854581507cde8cac6'
  '5117f65342fcc69c6a506529e4daca9e'
  '9247e218eea94ebda0aebc8ee0e77db8'
- '52675e2d7a7f77005f1fc0212b86dbe3'
  'cb58bf4e0b80eaee383712e5c84a1ab4'
  'b578bcd17949a7203237ba1e31f78ef9'
- '0becd6ab8782b97f19a02c1dc174c75e'
- 'f1f0ee65296d438a8c83467ff03f652d')
+ '0becd6ab8782b97f19a02c1dc174c75e')
 
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
+prepare() {
 
+  cd ${pkgbase}-${pkgver}
+   
   # add systemd socket support - Fedora patch, also used in Gentoo
   # modified now to the changes done by Gentoo in their svn ebuild
   # 
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1
@@ -74,9 +70,6 @@
   # Ensure attributes are valid UTF-8 in dbus notifier
   patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch
 
-  # More USB quirks for the libusb-based backend (STR #4311)
-  # Fixed in 1.6.3
-  patch -Np1 -i ${srcdir}/usb-backend-more-quirk-rules.patch
   # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused 
by a wrong shutdown sequence for shutting down the Avahi threaded poll.
   patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
   # Applications could not get the PPD file for statically-configured 
IPP-shared print queues
@@ -84,9 +77,6 @@
   # If an external server is used via client.conf and the DNS is inconsistent 
(ex: DNS gives noname for many IPs, reverse DNS gives one of these IPs
   # for noname) local PPDs can get polled for print queues instead of the 
PPDs of the external server Bug: http://www.cups.org/str.php?L2763
   patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch
-  # Add more error handling to the libusb-based USB backend, especially to 
avoid a crash when USB is disabled in the BIOS. Also
-  # discard that error when counting warning messages.
-  patch -Np1 -i 
${srcdir}/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
   # fix permissions on some files - alternative: cups-0755.patch by FC
   patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
   # move /var/run - /run for pid file
@@ -101,7 +91,11 @@
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
   autoconf -I config-scripts
+}
 
+build() {
+  cd ${pkgbase}-${pkgver}
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
  --sbindir=/usr/bin \
  --libdir=/usr/lib \
@@ -122,7 +116,7 @@
 }
 
 check() {
-  cd $srcdir/$pkgbase-$pkgver
+  cd ${pkgbase}-${pkgver}
   #httpAddrGetList(workstation64): FAIL
   #1 TESTS FAILED!
   #make[1]: *** [testhttp] Error 1
@@ -134,7 +128,7 @@
 depends=('gnutls=2.8.3' 'libtiff=4.0.0' 'libpng=1.5.7' 'krb5' 'avahi')
 backup=(etc/cups/client.conf)
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-headers install-libs
   # put this into the libs pkg to make other software find the libs(no 
pkg-config file included)
   mkdir -p ${pkgdir}/usr/bin 
@@ -166,7 +160,7 @@
 depends=('acl' 'pam' libcups=${pkgver} 'cups-filters' 'bc' 'colord' 
'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
 optdepends=('xdg-utils: xdg .desktop file support')
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
+

[arch-commits] Commit in cups/trunk (3 files)

2012-08-10 Thread andyrtr 
Date: Friday, August 10, 2012 @ 09:30:13
  Author: andyrtr
Revision: 165094

upgpkg: cups 1.6.1-3

add fix for some printers failing with usb resets FS#30965; add note about 
keeping usblp module loaded

Added:
  cups/trunk/usb-backend-reset-after-job-only-for-specific-devices.patch
Modified:
  cups/trunk/PKGBUILD
  cups/trunk/cups.install

-+
 PKGBUILD|   10 -
 cups.install|5 
 usb-backend-reset-after-job-only-for-specific-devices.patch |   74 ++
 3 files changed, 86 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-10 09:13:54 UTC (rev 165093)
+++ PKGBUILD2012-08-10 13:30:13 UTC (rev 165094)
@@ -4,7 +4,7 @@
 pkgbase=cups
 pkgname=('libcups' 'cups')
 pkgver=1.6.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.cups.org/;
@@ -18,7 +18,8 @@
 cups cups.logrotate cups.pam
 cupsd-conf-remove-obsolete-browse-directives.patch
 avahi-missing-in-conditionals.patch
-recognize-remote-cups-queue-via-dnssd-uri.patch)
+recognize-remote-cups-queue-via-dnssd-uri.patch
+usb-backend-reset-after-job-only-for-specific-devices.patch)
 #options=('!emptydirs')
 md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
  '9b8467a1e51d360096b70e2c3c081e6c'
@@ -30,7 +31,8 @@
  '96f82c38f3f540b53f3e5144900acf17'
  '6bef262b5081051e88cd2ae94fed1867'
  '9c91b1319f4b20dc323986cb4abbe806'
- 'dcef8dd5614461166cada8a706eebb49')
+ 'dcef8dd5614461166cada8a706eebb49'
+ '0779ef8ba1d724ebb3b9bf360deba52b')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -54,6 +56,8 @@
   patch -Np1 -i ${srcdir}/avahi-missing-in-conditionals.patch
   # http://www.cups.org/str.php?L4158 - DNS-SD-based print queues pointing to 
CUPS server are not considered remote printers with driver on server
   patch -Np1 -i ${srcdir}/recognize-remote-cups-queue-via-dnssd-uri.patch
+  # http://cups.org/str.php?L4155 / https://bugs.archlinux.org/task/30965
+  patch -Np0 -i 
${srcdir}/usb-backend-reset-after-job-only-for-specific-devices.patch
   
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts

Modified: cups.install
===
--- cups.install2012-08-10 09:13:54 UTC (rev 165093)
+++ cups.install2012-08-10 13:30:13 UTC (rev 165094)
@@ -24,6 +24,11 @@
 echo * check your config with cupsd -t
 echo   and fix all Browsing related settings
   fi
+if [ `vercmp $2 1.6.1-3` -lt 0 ]; then
+# important upgrade notice
+echo  It's now safe to load usblp kernel module.
+echo  There's no more need to blacklist it.
+  fi
 }
 
 post_remove() {

Added: usb-backend-reset-after-job-only-for-specific-devices.patch
===
--- usb-backend-reset-after-job-only-for-specific-devices.patch 
(rev 0)
+++ usb-backend-reset-after-job-only-for-specific-devices.patch 2012-08-10 
13:30:13 UTC (rev 165094)
@@ -0,0 +1,74 @@
+--- backend/usb-libusb.c.orig  2012-07-16 19:10:55.0 +0200
 backend/usb-libusb.c   2012-08-06 11:01:58.034150159 +0200
+@@ -70,7 +70,7 @@
+   read_endp,  /* Read endpoint */
+   protocol,   /* Protocol: 1 = Uni-di, 2 = Bi-di. */
+   usblp_attached, /* usblp kernel module attached? */
+-  opened_for_job; /* Set to 1 by print_device() */
++  reset_after_job; /* Set to 1 by print_device() */
+   unsigned intquirks; /* Quirks flags */
+   struct libusb_device_handle *handle;/* Open handle to device */
+ } usb_printer_t;
+@@ -122,6 +122,8 @@
+ #define USBLP_QUIRK_USB_INIT  0x2 /* needs vendor USB init string */
+ #define USBLP_QUIRK_BAD_CLASS 0x4 /* descriptor uses vendor-specific
+  Class or SubClass */
++#define USBLP_QUIRK_RESET 0x4000  /* After printing do a reset
++ for clean-up */
+ #define USBLP_QUIRK_NO_REATTACH   0x8000  /* After printing we cannot 
re-attach
+  the usblp kernel module */
+ 
+@@ -147,9 +149,11 @@
+   { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
+ Printer M129C */
+   { 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
+-USBLP_QUIRK_NO_REATTACH },
++USBLP_QUIRK_NO_REATTACH |
++USBLP_QUIRK_RESET },
+   /* Prolific Technology, Inc. PL2305 Parallel Port
+  (USB - Parallel adapter) */
++  { 0x04e8, 0x, USBLP_QUIRK_RESET }, /*