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

[andyrtr at archlinux.org]

    Date: Monday, August 9, 2010 @ 15:00:26
  Author: andyrtr
Revision: 87039

upgpkg: cups 1.4.4-2
reimplement full avahi/dnssd support

Modified:
  cups/trunk/PKGBUILD
  cups/trunk/cups-avahi.patch
Deleted:
  cups/trunk/cups-1.3.7-peercred.patch
  cups/trunk/fix-infinite-usb-loop.patch

-----------------------------+
 PKGBUILD                    |   11 +++++------
 cups-1.3.7-peercred.patch   |   11 -----------
 cups-avahi.patch            |    1 -
 fix-infinite-usb-loop.patch |   35 -----------------------------------
 4 files changed, 5 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-09 18:04:53 UTC (rev 87038)
+++ PKGBUILD	2010-08-09 19:00:26 UTC (rev 87039)
@@ -4,7 +4,7 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.4.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -15,7 +15,7 @@
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
 md5sums=('8776403ad60fea9e85eab9c04d88560d'
-         '3388dbe3fc20f16f37912e60a8ec46bc'
+         'fce500e3e6e244f5b77fe8eaad87e022'
          '5c85b7d8d2ddd02c2c64955cebbf55ea'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17')
@@ -27,21 +27,20 @@
   # Rebuild configure script for --enable-avahi.
   aclocal -I config-scripts
   autoconf -I config-scripts
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \
      --with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \
      --disable-ldap --libdir=/usr/lib --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-dnssd\
+     --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\
      --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS"
   make || return 1
 }
 
 package_libcups() {
 pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1')
-optdepends=('avahi: for the "dnssd" CUPS backend')
+depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1' 'avahi')
 
-
   cd ${srcdir}/${pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-headers install-libs || return 1
   # put this into the libs pkg to make other software find the libs(no pkg-config file included)

Deleted: cups-1.3.7-peercred.patch
===================================================================
--- cups-1.3.7-peercred.patch	2010-08-09 18:04:53 UTC (rev 87038)
+++ cups-1.3.7-peercred.patch	2010-08-09 19:00:26 UTC (rev 87039)
@@ -1,11 +0,0 @@
-diff -Naur cups-1.3.7/scheduler/auth.c cups-1.3.7.new/scheduler/auth.c
---- cups-1.3.7/scheduler/auth.c	2008-03-20 21:58:16.000000000 +0100
-+++ cups-1.3.7.new/scheduler/auth.c	2008-06-09 14:53:45.535194741 +0200
-@@ -54,6 +54,7 @@
-  * Include necessary headers...
-  */
- 
-+#define _GNU_SOURCE
- #include "cupsd.h"
- #include <grp.h>
- #ifdef HAVE_SHADOW_H

Modified: cups-avahi.patch
===================================================================
--- cups-avahi.patch	2010-08-09 18:04:53 UTC (rev 87038)
+++ cups-avahi.patch	2010-08-09 19:00:26 UTC (rev 87039)
@@ -1086,4 +1086,3 @@
  
  /*
   * End of "$Id: http-support.c 8705 2009-06-12 00:21:58Z mike $".
-

Deleted: fix-infinite-usb-loop.patch
===================================================================
--- fix-infinite-usb-loop.patch	2010-08-09 18:04:53 UTC (rev 87038)
+++ fix-infinite-usb-loop.patch	2010-08-09 19:00:26 UTC (rev 87039)
@@ -1,35 +0,0 @@
-diff -urNad cups-1.4.0~/backend/usb-libusb.c cups-1.4.0/backend/usb-libusb.c
---- cups-1.4.0~/backend/usb-libusb.c	2009-08-08 00:24:14.000000000 +0200
-+++ cups-1.4.0/backend/usb-libusb.c	2009-09-02 16:37:31.000000000 +0200
-@@ -158,7 +158,7 @@
- 
-     while (poll(pfds, 2, -1) > 0)
-     {
--      if (pfds[0].revents & POLLIN)
-+      if (pfds[0].revents & (POLLIN + POLLHUP))
-       {
- 	if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0)
- 	{
-@@ -179,7 +179,12 @@
-       }
- 
-       if (pfds[1].revents & POLLIN)
--        tbytes += side_cb(printer, print_fd);
-+      {
-+        if ((bytes = side_cb(printer, print_fd)) < 0)
-+	  pfds[1].events = 0;		/* Filter has gone away... */
-+	else
-+          tbytes += bytes;
-+      }
-     }
-   }
- 
-@@ -747,7 +752,7 @@
-   if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-   {
-     _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
--    return (0);
-+    return (-1);
-   }
- 
-   switch (command)