diff options
Diffstat (limited to 'extra')
24 files changed, 665 insertions, 64 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 3706afac0..6b382d3f6 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,29 +1,56 @@ -# $Id: PKGBUILD 185777 2013-05-18 15:46:13Z andyrtr $ +# $Id: PKGBUILD 188723 2013-06-18 15:31:30Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.6.2 -pkgrel=2 +pkgrel=3 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>=2.8.3' 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd') -source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 +source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 + http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz + cups.logrotate cups.pam + # improve build and linking cups-no-export-ssllibs.patch cups-no-gcrypt.patch cups-no-gzip-man.patch + # FC cups-systemd-socket.patch - cups.logrotate cups.pam) + cups-dbus-utf8.patch + cups-res_init.patch + cups-avahi-address.patch + cups-enum-all.patch + # Gentoo + 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=('13c8b2b2336d42001abe4899766b62dc' +md5sums=('8b8e40560b67e28607b1f04dafd9a94d' + 'f861b18f4446c43918c8643dcbbd7f6d' + '96f82c38f3f540b53f3e5144900acf17' '3ba9e3410df1dc3015463d615ef91b3b' 'cc4101beccb5ed6deb1c92707a575925' '90c30380d4c8cd48a908cfdadae1ea24' 'b4868b83f7f2d6ec24a1be76509379f0' - 'f861b18f4446c43918c8643dcbbd7f6d' - '96f82c38f3f540b53f3e5144900acf17') + 'a2a88b3a3257c3b5fd3edcc169e6aca4' + '8fe27d4248cacbc02824e7937cab4088' + 'df0c367c0022e3c7d8e01827e8a6c5e7' + 'f30c2a161caaf27854581507cde8cac6' + '5117f65342fcc69c6a506529e4daca9e' + '9247e218eea94ebda0aebc8ee0e77db8' + '52675e2d7a7f77005f1fc0212b86dbe3' + 'cb58bf4e0b80eaee383712e5c84a1ab4' + 'b578bcd17949a7203237ba1e31f78ef9' + '0becd6ab8782b97f19a02c1dc174c75e' + 'f1f0ee65296d438a8c83467ff03f652d') build() { cd ${srcdir}/${pkgbase}-${pkgver} @@ -40,6 +67,36 @@ build() { # don't zip man pages in make install, let makepkg do that / Fedora patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch + + + # various bugfixes (upstream reports/SVN or Fedora/Debian + + # 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 + 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 + # 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 + patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch + # Re-initialise the resolver on failure in httpAddrGetList() + patch -Np1 -i ${srcdir}/cups-res_init.patch + # Use IP address when resolving DNSSD URIs + patch -Np1 -i ${srcdir}/cups-avahi-address.patch + # Return from cupsEnumDests() once all records have been returned. + patch -Np1 -i ${srcdir}/cups-enum-all.patch # Rebuild configure script for not zipping man-pages. aclocal -I config-scripts diff --git a/extra/cups/cups-1.6.0-fix-install-perms.patch b/extra/cups/cups-1.6.0-fix-install-perms.patch new file mode 100644 index 000000000..2d7a77c44 --- /dev/null +++ b/extra/cups/cups-1.6.0-fix-install-perms.patch @@ -0,0 +1,25 @@ +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... diff --git a/extra/cups/cups-1.6.2-statedir.patch b/extra/cups/cups-1.6.2-statedir.patch new file mode 100644 index 000000000..3e836657d --- /dev/null +++ b/extra/cups/cups-1.6.2-statedir.patch @@ -0,0 +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.000000000 +0200 ++++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02 00:11:41.000000000 +0200 +@@ -429,7 +429,7 @@ + ;; + *) + # All others +- CUPS_STATEDIR="$localstatedir/run/cups" ++ CUPS_STATEDIR="/run/cups" + ;; + esac + AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") diff --git a/extra/cups/cups-avahi-address.patch b/extra/cups/cups-avahi-address.patch new file mode 100644 index 000000000..a03d1adbb --- /dev/null +++ b/extra/cups/cups-avahi-address.patch @@ -0,0 +1,75 @@ +diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-support.c +--- cups-1.6.2/cups/http-support.c.avahi-address 2013-03-11 18:44:36.000000000 +0000 ++++ cups-1.6.2/cups/http-support.c 2013-04-04 15:39:06.651847041 +0100 +@@ -2121,7 +2121,7 @@ http_resolve_cb( + const char *type, /* I - Registration type */ + const char *domain, /* I - Domain (unused) */ + const char *hostTarget, /* I - Hostname */ +- const AvahiAddress *address, /* I - Address (unused) */ ++ const AvahiAddress *address, /* I - Address */ + uint16_t port, /* I - Port number */ + AvahiStringList *txt, /* I - TXT record */ + AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */ +@@ -2253,36 +2253,37 @@ http_resolve_cb( + + DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget)); + +- snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port)); +- if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL) ++ int error = getnameinfo(&(address->data), ++ address->proto == AVAHI_PROTO_INET ? ++ sizeof (AvahiIPv4Address) : ++ (address->proto == AVAHI_PROTO_INET6 ? ++ sizeof (AvahiIPv6Address) : ++ sizeof (address->data)), ++ fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); ++ ++ if (!error) + { +- for (addr = addrlist; addr; addr = addr->next) ++ DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); ++ ++ if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || ++ _cups_strcasecmp(hostptr, ".local")) + { +- int error = getnameinfo(&(addr->addr.addr), +- httpAddrLength(&(addr->addr)), +- fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); +- +- if (!error) +- { +- DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); +- +- if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || +- _cups_strcasecmp(hostptr, ".local")) +- { +- hostTarget = fqdn; +- break; +- } +- } ++ hostTarget = fqdn; ++ } ++ } + #ifdef DEBUG +- else +- DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", +- httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), +- error)); ++ else ++ DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", ++ httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), ++ error)); + #endif /* DEBUG */ +- } ++ } else { ++ /* ++ * Use the IP address that responded... ++ */ + +- httpAddrFreeList(addrlist); +- } ++ avahi_address_snprint (fqdn, sizeof (fqdn), address); ++ hostTarget = fqdn; + } + + /* diff --git a/extra/cups/cups-dbus-utf8.patch b/extra/cups/cups-dbus-utf8.patch new file mode 100644 index 000000000..0bcd4a163 --- /dev/null +++ b/extra/cups/cups-dbus-utf8.patch @@ -0,0 +1,106 @@ +diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c +--- cups-1.6.1/notifier/dbus.c.dbus-utf8 2012-01-20 19:00:32.000000000 +0000 ++++ cups-1.6.1/notifier/dbus.c 2012-10-31 11:04:47.686973616 +0000 +@@ -31,6 +31,9 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> ++#include <assert.h> ++#include <locale.h> ++#include <wchar.h> + + #ifdef HAVE_DBUS + # include <dbus/dbus.h> +@@ -157,10 +160,82 @@ enum + * Local functions... + */ + +-static int acquire_lock(int *fd, char *lockfile, size_t locksize); ++static int acquire_lock(int *fd, char *lockfile, size_t locksize); ++static const char *validate_utf8(const char *str); + + + /* ++ * 'validate_utf8()' - Convert to valid UTF-8 ++ */ ++ ++static const char * ++validate_utf8 (const char *str) ++{ ++ static char *buffer = NULL; ++ static size_t buflen = 0; ++ char *p; ++ size_t str_len; ++ unsigned int i; ++ mbstate_t instate, outstate; ++ ++ if (str == NULL) ++ { ++ free (buffer); ++ return (NULL); ++ } ++ ++ /* Is it already valid? */ ++ if (mbstowcs (NULL, str, 0) != (size_t) -1) ++ return str; ++ ++ /* Make sure our buffer is at least as large as the input string */ ++ str_len = strlen (str); ++ if (str_len > buflen) ++ { ++ if (buffer == NULL) ++ /* Set encoding type to UTF-8 the first time we need to */ ++ setlocale (LC_CTYPE, "en_US.UTF-8"); ++ ++ buflen = str_len + 1; ++ buffer = realloc (buffer, buflen); ++ } ++ ++ memset (&instate, '\0', sizeof (mbstate_t)); ++ memset (&outstate, '\0', sizeof (mbstate_t)); ++ p = buffer; ++ i = 0; ++ while (i < str_len) ++ { ++ wchar_t wc; ++ size_t used, written; ++ mbstate_t orig_instate = instate; ++ used = mbrtowc (&wc, str + i, str_len - i, &instate); ++ switch (used) ++ { ++ case (size_t) -2: ++ case (size_t) -1: ++ wc = L'?'; /* so replacement is never longer than original char */ ++ instate = orig_instate; ++ /* fallthru */ ++ case 0: ++ used = 1; ++ } ++ ++ written = wcrtomb (p, wc, &outstate); ++ if (written != -1) ++ { ++ p += written; ++ assert (p - buffer < buflen); ++ } ++ ++ i += used; ++ } ++ ++ *p = '\0'; ++ return buffer; ++} ++ ++/* + * 'main()' - Read events and send DBUS notifications. + */ + +@@ -366,7 +441,7 @@ main(int argc, /* I - Number of comm + attr = ippFindAttribute(msg, "notify-text", IPP_TAG_TEXT); + if (attr) + { +- const char *val = ippGetString(attr, 0, NULL); ++ const char *val = validate_utf8 (ippGetString(attr, 0, NULL)); + if (!dbus_message_iter_append_string(&iter, &val)) + goto bail; + } diff --git a/extra/cups/cups-enum-all.patch b/extra/cups/cups-enum-all.patch new file mode 100644 index 000000000..0ac39835e --- /dev/null +++ b/extra/cups/cups-enum-all.patch @@ -0,0 +1,17 @@ +diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c +--- cups-1.6.2/cups/dest.c.enum-all 2013-06-04 10:58:36.169786250 +0100 ++++ cups-1.6.2/cups/dest.c 2013-06-04 10:59:02.147900811 +0100 +@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb( + break; + + case AVAHI_BROWSER_REMOVE: +- case AVAHI_BROWSER_ALL_FOR_NOW: + case AVAHI_BROWSER_CACHE_EXHAUSTED: + break; ++ ++ case AVAHI_BROWSER_ALL_FOR_NOW: ++ avahi_simple_poll_quit(data->simple_poll); ++ break; + } + } + diff --git a/extra/cups/cups-res_init.patch b/extra/cups/cups-res_init.patch new file mode 100644 index 000000000..94a81a457 --- /dev/null +++ b/extra/cups/cups-res_init.patch @@ -0,0 +1,26 @@ +diff -up cups-1.6b1/cups/http-addr.c.res_init cups-1.6b1/cups/http-addr.c +--- cups-1.6b1/cups/http-addr.c.res_init 2012-05-17 00:57:03.000000000 +0200 ++++ cups-1.6b1/cups/http-addr.c 2012-05-25 15:51:51.323916352 +0200 +@@ -254,7 +254,8 @@ httpAddrLookup( + + if (error) + { +- if (error == EAI_FAIL) ++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || ++ error == EAI_NONAME) + cg->need_res_init = 1; + + return (httpAddrString(addr, name, namelen)); +diff -up cups-1.6b1/cups/http-addrlist.c.res_init cups-1.6b1/cups/http-addrlist.c +--- cups-1.6b1/cups/http-addrlist.c.res_init 2012-04-23 19:26:57.000000000 +0200 ++++ cups-1.6b1/cups/http-addrlist.c 2012-05-25 16:05:05.930377452 +0200 +@@ -540,7 +540,8 @@ httpAddrGetList(const char *hostname, /* + } + else + { +- if (error == EAI_FAIL) ++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || ++ error == EAI_NONAME) + cg->need_res_init = 1; + + _cupsSetError(IPP_INTERNAL_ERROR, gai_strerror(error), 0); diff --git a/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch b/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch new file mode 100644 index 000000000..ee36936f8 --- /dev/null +++ b/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch @@ -0,0 +1,19 @@ +Description: Fixed crash which sometimes happens on shutdown of the CUPS + daemon, caused by a wrong shutdown sequence for shutting down the Avahi + threaded poll. +Author: Till Kamppeter <till.kamppeter@gmail.com> +Bug-Upstream: http://cups.org/str.php?L4180 +Bug-Upstream: http://cups.org/str.php?L4213 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1034045 +Last-Updated: 2012-10-16 + +--- a/scheduler/dirsvc.c ++++ b/scheduler/dirsvc.c +@@ -1333,6 +1333,7 @@ + DNSSDMaster = NULL; + + # else /* HAVE_AVAHI */ ++ avahi_threaded_poll_stop(DNSSDMaster); + avahi_client_free(DNSSDClient); + DNSSDClient = NULL; + diff --git a/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch b/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch new file mode 100644 index 000000000..ed132d750 --- /dev/null +++ b/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch @@ -0,0 +1,31 @@ +Description: Applications could not get the PPD file for + statically-configured IPP-shared print queues +Author: Till Kamppeter <till.kamppeter@gmail.com> +Bug-Upstream: http://cups.org/str.php?L4178 +Last-Updated: 2012-09-19 + +--- a/cups/util.c ++++ b/cups/util.c +@@ -1731,6 +1731,22 @@ + + return (1); + } ++ else if (device_uri && ++ (!strncmp(device_uri, "ipp:", 4) != NULL || ++ !strncmp(device_uri, "ipps:", 5) != NULL)) ++ { ++ /* ++ * Statically-configured IPP shared printer. ++ */ ++ ++ httpSeparateURI(HTTP_URI_CODING_ALL, ++ device_uri, ++ scheme, sizeof(scheme), username, sizeof(username), ++ host, hostsize, port, resource, resourcesize); ++ ippDelete(response); ++ ++ return (1); ++ } + else if ((attr = ippFindAttribute(response, "member-uris", + IPP_TAG_URI)) != NULL) + { diff --git a/extra/cups/ppd-poll-with-client-conf.patch b/extra/cups/ppd-poll-with-client-conf.patch new file mode 100644 index 000000000..8985fa3be --- /dev/null +++ b/extra/cups/ppd-poll-with-client-conf.patch @@ -0,0 +1,23 @@ +Description: 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 + +--- a/cups/util.c ++++ b/cups/util.c +@@ -1085,11 +1085,13 @@ + http2 = http; + else if ((http2 = httpConnectEncrypt(hostname, port, + cupsEncryption())) == NULL) +- { +- DEBUG_puts("1cupsGetPPD3: Unable to connect to server"); ++ if ((http2 = httpConnectEncrypt(http_hostname, http_port, ++ cupsEncryption())) == NULL) ++ { ++ DEBUG_puts("1cupsGetPPD3: Unable to connect to server"); + +- return (HTTP_SERVICE_UNAVAILABLE); +- } ++ return (HTTP_SERVICE_UNAVAILABLE); ++ } + + /* + * Get a temp file... diff --git a/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch b/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch new file mode 100644 index 000000000..711dab8ce --- /dev/null +++ b/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch @@ -0,0 +1,54 @@ +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@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 diff --git a/extra/cups/usb-backend-more-quirk-rules.patch b/extra/cups/usb-backend-more-quirk-rules.patch new file mode 100644 index 000000000..3b72011d6 --- /dev/null +++ b/extra/cups/usb-backend-more-quirk-rules.patch @@ -0,0 +1,66 @@ +Description: USB backend quirk rule for Epson Stylus Photo 750 (and maybe others) +Author: Didier Raboud <odyx@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@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, diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD index b420cb566..0414cffd3 100644 --- a/extra/dcraw/PKGBUILD +++ b/extra/dcraw/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 177853 2013-02-10 10:42:13Z bisson $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 188700 2013-06-18 09:44:02Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=dcraw -pkgver=9.17 +pkgver=9.19 pkgrel=1 pkgdesc='Decodes any raw image from any digital camera' url='http://www.cybercom.net/~dcoffin/dcraw/' @@ -11,7 +12,7 @@ arch=('i686' 'x86_64') license=('custom') depends=('lcms' 'jasper') source=("http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz") -sha1sums=('11a0b20b8f46950dd94e6c1ada313807049a6b27') +sha1sums=('83a85200b0f105a40d23e885f5108bc3b53bdbe4') build() { cd "${srcdir}/${pkgname}" diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index e61ec921b..282da69ac 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186001 2013-05-20 08:28:29Z andyrtr $ +# $Id: PKGBUILD 188728 2013-06-18 15:46:35Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.2 +pkgver=2.2.3 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('e6c011b4bbddf19e79205d012723449a' +md5sums=('306664f09560d2c6515ba80e1dd7f353' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 12da86d89..244a8e47a 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187933 2013-06-08 07:59:11Z andrea $ +# $Id: PKGBUILD 188702 2013-06-18 10:31:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python @@ -6,13 +6,13 @@ pkgname=('kdebindings-python' 'kdebindings-python2' 'kdebindings-python-common') pkgver=4.10.4 -pkgrel=1 +pkgrel=2 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' - 'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4' + 'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") sha1sums=('4243f60d549b75ad734141ad2bfef884d12d014e') @@ -44,7 +44,7 @@ build() { package_kdebindings-python() { pkgdesc="A set of Python 3.x bindings for KDE" - depends=('kdepim-runtime' 'pyqt' 'kdebindings-python-common') + depends=('kdepim-runtime' 'python-pyqt4' 'kdebindings-python-common') cd "${srcdir}"/build make DESTDIR="${pkgdir}" install @@ -58,7 +58,7 @@ package_kdebindings-python() { package_kdebindings-python2() { pkgdesc="A set of Python 2.x bindings for KDE" - depends=('kdepim-runtime' 'python2-pyqt' 'kdebindings-python-common') + depends=('kdepim-runtime' 'python2-pyqt4' 'kdebindings-python-common') conflicts=('kdebindings-python<4.8.1-2') cd "${srcdir}"/build-python2 diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 2871aca2f..5f01e6cf9 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187934 2013-06-08 07:59:13Z andrea $ +# $Id: PKGBUILD 188716 2013-06-18 14:20:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate @@ -6,7 +6,7 @@ pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') pkgver=4.10.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python') diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD index c2215585e..1358339c0 100644 --- a/extra/libbsd/PKGBUILD +++ b/extra/libbsd/PKGBUILD @@ -1,19 +1,29 @@ -# $Id: PKGBUILD 188599 2013-06-16 20:01:01Z eric $ +# $Id: PKGBUILD 188690 2013-06-18 01:22:22Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=libbsd pkgver=0.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" arch=('i686' 'x86_64') url="http://libbsd.freedesktop.org" license=('custom') depends=('glibc') options=('!libtool') -source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc}) +source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc} + spt.patch) md5sums=('be8b2e0dc4614699834c49693574fd1a' - 'SKIP') + 'SKIP' + '56236fb72c8ec6cbdbd0daa5f404bccb') + +prepare() { + cd $pkgname-$pkgver + + # Paper over a firefox crash + # http://lists.freedesktop.org/archives/libbsd/2013-June/000085.html + patch -Np1 -i ../spt.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/libbsd/spt.patch b/extra/libbsd/spt.patch new file mode 100644 index 000000000..b19dc9b87 --- /dev/null +++ b/extra/libbsd/spt.patch @@ -0,0 +1,50 @@ +diff -u -r libbsd-0.5.2-orig/src/setproctitle.c libbsd-0.5.2/src/setproctitle.c +--- libbsd-0.5.2-orig/src/setproctitle.c 2013-06-08 18:26:04.000000000 +0200 ++++ libbsd-0.5.2/src/setproctitle.c 2013-06-18 02:35:59.441393418 +0200 +@@ -86,7 +86,7 @@ + if (environ != envp) + return 0; + +- /* Make a copy of the old environ array of pointers, in case ++ /* Make a deep copy of the old environ array of pointers, in case + * clearenv() or setenv() is implemented to free the internal + * environ array, because we will need to access the old environ + * contents to make the new copy. */ +@@ -94,11 +94,13 @@ + envcopy = malloc(envsize); + if (envcopy == NULL) + return errno; +- memcpy(envcopy, envp, envsize); ++ for (i = 0; envp[i]; i++) envcopy[i] = strdup(envp[i]); ++ envcopy[i] = NULL; + + error = spt_clearenv(); + if (error) { + environ = envp; ++ for(i = 0; envcopy[i]; i++) free(envcopy[i]); + free(envcopy); + return error; + } +@@ -116,18 +118,20 @@ + if (error) { + #ifdef HAVE_CLEARENV + /* Because the old environ might not be available +- * anymore we will make do with the shallow copy. */ ++ * anymore we will make do with the deep copy. */ + environ = envcopy; + #else + environ = envp; ++ for(i = 0; envcopy[i]; i++) free(envcopy[i]); + free(envcopy); + #endif + return error; + } + } + +- /* Dispose of the shallow copy, now that we've finished transfering ++ /* Dispose of the deep copy, now that we've finished transfering + * the old environment. */ ++ for(i = 0; envcopy[i]; i++) free(envcopy[i]); + free(envcopy); + + return 0; diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD index 5ab3a569a..6b2f5c07b 100644 --- a/extra/libpeas/PKGBUILD +++ b/extra/libpeas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183434 2013-04-21 22:11:27Z heftig $ +# $Id: PKGBUILD 188712 2013-06-18 13:46:20Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libpeas -pkgver=1.8.0 -pkgrel=2 +pkgver=1.8.1 +pkgrel=1 pkgdesc="A GObject-based plugins engine" arch=(i686 x86_64) url="http://www.gtk.org/" @@ -16,17 +16,29 @@ options=('!libtool') install=libpeas.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz js17.patch) -sha256sums=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe' - '1a023c402e34203f13f3ffbb27afc9bbe46003cf2c911ceb2a0fc02742e9c889') +sha256sums=('ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d' + '094f28f911de979167c870b3ed51df09dbe3cacc271b375d891d7601c51ad44f') -build() { +prepare() { cd $pkgname-$pkgver patch -Np1 -i ../js17.patch - ./configure --prefix=/usr \ - --sysconfdir=/etc --localstatedir=/var +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install diff --git a/extra/libpeas/js17.patch b/extra/libpeas/js17.patch index b0f7d041d..7f54a1803 100644 --- a/extra/libpeas/js17.patch +++ b/extra/libpeas/js17.patch @@ -1,24 +1,46 @@ -diff -u -r libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c ---- libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c 2013-01-05 20:32:04.000000000 +0100 -+++ libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c 2013-04-03 00:22:56.726029598 +0200 -@@ -362,7 +362,7 @@ +From 8c54d0ee9c929d9141f74a0c047fed2e28347aa3 Mon Sep 17 00:00:00 2001 +From: Garrett Regier <garrettregier@gmail.com> +Date: Sat, 27 Apr 2013 11:36:13 +0000 +Subject: Fix Gjs plugin loader + +The garbage collection now takes a runtime instead of a contex +so just use Gjs's gc method to do the right thing and jsvals +cannot be compared anymore. +--- +diff --git a/loaders/gjs/peas-extension-gjs.c b/loaders/gjs/peas-extension-gjs.c +index 2a71ff8..0ec418c 100644 +--- a/loaders/gjs/peas-extension-gjs.c ++++ b/loaders/gjs/peas-extension-gjs.c +@@ -362,7 +362,7 @@ peas_extension_gjs_call (PeasExtensionWrapper *exten, if (!JS_GetElement (gexten->js_context, JSVAL_TO_OBJECT (js_retval), nth_out_arg++, &js_value) || - js_value == JSVAL_VOID) -+ js_value.asBits == JSVAL_VOID.asBits) ++ JSVAL_IS_VOID (js_value)) { g_warning ("Error failed to get out argument %i", nth_out_arg); return FALSE; -diff -u -r libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c ---- libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c 2012-08-15 12:40:31.000000000 +0200 -+++ libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c 2013-04-03 00:19:12.884403305 +0200 -@@ -279,7 +279,7 @@ +diff --git a/loaders/gjs/peas-plugin-loader-gjs.c b/loaders/gjs/peas-plugin-loader-gjs.c +index d9acfdf..8cea724 100644 +--- a/loaders/gjs/peas-plugin-loader-gjs.c ++++ b/loaders/gjs/peas-plugin-loader-gjs.c +@@ -279,7 +279,7 @@ peas_plugin_loader_gjs_create_extension (PeasPluginLoader *loader, if (!JS_GetPropertyById (js_context, ginfo->extensions, prop_name_id, &prop_extension_ctor) || - prop_extension_ctor != extension_ctor) -+ prop_extension_ctor.asBits != extension_ctor.asBits) ++ JSVAL_TO_OBJECT (prop_extension_ctor) != JSVAL_TO_OBJECT (extension_ctor)) continue; if (!JS_IdToValue (js_context, prop_name_id, &prop_name_val) || +@@ -327,7 +327,7 @@ static void + garbage_collect (PeasPluginInfo *info, + GjsInfo *ginfo) + { +- JS_GC (gjs_context_get_native_context (ginfo->context)); ++ gjs_context_gc (ginfo->context); + } + + static void +-- +cgit v0.9.2 diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 8a9bc47da..4caacad2b 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186354 2013-05-25 09:05:56Z andyrtr $ +# $Id: PKGBUILD 188729 2013-06-18 15:46:36Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,12 +7,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.2.2 +_dcpkgver=2.2.3 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64') url="http://pigeonhole.dovecot.org/" diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index bb85d593a..8e412251f 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186342 2013-05-25 02:56:35Z foutrelis $ +# $Id: PKGBUILD 188733 2013-06-18 15:55:17Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.4 +pkgver=0.22.5 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -13,11 +13,10 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('49d55921ce795778c7231fe9f2fe923b' +md5sums=('1cd27460f7e3379d1eb109cfd7bcdb39' '9dc64c254a31e570507bdd4ad4ba629a') build() { -# . /etc/profile.d/qt4.sh cd "${srcdir}" ln -sf test-${_testtag} test diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index e8e899005..e5371df48 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188680 2013-06-17 18:07:30Z andrea $ +# $Id: PKGBUILD 188708 2013-06-18 12:21:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -6,11 +6,11 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.7.2 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=('python2-pyqt' 'pyqt' 'chrpath') +makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') md5sums=('0fbfb06078f206a241a62c94861cce21' @@ -63,7 +63,7 @@ package_python-qscintilla-common() { package_python-qscintilla() { pkgdesc="Python 3.x bindings for QScintilla2" - depends=('python-qscintilla-common' 'pyqt') + depends=('python-qscintilla-common' 'python-pyqt4') cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ @@ -72,7 +72,7 @@ package_python-qscintilla() { package_python2-qscintilla() { pkgdesc="Python 2.x bindings for QScintilla2" - depends=('python-qscintilla-common' 'python2-pyqt') + depends=('python-qscintilla-common' 'python2-pyqt4') cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" install -Dm755 Qsci.so \ diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index e5fb00be4..9a89a6eb8 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 185368 2013-05-13 17:51:30Z dreisner $ +# $Id: PKGBUILD 188735 2013-06-18 17:08:27Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=varnish -pkgver=3.0.3 -pkgrel=3 +pkgver=3.0.4 +pkgrel=1 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64') url="http://www.varnish-cache.org/" @@ -18,17 +18,13 @@ options=('!libtool') source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" varnish-vcl-reload varnish.service) -md5sums=('714310c83fdbd2061d897dacd3f63d8b' +md5sums=('a130ce9c3504b9603a46542635e18701' '03196dee7fc68e75069393d52c370762' 'a59b17d8e3066abcf3dd7755a2212dd4') build() { cd "$pkgname-$pkgver" - # disable JIT compilation, as it's crashy crashy (bug in PCRE) - # this is flagged out and disabled by default in $nextrelease of Varnish. - sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ |