Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

2025-02-06 00:48:12 +08:00 · 2010-12-21 21:16:05 +00:00 · 2010-12-21 21:16:05 +00:00 · e7920974c2
commit e7920974c2
parent 55e5a969df f2ec479fe3
3 changed files with 35 additions and 35 deletions
--- a/cups/PKGBUILD
+++ b/cups/PKGBUILD
@ -8,21 +8,19 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
 makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0'  'acl' 'openslp' 'pam' 'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3'
-             'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme')
+             'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi'  'hicolor-icon-theme')
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
 	cups-avahi.patch
-	http://www.cups.org/strfiles/3595/str3595.patch
        cups cups.logrotate cups.pam)
 #options=('!emptydirs')
-md5sums=('8776403ad60fea9e85eab9c04d88560d'
-         'fce500e3e6e244f5b77fe8eaad87e022'
-         '0dd7329fc956d63a72085553171d62a2'
+md5sums=('50729f6fc46ba54223e0eaf5009f3419'
+         '8ebd390197501ffd709f0ee546937fd5'
         '5c85b7d8d2ddd02c2c64955cebbf55ea'
         'f861b18f4446c43918c8643dcbbd7f6d'
         '96f82c38f3f540b53f3e5144900acf17')
@ -32,9 +30,6 @@ build() {
  # Avahi support in the dnssd backend. patch from Fedora
  patch -Np1 -i ${srcdir}/cups-avahi.patch || return 1
  
-  # fix  Brother HL-1440 failing with msg "Unable to write 8192 bytes to printer!" (http://bugs.archlinux.org/task/18167)
-  patch -Np0 -i ${srcdir}/str3595.patch || return 1
-  
  # Rebuild configure script for --enable-avahi.
  aclocal -I config-scripts
  autoconf -I config-scripts
@ -74,7 +69,7 @@ backup=(etc/cups/cupsd.conf
        etc/logrotate.d/cups
        etc/pam.d/cups
        etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb' 'dbus-core' 'hicolor-icon-theme')
+depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme')
 optdepends=('php: for included phpcups.so module')

  cd ${srcdir}/${pkgbase}-${pkgver}
--- a/cups/cups-avahi.patch
+++ b/cups/cups-avahi.patch
@ -1,6 +1,6 @@
-diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c
--- cups-1.4.0/backend/dnssd.c.avahi	2009-08-07 23:27:12.000000000 +0100
-+++ cups-1.4.0/backend/dnssd.c	2009-09-04 14:57:04.730388833 +0100
+diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c
+--- cups-1.4.5/backend/dnssd.c.avahi	2009-08-08 00:27:12.000000000 +0200
+++ cups-1.4.5/backend/dnssd.c	2010-11-12 13:13:31.000000000 +0100
@@ -22,6 +22,7 @@
  *   exec_backend()          - Execute the backend that corresponds to the
  *                             resolved service name.
@ -794,10 +794,10 @@ diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c
 /*
  * 'sigterm_handler()' - Handle termination signals...
  */
-diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in
--- cups-1.4.0/config.h.in.avahi	2009-06-10 16:51:21.000000000 +0100
-+++ cups-1.4.0/config.h.in	2009-09-04 14:57:04.733388405 +0100
-@@ -336,6 +336,13 @@
+diff -up cups-1.4.5/config.h.in.avahi cups-1.4.5/config.h.in
+--- cups-1.4.5/config.h.in.avahi	2010-08-13 06:11:46.000000000 +0200
+++ cups-1.4.5/config.h.in	2010-11-12 13:13:31.000000000 +0100
+@@ -344,6 +344,13 @@
 
 
 /*
@ -811,9 +811,9 @@ diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in
  * Do we have <sys/ioctl.h>?
  */
 
-diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4
--- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
-+++ cups-1.4.0/config-scripts/cups-dnssd.m4	2009-09-04 14:57:04.731388902 +0100
+diff -up cups-1.4.5/config-scripts/cups-dnssd.m4.avahi cups-1.4.5/config-scripts/cups-dnssd.m4
+--- cups-1.4.5/config-scripts/cups-dnssd.m4.avahi	2009-08-29 00:54:34.000000000 +0200
+++ cups-1.4.5/config-scripts/cups-dnssd.m4	2010-11-12 13:13:31.000000000 +0100
@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
 DNSSDLIBS=""
 DNSSD_BACKEND=""
@ -836,9 +836,9 @@ diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts
 if test x$enable_dnssd != xno; then
 	AC_CHECK_HEADER(dns_sd.h, [
 		case "$uname" in
-diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
--- cups-1.4.0/cups/http-support.c.avahi	2009-06-12 01:21:58.000000000 +0100
-+++ cups-1.4.0/cups/http-support.c	2009-09-04 14:57:04.736398674 +0100
+diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c
+--- cups-1.4.5/cups/http-support.c.avahi	2010-10-02 00:40:38.000000000 +0200
+++ cups-1.4.5/cups/http-support.c	2010-11-12 13:28:45.000000000 +0100
@@ -55,6 +55,11 @@
 #  include <dns_sd.h>
 #  include <poll.h>
@ -876,7 +876,7 @@ diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
 
 /*
  * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1349,15 +1372,26 @@ _httpResolveURI(
+@@ -1351,16 +1374,27 @@ _httpResolveURI(
 
   if (strstr(hostname, "._tcp"))
   {
@ -887,7 +887,8 @@ diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
     DNSServiceRef	ref,		/* DNS-SD master service reference */
 			domainref,	/* DNS-SD service reference for domain */
 			localref;	/* DNS-SD service reference for .local */
-     int			domainsent = 0;	/* Send the domain resolve? */
+     int			domainsent = 0,	/* Send the domain resolve? */
+ 			offline = 0;	/* offline-report state set? */
 -    char		*regtype,	/* Pointer to type in hostname */
 -			*domain;	/* Pointer to domain in hostname */
     _http_uribuf_t	uribuf;		/* URI buffer */
@ -905,7 +906,7 @@ diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
 
 
     if (logit)
-@@ -1395,8 +1429,13 @@ _httpResolveURI(
+@@ -1398,8 +1432,13 @@ _httpResolveURI(
     if (domain)
       *domain++ = '\0';
 
@ -919,7 +920,7 @@ diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
 
     resolved_uri[0] = '\0';
 
-@@ -1411,6 +1450,7 @@ _httpResolveURI(
+@@ -1414,6 +1453,7 @@ _httpResolveURI(
 
     uri = NULL;
 
@ -927,7 +928,7 @@ diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
     if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
     {
       localref = ref;
-@@ -1486,6 +1526,36 @@ _httpResolveURI(
+@@ -1500,6 +1540,36 @@ _httpResolveURI(
 
       DNSServiceRefDeallocate(ref);
     }
@ -964,8 +965,8 @@ diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
 
     if (logit)
     {
-@@ -1497,13 +1567,13 @@ _httpResolveURI(
-       fputs("STATE: -connecting-to-device\n", stderr);
+@@ -1511,13 +1581,13 @@ _httpResolveURI(
+       fputs("STATE: -connecting-to-device,offline-report\n", stderr);
     }
 
 -#else
@ -980,7 +981,7 @@ diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
 
     if (logit && !uri)
       _cupsLangPuts(stderr, _("Unable to find printer!\n"));
-@@ -1708,6 +1778,105 @@ resolve_callback(
+@@ -1722,6 +1792,105 @@ resolve_callback(
 }
 #endif /* HAVE_DNSSD */
 
@ -1085,4 +1086,4 @@ diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
 +
 
 /*
-  * End of "$Id: http-support.c 8705 2009-06-12 00:21:58Z mike $".
+  * End of "$Id: http-support.c 9322 2010-10-01 22:40:38Z mike $".
--- a/cups/cups.install
+++ b/cups/cups.install
@ -1,11 +1,15 @@
 post_install() {
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ echo ">> If you use an HTTPS connection to CUPS, the first time you access"
+ echo ">> the interface it may take a very long time before the site comes up."
+ echo ">> This is because the first request triggers the generation of the CUPS"
+ echo ">> SSL certificates which can be a very time-consuming job."
 }

 post_upgrade() {
-  post_install
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
 }

 post_remove() {
-  post_install
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
 }