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

Andreas Radke andyrtr at nymeria.archlinux.org
Fri Jul 12 13:35:10 UTC 2013


    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
===================================================================
--- PKGBUILD	2013-07-12 13:09:47 UTC (rev 189981)
+++ PKGBUILD	2013-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}
+  cd ${pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-data install-exec
 
   # this one we ship in the libcups pkg

Deleted: usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
===================================================================
--- usb-backend-do-not-crash-if-usb-disabled-in-bios.patch	2013-07-12 13:09:47 UTC (rev 189981)
+++ usb-backend-do-not-crash-if-usb-disabled-in-bios.patch	2013-07-12 13:35:09 UTC (rev 189982)
@@ -1,54 +0,0 @@
-Description: 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.
-Author: Till Kamppeter <till.kamppeter at gmail.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1108719
-Last-Update: 2013-05-03
---- a/backend/usb-libusb.c
-+++ b/backend/usb-libusb.c
-@@ -898,7 +898,8 @@
- 					/* Pointer to current alternate setting */
-   const struct libusb_endpoint_descriptor *endpptr = NULL;
- 					/* Pointer to current endpoint */
--  ssize_t               numdevs,        /* number of connected devices */
-+  ssize_t               err = 0,
-+                        numdevs,        /* number of connected devices */
-                         i = 0;
-   uint8_t		conf,		/* Current configuration */
- 			iface,		/* Current interface */
-@@ -917,7 +918,13 @@
-   * Initialize libusb...
-   */
- 
--  libusb_init(NULL);
-+  err = libusb_init(NULL);
-+  if (err)
-+  {
-+    fprintf(stderr, "WARNING: Unable to initialize USB access via libusb, libusb error %i\n", err);
-+    return (NULL);
-+  }
-+
-   numdevs = libusb_get_device_list(NULL, &list);
-   fprintf(stderr, "DEBUG: libusb_get_device_list=%d\n", (int)numdevs);
- 
-@@ -1087,7 +1094,8 @@
-   * Clean up ....
-   */
- 
--  libusb_free_device_list(list, 1);
-+  if (numdevs >= 0)
-+    libusb_free_device_list(list, 1);
-   libusb_exit(NULL);
- 
-   return (NULL);
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -838,7 +838,7 @@
- fi
- 
- # Warning log messages
--count=`$GREP '^W ' /tmp/cups-$user/log/error_log | wc -l | awk '{print $1}'`
-+count=`$GREP '^W ' /tmp/cups-$user/log/error_log | grep -v 'Unable to initialize USB access via libusb, libusb error' | wc -l | awk '{print $1}'`
- if test $count != 9; then
- 	echo "FAIL: $count warning messages, expected 9."
- 	$GREP '^W ' /tmp/cups-$user/log/error_log

Deleted: usb-backend-more-quirk-rules.patch
===================================================================
--- usb-backend-more-quirk-rules.patch	2013-07-12 13:09:47 UTC (rev 189981)
+++ usb-backend-more-quirk-rules.patch	2013-07-12 13:35:09 UTC (rev 189982)
@@ -1,66 +0,0 @@
-Description: USB backend quirk rule for Epson Stylus Photo 750 (and maybe others)
-Author: Didier Raboud <odyx at debian.org>
-Bugs-Debian: http://bugs.debian.org/697970
-Last-Update: 2013-03-11
-
---- a/backend/usb-libusb.c
-+++ b/backend/usb-libusb.c
-@@ -142,8 +142,12 @@
- 	{ 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */
- 	{ 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */
- 	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
-+	{ 0x043d, 0x00f3, USBLP_QUIRK_NO_REATTACH }, /* Lexmark International,
-+		       Inc. (e250d), https://bugs.launchpad.net/bugs/1084164 */
- 	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820,
- 						  by zut <kernel at zut.de> */
-+	{ 0x04a9, 0x1095, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP6000D
-+			    Printer, https://bugs.launchpad.net/bugs/1160638 */
- 	{ 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200
- 			    Printer, http://www.cups.org/str.php?L4155 */
- 	{ 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
-@@ -158,6 +162,8 @@
- 			    Printer, http://www.cups.org/str.php?L4155 */
- 	{ 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
- 			    Printer, http://www.cups.org/str.php?L4155 */
-+	{ 0x04a9, 0x26a3, USBLP_QUIRK_NO_REATTACH }, /* Canon, Inc. MF4150
-+		            Printer, https://bugs.launchpad.net/bugs/1160638 */
- 	{ 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
- 						  HL-1430 Laser Printer,
- 				     https://bugs.launchpad.net/bugs/1038695 */
-@@ -165,24 +171,33 @@
- 			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
- 						  HL-1440 Laser Printer,
- 				     https://bugs.launchpad.net/bugs/1000253 */
-+	{ 0x04f9, 0x000e, USBLP_QUIRK_BIDIR |
-+			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
-+						  HL-1450 Laser Printer,
-+				     https://bugs.launchpad.net/bugs/1000253 */
- 	{ 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp.
- 						  Okipage 14ex Printer,
- 				     https://bugs.launchpad.net/bugs/872483 */
- 	{ 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d,
- 				     https://bugs.launchpad.net/bugs/872483 */
--	{ 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750,
-+	{ 0x04b8, 0x0001, USBLP_QUIRK_BIDIR |
-+			  USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750,
- 				     http://bugs.debian.org/697970 */
-+	{ 0x04b8, 0x0005, USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 670,
-+				     https://bugs.launchpad.net/bugs/872483 */
- 	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
- 						      Printer M129C */
- 	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
- 			  USBLP_QUIRK_NO_REATTACH |
- 	                  USBLP_QUIRK_RESET },
-+	/* Prolific Technology, Inc. PL2305 Parallel Port
-+	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
- 	{ 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
- 			  https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
- 	{ 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210
- 				     https://bugs.launchpad.net/bugs/1102470 */
--	/* Prolific Technology, Inc. PL2305 Parallel Port
--	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
-+	{ 0x1a86, 0x7584, USBLP_QUIRK_NO_REATTACH }, /* QinHeng Electronics
-+   CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253 */
- 	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,
- 				     https://bugs.launchpad.net/bugs/1032456 */
- 	{ 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices,




More information about the arch-commits mailing list