Merge branch 'master' of ssh://parabolagnulinux.org:1863/abslibre

45 files changed, 4505 insertions, 124 deletions

diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD
index a9be5a541..1abcd02dc 100644
--- a/libre/abs-libre/PKGBUILD
+++ b/libre/abs-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 101993 2010-12-03 13:48:19Z allan $
+# $Id: PKGBUILD 134858 2011-08-08 04:45:57Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 _pkgname=abs
 pkgname=abs-libre
-#CARCH=x86_64
+#CARCH=mips64el
 pkgver=2.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.archlinux.org/abs.git/"
@@ -14,6 +14,9 @@ depends=('bash' 'rsync')
 backup=(etc/abs.conf)
 source=(ftp://ftp.archlinux.org/other/abs/${_pkgname}-${pkgver}.tar.gz)
 md5sums=('b8b46b22d2f9a2aec2c994ccf230b4fd')
+provides=("${_pkgname}=${pkgver}")
+replaces=("${_pkgname}")
+conflicts=("${_pkgname}")
 
 build() {
   cd ${srcdir}/${_pkgname}
diff --git a/libre/cups-libre/PKGBUILD b/libre/cups-libre/PKGBUILD
new file mode 100644
index 000000000..d9531974c
--- /dev/null
+++ b/libre/cups-libre/PKGBUILD
@@ -0,0 +1,147 @@
+# $Id: PKGBUILD 135897 2011-08-20 06:24:46Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase="cups"
+pkgname=('libcups' 'cups-libre')
+pkgver=1.5.0
+pkgrel=1
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://www.cups.org/"
+makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
+             '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
+        cups-no-export-ssllibs.patch
+        cups-no-gcrypt.patch
+        cups cups.logrotate cups.pam)
+#options=('!emptydirs')
+md5sums=('e54ed09ede2340fc3014913333520fe4'
+         'e0843e8d8c345792ac73a185260e69fe'
+         '9b8467a1e51d360096b70e2c3c081e6c'
+         '3733c23e77eb503bd94cc368e02830dc'
+         '9657daa21760bb0b5fa3d8b51d5e01a1'
+         'f861b18f4446c43918c8643dcbbd7f6d'
+         '96f82c38f3f540b53f3e5144900acf17')
+
+# move client.conf man page for next update to the client pkg.
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  # Avahi support in the dnssd backend. patch from Debian based on the Fedora work but brings it in a single file http://patch-tracker.debian.org/package/cups
+  patch -Np1 -i ${srcdir}/cups-avahi.patch
+
+  # Do not export SSL libs in cups-config
+  patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
+
+  patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
+  
+  # Rebuild configure script for --enable-avahi.
+  aclocal -I config-scripts
+  autoconf -I config-scripts
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+     --libdir=/usr/lib \
+     --with-logdir=/var/log/cups \
+     --with-docdir=/usr/share/cups/doc \
+     --with-cups-user=daemon \
+     --with-cups-group=lp \
+     --enable-pam=yes \
+     --disable-ldap \
+     --enable-raw-printing \
+     --enable-dbus --with-dbusdir=/etc/dbus-1 \
+     --enable-ssl=yes --enable-gnutls \
+     --enable-threads \
+     --enable-avahi\
+     --with-php=/usr/bin/php-cgi \
+     --with-pdftops=pdftops \
+     --with-optim="$CFLAGS"
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgbase-$pkgver"
+  #httpAddrGetList(workstation64): FAIL
+  #1 TESTS FAILED!
+  #make[1]: *** [testhttp] Error 1
+  make -k check || /bin/true
+}
+
+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' 'krb5' 'avahi')
+
+  cd ${srcdir}/${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
+  install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
+}
+
+package_cups-libre() {
+pkgdesc="The CUPS Printing System - daemon package"
+provides=("${pkgbase}=${pkgver}")
+replaces=("${pkgbase}")
+conflicts=("${pkgbase}")
+install=cups.install
+backup=(etc/cups/cupsd.conf
+        etc/cups/mime.convs
+        etc/cups/mime.types
+        etc/cups/snmp.conf
+        etc/cups/printers.conf
+        etc/cups/classes.conf
+        etc/cups/client.conf
+        etc/cups/subscriptions.conf
+        etc/dbus-1/system.d/cups.conf
+        etc/logrotate.d/cups
+        etc/pam.d/cups
+        etc/xinetd.d/cups-lpd)
+depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme')
+optdepends=('php: for included phpcups.so module'
+            'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
+	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
+	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
+	    'xdg-utils: xdg .desktop file support')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make BUILDROOT=${pkgdir} install-data install-exec
+
+  # this one we ship in the libcups pkg
+  rm -f ${pkgdir}/usr/bin/cups-config
+
+  # kill the sysv stuff
+  rm -rf ${pkgdir}/etc/rc*.d
+  rm -rf ${pkgdir}/etc/init.d
+  install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
+  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
+  
+  # serial backend needs to run as root (http://bugs.archlinux.org/task/20396)
+  chmod 700 ${pkgdir}/usr/lib/cups/backend/serial
+
+  # install ssl directory where to store the certs, solves some samba issues
+  install -dm700 -g lp ${pkgdir}/etc/cups/ssl
+  # remove directory from package, we create it in cups rc.d file
+  rm -rf ${pkgdir}/var/run
+#  install -dm511 -g lp ${pkgdir}/var/run/cups/certs 
+
+  # install some more configuration files that will get filled by cupsd
+  touch ${pkgdir}/etc/cups/printers.conf
+  touch ${pkgdir}/etc/cups/classes.conf
+  touch ${pkgdir}/etc/cups/client.conf
+  echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
+  echo "ServerName /var/run/cups/cups.sock #  alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
+  touch ${pkgdir}/etc/cups/subscriptions.conf 
+  chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf}
+  
+  # fix .desktop file
+  sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
+  
+  # compress some driver files, adopted from Fedora
+  find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
+}
+
diff --git a/libre/cups-libre/cups b/libre/cups-libre/cups
new file mode 100644
index 000000000..a9d91de76
--- /dev/null
+++ b/libre/cups-libre/cups
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+daemon_name=cupsd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+#. /etc/conf.d/$daemon_name.conf
+
+get_pid() {
+        pidof -o %PPID $daemon_name
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting $daemon_name daemon"
+
+    PID=$(get_pid)
+    if [ -z "$PID" ]; then
+      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
+      # RUN
+      $daemon_name
+      #
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        echo $(get_pid) > /var/run/$daemon_name.pid
+        add_daemon $daemon_name
+        stat_done
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping $daemon_name daemon"
+    PID=$(get_pid)
+    # KILL
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    #
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm -f /var/run/$daemon_name.pid &> /dev/null
+      rm_daemon $daemon_name
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+
+  status)
+    stat_busy "Checking $daemon_name status";
+    ck_status $daemon_name
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart|status}"
+esac
+
+exit 0
+
diff --git a/libre/cups-libre/cups-avahi.patch b/libre/cups-libre/cups-avahi.patch
new file mode 100644
index 000000000..47860ef97
--- /dev/null
+++ b/libre/cups-libre/cups-avahi.patch
@@ -0,0 +1,3157 @@
+Description: Avahi support
+Bug: http://www.cups.org/str.php?L3066
+Author: Tim Waugh
+Origin: git clone http://twaugh.fedorapeople.org/cups-avahi.git (Aug 11, 2011)
+
+--- a/backend/dnssd.c
++++ b/backend/dnssd.c
+@@ -15,14 +15,21 @@
+  *
+  * Contents:
+  *
++ *   next_txt_record()       - Get next TXT record from a cups_txt_records_t.
++ *   parse_txt_record_pair() - Read key/value pair in cups_txt_records_t.
+  *   main()                  - Browse for printers.
+  *   browse_callback()       - Browse devices.
+  *   browse_local_callback() - Browse local devices.
+  *   compare_devices()       - Compare two devices.
+  *   exec_backend()          - Execute the backend that corresponds to the
+  *                             resolved service name.
++ *   device_type()           - Get DNS-SD type enumeration from string.
+  *   get_device()            - Create or update a device.
+  *   query_callback()        - Process query data.
++ *   avahi_client_callback() - Avahi client callback function.
++ *   avahi_query_callback()  - Avahi query callback function.
++ *   avahi_browse_callback() - Avahi browse callback function.
++ *   find_device()           - Find a device from its name and domain.
+  *   sigterm_handler()       - Handle termination signals...
+  *   unquote()               - Unquote a name string.
+  */
+@@ -33,7 +40,18 @@
+ 
+ #include "backend-private.h"
+ #include <cups/array.h>
+-#include <dns_sd.h>
++#ifdef HAVE_DNSSD
++#  include <dns_sd.h>
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++#  include <avahi-client/client.h>
++#  include <avahi-client/lookup.h>
++#  include <avahi-common/simple-watch.h>
++#  include <avahi-common/domain.h>
++#  include <avahi-common/error.h>
++#  include <avahi-common/malloc.h>
++#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
++#endif /* HAVE_AVAHI */
+ 
+ 
+ /*
+@@ -53,7 +71,12 @@
+ 
+ typedef struct
+ {
++#ifdef HAVE_DNSSD
+   DNSServiceRef	ref;			/* Service reference for resolve */
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  int		resolved;		/* Did we resolve the device? */
++#endif /* HAVE_AVAHI */
+   char		*name,			/* Service name */
+ 		*domain,		/* Domain name */
+ 		*fullName,		/* Full name */
+@@ -65,6 +88,20 @@
+ 		sent;			/* Did we list the device? */
+ } cups_device_t;
+ 
++typedef struct
++{
++  char key[256];
++  char value[256];
++
++#ifdef HAVE_DNSSD
++  const uint8_t *data;
++  const uint8_t *datanext;
++  const uint8_t *dataend;
++#else /* HAVE_AVAHI */
++  AvahiStringList *txt;
++#endif /* HAVE_DNSSD */
++} cups_txt_records_t;
++
+ 
+ /*
+  * Local globals...
+@@ -78,6 +115,7 @@
+  * Local functions...
+  */
+ 
++#ifdef HAVE_DNSSD
+ static void		browse_callback(DNSServiceRef sdRef,
+ 			                DNSServiceFlags flags,
+ 				        uint32_t interfaceIndex,
+@@ -93,12 +131,6 @@
+ 					      const char *regtype,
+ 					      const char *replyDomain,
+ 					      void *context);
+-static int		compare_devices(cups_device_t *a, cups_device_t *b);
+-static void		exec_backend(char **argv);
+-static cups_device_t	*get_device(cups_array_t *devices,
+-			            const char *serviceName,
+-			            const char *regtype,
+-				    const char *replyDomain);
+ static void		query_callback(DNSServiceRef sdRef,
+ 			               DNSServiceFlags flags,
+ 				       uint32_t interfaceIndex,
+@@ -107,9 +139,118 @@
+ 				       uint16_t rrclass, uint16_t rdlen,
+ 				       const void *rdata, uint32_t ttl,
+ 				       void *context);
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++static void		avahi_client_callback (AvahiClient *client,
++					       AvahiClientState state,
++					       void *context);
++static void		avahi_browse_callback (AvahiServiceBrowser *browser,
++					       AvahiIfIndex interface,
++					       AvahiProtocol protocol,
++					       AvahiBrowserEvent event,
++					       const char *serviceName,
++					       const char *regtype,
++					       const char *replyDomain,
++					       AvahiLookupResultFlags flags,
++					       void *context);
++#endif /* HAVE_AVAHI */
++
++static cups_device_t *	find_device (cups_array_t *devices,
++				     cups_txt_records_t *txt,
++				     cups_device_t *dkey);
++static int		compare_devices(cups_device_t *a, cups_device_t *b);
++static void		exec_backend(char **argv);
++static cups_device_t	*get_device(cups_array_t *devices,
++			            const char *serviceName,
++			            const char *regtype,
++				    const char *replyDomain);
+ static void		sigterm_handler(int sig);
+ static void		unquote(char *dst, const char *src, size_t dstsize);
+ 
++#ifdef HAVE_AVAHI
++static AvahiSimplePoll *simple_poll = NULL;
++static int avahi_got_callback;
++#endif /* HAVE_AVAHI */
++
++
++/*
++ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t.
++ */
++
++static cups_txt_records_t *
++next_txt_record (cups_txt_records_t *txt)
++{
++#ifdef HAVE_DNSSD
++  txt->data = txt->datanext;
++#else /* HAVE_AVAHI */
++  txt->txt = avahi_string_list_get_next (txt->txt);
++  if (txt->txt == NULL)
++    return NULL;
++#endif /* HAVE_DNSSD */
++
++  return txt;
++}
++
++
++/*
++ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t.
++ */
++
++static int
++parse_txt_record_pair (cups_txt_records_t *txt)
++{
++#ifdef HAVE_DNSSD
++  uint8_t	datalen;
++  uint8_t	*data = txt->data;
++  char		*ptr;
++
++ /*
++  * Read a key/value pair starting with an 8-bit length.  Since the
++  * length is 8 bits and the size of the key/value buffers is 256, we
++  * don't need to check for overflow...
++  */
++
++  datalen = *data++;
++  if (!datalen || (data + datalen) >= txt->dataend)
++    return NULL;
++  txt->datanext = data + datalen;
++
++  for (ptr = txt->key; data < txt->datanext && *data != '='; data ++)
++    *ptr++ = *data;
++  *ptr = '\0';
++
++  if (data < txt->datanext && *data == '=')
++  {
++    data++;
++
++    if (data < datanext)
++      memcpy (txt->value, data, txt->datanext - data);
++    value[txt->datanext - data] = '\0';
++  }
++  else
++    return 1;
++#else /* HAVE_AVAHI */
++  char *key, *value;
++  size_t len;
++  avahi_string_list_get_pair (txt->txt, &key, &value, &len);
++  if (len > sizeof (txt->value) - 1)
++    len = sizeof (txt->value) - 1;
++
++  memcpy (txt->value, value, len);
++  txt->value[len] = '\0';
++  len = strlen (key);
++  if (len > sizeof (txt->key) - 1)
++    len = sizeof (txt->key) - 1;
++
++  memcpy (txt->key, key, len);
++  txt->key[len] = '\0';
++  avahi_free (key);
++  avahi_free (value);
++#endif /* HAVE_AVAHI */
++
++  return 0;
++}
++
+ 
+ /*
+  * 'main()' - Browse for printers.
+@@ -120,6 +261,13 @@
+      char *argv[])			/* I - Command-line arguments */
+ {
+   const char	*name;			/* Backend name */
++  cups_array_t	*devices;		/* Device array */
++  cups_device_t	*device;		/* Current device */
++  char		uriName[1024];		/* Unquoted fullName for URI */
++#ifdef HAVE_DNSSD
++  int		fd;			/* Main file descriptor */
++  fd_set	input;			/* Input set for select() */
++  struct timeval timeout;		/* Timeout for select() */
+   DNSServiceRef	main_ref,		/* Main service reference */
+ 		fax_ipp_ref,		/* IPP fax service reference */
+ 		ipp_ref,		/* IPP service reference */
+@@ -133,12 +281,11 @@
+ 		pdl_datastream_ref,	/* AppSocket service reference */
+ 		printer_ref,		/* LPD service reference */
+ 		riousbprint_ref;	/* Remote IO service reference */
+-  int		fd;			/* Main file descriptor */
+-  fd_set	input;			/* Input set for select() */
+-  struct timeval timeout;		/* Timeout for select() */
+-  cups_array_t	*devices;		/* Device array */
+-  cups_device_t	*device;		/* Current device */
+-  char		uriName[1024];		/* Unquoted fullName for URI */
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  AvahiClient	*client;
++  int		error;
++#endif /* HAVE_AVAHI */
+ #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+   struct sigaction action;		/* Actions for POSIX signals */
+ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+@@ -198,6 +345,49 @@
+   * Browse for different kinds of printers...
+   */
+ 
++#ifdef HAVE_AVAHI
++  if ((simple_poll = avahi_simple_poll_new ()) == NULL)
++  {
++    perror ("ERROR: Unable to create avahi simple poll object");
++    return (1);
++  }
++
++  client = avahi_client_new (avahi_simple_poll_get (simple_poll),
++			     0, avahi_client_callback, NULL, &error);
++  if (!client)
++  {
++    perror ("DEBUG: Unable to create avahi client");
++    return (0);
++  }
++
++  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
++			     AVAHI_PROTO_UNSPEC,
++			     "_fax-ipp._tcp", NULL, 0,
++			     avahi_browse_callback, devices);
++  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
++			     AVAHI_PROTO_UNSPEC,
++			     "_ipp._tcp", NULL, 0,
++			     avahi_browse_callback, devices);
++  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
++			     AVAHI_PROTO_UNSPEC,
++			     "_ipp-tls._tcp", NULL, 0,
++			     avahi_browse_callback, devices);
++  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
++			     AVAHI_PROTO_UNSPEC,
++			     "_pdl-datastream._tcp",
++			     NULL, 0,
++			     avahi_browse_callback,
++			     devices);
++  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
++			     AVAHI_PROTO_UNSPEC,
++			     "_printer._tcp", NULL, 0,
++			     avahi_browse_callback, devices);
++  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
++			     AVAHI_PROTO_UNSPEC,
++			     "_riousbprint._tcp", NULL, 0,
++			     avahi_browse_callback, devices);
++#endif /* HAVE_AVAHI */
++#ifdef HAVE_DNSSD
+   if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
+   {
+     perror("ERROR: Unable to create service connection");
+@@ -258,6 +448,7 @@
+   riousbprint_ref = main_ref;
+   DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
+                    "_riousbprint._tcp", NULL, browse_callback, devices);
++#endif /* HAVE_DNSSD */
+ 
+  /*
+   * Loop until we are killed...
+@@ -265,6 +456,9 @@
+ 
+   while (!job_canceled)
+   {
++    int announce = 0;
++
++#ifdef HAVE_DNSSD
+     FD_ZERO(&input);
+     FD_SET(fd, &input);
+ 
+@@ -284,11 +478,35 @@
+     }
+     else
+     {
++      announce = 1;
++    }
++#else /* HAVE_AVAHI */
++    int r;
++    avahi_got_callback = 0;
++    r = avahi_simple_poll_iterate (simple_poll, 1);
++    if (r != 0 && r != EINTR)
++    {
++     /*
++      * We've been told to exit the loop.  Perhaps the connection to
++      * avahi failed.
++      */
++
++      break;
++    }
++
++    if (avahi_got_callback)
++      announce = 1;
++#endif /* HAVE_DNSSD */
++
++    if (announce)
++    {
+      /*
+       * Announce any devices we've found...
+       */
+ 
++#ifdef HAVE_DNSSD
+       DNSServiceErrorType status;	/* DNS query status */
++#endif /* HAVE_DNSSD */
+       cups_device_t *best;		/* Best matching device */
+       char	device_uri[1024];	/* Device URI */
+       int	count;			/* Number of queries */
+@@ -302,6 +520,7 @@
+         if (device->sent)
+ 	  sent ++;
+ 
++#ifdef HAVE_DNSSD
+         if (device->ref)
+ 	  count ++;
+ 
+@@ -333,14 +552,23 @@
+ 	      count ++;
+           }
+ 	}
+-	else if (!device->sent)
++	else
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++	if (!device->resolved)
++	  continue;
++        else
++#endif /* HAVE_AVAHI */
++	if (!device->sent)
+ 	{
++#ifdef HAVE_DNSSD
+ 	 /*
+ 	  * Got the TXT records, now report the device...
+ 	  */
+ 
+ 	  DNSServiceRefDeallocate(device->ref);
+ 	  device->ref = 0;
++#endif /* HAVE_DNSSD */
+ 
+           if (!best)
+ 	    best = device;
+@@ -401,6 +629,7 @@
+ }
+ 
+ 
++#ifdef HAVE_DNSSD
+ /*
+  * 'browse_callback()' - Browse devices.
+  */
+@@ -489,6 +718,7 @@
+ 	  device->fullName);
+   device->sent = 1;
+ }
++#endif /* HAVE_DNSSD */
+ 
+ 
+ /*
+@@ -569,6 +799,41 @@
+ 
+ 
+ /*
++ * 'device_type()' - Get DNS-SD type enumeration from string.
++ */
++
++static int
++device_type (const char *regtype)
++{
++#ifdef HAVE_AVAHI
++  if (!strcmp(regtype, "_ipp._tcp"))
++    return (CUPS_DEVICE_IPP);
++  else if (!strcmp(regtype, "_ipps._tcp") ||
++	   !strcmp(regtype, "_ipp-tls._tcp"))
++    return (CUPS_DEVICE_IPPS);
++  else if (!strcmp(regtype, "_fax-ipp._tcp"))
++    return (CUPS_DEVICE_FAX_IPP);
++  else if (!strcmp(regtype, "_printer._tcp"))
++    return (CUPS_DEVICE_PDL_DATASTREAM);
++#else
++  if (!strcmp(regtype, "_ipp._tcp."))
++    return (CUPS_DEVICE_IPP);
++  else if (!strcmp(regtype, "_ipps._tcp.") ||
++	   !strcmp(regtype, "_ipp-tls._tcp."))
++    return (CUPS_DEVICE_IPPS);
++  else if (!strcmp(regtype, "_fax-ipp._tcp."))
++    return (CUPS_DEVICE_FAX_IPP);
++  else if (!strcmp(regtype, "_printer._tcp."))
++    return (CUPS_DEVICE_PRINTER);
++  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
++    return (CUPS_DEVICE_PDL_DATASTREAM);
++#endif /* HAVE_AVAHI */
++
++  return (CUPS_DEVICE_RIOUSBPRINT);
++}
++
++
++/*
+  * 'get_device()' - Create or update a device.
+  */
+ 
+@@ -589,20 +854,7 @@
+   */
+ 
+   key.name = (char *)serviceName;
+-
+-  if (!strcmp(regtype, "_ipp._tcp."))
+-    key.type = CUPS_DEVICE_IPP;
+-  else if (!strcmp(regtype, "_ipps._tcp.") ||
+-	   !strcmp(regtype, "_ipp-tls._tcp."))
+-    key.type = CUPS_DEVICE_IPPS;
+-  else if (!strcmp(regtype, "_fax-ipp._tcp."))
+-    key.type = CUPS_DEVICE_FAX_IPP;
+-  else if (!strcmp(regtype, "_printer._tcp."))
+-    key.type = CUPS_DEVICE_PRINTER;
+-  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
+-    key.type = CUPS_DEVICE_PDL_DATASTREAM;
+-  else
+-    key.type = CUPS_DEVICE_RIOUSBPRINT;
++  key.type = device_type (regtype);
+ 
+   for (device = cupsArrayFind(devices, &key);
+        device;
+@@ -622,8 +874,14 @@
+         free(device->domain);
+ 	device->domain = strdup(replyDomain);
+ 
++#ifdef HAVE_DNSSD
+ 	DNSServiceConstructFullName(fullName, device->name, regtype,
+ 	                            replyDomain);
++#else /* HAVE_AVAHI */
++	avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
++				 serviceName, regtype, replyDomain);
++#endif /* HAVE_DNSSD */
++
+ 	free(device->fullName);
+ 	device->fullName = strdup(fullName);
+       }
+@@ -643,6 +901,9 @@
+   device->domain   = strdup(replyDomain);
+   device->type     = key.type;
+   device->priority = 50;
++#ifdef HAVE_AVAHI
++  device->resolved = 0;
++#endif /* HAVE_AVAHI */
+ 
+   cupsArrayAdd(devices, device);
+ 
+@@ -650,13 +911,20 @@
+   * Set the "full name" of this service, which is used for queries...
+   */
+ 
++#ifdef HAVE_DNSSD
+   DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
++#else /* HAVE_AVAHI */
++  avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
++			   serviceName, regtype, replyDomain);
++#endif /* HAVE_DNSSD */
++
+   device->fullName = strdup(fullName);
+ 
+   return (device);
+ }
+ 
+ 
++#ifdef HAVE_DNSSD
+ /*
+  * 'query_callback()' - Process query data.
+  */
+@@ -680,7 +948,7 @@
+ 		*ptr;			/* Pointer into string */
+   cups_device_t	dkey,			/* Search key */
+ 		*device;		/* Device */
+-
++  cups_txt_records_t txt;
+ 
+   fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
+                   "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
+@@ -714,94 +982,233 @@
+   if ((ptr = strstr(name, "._")) != NULL)
+     *ptr = '\0';
+ 
+-  if (strstr(fullName, "_ipp._tcp."))
+-    dkey.type = CUPS_DEVICE_IPP;
+-  else if (strstr(fullName, "_ipps._tcp.") ||
+-           strstr(fullName, "_ipp-tls._tcp."))
+-    dkey.type = CUPS_DEVICE_IPPS;
+-  else if (strstr(fullName, "_fax-ipp._tcp."))
+-    dkey.type = CUPS_DEVICE_FAX_IPP;
+-  else if (strstr(fullName, "_printer._tcp."))
+-    dkey.type = CUPS_DEVICE_PRINTER;
+-  else if (strstr(fullName, "_pdl-datastream._tcp."))
+-    dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
++  dkey.type = device_type (fullName);
++
++  txt.data = rdata;
++  txt.dataend = rdata + rdlen;
++  device = find_device ((cups_array_t *) context, &txt, &dkey);
++  if (!device)
++    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
++}
++#endif /* HAVE_DNSSD */
++
++
++#ifdef HAVE_AVAHI
++/*
++ * 'avahi_client_callback()' - Avahi client callback function.
++ */
++
++static void
++avahi_client_callback(AvahiClient *client,
++		      AvahiClientState state,
++		      void *context)
++{
++ /*
++  * If the connection drops, quit.
++  */
++
++  if (state == AVAHI_CLIENT_FAILURE)
++  {
++    fprintf (stderr, "ERROR: Avahi connection failed\n");
++    avahi_simple_poll_quit (simple_poll);
++  }
++}
++
++
++/*
++ * 'avahi_query_callback()' - Avahi query callback function.
++ */
++
++static void
++avahi_query_callback(AvahiServiceResolver *resolver,
++		     AvahiIfIndex interface,
++		     AvahiProtocol protocol,
++		     AvahiResolverEvent event,
++		     const char *name,
++		     const char *type,
++		     const char *domain,
++		     const char *host_name,
++		     const AvahiAddress *address,
++		     uint16_t port,
++		     AvahiStringList *txt,
++		     AvahiLookupResultFlags flags,
++		     void *context)
++{
++  AvahiClient		*client;
++  cups_device_t		key,
++			*device;
++  char			uqname[1024],
++			*ptr;
++  cups_txt_records_t	txtr;
++
++  client = avahi_service_resolver_get_client (resolver);
++  if (event != AVAHI_RESOLVER_FOUND)
++  {
++    if (event == AVAHI_RESOLVER_FAILURE)
++    {
++      fprintf (stderr, "ERROR: %s\n",
++	       avahi_strerror (avahi_client_errno (client)));
++    }
++
++    avahi_service_resolver_free (resolver);
++    return;
++  }
++
++ /*
++  * Set search key for device.
++  */
++
++  key.name = uqname;
++  unquote (uqname, name, sizeof (uqname));
++  if ((ptr = strstr(name, "._")) != NULL)
++    *ptr = '\0';
++
++  key.domain = (char *) domain;
++  key.type = device_type (type);
++
++ /*
++  * Find the device and the the TXT information.
++  */
++
++  txtr.txt = txt;
++  device = find_device ((cups_array_t *) context, &txtr, &key);
++  if (device)
++  {
++   /*
++    * Let the main loop know to announce the device.
++    */
++
++    device->resolved = 1;
++    avahi_got_callback = 1;
++  }
+   else
+-    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
++    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
++
++  avahi_service_resolver_free (resolver);
++}
++
++
++/*
++ * 'avahi_browse_callback()' - Avahi browse callback function.
++ */
++
++static void
++avahi_browse_callback(AvahiServiceBrowser *browser,
++		      AvahiIfIndex interface,
++		      AvahiProtocol protocol,
++		      AvahiBrowserEvent event,
++		      const char *name,
++		      const char *type,
++		      const char *domain,
++		      AvahiLookupResultFlags flags,
++		      void *context)
++{
++  AvahiClient *client = avahi_service_browser_get_client (browser);
++
++  switch (event)
++  {
++  case AVAHI_BROWSER_FAILURE:
++    fprintf (stderr, "ERROR: %s\n",
++	     avahi_strerror (avahi_client_errno (client)));
++    avahi_simple_poll_quit (simple_poll);
++    return;
++
++  case AVAHI_BROWSER_NEW:
++   /*
++    * This object is new on the network.
++    */
++
++    if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
++    {
++     /*
++      * This comes from the local machine so ignore it.
++      */
++
++      fprintf (stderr, "DEBUG: ignoring local service %s\n", name);
++    }
++    else
++    {
++     /*
++      * Create a device entry for it if it doesn't yet exist.
++      */
++
++      get_device ((cups_array_t *)context, name, type, domain);
++
++     /*
++      * Now look for a TXT entry.
++      */
++
++      if (avahi_service_resolver_new (client, interface, protocol,
++				      name, type, domain,
++				      AVAHI_PROTO_UNSPEC, 0,
++				      avahi_query_callback, context) == NULL)
++      {
++	fprintf (stderr, "ERROR: failed to resolve service %s: %s\n",
++		 name, avahi_strerror (avahi_client_errno (client)));
++      }
++    }
++
++    break;
++
++  case AVAHI_BROWSER_REMOVE:
++  case AVAHI_BROWSER_ALL_FOR_NOW:
++  case AVAHI_BROWSER_CACHE_EXHAUSTED:
++    break;
++  }
++}
++#endif /* HAVE_AVAHI */
++
+ 
+-  for (device = cupsArrayFind(devices, &dkey);
++/*
++ * 'find_device()' - Find a device from its name and domain.
++ */
++
++static cups_device_t *
++find_device (cups_array_t *devices,
++	     cups_txt_records_t *txt,
++	     cups_device_t *dkey)
++{
++  cups_device_t	*device;
++  char		*ptr;
++
++  for (device = cupsArrayFind(devices, dkey);
+        device;
+        device = cupsArrayNext(devices))
+   {
+-    if (_cups_strcasecmp(device->name, dkey.name) ||
+-        _cups_strcasecmp(device->domain, dkey.domain))
++    if (_cups_strcasecmp(device->name, dkey->name) ||
++        _cups_strcasecmp(device->domain, dkey->domain))
+     {
+       device = NULL;
+       break;
+     }
+-    else if (device->type == dkey.type)
++    else if (device->type == dkey->type)
+     {
+      /*
+       * Found it, pull out the priority and make and model from the TXT
+       * record and save it...
+       */
+ 
+-      const uint8_t	*data,		/* Pointer into data */
+-			*datanext,	/* Next key/value pair */
+-			*dataend;	/* End of entire TXT record */
+-      uint8_t		datalen;	/* Length of current key/value pair */
+-      char		key[256],	/* Key string */
+-			value[256],	/* Value string */
+-			make_and_model[512],
++      char		make_and_model[512],
+ 				      	/* Manufacturer and model */
+ 			model[256],	/* Model */
+-			device_id[2048];/* 1284 device ID */
+-
++			device_id[2048]; /* 1284 device ID */
+ 
+       device_id[0]      = '\0';
+       make_and_model[0] = '\0';
+ 
+       strcpy(model, "Unknown");
+ 
+-      for (data = rdata, dataend = data + rdlen;
+-           data < dataend;
+-           data = datanext)
++      for (;;)
+       {
+-       /*
+-        * Read a key/value pair starting with an 8-bit length.  Since the
+-	* length is 8 bits and the size of the key/value buffers is 256, we
+-	* don't need to check for overflow...
+-	*/
+-
+-        datalen = *data++;
+-
+-        if (!datalen || (data + datalen) >= dataend)
+-	  break;
+-
+-        datanext = data + datalen;
+-
+-        for (ptr = key; data < datanext && *data != '='; data ++)
+-	  *ptr++ = *data;
+-	*ptr = '\0';
++	char *key;
++	char *value;
+ 
+-	if (data < datanext && *data == '=')
+-	{
+-	  data ++;
+-
+-	  if (data < datanext)
+-	    memcpy(value, data, datanext - data);
+-	  value[datanext - data] = '\0';
++	if (parse_txt_record_pair (txt))
++	  goto next;
+ 
+-	  fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n",
+-	          key, value);
+-	}
+-	else
+-	{
+-	  fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n",
+-	          key);
+-	  continue;
+-	}
+-
+-        if (!_cups_strncasecmp(key, "usb_", 4))
++	key = txt->key;
++	value = txt->value;
++        if (!strncasecmp(key, "usb_", 4))
+ 	{
+ 	 /*
+ 	  * Add USB device ID information...
+@@ -856,6 +1263,10 @@
+ 	  if (device->type == CUPS_DEVICE_PRINTER)
+ 	    device->sent = 1;
+ 	}
++
++      next:
++	if (next_txt_record (txt) == NULL)
++	  break;
+       }
+ 
+       if (device->device_id)
+@@ -905,11 +1316,9 @@
+     }
+   }
+ 
+-  if (!device)
+-    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
++  return device;
+ }
+ 
+-
+ /*
+  * 'sigterm_handler()' - Handle termination signals...
+  */
+--- a/config-scripts/cups-dnssd.m4
++++ b/config-scripts/cups-dnssd.m4
+@@ -23,6 +23,21 @@
+ DNSSDLIBS=""
+ DNSSD_BACKEND=""
+ 
++AC_ARG_ENABLE(avahi, [  --enable-avahi          turn on DNS Service Discovery support, default=no],
++	      [if test x$enable_avahi = xyes; then
++		       AC_MSG_CHECKING(for Avahi)
++		       if $PKGCONFIG --exists avahi-client; then
++			       AC_MSG_RESULT(yes)
++			       CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
++			       DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
++			       DNSSD_BACKEND="dnssd"
++			       AC_DEFINE(HAVE_AVAHI)
++			       enable_dnssd=no
++		       else
++			       AC_MSG_RESULT(no)
++		       fi
++	       fi])
++
+ if test x$enable_dnssd != xno; then
+ 	AC_CHECK_HEADER(dns_sd.h, [
+ 		case "$uname" in
+--- a/config.h.in
++++ b/config.h.in
+@@ -390,6 +390,13 @@
+ 
+ 
+ /*
++ * Do we have Avahi for DNS Service Discovery?
++ */
++
++#undef HAVE_AVAHI
++
++
++/*
+  * Do we have <sys/ioctl.h>?
+  */
+ 
+--- a/cups/http-support.c
++++ b/cups/http-support.c
+@@ -43,6 +43,10 @@
+  *   http_copy_decode()   - Copy and decode a URI.
+  *   http_copy_encode()   - Copy and encode a URI.
+  *   http_resolve_cb()    - Build a device URI for the given service name.
++ *   avahi_resolve_uri_client_cb()
++ *                        - Avahi client callback for resolving URI.
++ *   avahi_resolve_uri_resolver_cb()
++ *                        - Avahi resolver callback for resolving URI.
+  */
+ 
+ /*
+@@ -60,6 +64,11 @@
+ #    include <sys/select.h>
+ #  endif /* WIN32 */
+ #endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++#  include <avahi-client/client.h>
++#  include <avahi-client/lookup.h>
++#  include <avahi-common/simple-watch.h>
++#endif /* HAVE_AVAHI */
+ 
+ 
+ /*
+@@ -127,6 +136,24 @@
+ 					void *context);
+ #endif /* HAVE_DNSSD */
+ 
++#ifdef HAVE_AVAHI
++static void	avahi_resolve_uri_client_cb(AvahiClient *client,
++					    AvahiClientState state,
++					    void *simple_poll);
++static void	avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver,
++					      AvahiIfIndex interface,
++					      AvahiProtocol protocol,
++					      AvahiResolverEvent event,
++					      const char *name,
++					      const char *type,
++					      const char *domain,
++					      const char *host_name,
++					      const AvahiAddress *address,
++					      uint16_t port,
++					      AvahiStringList *txt,
++					      AvahiLookupResultFlags flags,
++					      void *context);
++#endif /* HAVE_AVAHI */
+ 
+ /*
+  * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
+@@ -1431,6 +1458,9 @@
+ 
+   if (strstr(hostname, "._tcp"))
+   {
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
++    char		*regtype,	/* Pointer to type in hostname */
++			*domain;	/* Pointer to domain in hostname */
+ #ifdef HAVE_DNSSD
+ #  ifdef WIN32
+ #    pragma comment(lib, "dnssd.lib")
+@@ -1449,6 +1479,17 @@
+     fd_set		input_set;	/* Input set for select() */
+     struct timeval	stimeout;	/* Timeout value for select() */
+ #endif /* HAVE_POLL */
++#else /* HAVE_AVAHI */
++    AvahiSimplePoll	*simple_poll;
++    AvahiClient		*client;
++    int			error;
++    struct
++    {
++      AvahiSimplePoll	*poll;
++      _http_uribuf_t	uribuf;
++    } user_data;
++#endif /* HAVE_DNSSD */
++
+ 
+     if (options & _HTTP_RESOLVE_STDERR)
+       fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname);
+@@ -1485,9 +1526,16 @@
+     if (domain)
+       *domain++ = '\0';
+ 
++#ifdef HAVE_DNSSD
+     uribuf.buffer   = resolved_uri;
+     uribuf.bufsize  = resolved_size;
+     uribuf.options  = options;
++#else
++    user_data.uribuf.buffer = resolved_uri;
++    user_data.uribuf.bufsize = resolved_size;
++    user_data.uribuf.options = options;
++#endif
++
+     resolved_uri[0] = '\0';
+ 
+     DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", "
+@@ -1501,6 +1549,7 @@
+ 
+     uri = NULL;
+ 
++#ifdef HAVE_DNSSD
+     if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
+     {
+       localref = ref;
+@@ -1608,6 +1657,36 @@
+ 
+       DNSServiceRefDeallocate(ref);
+     }
++#else /* HAVE_AVAHI */
++    if ((simple_poll = avahi_simple_poll_new ()) != NULL)
++    {
++      if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll),
++				      0, avahi_resolve_uri_client_cb,
++				      &simple_poll, &error)) != NULL)
++      {
++	user_data.poll = simple_poll;
++	if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
++					AVAHI_PROTO_UNSPEC, hostname,
++					regtype, domain, AVAHI_PROTO_UNSPEC, 0,
++					avahi_resolve_uri_resolver_cb,
++					&user_data) != NULL)
++	{
++	  avahi_simple_poll_loop (simple_poll);
++
++	 /*
++	  * Collect the result.
++	  */
++
++	  if (resolved_uri[0])
++	    uri = resolved_uri;
++	}
++
++	avahi_client_free (client);
++      }
++
++      avahi_simple_poll_free (simple_poll);
++    }
++#endif /* HAVE_DNSSD */
+ 
+     if (options & _HTTP_RESOLVE_STDERR)
+     {
+@@ -1619,13 +1698,13 @@
+       fputs("STATE: -connecting-to-device,offline-report\n", stderr);
+     }
+ 
+-#else
++#else /* HAVE_DNSSD || HAVE_AVAHI */
+    /*
+     * No DNS-SD support...
+     */
+ 
+     uri = NULL;
+-#endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+     if ((options & _HTTP_RESOLVE_STDERR) && !uri)
+       _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer."));
+@@ -1895,6 +1974,116 @@
+ #endif /* HAVE_DNSSD */
+ 
+ 
++#ifdef HAVE_AVAHI
++/*
++ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI.
++ */
++
++static void
++avahi_resolve_uri_client_cb (AvahiClient *client,
++			     AvahiClientState state,
++			     void *simple_poll)
++{
++  DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, "
++		"simple_poll=%p)\n", client, state, simple_poll));
++
++  /*
++   * If the connection drops, quit.
++   */
++
++  if (state == AVAHI_CLIENT_FAILURE)
++    avahi_simple_poll_quit (simple_poll);
++}
++
++
++/*
++ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving
++ *                                     URI.
++ */
++
++static void
++avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
++			       AvahiIfIndex interface,
++			       AvahiProtocol protocol,
++			       AvahiResolverEvent event,
++			       const char *name,
++			       const char *type,
++			       const char *domain,
++			       const char *host_name,
++			       const AvahiAddress *address,
++			       uint16_t port,
++			       AvahiStringList *txt,
++			       AvahiLookupResultFlags flags,
++			       void *context)
++{
++  const char		*scheme;	/* URI scheme */
++  char			rp[256];	/* Remote printer */
++  AvahiStringList	*pair;
++  char			*value;
++  size_t		valueLen = 0;
++  char			addr[AVAHI_ADDRESS_STR_MAX];
++  struct
++  {
++    AvahiSimplePoll	*poll;
++    _http_uribuf_t	uribuf;
++  }		*poll_uribuf = context;
++
++  DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, "
++		"interface=%d, protocol=%d, event=%d, name=\"%s\", "
++		"type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, "
++		"port=%d, txt=%p, flags=%d, context=%p)\n",
++		resolver, interface, protocol, event, name, type, domain,
++		host_name, address, port, txt, flags, context));
++
++  if (event != AVAHI_RESOLVER_FOUND)
++  {
++    avahi_service_resolver_free (resolver);
++    avahi_simple_poll_quit (poll_uribuf->poll);
++    return;
++  }
++
++ /*
++  * Figure out the scheme from the full name...
++  */
++
++  if (strstr(type, "_ipp."))
++    scheme = "ipp";
++  else if (strstr(type, "_printer."))
++    scheme = "lpd";
++  else if (strstr(type, "_pdl-datastream."))
++    scheme = "socket";
++  else
++    scheme = "riousbprint";
++
++ /*
++  * Extract the "remote printer key from the TXT record...
++  */
++
++  if ((pair = avahi_string_list_find (txt, "rp")) != NULL)
++  {
++    avahi_string_list_get_pair (pair, NULL, &value, &valueLen);
++    rp[0] = '/';
++    memcpy (rp + 1, value, valueLen);
++    rp[valueLen + 1] = '\0';
++  }
++  else
++    rp[0] = '\0';
++
++ /*
++  * Assemble the final device URI...
++  */
++
++  avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address);
++  httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer,
++		  poll_uribuf->uribuf.bufsize, scheme, NULL,
++		  addr, port, rp);
++  DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n",
++		poll_uribuf->uribuf.buffer));
++  avahi_simple_poll_quit (poll_uribuf->poll);
++}
++#endif /* HAVE_AVAHI */
++
++
+ /*
+  * End of "$Id: http-support.c 9820 2011-06-10 22:06:26Z mike $".
+  */
+--- a/scheduler/Makefile
++++ b/scheduler/Makefile
+@@ -17,6 +17,7 @@
+ 
+ CUPSDOBJS =	\
+ 		auth.o \
++		avahi.o \
+ 		banners.o \
+ 		cert.o \
+ 		classes.o \
+@@ -39,7 +40,8 @@
+ 		server.o \
+ 		statbuf.o \
+ 		subscriptions.o \
+-		sysman.o
++		sysman.o \
++		timeout.o
+ LIBOBJS =	\
+ 		filter.o \
+ 		mime.o \
+--- /dev/null
++++ b/scheduler/avahi.c
+@@ -0,0 +1,445 @@
++/*
++ * "$Id$"
++ *
++ *   Avahi poll implementation for the CUPS scheduler.
++ *
++ *   Copyright (C) 2010 Red Hat, Inc.
++ *   Authors:
++ *    Tim Waugh <twaugh@redhat.com>
++ *
++ *   Distribution and use rights are outlined in the file "LICENSE.txt"
++ *   "LICENSE" which should have been included with this file.  If this
++ *   file is missing or damaged, see the license at "http://www.cups.org/".
++ *
++ * Contents:
++ *
++ *   watch_read_cb         - Read callback for file descriptor
++ *   watch_write_cb        - Write callback for file descriptor
++ *   watched_fd_add_select() - Call cupsdAddSelect() as needed
++ *   watch_new()           - Create a new file descriptor watch
++ *   watch_free()          - Free a file descriptor watch
++ *   watch_update()        - Update watched events for a file descriptor
++ *   watch_get_events()    - Get events that happened for a file descriptor
++ *   timeout_cb()          - Run a timed Avahi callback
++ *   timeout_new()         - Set a wakeup time
++ *   timeout_update()      - Update the expiration time for a timeout
++ *   timeout_free()        - Free a timeout
++ *   compare_watched_fds() - Compare watched file descriptors for array sorting
++ *   compare_timeouts()    - Compare timeouts for array sorting
++ *   avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
++ *   avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
++ *   avahi_cups_poll_get() - Get the abstract poll API structure
++ */
++
++#include <config.h>
++
++#ifdef HAVE_AVAHI /* Applies to entire file... */
++
++/*
++ * Include necessary headers...
++ */
++
++#include "cupsd.h"
++
++#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
++#  include <malloc.h>
++#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
++
++#ifdef HAVE_AVAHI
++#  include <avahi-common/timeval.h>
++#endif /* HAVE_AVAHI */
++
++
++typedef struct
++{
++  AvahiCupsPoll *cups_poll;
++
++  int fd;
++  AvahiWatchEvent occurred;
++  cups_array_t *watches;
++} cupsd_watched_fd_t;
++
++struct AvahiWatch
++{
++  cupsd_watched_fd_t *watched_fd;
++
++  AvahiWatchEvent events;
++  AvahiWatchCallback callback;
++  void *userdata;
++};
++
++struct AvahiTimeout
++{
++  AvahiCupsPoll *cups_poll;
++  AvahiTimeoutCallback callback;
++  void *userdata;
++  cupsd_timeout_t *cupsd_timeout;
++};
++
++/*
++ * Local functions...
++ */
++
++static AvahiWatch *	watch_new(const AvahiPoll *api,
++				  int fd,
++				  AvahiWatchEvent events,
++				  AvahiWatchCallback callback,
++				  void *userdata);
++static void		watch_free(AvahiWatch *watch);
++static void		watch_update(AvahiWatch *watch,
++				     AvahiWatchEvent events);
++static AvahiWatchEvent	watch_get_events(AvahiWatch *watch);
++static int		compare_watches(AvahiWatch *p0,
++					AvahiWatch *p1);
++
++
++/*
++ * 'watch_read_cb' - Read callback for file descriptor
++ */
++
++static void
++watch_read_cb (void *userdata)
++{
++  AvahiWatch *watch;
++  cupsd_watched_fd_t *watched_fd = userdata;
++  watched_fd->occurred |= AVAHI_WATCH_IN;
++  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
++       watch;
++       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
++    if (watch->events & watched_fd->occurred) {
++      (watch->callback) (watch, watched_fd->fd,
++			 AVAHI_WATCH_IN, watch->userdata);
++      watched_fd->occurred &= ~AVAHI_WATCH_IN;
++      break;
++    }
++  }
++}
++
++
++/*
++ * 'watch_write_cb' - Write callback for file descriptor
++ */
++
++static void
++watch_write_cb (void *userdata)
++{
++  AvahiWatch *watch;
++  cupsd_watched_fd_t *watched_fd = userdata;
++  watched_fd->occurred |= AVAHI_WATCH_OUT;
++  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
++       watch;
++       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
++    if (watch->events & watched_fd->occurred) {
++      (watch->callback) (watch, watched_fd->fd,
++			 AVAHI_WATCH_OUT, watch->userdata);
++      watched_fd->occurred &= ~AVAHI_WATCH_OUT;
++      break;
++    }
++  }
++}
++
++
++/*
++ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
++ */
++
++static int						/* O - Watches? */
++watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
++{
++  AvahiWatch *watch;
++  cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
++
++  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
++       watch;
++       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
++    if (watch->events & (AVAHI_WATCH_IN |
++			     AVAHI_WATCH_ERR |
++			     AVAHI_WATCH_HUP)) {
++      read_cb = (cupsd_selfunc_t)watch_read_cb;
++      if (write_cb != NULL)
++	break;
++    }
++
++    if (watch->events & AVAHI_WATCH_OUT) {
++      write_cb = (cupsd_selfunc_t)watch_write_cb;
++      if (read_cb != NULL)
++	break;
++    }
++  }
++
++  if (read_cb || write_cb)
++    cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
++  else
++    cupsdRemoveSelect (watched_fd->fd);
++
++  return (read_cb || write_cb);
++}
++
++/*
++ * 'watch_new' - Create a new file descriptor watch
++ */
++
++static AvahiWatch *
++watch_new (const AvahiPoll *api,
++	   int fd,
++	   AvahiWatchEvent events,
++	   AvahiWatchCallback callback,
++	   void *userdata)
++{
++  cupsd_watched_fd_t key, *watched_fd;
++  AvahiCupsPoll *cups_poll = api->userdata;
++  AvahiWatch *watch = malloc(sizeof(AvahiWatch));
++  if (watch == NULL)
++    return (NULL);
++
++  watch->events = events;
++  watch->callback = callback;
++  watch->userdata = userdata;
++
++  key.fd = fd;
++  watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
++  if (watched_fd == NULL) {
++    watched_fd = malloc(sizeof(cupsd_watched_fd_t));
++    if (watched_fd == NULL) {
++      free (watch);
++      return (NULL);
++    }
++
++    watched_fd->fd = fd;
++    watched_fd->occurred = 0;
++    watched_fd->cups_poll = cups_poll;
++    watched_fd->watches = cupsArrayNew ((cups_array_func_t)compare_watches,
++					NULL);
++  }
++
++  watch->watched_fd = watched_fd;
++  cupsArrayAdd(watched_fd->watches, watch);
++  watched_fd_add_select (watched_fd);
++  return (watch);
++}
++
++
++/*
++ * 'watch_free' - Free a file descriptor watch
++ */
++
++static void
++watch_free (AvahiWatch *watch)
++{
++  cupsd_watched_fd_t *watched_fd = watch->watched_fd;
++  AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
++
++  cupsArrayRemove (watched_fd->watches, watch);
++  free (watch);
++
++  if (!watched_fd_add_select (watched_fd)) {
++    /* No more watches */
++    cupsArrayRemove (cups_poll->watched_fds, watched_fd);
++    free (watched_fd);
++  }
++}
++
++
++/*
++ * 'watch_update' - Update watched events for a file descriptor
++ */
++
++static void
++watch_update (AvahiWatch *watch,
++	      AvahiWatchEvent events)
++{
++  watch->events = events;
++  watched_fd_add_select (watch->watched_fd);
++}
++
++
++/*
++ * 'watch_get_events' - Get events that happened for a file descriptor
++ */
++
++static AvahiWatchEvent
++watch_get_events (AvahiWatch *watch)
++{
++  return (watch->watched_fd->occurred);
++}
++
++
++/*
++ * 'compare_watches' - Compare watches for array sorting
++ */
++
++static int
++compare_watches (AvahiWatch *p0,
++		 AvahiWatch *p1)
++{
++  if (p0->watched_fd->fd < p1->watched_fd->fd)
++    return (-1);
++
++  return ((p0->watched_fd->fd == p1->watched_fd->fd) ? 0 : 1);
++}
++
++
++/*
++ * 'timeout_cb()' - Run a timed Avahi callback
++ */
++
++static void
++timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
++{
++  AvahiTimeout *timeout = userdata;
++  (timeout->callback) (timeout, timeout->userdata);
++}
++
++
++/*
++ * 'timeout_new' - Set a wakeup time
++ */
++
++static AvahiTimeout *
++timeout_new (const AvahiPoll *api,
++	     const struct timeval *tv,
++	     AvahiTimeoutCallback callback,
++	     void *userdata)
++{
++  AvahiTimeout *timeout;
++  AvahiCupsPoll *cups_poll = api->userdata;
++
++  timeout = malloc(sizeof(AvahiTimeout));
++  if (timeout == NULL)
++    return (NULL);
++
++  timeout->cups_poll = cups_poll;
++  timeout->callback = callback;
++  timeout->userdata = userdata;
++  timeout->cupsd_timeout = cupsdAddTimeout (tv,
++					    (cupsd_timeoutfunc_t)timeout_cb,
++					    timeout);
++  cupsArrayAdd (cups_poll->timeouts, timeout);
++  return (timeout);
++}
++
++
++/*
++ * 'timeout_update' - Update the expiration time for a timeout
++ */
++
++static void
++timeout_update (AvahiTimeout *timeout,
++		const struct timeval *tv)
++{
++  cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
++}
++
++
++/*
++ * ' timeout_free' - Free a timeout
++ */
++
++static void
++timeout_free (AvahiTimeout *timeout)
++{
++  cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
++  cupsdRemoveTimeout (timeout->cupsd_timeout);
++  free (timeout);
++}
++
++
++/*
++ * 'compare_watched_fds' - Compare watched file descriptors for array sorting
++ */
++static int
++compare_watched_fds(cupsd_watched_fd_t *p0,
++		    cupsd_watched_fd_t *p1)
++{
++  if (p0->fd != p1->fd)
++    return (p0->fd < p1->fd ? -1 : 1);
++
++  if (p0 == p1)
++    return (0);
++
++  return (p0 < p1 ? -1 : 1);
++}
++
++
++/*
++ * 'compare_timeouts' - Compare timeouts for array sorting
++ */
++static int
++compare_timeouts(AvahiTimeout *p0,
++		 AvahiTimeout *p1)
++{
++ /*
++  * Just compare pointers to make it a stable sort.
++  */
++
++  if (p0->cupsd_timeout < p1->cupsd_timeout)
++    return (-1);
++  return ((p0->cupsd_timeout == p1->cupsd_timeout) ? 0 : 1);
++}
++
++
++/*
++ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
++ */
++
++AvahiCupsPoll *
++avahi_cups_poll_new (void)
++{
++  AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
++  if (cups_poll == NULL)
++    return (NULL);
++
++  cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
++					 NULL);
++  cups_poll->timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts,
++				      NULL);
++
++  cups_poll->api.userdata = cups_poll;
++  cups_poll->api.watch_new = watch_new;
++  cups_poll->api.watch_free = watch_free;
++  cups_poll->api.watch_update = watch_update;
++  cups_poll->api.watch_get_events = watch_get_events;
++
++  cups_poll->api.timeout_new = timeout_new;
++  cups_poll->api.timeout_update = timeout_update;
++  cups_poll->api.timeout_free = timeout_free;
++
++  return (cups_poll);
++}
++
++
++/*
++ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
++ */
++void
++avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
++{
++  cupsd_watched_fd_t *watched_fd;
++
++  for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
++       watched_fd;
++       watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)){
++    cupsArrayClear (watched_fd->watches);
++  }
++
++  cupsArrayClear (cups_poll->watched_fds);
++  cupsArrayClear (cups_poll->timeouts);
++}
++
++
++/*
++ * 'avahi_cups_poll_get' - Get the abstract poll API structure
++ */
++
++const AvahiPoll *
++avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
++{
++  return (&cups_poll->api);
++}
++
++
++#endif /* HAVE_AVAHI ... from top of file */
++
++/*
++ * End of "$Id$".
++ */
+--- /dev/null
++++ b/scheduler/avahi.h
+@@ -0,0 +1,49 @@
++/*
++ * "$Id$"
++ *
++ *   Avahi poll implementation for the CUPS scheduler.
++ *
++ *   Copyright (C) 2010 Red Hat, Inc.
++ *   Authors:
++ *    Tim Waugh <twaugh@redhat.com>
++ *
++ *   Distribution and use rights are outlined in the file "LICENSE.txt"
++ *   which should have been included with this file.  If this file is
++ *   file is missing or damaged, see the license at "http://www.cups.org/".
++ */
++
++#include <config.h>
++
++#ifdef HAVE_AVAHI
++#  include <avahi-client/client.h>
++#  include <avahi-client/publish.h>
++#endif /* HAVE_AVAHI */
++
++#ifdef HAVE_AUTHORIZATION_H
++#  include <Security/Authorization.h>
++#endif /* HAVE_AUTHORIZATION_H */
++
++
++#ifdef HAVE_AVAHI
++typedef struct
++{
++    AvahiPoll api;
++    cups_array_t *watched_fds;
++    cups_array_t *timeouts;
++} AvahiCupsPoll;
++#endif /* HAVE_AVAHI */
++
++/*
++ * Prototypes...
++ */
++
++#ifdef HAVE_AVAHI
++extern AvahiCupsPoll *	avahi_cups_poll_new(void);
++extern void		avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
++extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
++#endif /* HAVE_AVAHI */
++
++
++/*
++ * End of "$Id$".
++ */
+--- a/scheduler/cupsd.h
++++ b/scheduler/cupsd.h
+@@ -140,6 +140,15 @@
+ 
+ typedef void (*cupsd_selfunc_t)(void *data);
+ 
++#ifdef HAVE_AVAHI
++/*
++ * Timeout callback function type...
++ */
++
++typedef struct _cupsd_timeout_s cupsd_timeout_t;
++typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
++#endif /* HAVE_AVAHI */
++
+ 
+ /*
+  * Globals...
+@@ -173,6 +182,11 @@
+ 					/* Running from launchd */
+ #endif /* HAVE_LAUNCH_H */
+ 
++#ifdef HAVE_AVAHI
++VAR cups_array_t *Timeouts;		/* Timed callbacks for main loop */
++#endif /* HAVE_AVAHI */
++
++
+ 
+ /*
+  * Prototypes...
+@@ -242,6 +256,20 @@
+ extern void		cupsdStartServer(void);
+ extern void		cupsdStopServer(void);
+ 
++#ifdef HAVE_AVAHI
++extern void     cupsdInitTimeouts(void);
++extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
++					 cupsd_timeoutfunc_t cb,
++					 void *data);
++extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
++extern void     cupsdRunTimeout (cupsd_timeout_t *timeout);
++extern void     cupsdUpdateTimeout (cupsd_timeout_t *timeout,
++				    const struct timeval *tv);
++extern void     cupsdRemoveTimeout (cupsd_timeout_t *timeout);
++#endif /* HAVE_AVAHI */
++
++extern int	cupsdRemoveFile(const char *filename);
++
+ 
+ /*
+  * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $".
+--- a/scheduler/main.c
++++ b/scheduler/main.c
+@@ -122,6 +122,10 @@
+   cupsd_listener_t	*lis;		/* Current listener */
+   time_t		current_time,	/* Current time */
+ 			activity,	/* Client activity timer */
++#ifdef HAVE_AVAHI
++			avahi_client_time, /* Time for next Avahi client
++					      check */
++#endif /* HAVE_AVAHI */
+ 			browse_time,	/* Next browse send time */
+ 			senddoc_time,	/* Send-Document time */
+ 			expire_time,	/* Subscription expire time */
+@@ -148,6 +152,10 @@
+   int			launchd_idle_exit;
+ 					/* Idle exit on select timeout? */
+ #endif	/* HAVE_LAUNCHD */
++#ifdef HAVE_AVAHI
++  cupsd_timeout_t	*tmo;		/* Next scheduled timed callback */
++  long			tmo_delay;	/* Time before it must be called */
++#endif /* HAVE_AVAHI */
+ 
+ 
+ #ifdef HAVE_GETEUID
+@@ -527,6 +535,14 @@
+ 
+   httpInitialize();
+ 
++#ifdef HAVE_AVAHI
++ /*
++  * Initialize timed callback structures.
++  */
++
++  cupsdInitTimeouts();
++#endif /* HAVE_AVAHI */
++
+   cupsdStartServer();
+ 
+  /*
+@@ -657,6 +673,9 @@
+   */
+ 
+   current_time  = time(NULL);
++#ifdef HAVE_AVAHI
++  avahi_client_time = current_time;
++#endif /* HAVE_AVAHI */
+   browse_time   = current_time;
+   event_time    = current_time;
+   expire_time   = current_time;
+@@ -871,6 +890,26 @@
+     }
+ #endif /* __APPLE__ */
+ 
++#ifdef HAVE_AVAHI
++   /*
++    * If a timed callback is due, run it.
++    */
++
++    tmo = cupsdNextTimeout (&tmo_delay);
++    if (tmo && tmo_delay == 0)
++      cupsdRunTimeout (tmo);
++
++   /*
++    * Try to restart the Avahi client every 10 seconds if needed...
++    */
++
++    if ((current_time - avahi_client_time) >= 10)
++    {
++      avahi_client_time = current_time;
++      cupsdStartAvahiClient();
++    }
++#endif /* HAVE_AVAHI */
++
+ #ifndef __APPLE__
+    /*
+     * Update the network interfaces once a minute...
+@@ -1815,6 +1854,10 @@
+   cupsd_job_t		*job;		/* Job information */
+   cupsd_subscription_t	*sub;		/* Subscription information */
+   const char		*why;		/* Debugging aid */
++#ifdef HAVE_AVAHI
++  cupsd_timeout_t	*tmo;		/* Timed callback */
++  long			tmo_delay;	/* Seconds before calling it */
++#endif /* HAVE_AVAHI */
+ 
+ 
+  /*
+@@ -1857,6 +1900,19 @@
+   }
+ #endif /* __APPLE__ */
+ 
++#ifdef HAVE_AVAHI
++ /*
++  * See if there are any scheduled timed callbacks to run.
++  */
++
++  tmo = cupsdNextTimeout (&tmo_delay);
++  if (tmo)
++  {
++    timeout = tmo_delay;
++    why = "run a timed callback";
++  }
++#endif /* HAVE_AVAHI */
++
+  /*
+   * Check whether we are accepting new connections...
+   */
+--- /dev/null
++++ b/scheduler/timeout.c
+@@ -0,0 +1,195 @@
++/*
++ * "$Id$"
++ *
++ *   Timeout functions for the Common UNIX Printing System (CUPS).
++ *
++ *   Copyright (C) 2010 Red Hat, Inc.
++ *   Authors:
++ *     Tim Waugh <twaugh@redhat.com>
++ *
++ *   Distribution and use rights are outlined in the file "LICENSE.txt"
++ *   which should have been included with this file.  If this file is
++ *   file is missing or damaged, see the license at "http://www.cups.org/".
++ *
++ * Contents:
++ *
++ *   cupsdInitTimeouts()  - Initialise timeout structure.
++ *   cupsdAddTimeout()    - Add a timed callback.
++ *   cupsdNextTimeout()   - Find the next enabled timed callback.
++ *   cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
++ *   cupsdRemoveTimeout() - Discard a timed callback.
++ *   compare_timeouts()   - Compare timed callbacks for array sorting.
++ */
++
++#include <config.h>
++
++#ifdef HAVE_AVAHI /* Applies to entire file... */
++
++/*
++ * Include necessary headers...
++ */
++
++#include "cupsd.h"
++
++#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
++#  include <malloc.h>
++#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
++
++#ifdef HAVE_AVAHI
++#  include <avahi-common/timeval.h>
++#endif /* HAVE_AVAHI */
++
++
++struct _cupsd_timeout_s
++{
++  struct timeval when;
++  int enabled;
++  cupsd_timeoutfunc_t callback;
++  void *data;
++};
++
++/*
++ * Local functions...
++ */
++
++/*
++ * 'compare_timeouts()' - Compare timed callbacks for array sorting.
++ */
++
++static int
++compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
++{
++  if (!p0->enabled || !p1->enabled)
++  {
++    if (!p0->enabled && !p1->enabled)
++      return (0);
++
++    return (p0->enabled ? -1 : 1);
++  }
++
++  return (avahi_timeval_compare (&p0->when, &p1->when));
++}
++
++
++/*
++ * 'cupsdInitTimeouts()' - Initialise timeout structures.
++ */
++
++void
++cupsdInitTimeouts(void)
++{
++  Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
++}
++
++
++/*
++ * 'cupsdAddTimeout()' - Add a timed callback.
++ */
++
++cupsd_timeout_t *				/* O - Timeout handle */
++cupsdAddTimeout(const struct timeval *tv,	/* I - Absolute time */
++		cupsd_timeoutfunc_t cb,		/* I - Callback function */
++		void *data)			/* I - User data */
++{
++  cupsd_timeout_t *timeout;
++
++  timeout = malloc (sizeof(cupsd_timeout_t));
++  if (timeout != NULL)
++  {
++    timeout->enabled = (tv != NULL);
++    if (tv)
++    {
++      timeout->when.tv_sec = tv->tv_sec;
++      timeout->when.tv_usec = tv->tv_usec;
++    }
++
++    timeout->callback = cb;
++    timeout->data = data;
++    cupsArrayAdd (Timeouts, timeout);
++  }
++
++  return timeout;
++}
++
++
++/*
++ * 'cupsdNextTimeout()' - Find the next enabled timed callback.
++ */
++
++cupsd_timeout_t *		/* O - Next enabled timeout or NULL */
++cupsdNextTimeout(long *delay)	/* O - Seconds before scheduled */
++{
++  cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
++  struct timeval curtime;
++
++  if (first && !first->enabled)
++    first = NULL;
++
++  if (first && delay)
++  {
++    gettimeofday (&curtime, NULL);
++    if (avahi_timeval_compare (&curtime, &first->when) > 0)
++    {
++      *delay = 0;
++    } else {
++      *delay = 1 + first->when.tv_sec - curtime.tv_sec;
++      if (first->when.tv_usec < curtime.tv_usec)
++	(*delay)--;
++    }
++  }
++
++  return (first);
++}
++
++
++/*
++ * 'cupsdRunTimeout()' - Run a timed callback.
++ */
++
++void
++cupsdRunTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
++{
++  if (!timeout)
++    return;
++  timeout->enabled = 0;
++  if (!timeout->callback)
++    return;
++  timeout->callback (timeout, timeout->data);
++}
++
++/*
++ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
++ */
++
++void
++cupsdUpdateTimeout(cupsd_timeout_t *timeout,	/* I - Timeout */
++		   const struct timeval *tv)	/* I - Absolute time or NULL */
++{
++  cupsArrayRemove (Timeouts, timeout);
++  timeout->enabled = (tv != NULL);
++  if (tv)
++  {
++    timeout->when.tv_sec = tv->tv_sec;
++    timeout->when.tv_usec = tv->tv_usec;
++  }
++  cupsArrayAdd (Timeouts, timeout);
++}
++
++
++/*
++ * 'cupsdRemoveTimeout()' - Discard a timed callback.
++ */
++
++void
++cupsdRemoveTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
++{
++  cupsArrayRemove (Timeouts, timeout);
++  free (timeout);
++}
++
++
++#endif /* HAVE_AVAHI ... from top of file */
++
++/*
++ * End of "$Id$".
++ */
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1643,7 +1643,7 @@
+       else
+ 	local_protocols[0] = '\0';
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+       if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))
+       {
+ 	if (local_protocols[0])
+@@ -1651,7 +1651,7 @@
+ 	else
+ 	  strcat(local_protocols, "dnssd");
+       }
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ #ifdef HAVE_LDAP
+       if (cgiGetVariable("BROWSE_LOCAL_LDAP"))
+@@ -2718,9 +2718,9 @@
+ #endif /* HAVE_GSSAPI */
+   cgiSetVariable("KERBEROS", "");
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   cgiSetVariable("HAVE_DNSSD", "1");
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ #ifdef HAVE_LDAP
+   cgiSetVariable("HAVE_LDAP", "1");
+--- a/scheduler/client.c
++++ b/scheduler/client.c
+@@ -4987,7 +4987,7 @@
+ 	    !strncmp(host, "[::1]:", 6));
+   }
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+  /*
+   * Check if the hostname is something.local (Bonjour); if so, allow it.
+   */
+@@ -4996,7 +4996,7 @@
+       (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) ||
+        !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8)))
+     return (1);
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+  /*
+   * Check if the hostname is an IP address...
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -27,6 +27,7 @@
+  *   ldap_connect()             - Start new LDAP connection
+  *   ldap_reconnect()           - Reconnect to LDAP Server
+  *   ldap_disconnect()          - Disconnect from LDAP Server
++ *   cupsdStartAvahiClient()    - Start an Avahi client if needed
+  *   cupsdStartBrowsing()       - Start sending and receiving broadcast
+  *                                information.
+  *   cupsdStartPolling()        - Start polling servers as needed.
+@@ -45,6 +46,8 @@
+  *                                printer.
+  *   dnssdPackTxtRecord()       - Pack an array of key/value pairs into the TXT
+  *                                record format.
++ *   avahiPackTxtRecord()       - Pack an array of key/value pairs into an
++ *                                AvahiStringList.
+  *   dnssdRegisterCallback()    - DNSServiceRegister callback.
+  *   dnssdRegisterPrinter()     - Start sending broadcast information for a
+  *                                printer or update the broadcast contents.
+@@ -83,6 +86,7 @@
+  */
+ 
+ #include "cupsd.h"
++#include <assert.h>
+ #include <grp.h>
+ 
+ #ifdef HAVE_DNSSD
+@@ -97,6 +101,17 @@
+ #    endif /* HAVE_SYSTEMCONFIGURATION */
+ #  endif /* __APPLE__ */
+ #endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++#  include <avahi-common/domain.h>
++#endif /* HAVE_AVAHI */
++
++
++#ifdef HAVE_DNSSD
++typedef char *cupsd_txt_record_t;
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++typedef AvahiStringList *cupsd_txt_record_t;
++#endif /* HAVE_AVAHI */
+ 
+ 
+ /*
+@@ -159,27 +174,39 @@
+ static void	update_smb(int onoff);
+ 
+ 
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
++static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
++					      int for_lpd);
++static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
++static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
++static void	dnssdRegisterPrinter(cupsd_printer_t *p);
++static void	dnssdStop(void);
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
++
+ #ifdef HAVE_DNSSD
+ #  ifdef HAVE_COREFOUNDATION
+ static void	dnssdAddAlias(const void *key, const void *value,
+ 		              void *context);
+ #  endif /* HAVE_COREFOUNDATION */
+-static char	*dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
+-		                     int for_lpd);
+-static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
+-static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
+-static char	*dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],
+-		                    int count);
+ static void	dnssdRegisterCallback(DNSServiceRef sdRef,
+ 		                      DNSServiceFlags flags,
+ 				      DNSServiceErrorType errorCode,
+ 				      const char *name, const char *regtype,
+ 				      const char *domain, void *context);
+-static void	dnssdRegisterPrinter(cupsd_printer_t *p);
+-static void	dnssdStop(void);
+ static void	dnssdUpdate(void);
+ #endif /* HAVE_DNSSD */
+ 
++#ifdef HAVE_AVAHI
++static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2],
++					   int count);
++static void	avahi_entry_group_cb (AvahiEntryGroup *group,
++				      AvahiEntryGroupState state,
++				      void *userdata);
++static void	avahi_client_cb (AvahiClient *client,
++				 AvahiClientState state,
++				 void *userdata);
++#endif /* HAVE_AVAHI */
++
+ #ifdef HAVE_LDAP
+ static const char * const ldap_attrs[] =/* CUPS LDAP attributes */
+ 		{
+@@ -283,10 +310,10 @@
+     ldap_dereg_printer(p);
+ #endif /* HAVE_LDAP */
+ 
+-#ifdef HAVE_DNSSD
+-  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
++  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD))
+     dnssdDeregisterPrinter(p);
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ }
+ 
+ 
+@@ -702,10 +729,10 @@
+     slpRegisterPrinter(p); */
+ #endif /* HAVE_LIBSLP */
+ 
+-#ifdef HAVE_DNSSD
+-  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
++  if ((BrowseLocalProtocols & BROWSE_DNSSD))
+     dnssdRegisterPrinter(p);
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ }
+ 
+ 
+@@ -1419,6 +1446,27 @@
+ #endif /* HAVE_LDAP */
+ 
+ 
++#ifdef HAVE_AVAHI
++/*
++ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed
++ */
++
++void
++cupsdStartAvahiClient(void)
++{
++  if (!AvahiCupsClient && !AvahiCupsClientConnecting)
++  {
++    if (!AvahiCupsPollHandle)
++      AvahiCupsPollHandle = avahi_cups_poll_new ();
++
++    if (AvahiCupsPollHandle)
++      avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle),
++			AVAHI_CLIENT_NO_FAIL, avahi_client_cb, NULL, NULL);
++  }
++}
++#endif /* HAVE_AVAHI */
++
++  
+ /*
+  * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.
+  */
+@@ -1542,13 +1590,16 @@
+   else
+     BrowseSocket = -1;
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)
+   {
++#ifdef HAVE_DNSSD
+     DNSServiceErrorType error;		/* Error from service creation */
++#endif /* HAVE_DNSSD */
+     cupsd_listener_t	*lis;		/* Current listening socket */
+ 
+ 
++#ifdef HAVE_DNSSD
+    /*
+     * First create a "master" connection for all registrations...
+     */
+@@ -1573,6 +1624,7 @@
+       fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+ 
+       cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
++#endif /* HAVE_DNSSD */
+ 
+      /*
+       * Then get the port we use for registrations.  If we are not listening
+@@ -1606,9 +1658,16 @@
+       */
+ 
+       cupsdUpdateDNSSDName();
++
++#ifdef HAVE_AVAHI
++      cupsdStartAvahiClient ();
++#endif /* HAVE_AVAHI */
++
++#ifdef HAVE_DNSSD
+     }
+-  }
+ #endif /* HAVE_DNSSD */
++  }
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ #ifdef HAVE_LIBSLP
+   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
+@@ -1834,10 +1893,10 @@
+     BrowseSocket = -1;
+   }
+ 
+-#ifdef HAVE_DNSSD
+-  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
++  if ((BrowseLocalProtocols & BROWSE_DNSSD))
+     dnssdStop();
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ #ifdef HAVE_LIBSLP
+   if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
+@@ -1902,7 +1961,7 @@
+ }
+ 
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ /*
+  * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing...
+  */
+@@ -1910,8 +1969,14 @@
+ void
+ cupsdUpdateDNSSDName(void)
+ {
++#ifdef HAVE_DNSSD
+   DNSServiceErrorType error;		/* Error from service creation */
+   char		webif[1024];		/* Web interface share name */
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  int		ret;			/* Error from service creation */
++  char		webif[AVAHI_LABEL_MAX];	/* Web interface share name */
++#endif /* HAVE_AVAHI */
+ #  ifdef HAVE_SYSTEMCONFIGURATION
+   SCDynamicStoreRef sc;			/* Context for dynamic store */
+   CFDictionaryRef btmm;			/* Back-to-My-Mac domains */
+@@ -2042,6 +2107,7 @@
+     else
+       strlcpy(webif, "CUPS Web Interface", sizeof(webif));
+ 
++#ifdef HAVE_DNSSD
+     if (WebIFRef)
+       DNSServiceRefDeallocate(WebIFRef);
+ 
+@@ -2054,9 +2120,45 @@
+ 				    NULL)) != kDNSServiceErr_NoError)
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+ 		      "DNS-SD web interface registration failed: %d", error);
++#endif /* HAVE_DNSSD */
++
++#ifdef HAVE_AVAHI
++    if (!AvahiCupsClient)
++     /*
++      * Client not yet running.
++      */
++      return;
++
++    if (AvahiWebIFGroup)
++      avahi_entry_group_reset (AvahiWebIFGroup);
++    else
++      AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient,
++					       avahi_entry_group_cb,
++					       NULL);
++
++    if (AvahiWebIFGroup)
++    {
++      ret = avahi_entry_group_add_service (AvahiWebIFGroup,
++					   AVAHI_IF_UNSPEC,
++					   AVAHI_PROTO_UNSPEC,
++					   0, /* flags */
++					   webif, /* name */
++					   "_http._tcp", /* type */
++					   NULL, /* domain */
++					   NULL, /* host */
++					   DNSSDPort, /* port */
++					   "path=/", NULL);
++      if (ret == 0)
++	ret = avahi_entry_group_commit (AvahiWebIFGroup);
++
++      if (ret != 0)
++	cupsdLogMessage (CUPSD_LOG_ERROR,
++			 "Avahi web interface registration failed: %d", ret);
++    }
++#endif /* HAVE_AVAHI */
+   }
+ }
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ 
+ #ifdef HAVE_LDAP
+@@ -2334,13 +2436,15 @@
+                     "Bad Back to My Mac domain in dynamic store!");
+ }
+ #  endif /* HAVE_COREFOUNDATION */
++#endif /* HAVE_DNSSD */
+ 
+ 
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ /*
+  * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
+  */
+ 
+-static char *				/* O - TXT record */
++static cupsd_txt_record_t		/* O - TXT record */
+ dnssdBuildTxtRecord(
+     int             *txt_len,		/* O - TXT record length */
+     cupsd_printer_t *p,			/* I - Printer information */
+@@ -2379,7 +2483,12 @@
+   keyvalue[i  ][0] = "ty";
+   keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown";
+ 
+-  snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName);
++  snprintf(admin_hostname, sizeof(admin_hostname),
++	   "%s.local"
++#ifdef HAVE_DNSSD
++	   "." /* terminating dot no good for Avahi */
++#endif /* HAVE_DNSSD */
++	   , DNSSDHostName);
+   httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str),
+                    "http", NULL, admin_hostname, DNSSDPort, "/%s/%s",
+ 		   (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",
+@@ -2462,7 +2571,12 @@
+   * Then pack them into a proper txt record...
+   */
+ 
++#ifdef HAVE_DNSSD
+   return (dnssdPackTxtRecord(txt_len, keyvalue, i));
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  return (avahiPackTxtRecord(keyvalue, i));
++#endif /* HAVE_AVAHI */
+ }
+ 
+ 
+@@ -2474,7 +2588,16 @@
+ dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */
+                      cupsd_printer_t *b)/* I - Second printer */
+ {
+-  return (_cups_strcasecmp(a->reg_name, b->reg_name));
++  if (!a->reg_name)
++    if (!b->reg_name)
++      return 0;
++    else
++      return -1;
++  else
++    if (!b->reg_name)
++      return 1;
++    else
++      return (_cups_strcasecmp(a->reg_name, b->reg_name));
+ }
+ 
+ 
+@@ -2489,6 +2612,10 @@
+ {
+   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);
+ 
++#ifdef HAVE_DNSSD
++  if (!DNSSDRef)
++    return;
++
+  /*
+   * Closing the socket deregisters the service
+   */
+@@ -2524,6 +2651,24 @@
+     free(p->printer_txt);
+     p->printer_txt = NULL;
+   }
++#endif /* HAVE_DNSSD */
++
++#ifdef HAVE_AVAHI
++  if (p->avahi_group)
++    {
++      avahi_entry_group_reset (p->avahi_group);
++      avahi_entry_group_free (p->avahi_group);
++      p->avahi_group = NULL;
++
++      if (p->ipp_txt)
++	avahi_string_list_free (p->ipp_txt);
++
++      if (p->printer_txt)
++	avahi_string_list_free (p->printer_txt);
++
++      p->ipp_txt = p->printer_txt = NULL;
++    }
++#endif /* HAVE_AVAHI */
+ 
+  /*
+   * Remove the printer from the array of DNS-SD printers, then clear the
+@@ -2533,8 +2678,10 @@
+   cupsArrayRemove(DNSSDPrinters, p);
+   cupsdClearString(&p->reg_name);
+ }
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ 
++#ifdef HAVE_DNSSD
+ /*
+  * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the
+  *                          TXT record format.
+@@ -2644,8 +2791,10 @@
+     LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED;
+   }
+ }
++#endif /* HAVE_DNSSD */
+ 
+ 
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ /*
+  * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer
+  *		              or update the broadcast contents.
+@@ -2654,20 +2803,40 @@
+ static void
+ dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
+ {
++#ifdef HAVE_DNSSD
+   DNSServiceErrorType	se;		/* dnssd errors */
+   char			*ipp_txt,	/* IPP TXT record buffer */
+ 			*printer_txt,	/* LPD TXT record buffer */
+-			name[1024],	/* Service name */
+-			*nameptr;	/* Pointer into name */
++			name[1024];	/* Service name */
+   int			ipp_len,	/* IPP TXT record length */
+ 			printer_len,	/* LPD TXT record length */
+ 			printer_port;	/* LPD port number */
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  int			ret;		/* Error code */
++  AvahiStringList	*ipp_txt,	/* IPP TXT record */
++			*printer_txt;	/* LPD TXT record */
++  char			name[AVAHI_LABEL_MAX],	/* Service name */
++			fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */
++  char			*regtype_copy,	/* Writeable copy of reg type */
++			*subtype,	/* Current service sub type */
++			*nextsubtype;	/* Next service sub type */
++#endif /* HAVE_AVAHI */
++  char			*nameptr;	/* Pointer into name */
+   const char		*regtype;	/* Registration type */
+ 
+ 
++#ifdef HAVE_DNSSD
++  if (!DNSSDRef)
++    return;
++
+   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
+                   !p->ipp_ref ? "new" : "update");
+-
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
++		  !p->avahi_group ? "new" : "update");
++#endif /* HAVE_AVAHI */
+  /*
+   * If per-printer sharing was just disabled make sure we're not
+   * registered before returning.
+@@ -2686,12 +2855,36 @@
+   if (p->info && strlen(p->info) > 0)
+   {
+     if (DNSSDComputerName)
+-      snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName);
++    {
++     /*
++      * Make sure there is room for at least 15 characters of
++      * DNSSDComputerName.
++      */
++
++      assert(sizeof(name) >= 15 + 4);
++      nameptr = name + strlcpy(name, p->info,
++			       sizeof(name) - 4 -
++			       strnlen(DNSSDComputerName, 15));
++      nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
++      strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
++    }
+     else
+       strlcpy(name, p->info, sizeof(name));
+   }
+   else if (DNSSDComputerName)
+-    snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName);
++  {
++   /*
++    * Make sure there is room for at least 15 characters of
++    * DNSSDComputerName.
++    */
++
++    assert(sizeof(name) >= 15 + 4);
++    nameptr = name + strlcpy(name, p->info,
++			     sizeof(name) - 4 -
++			     strnlen(DNSSDComputerName, 15));
++    nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
++    strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
++  }
+   else
+     strlcpy(name, p->name, sizeof(name));
+ 
+@@ -2712,6 +2905,7 @@
+   * Register IPP and (optionally) LPD...
+   */
+ 
++#ifdef HAVE_DNSSD
+   ipp_len = 0;				/* anti-compiler-warning-code */
+   ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0);
+ 
+@@ -2884,6 +3078,209 @@
+ 
+   if (printer_txt)
+     free(printer_txt);
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  if (!AvahiCupsClient)
++   /*
++    * Client not running yet.  The client callback will call us again later.
++    */
++    return;
++
++  ipp_txt = dnssdBuildTxtRecord(NULL, p, 0);
++  printer_txt = dnssdBuildTxtRecord(NULL, p, 1);
++  regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType;
++
++  if (p->avahi_group && p->ipp_txt && ipp_txt &&
++      !avahi_string_list_equal (p->ipp_txt, ipp_txt))
++  {
++   /*
++    * Update the existing registration...
++    */
++
++    avahi_string_list_free (p->ipp_txt);
++
++    if (p->printer_txt)
++      avahi_string_list_free (p->printer_txt);
++
++   /*
++    * Update the service group entry.
++    */
++
++    regtype_copy = strdup (regtype);
++    subtype = strchr (regtype_copy, ',');
++    if (subtype)
++      *subtype = '\0';
++
++    cupsdLogMessage (CUPSD_LOG_DEBUG,
++		     "Updating TXT record for %s (%s)", name, regtype_copy);
++    ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
++						       AVAHI_IF_UNSPEC,
++						       AVAHI_PROTO_UNSPEC,
++						       0, name,
++						       regtype_copy,
++						       NULL, ipp_txt);
++    free (regtype_copy);
++
++    if (ret < 0)
++      goto update_failed;
++
++    p->ipp_txt = ipp_txt;
++    ipp_txt = NULL;
++
++    if (BrowseLocalProtocols & BROWSE_LPD)
++    {
++      ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
++							 AVAHI_IF_UNSPEC,
++							 AVAHI_PROTO_UNSPEC,
++							 0, name,
++							 "_printer._tcp", NULL,
++							 printer_txt);
++      if (ret < 0)
++	goto update_failed;
++
++      p->printer_txt = printer_txt;
++      printer_txt = NULL;
++    }
++
++    ret = avahi_entry_group_commit (p->avahi_group);
++    if (ret < 0)
++    {
++    update_failed:
++      cupsdLogMessage (CUPSD_LOG_ERROR,
++		       "Failed to update TXT record for %s: %d",
++		       name, ret);
++      avahi_entry_group_reset (p->avahi_group);
++      avahi_entry_group_free (p->avahi_group);
++      p->avahi_group = NULL;
++      ipp_txt = p->ipp_txt;
++      p->ipp_txt = NULL;
++    }
++  }
++
++  if (!p->avahi_group)
++  {
++   /*
++    * Initial registration.  Use the _fax subtype for fax queues...
++    */
++
++    p->avahi_group = avahi_entry_group_new (AvahiCupsClient,
++					    avahi_entry_group_cb,
++					    p);
++
++    cupsdLogMessage(CUPSD_LOG_DEBUG,
++		    "Registering Avahi printer %s with name \"%s\" and "
++		    "type \"%s\"", p->name, name, regtype);
++
++    if (!p->avahi_group)
++    {
++      ret = 0;
++      goto add_failed;
++    }
++
++   /*
++    * Add each service type (DNSSDRegType may contain several,
++    * separated by commas).
++    */
++
++    subtype = regtype_copy = strdup (regtype);
++    while (subtype && *subtype)
++    {
++      nextsubtype = strchr (subtype, ',');
++      if (nextsubtype)
++	*nextsubtype++ = '\0';
++
++      if (subtype == regtype_copy)
++      {
++       /*
++	* Main type entry.
++	*/
++
++	cupsdLogMessage (CUPSD_LOG_DEBUG,
++			 "Adding TXT record for %s (%s)", name, regtype_copy);
++	ret = avahi_entry_group_add_service_strlst (p->avahi_group,
++						    AVAHI_IF_UNSPEC,
++						    AVAHI_PROTO_UNSPEC,
++						    0, name, regtype_copy,
++						    NULL, NULL,
++						    DNSSDPort,
++						    ipp_txt);
++      }
++      else
++      {
++       /*
++	* Sub-type entry.
++	*/
++
++	snprintf (fullsubtype, sizeof(fullsubtype),
++		  "%s._sub.%s", subtype, regtype_copy);
++	cupsdLogMessage (CUPSD_LOG_DEBUG,
++			 "Adding TXT record for %s (%s)", name, fullsubtype);
++	ret = avahi_entry_group_add_service_subtype (p->avahi_group,
++						     AVAHI_IF_UNSPEC,
++						     AVAHI_PROTO_UNSPEC,
++						     0, name,
++						     regtype_copy,
++						     NULL, fullsubtype);
++      }
++
++      if (ret < 0)
++      {
++	free (regtype_copy);
++	goto add_failed;
++      }
++
++      subtype = nextsubtype;
++    }
++
++    free (regtype_copy);
++    p->ipp_txt = ipp_txt;
++    ipp_txt = NULL;
++
++    if (BrowseLocalProtocols & BROWSE_LPD)
++    {
++      cupsdLogMessage(CUPSD_LOG_DEBUG,
++		      "Registering Avahi printer %s with name \"%s\" and "
++		      "type \"_printer._tcp\"", p->name, name);
++
++      ret = avahi_entry_group_add_service_strlst (p->avahi_group,
++						  AVAHI_IF_UNSPEC,
++						  AVAHI_PROTO_UNSPEC,
++						  0, name,
++						  "_printer._tcp", NULL, NULL,
++						  515,
++						  printer_txt);
++      if (ret < 0)
++	goto add_failed;
++
++      p->printer_txt = printer_txt;
++      printer_txt = NULL;
++    }
++
++    ret = avahi_entry_group_commit (p->avahi_group);
++
++    if (ret < 0)
++    {
++    add_failed:
++      cupsdLogMessage (CUPSD_LOG_ERROR,
++		       "Failed to add Avahi entry for %s: %d",
++		       name, ret);
++      if (p->avahi_group)
++      {
++	avahi_entry_group_reset (p->avahi_group);
++	avahi_entry_group_free (p->avahi_group);
++	p->avahi_group = NULL;
++      }
++      ipp_txt = p->ipp_txt;
++      p->ipp_txt = NULL;
++    }
++  }
++
++  if (ipp_txt)
++    avahi_string_list_free (ipp_txt);
++
++  if (printer_txt)
++    avahi_string_list_free (printer_txt);
++#endif /* HAVE_AVAHI */
+ }
+ 
+ 
+@@ -2896,6 +3293,10 @@
+ {
+   cupsd_printer_t	*p;		/* Current printer */
+ 
++#ifdef HAVE_DNSSD
++  if (!DNSSDRef)
++    return;
++#endif /* HAVE_DNSSD */
+ 
+  /*
+   * De-register the individual printers
+@@ -2906,6 +3307,7 @@
+        p = (cupsd_printer_t *)cupsArrayNext(Printers))
+     dnssdDeregisterPrinter(p);
+ 
++#ifdef HAVE_DNSSD
+  /*
+   * Shutdown the rest of the service refs...
+   */
+@@ -2926,14 +3328,17 @@
+ 
+   DNSServiceRefDeallocate(DNSSDRef);
+   DNSSDRef = NULL;
++#endif /* HAVE_DNSSD */
+ 
+   cupsArrayDelete(DNSSDPrinters);
+   DNSSDPrinters = NULL;
+ 
+   DNSSDPort = 0;
+ }
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+ 
++#ifdef HAVE_DNSSD
+ /*
+  * 'dnssdUpdate()' - Handle DNS-SD queries.
+  */
+@@ -2955,6 +3360,147 @@
+ #endif /* HAVE_DNSSD */
+ 
+ 
++#ifdef HAVE_AVAHI
++/*
++ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an
++ *                          AvahiStringList.
++ */
++
++static AvahiStringList *		/* O - new string list */
++avahiPackTxtRecord(char *keyvalue[][2],	/* I - Table of key value pairs */
++		   int count)		/* I - Number of items in table */
++{
++  AvahiStringList *strlst = NULL;
++  char **elements;
++  size_t len;
++  int i = 0;
++
++  elements = malloc ((1 + count) * sizeof (char *));
++  if (!elements)
++    goto cleanup;
++
++  for (i = 0; i < count; i++)
++    {
++      len = (1 + strlen (keyvalue[i][0]) +
++	     (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1));
++      elements[i] = malloc (len * sizeof (char));
++      if (!elements[i])
++	goto cleanup;
++
++      snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]);
++    }
++
++  strlst = avahi_string_list_new_from_array ((const char **) elements, count);
++
++cleanup:
++  while (--i >= 0)
++    free (elements[i]);
++
++  free (elements);
++  return (strlst);
++}
++
++
++/*
++ * 'avahi_entry_group_cb()' - Avahi entry group callback function.
++ */
++static void
++avahi_entry_group_cb (AvahiEntryGroup *group,
++		      AvahiEntryGroupState state,
++		      void *userdata)
++{
++  char *name;
++
++  if (userdata)
++    name = ((cupsd_printer_t *) userdata)->reg_name;
++  else
++    name = "CUPS web interface";
++
++  switch (state)
++  {
++  case AVAHI_ENTRY_GROUP_UNCOMMITED:
++  case AVAHI_ENTRY_GROUP_REGISTERING:
++    break;
++
++  case AVAHI_ENTRY_GROUP_ESTABLISHED:
++    cupsdLogMessage (CUPSD_LOG_DEBUG,
++		     "Avahi entry group established for %s", name);
++    break;
++
++  default:
++    cupsdLogMessage (CUPSD_LOG_DEBUG,
++		     "Avahi entry group %s has state %d",
++		     name, state);
++    break;
++  }
++}
++
++
++/*
++ * 'avahi_client_cb()' - Avahi client callback function.
++ */
++static void
++avahi_client_cb (AvahiClient *client,
++		 AvahiClientState state,
++		 void *userdata)
++{
++  cupsd_printer_t *printer;
++  switch (state)
++  {
++  case AVAHI_CLIENT_S_RUNNING:
++   /*
++    * Avahi client started successfully.
++    */
++    AvahiCupsClient = client;
++    AvahiCupsClientConnecting = 0;
++    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started");
++
++    cupsdUpdateDNSSDName ();
++
++    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
++	 printer;
++	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
++      if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) &&
++	  (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT |
++			      CUPS_PRINTER_SCANNER))) && printer->shared)
++	dnssdRegisterPrinter (printer);
++
++    break;
++
++  case AVAHI_CLIENT_CONNECTING:
++   /*
++    * No Avahi daemon, client is waiting.
++    */
++    AvahiCupsClientConnecting = 1;
++    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting");
++    break;
++
++  case AVAHI_CLIENT_FAILURE:
++   /*
++    * Avahi client failed, close it to allow a clean restart.
++    */
++    cupsdLogMessage (CUPSD_LOG_ERROR,
++		     "Avahi client failed, "
++		     "closing client to allow a clean restart");
++
++    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
++	 printer;
++	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
++      dnssdDeregisterPrinter (printer);
++
++    avahi_client_free(client);
++    AvahiCupsClientConnecting = 0;
++    AvahiCupsClient = NULL;
++
++    break;
++
++  default:
++    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state);
++  }
++}
++#endif /* HAVE_AVAHI */
++
++
+ /*
+  * 'get_auth_info_required()' - Get the auth-info-required value to advertise.
+  */
+--- a/scheduler/dirsvc.h
++++ b/scheduler/dirsvc.h
+@@ -31,6 +31,10 @@
+ #  endif /* HAVE_LDAP_SSL_H */
+ #endif /* HAVE_LDAP */
+ 
++#ifdef HAVE_AVAHI
++#  include <avahi-client/publish.h>
++#endif /* HAVE_AVAHI */
++
+ /*
+  * Browse protocols...
+  */
+@@ -131,19 +135,22 @@
+ VAR cupsd_statbuf_t	*PollStatusBuffer VALUE(NULL);
+ 					/* Status buffer for pollers */
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ VAR char		*DNSSDComputerName VALUE(NULL),
+ 					/* Computer/server name */
+ 			*DNSSDHostName	VALUE(NULL),
+ 					/* Hostname */
+ 			*DNSSDRegType VALUE(NULL);
+ 					/* Bonjour registration type */
+-VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
+-					/* List of dynamic ServerAlias's */
+ VAR int			DNSSDPort	VALUE(0);
+ 					/* Port number to register */
+ VAR cups_array_t	*DNSSDPrinters	VALUE(NULL);
+ 					/* Printers we have registered */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
++
++#ifdef HAVE_DNSSD
++VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
++					/* List of dynamic ServerAlias's */
+ VAR DNSServiceRef	DNSSDRef	VALUE(NULL),
+ 					/* Master DNS-SD service reference */
+ 			WebIFRef	VALUE(NULL),
+@@ -152,6 +159,17 @@
+ 					/* Remote printer browse reference */
+ #endif /* HAVE_DNSSD */
+ 
++#ifdef HAVE_AVAHI
++VAR AvahiCupsPoll	*AvahiCupsPollHandle	VALUE(NULL);
++					/* AvahiCupsPoll object */
++VAR AvahiClient		*AvahiCupsClient	VALUE(NULL);
++					/* AvahiClient object */
++VAR int			AvahiCupsClientConnecting	VALUE(0);
++					/* Is AvahiClient object connecting? */
++VAR AvahiEntryGroup	*AvahiWebIFGroup	VALUE(NULL);
++					/* Web interface entry group */
++#endif /* HAVE_AVAHI */
++
+ #ifdef HAVE_LIBSLP
+ VAR SLPHandle		BrowseSLPHandle	VALUE(NULL);
+ 					/* SLP API handle */
+@@ -195,13 +213,14 @@
+ extern void	cupsdRestartPolling(void);
+ extern void	cupsdSaveRemoteCache(void);
+ extern void	cupsdSendBrowseList(void);
++extern void	cupsdStartAvahiClient(void);
+ extern void	cupsdStartBrowsing(void);
+ extern void	cupsdStartPolling(void);
+ extern void	cupsdStopBrowsing(void);
+ extern void	cupsdStopPolling(void);
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ extern void	cupsdUpdateDNSSDName(void);
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ #ifdef HAVE_LDAP
+ extern void	cupsdUpdateLDAPBrowse(void);
+ #endif /* HAVE_LDAP */
+--- a/scheduler/ipp.c
++++ b/scheduler/ipp.c
+@@ -6087,7 +6087,7 @@
+     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
+                ippTimeToDate(curtime));
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
+   {
+     if (printer->reg_name)
+@@ -6097,7 +6097,7 @@
+       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
+                    "printer-dns-sd-name", 0);
+   }
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
+     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -883,9 +883,9 @@
+   cupsdClearString(&p->alert);
+   cupsdClearString(&p->alert_description);
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   cupsdClearString(&p->pdl);
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ 
+   cupsArrayDelete(p->filetypes);
+ 
+@@ -3765,7 +3765,7 @@
+     attr->values[i].string.text = _cupsStrAlloc(mimetype);
+   }
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   {
+     char		pdl[1024];	/* Buffer to build pdl list */
+     mime_filter_t	*filter;	/* MIME filter looping var */
+@@ -3821,7 +3821,7 @@
+ 
+     cupsdSetString(&p->pdl, pdl);
+   }
+-#endif /* HAVE_DNSSD */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
+ }
+ 
+ 
+--- a/scheduler/printers.h
++++ b/scheduler/printers.h
+@@ -16,6 +16,9 @@
+ #ifdef HAVE_DNSSD
+ #  include <dns_sd.h>
+ #endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++#  include "avahi.h"
++#endif /* HAVE_AVAHI */
+ #include <cups/pwg-private.h>
+ 
+ 
+@@ -95,16 +98,23 @@
+   time_t	marker_time;		/* Last time marker attributes were updated */
+   _ppd_cache_t	*pc;			/* PPD cache and mapping data */
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   char		*reg_name,		/* Name used for service registration */
+-		*pdl,			/* pdl value for TXT record */
+-		*ipp_txt,		/* IPP TXT record contents */
++		*pdl;			/* pdl value for TXT record */
++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
++#ifdef HAVE_DNSSD
++  char		*ipp_txt,		/* IPP TXT record contents */
+ 		*printer_txt;		/* LPD TXT record contents */
+   int		ipp_len,		/* IPP TXT record length */
+ 		printer_len;		/* LPD TXT record length */
+   DNSServiceRef	ipp_ref,		/* Reference for _ipp._tcp,_cups */
+ 		printer_ref;		/* Reference for _printer._tcp */
+ #endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  AvahiStringList *ipp_txt,		/* IPP TXT record */
++		*printer_txt;		/* LPD TXT record */
++  AvahiEntryGroup *avahi_group;		/* Avahi entry group */
++#endif /* HAVE_AVAHI */
+ };
+ 
+ 
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -650,7 +650,7 @@
+   Browsing                 = CUPS_DEFAULT_BROWSING;
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups");
+ #endif /* HAVE_DNSSD */
+ 
+
diff --git a/libre/cups-libre/cups-no-export-ssllibs.patch b/libre/cups-libre/cups-no-export-ssllibs.patch
new file mode 100644
index 000000000..24bac2e56
--- /dev/null
+++ b/libre/cups-libre/cups-no-export-ssllibs.patch
@@ -0,0 +1,13 @@
+diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
+--- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
++++ cups-1.5b1/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
+@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
+ AC_SUBST(SSLFLAGS)
+ AC_SUBST(SSLLIBS)
+ 
+-EXPORT_SSLLIBS="$SSLLIBS"
++EXPORT_SSLLIBS=""
+ AC_SUBST(EXPORT_SSLLIBS)
+ 
+ 
+
diff --git a/libre/cups-libre/cups-no-gcrypt.patch b/libre/cups-libre/cups-no-gcrypt.patch
new file mode 100644
index 000000000..ab299d989
--- /dev/null
+++ b/libre/cups-libre/cups-no-gcrypt.patch
@@ -0,0 +1,39 @@
+diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4
+--- cups-1.5.0.orig//config-scripts/cups-ssl.m4	2011-01-11 08:05:58.000000000 +0100
++++ cups-1.5.0/config-scripts/cups-ssl.m4	2011-08-02 10:44:26.011047900 +0200
+@@ -96,7 +96,6 @@
+     dnl Then look for GNU TLS...
+     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
+     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
+-    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
+ 	if $PKGCONFIG --exists gnutls; then
+ 	    have_ssl=1
+ 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
+@@ -110,16 +109,6 @@
+ 	    AC_DEFINE(HAVE_SSL)
+ 	    AC_DEFINE(HAVE_GNUTLS)
+ 	fi
+-
+-	if test $have_ssl = 1; then
+-            if $PKGCONFIG --exists gcrypt; then
+-	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
+-	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
+-	    elif test "x$LIBGCRYPTCONFIG" != x; then
+-	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
+-	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
+-	    fi
+-	fi
+     fi
+ 
+     dnl Check for the OpenSSL library last...
+--- cups-1.5.0.orig//cups/http-private.h	2011-01-22 01:07:22.000000000 +0100
++++ cups-1.5.0/cups/http-private.h	2011-08-02 10:42:43.341604107 +0200
+@@ -93,7 +93,6 @@
+ #  elif defined HAVE_GNUTLS
+ #    include <gnutls/gnutls.h>
+ #    include <gnutls/x509.h>
+-#    include <gcrypt.h>
+ #  elif defined(HAVE_CDSASSL)
+ #    include <CoreFoundation/CoreFoundation.h>
+ #    include <Security/Security.h>
+
diff --git a/libre/cups-libre/cups.install b/libre/cups-libre/cups.install
new file mode 100644
index 000000000..f73c3b44b
--- /dev/null
+++ b/libre/cups-libre/cups.install
@@ -0,0 +1,27 @@
+post_install() {
+    if [ -x usr/bin/xdg-icon-resource ]; then
+	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+    fi
+ 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() {
+    if [ -x usr/bin/xdg-icon-resource ]; then
+	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+    fi
+  if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
+    # important upgrade notice
+    echo "daemon script has been renamed to /etc/rc.d/cupsd"
+    echo "change your entry in  /etc/rc.conf"
+  fi
+}
+
+post_remove() {
+    if [ -x usr/bin/xdg-icon-resource ]; then
+	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+    fi
+}
+
diff --git a/libre/cups-libre/cups.logrotate b/libre/cups-libre/cups.logrotate
new file mode 100644
index 000000000..67c4cdd39
--- /dev/null
+++ b/libre/cups-libre/cups.logrotate
@@ -0,0 +1,9 @@
+/var/log/cups/*log {
+   missingok
+   notifempty
+   delaycompress
+   postrotate
+      /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true
+   endscript
+}
+
diff --git a/libre/cups-libre/cups.pam b/libre/cups-libre/cups.pam
new file mode 100644
index 000000000..5a31a927a
--- /dev/null
+++ b/libre/cups-libre/cups.pam
@@ -0,0 +1,4 @@
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so
+
diff --git a/libre/cups-libre/rePKGBUILD b/libre/cups-libre/rePKGBUILD
new file mode 100644
index 000000000..2ae999f9c
--- /dev/null
+++ b/libre/cups-libre/rePKGBUILD
@@ -0,0 +1,52 @@
+# This is an example rePKGBUILD file. Use this as a start to creating your own,
+# and remove these comments. For more information, see 'man PKGBUILD'.
+# NOTE: Please fill out the license field for your package! If it is unknown,
+# then please put 'unknown'.
+
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+source PKGBUILD
+CARCH=x86_64
+unset build package md5sums source check
+_repo=extra
+pkgname='cups-libre'
+options=(!strip)
+source=(PKGBUILD
+	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgbase}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+	# files for pkg modifications
+    )
+
+build() {
+  cd "${srcdir}/"
+  rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT || true
+  # put actions for package modifications below this line
+}
+
+package_cups-libre() {
+    pkgdesc="The CUPS Printing System - daemon package"
+    provides=("${pkgbase}=${pkgver}")
+    replaces=("${pkgbase}")
+    conflicts=("${pkgbase}")
+    install=cups.install
+    backup=(etc/cups/cupsd.conf
+            etc/cups/mime.convs
+            etc/cups/mime.types
+            etc/cups/snmp.conf
+            etc/cups/printers.conf
+            etc/cups/classes.conf
+            etc/cups/client.conf
+            etc/cups/subscriptions.conf
+            etc/dbus-1/system.d/cups.conf
+            etc/logrotate.d/cups
+            etc/pam.d/cups
+            etc/xinetd.d/cups-lpd)
+    depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme')
+    optdepends=('php: for included phpcups.so module'
+                'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
+            'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
+            'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
+            'xdg-utils: xdg .desktop file support')
+
+  find ${srcdir} -type l -maxdepth 1 -delete
+  cd ${srcdir}
+  cp -a ./* ${pkgdir}
+}
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
new file mode 100644
index 000000000..058573d05
--- /dev/null
+++ b/libre/hplip-libre/PKGBUILD
@@ -0,0 +1,70 @@
+# $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $
+# Maintainer : Rémy Oudompheng <remy@archlinux.org>
+# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
+
+_pkgname=hplip
+pkgname=hplip-libre
+pkgver=3.11.10
+pkgrel=2
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
+arch=('i686' 'x86_64')
+url="http://hplipopensource.com"
+license=('GPL')
+depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+	 'net-snmp>=5.7.1')
+makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+optdepends=('cups: for printing support'
+            'dbus-python: for dbus support'
+            'sane: for scanner support'
+            'python-imaging: for commandline scanning support'
+            'python-notify: for Desktop notification support'
+            'rpcbind: for network support'
+            'python2-qt: for running hp-toolbox'
+            'python2-gobject2: for running hp-toolbox')
+replaces=('hpijs' "${_pkgname}")
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver}")
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('6143f30f3b6905ef22105176a3b80db0'
+         '396bbd8c5cc92aa8295e5bcb508692f3')
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ export PYTHON=python2
+ find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ sed -i 's|python ./print.py|python2 ./print.py|' scan.py
+ sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py 
+ sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
+ sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+
+ # fix sysfs rules
+ sed -i -e "s|SYSFS|ATTR|g" \
+        -e "s|sysfs|attr|g" \
+   data/rules/56-hpmud_support.rules
+
+ ./configure --prefix=/usr \
+             --enable-qt4 \
+             --enable-foomatic-rip-hplip-install \
+             --enable-foomatic-ppd-install \
+             --enable-hpcups-install \
+             --enable-new-hpcups \
+             --enable-cups-ppd-install \
+             --enable-cups-drv-install \
+             --enable-hpijs-install \
+             --enable-foomatic-drv-install \
+             --enable-pp-build \
+             --enable-udev-acl-rules
+
+ make
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
+}
diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install
new file mode 100644
index 000000000..a05cbdd50
--- /dev/null
+++ b/libre/hplip-libre/hplip.install
@@ -0,0 +1,11 @@
+post_install() {
+  cat << EOF
+
+NOTE
+----
+# If you want to use this driver with sane:
+#  echo "hpaio" >> /etc/sane.d/dll.conf
+
+EOF
+}
+
diff --git a/libre/hplip-libre/rePKGBUILD b/libre/hplip-libre/rePKGBUILD
new file mode 100644
index 000000000..753b348e3
--- /dev/null
+++ b/libre/hplip-libre/rePKGBUILD
@@ -0,0 +1,26 @@
+# This is an example rePKGBUILD file. Use this as a start to creating your own,
+# and remove these comments. For more information, see 'man PKGBUILD'.
+# NOTE: Please fill out the license field for your package! If it is unknown,
+# then please put 'unknown'.
+
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+source PKGBUILD
+CARCH=x86_64
+unset build package md5sums source check
+_repo=extra
+options=(!strip)
+source=(PKGBUILD
+	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+	# files for pkg modifications
+    )
+
+build() {
+  cd "${srcdir}/"
+  rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT || true
+  # put actions for package modifications below this line
+}
+
+package() {
+  find ${srcdir} -type l -maxdepth 1 -delete
+  cp -a ${srcdir}/* ${pkgdir}
+}
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index da4e33e37..9ce6cd8ae 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 140751 2011-10-18 16:38:38Z tomegun $
+# $Id: PKGBUILD 144989 2011-12-13 15:25:38Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2011.10.3
+pkgver=2011.12.14
 pkgrel=1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
-arch=('i686' 'x86_64')
-url="http://parabolagnulinux.org"
+arch=('any')
+url="https://parabolagnulinux.org"
 license=('GPL2')
 groups=('base')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
-depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=173' 'iproute2'
+depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=174' 'iproute2'
          'ncurses' 'kbd' 'findutils' 'sysvinit')
 optdepends=('bridge-utils: Network bridging support'
             'dhcpcd: DHCP network configuration'
@@ -21,7 +20,7 @@ optdepends=('bridge-utils: Network bridging support'
             'wireless_tools: Wireless networking')
 makedepends=(asciidoc)
 install=initscripts.install
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
+source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
         'wireless.conf.d')
 
 package() {
@@ -29,5 +28,5 @@ package() {
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
-md5sums=('4783d7297925bc0722367b0eed8cb53a'
+md5sums=('55f010509c91d2a236df49a82af48b4b'
          '027576534885b8d5dded9be546057b12')
diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD
new file mode 100644
index 000000000..dee7e1dd1
--- /dev/null
+++ b/libre/kile-libre/PKGBUILD
@@ -0,0 +1,41 @@
+# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# $Id: PKGBUILD 135613 2011-08-16 16:22:12Z andrea $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+
+_pkgname=kile
+pkgname=kile-libre
+pkgver=2.1
+pkgrel=2
+pkgdesc="A user friendly TeX/LaTeX frontend for KDE"
+arch=("i686" "x86_64")
+license=('GPL2')
+url="http://kile.sourceforge.net/"
+depends=('kdebase-runtime' 'texlive-core' 'kdebase-kwrite')
+makedepends=('cmake' 'automoc4')
+conflicts=('kile')
+replaces=('kile')
+provides=('kile')
+install=${_pkgname}.install
+source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2"
+        "no-acroread.patch")
+sha1sums=('860ac96b68b6026f48b8a9c401c6024ba78e3cdf'
+          '9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  # Don't recommend a nonfree PDF viewer.
+  patch -Np1 -i "${srcdir}/no-acroread.patch"
+  cd ..
+  mkdir build
+  cd build
+  cmake ../${_pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/kile-libre/kile.install b/libre/kile-libre/kile.install
new file mode 100644
index 000000000..9fe93eeac
--- /dev/null
+++ b/libre/kile-libre/kile.install
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+        update-mime-database usr/share/mime &> /dev/null
+        update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/libre/kile-libre/no-acroread.patch b/libre/kile-libre/no-acroread.patch
new file mode 100644
index 000000000..7d305a2d0
--- /dev/null
+++ b/libre/kile-libre/no-acroread.patch
@@ -0,0 +1,97 @@
+diff -Nru kile-2.1.orig/README-win.txt kile-2.1/README-win.txt
+--- kile-2.1.orig/README-win.txt	2011-12-18 14:44:55.824341708 +0100
++++ kile-2.1/README-win.txt	2011-12-18 14:49:23.722382332 +0100
+@@ -10,8 +10,6 @@
+ -----------------------------
+ The most common problem you'll prbably encounter when trying to use Kile on Windows is Kile not being able to find all the supporting applications it depends on (latex, dvips, etc).  If this happens, the easiest solution is to just add the directories containing these programs to your PATH variable (details below).  To see which programs Kile is able to find, run the system checker (Settings -> System Checker) and see what you get.  
+ 
+-Note: acroread does not by default add itself to your PATH so you probably won't be able to use it directly.  However, if you have Adobe Reader setup as your default PDF viewer, setting Kile to System Default for ViewPDF should still work.  You could also just add C:\Program Files\Adobe\path\to\acrord32.exe to your path but it isn't really necessary.
+-
+ Setting your PATH
+ -----------------
+ At a minimum, latex.exe and friends should be in your PATH.  MikTeX will do this for you during the install process, but if it doesn't work for some reason, you can add it manually by:
+diff -Nru kile-2.1.orig/src/configtester.cpp kile-2.1/src/configtester.cpp
+--- kile-2.1.orig/src/configtester.cpp	2011-12-18 14:44:55.697674394 +0100
++++ kile-2.1/src/configtester.cpp	2011-12-18 14:46:52.644940609 +0100
+@@ -159,11 +159,6 @@
+ 	// which are not needed, but probably useful for the work with kile
+ 	ConfigTest::addFailureMessage("dvipng", i18n("You cannot use the png preview for mathgroups in the bottom bar."));
+ 	ConfigTest::addFailureMessage("convert", i18n("You cannot use the png previews with conversions 'dvi->ps->png' and 'pdf->png'."));
+-#ifdef Q_WS_WIN
+-	ConfigTest::addFailureMessage("acrord32", i18n("You cannot open pdf documents with Adobe Reader because acroread could not be found in your path.  <br>If Adobe Reader is your default pdf viewer, try setting ViewPDF to System Default.  Alternatively, you could use Okular."));
+-#else
+-	ConfigTest::addFailureMessage("acroread", i18n("You cannot open pdf documents with Adobe Reader, but you could use Okular."));
+-#endif
+ 
+ 	ConfigTest::addPrettyName("okular", i18n("ForwardDVI"));
+ 	ConfigTest::addSuccessMessage("okular", i18n("Supported."));
+diff -Nru kile-2.1.orig/src/data/kilestdtools.rc kile-2.1/src/data/kilestdtools.rc
+--- kile-2.1.orig/src/data/kilestdtools.rc	2011-12-18 14:44:55.787674856 +0100
++++ kile-2.1/src/data/kilestdtools.rc	2011-12-18 14:47:50.381903415 +0100
+@@ -747,15 +747,6 @@
+ state=Viewer
+ type=Part
+ 
+-[Tool/ViewPDF/Acroread]
+-class=View
+-command=acroread
+-options='%target'
+-state=Viewer
+-from=pdf
+-to=pdf
+-type=Process
+-
+ [Tool/Lilypond/PDF]
+ class=Compile
+ command=lilypond
+diff -Nru kile-2.1.orig/src/data/kilestdtools-win.rc kile-2.1/src/data/kilestdtools-win.rc
+--- kile-2.1.orig/src/data/kilestdtools-win.rc	2011-12-18 14:44:55.741007951 +0100
++++ kile-2.1/src/data/kilestdtools-win.rc	2011-12-18 14:47:59.695284518 +0100
+@@ -740,15 +740,6 @@
+ state=Viewer
+ type=Part
+ 
+-[Tool/ViewPDF/Acroread]
+-class=View
+-command=acroread
+-options="%target"
+-state=Viewer
+-from=pdf
+-to=pdf
+-type=Process
+-
+ [Tool/ViewPDF/SystemDefault]
+ class=View
+ command=cmd
+diff -Nru kile-2.1.orig/src/test/runTests.bat kile-2.1/src/test/runTests.bat
+--- kile-2.1.orig/src/test/runTests.bat	2011-12-18 14:44:55.697674394 +0100
++++ kile-2.1/src/test/runTests.bat	2011-12-18 14:45:37.097886600 +0100
+@@ -185,12 +185,6 @@
+ call :setKey executable okular
+ call :findAndSetWhere okular
+ 
+-echo starting test: Acroread
+-call :setTool Acroread
+-call :setKey mustpass ""
+-call :setKey executable acrord32
+-call :findAndSetWhere acrord32
+-
+ echo starting test: DVItoPNG
+ call :setTool DVItoPNG
+ call :setKey mustpass ""
+diff -Nru kile-2.1.orig/src/test/runTests.sh kile-2.1/src/test/runTests.sh
+--- kile-2.1.orig/src/test/runTests.sh	2011-12-18 14:44:55.697674394 +0100
++++ kile-2.1/src/test/runTests.sh	2011-12-18 14:45:26.427831910 +0100
+@@ -210,12 +210,6 @@
+ performTest okular "isTheOkularVersionRecentEnough"
+ setKey where `which okular`
+ 
+-echo "starting test: Acroread"
+-setTool Acroread
+-setKey mustpass ""
+-setKey executable acroread
+-setKey where `which acroread`
+-
+ echo "starting test: DVItoPNG"
+ setTool DVItoPNG
+ setKey mustpass ""
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 86fb882e6..4e10d29a0 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.1
-pkgver=${_basekernel}.4
+pkgver=${_basekernel}.5
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://linux-libre.fsfla.org/"
@@ -292,7 +292,7 @@ package_linux-libre-docs() {
   rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
 }
 md5sums=('d73df15ab1d36fe3c102755d8f42117f'
-         'ad965eeb168f19c536722ede6e22983b'
+         '06b461d4db995ddcbecbf345ae3b8987'
          '7d8fac41f4c4c2d14d8c65645fb676bd'
          '2a0302eda795903d3b01e41ba807c91e'
          'a8a3843046926eb7ab81312cd438c5c5'
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 146d349d1..d75b48c8f 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.1.4-1-LIBRE
+KERNEL_VERSION=3.1.5-1-LIBRE
 
 post_install () {
   # updating module dependencies
diff --git a/libre/metalog/PKGBUILD b/libre/metalog/PKGBUILD
new file mode 100644
index 000000000..dee52d986
--- /dev/null
+++ b/libre/metalog/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 137711 2011-09-10 13:12:33Z pierre $
+# Maintainer: juergen <juergen@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=metalog
+pkgver=2.0
+pkgrel=2
+pkgdesc="Metalog is a modern replacement for syslogd and klogd"
+url="http://metalog.sourceforge.net"
+license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('pcre')
+groups=('base')
+provides=('logger')
+replaces=('syslog-ng')
+conflicts=('syslog-ng')
+backup=('etc/metalog.conf' 'etc/conf.d/metalog')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-2.tar.xz"
+        'metalog' 'metalog.confd')
+md5sums=('e948d10d780205eae17645c89aee1361'
+         'cdd1d34eedbfbc2d9e659bf0a0f58f56'
+         '86bccd5a02996921e29eff8a0394d11f')
+
+build() {
+  cd $srcdir/$pkgname-2
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+check() {
+  cd $srcdir/$pkgname-2
+  make check
+}
+
+package() {
+  cd $srcdir/$pkgname-2
+  make DESTDIR=$pkgdir install
+  install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog
+  install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog
+  install -D -m644 metalog.conf $pkgdir/etc/metalog.conf
+
+}
+
diff --git a/libre/metalog/metalog b/libre/metalog/metalog
new file mode 100644
index 000000000..d30f47289
--- /dev/null
+++ b/libre/metalog/metalog
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# source application-specific settings
+[ -f /etc/conf.d/metalog ] && . /etc/conf.d/metalog
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/metalog`
+case "$1" in
+  start)
+    stat_busy "Starting Metalog"
+    [ -z "$PID" ] && /usr/sbin/metalog -B $METALOG_OPTS 2>&1
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      echo $PID > /var/run/metalog.pid
+      add_daemon metalog
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Metalog"
+    [ ! -z "$PID" ]  && kill $PID &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon metalog
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}" 
+esac
+exit 0 
diff --git a/libre/metalog/metalog.confd b/libre/metalog/metalog.confd
new file mode 100644
index 000000000..3d76ffab3
--- /dev/null
+++ b/libre/metalog/metalog.confd
@@ -0,0 +1,8 @@
+#
+# Parameters to be passed to metalog
+#
+
+# NOTE: Since v.0.7, metalog disables buffering by default.
+# Add '-a' if you want buffering.
+
+METALOG_OPTS=""
diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD
index 78550b63f..c4f09188d 100644
--- a/libre/python2-libre/PKGBUILD
+++ b/libre/python2-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=python2
 pkgname=python2-libre
 pkgver=2.7.2
-pkgrel=2
+pkgrel=4
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -17,30 +17,15 @@ makedepends=('tk')
 optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
-source=(http://repo.parabolagnulinux.org/other/Python-${pkgver}.tar.xz
+source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz
         doc_license_change.patch
-        WDAS.patch)
-md5sums=('5f8a18361784411b16dbb1cdcd6f6664'
-         '1e6595f85a1da7f42b69456119924d50'
-         '3f8c0e310a0be0bd8b319d6c46bbd427')
+        WDAS.patch
+        linux2.patch
+        gdbm-magic-values.patch)
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
 replaces=("$_pkgname")
 
-mksource() {
-    [ ! -d "Python-${pkgver}" ] && \
-    wget -O - http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz |\
-        tar -xJf -
-
-    cd "Python-${pkgver}"
-# http://bugs.python.org/issue12417
-    patch -Np1 -i ../WDAS.patch || return 1
-    patch -Np0 -i ../doc_license_change.patch || return 1
-
-    cd ..
-    tar -cJf Python-${pkgver}.tar.xz "Python-${pkgver}"
-}
-
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
@@ -54,6 +39,14 @@ build() {
   # FS#23997
   sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
 
+  # Make sure sys.platform is set to linux2, even on kernel 3.X
+  # cf http://bugs.python.org/issue12326
+  patch -Np1 -i ../linux2.patch
+
+  # gdbm has new magic that whichdb does not recognize
+  # http://bugs.python.org/issue13007
+  patch -Np1 -i ../gdbm-magic-values.patch
+
   # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
@@ -62,9 +55,10 @@ build() {
 
   export OPT="${CFLAGS}"
   ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
-              --enable-unicode=ucs4 --with-system-expat --with-system-ffi
+              --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
+              --with-dbmliborder=gdbm:ndbm
 
-  make
+  make MACHDEP=linux2
 }
 
 package() {
@@ -101,5 +95,10 @@ package() {
     "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile"
 
   # license
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+md5sums=('456d053a5d418adc913a4971e95fe918'
+         '1e6595f85a1da7f42b69456119924d50'
+         '3f8c0e310a0be0bd8b319d6c46bbd427'
+         '74c04694573e0d331e2a99d7b9179460'
+         '2874e9d93f4f46c1460605a5c7751372')
diff --git a/libre/python2-libre/SRCBUILD b/libre/python2-libre/SRCBUILD
new file mode 100644
index 000000000..f021d6624
--- /dev/null
+++ b/libre/python2-libre/SRCBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Maintainer (Parabola): xihh
+
+pkgname=python2-libre
+pkgver=2.7.2
+pkgrel=4
+pkgdesc="A high-level scripting language"
+arch=('any')
+license=('PSF')
+url="http://www.python.org/"
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+        doc_license_change.patch
+        WDAS.patch)
+md5sums=('75c87a80c6ddb0b785a57ea3583e04fa'
+         '1e6595f85a1da7f42b69456119924d50'
+         '3f8c0e310a0be0bd8b319d6c46bbd427')
+options=(!strip docs libtool emptydirs !zipman !purge)
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
+
+  export PKGEXT=.src.tar.xz
+
+  patch -Np1 -i ../WDAS.patch
+  patch -Np0 -i ../doc_license_change.patch
+  
+}
+
+package() {
+  export PKGEXT=.src.tar.xz
+  export PKGDEST=${startdir}
+
+  mv "${srcdir}/Python-${pkgver}" ${pkgdir}
+
+}
diff --git a/libre/python2-libre/gdbm-magic-values.patch b/libre/python2-libre/gdbm-magic-values.patch
new file mode 100644
index 000000000..5613ae35c
--- /dev/null
+++ b/libre/python2-libre/gdbm-magic-values.patch
@@ -0,0 +1,14 @@
+diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py
+--- Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic	2011-06-11 11:46:26.000000000 -0400
++++ Python-2.7.2/Lib/whichdb.py	2011-09-30 15:45:21.778872290 -0400
+@@ -91,7 +91,7 @@ def whichdb(filename):
+         return ""
+ 
+     # Check for GNU dbm
+-    if magic == 0x13579ace:
++    if magic in (0x13579ace, 0x13579acd, 0x13579acf):
+         return "gdbm"
+ 
+     # Check for old Berkeley db hash file format v2
+diff -up Python-2.7.2/Misc/NEWS.gdbm-1.9-magic Python-2.7.2/Misc/NEWS
+
diff --git a/libre/python2-libre/linux2.patch b/libre/python2-libre/linux2.patch
new file mode 100644
index 000000000..74ae2aa12
--- /dev/null
+++ b/libre/python2-libre/linux2.patch
@@ -0,0 +1,24 @@
+http://hg.python.org/cpython/rev/c816479f6aaf/
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -2995,6 +2995,7 @@ then
+	MACHDEP="$ac_md_system$ac_md_release"
+
+	case $MACHDEP in
++	linux*) MACHDEP="linux2";;
+	cygwin*) MACHDEP="cygwin";;
+	darwin*) MACHDEP="darwin";;
+	atheos*) MACHDEP="atheos";;
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -293,6 +293,7 @@ then
+	MACHDEP="$ac_md_system$ac_md_release"
+
+	case $MACHDEP in
++	linux*) MACHDEP="linux2";;
+	cygwin*) MACHDEP="cygwin";;
+	darwin*) MACHDEP="darwin";;
+	atheos*) MACHDEP="atheos";;
+
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 76c2de5e4..25048150c 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -5,15 +5,15 @@
 pkgname=texlive-bin-libre
 pkgver=2011.1
 _luatex_ver=0.70.1
-pkgrel=4
+pkgrel=5.1
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18.1' 'libsigsegv' 'zziplib')
+depends=('t1lib' 'gd' 'poppler>=0.18.1' 'libsigsegv' 'zziplib')
 makedepends=('perl' 'clisp' 'ffcall' 'pkg-config')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
-conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.19')
+conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.18.3')
 replaces=('texlive-bin')
 options=('!libtool')
 url='http://tug.org/texlive/'
@@ -52,8 +52,7 @@ md5sums=('ff30d6813babd2e41c414365eea9c147'
 build() {
    cd $srcdir
    # Remove bundled packages available in Parabola or not needed.
-   # TODO remove also icu
-   rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler,graphite},utils/dialog}
+   rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler},utils/dialog}
    rm -rf luatex-beta-0.70.1/source/libs/{libpng,zziplib,zlib,poppler}
    # Building LuaTeX
    # cd luatex-beta-${_luatex_ver}
@@ -71,7 +70,7 @@ build() {
     --disable-ptex \
     --enable-luatex  \
     --without-system-ptexenc \
-    --with-system-graphite \
+    --without-system-graphite \
     --without-system-icu \
     --without-system-kpathsea \
     --with-system-freetype2 \
@@ -99,6 +98,8 @@ build() {
    cd "$srcdir"
    # this patch removes spurious error message with locale "xx_YY.utf8"
    patch -p0 -i fix-fontforge-encoding.patch
+   # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
+   sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c
    #############################################################
    ### configure
    cd source
@@ -134,7 +135,7 @@ build() {
      --with-system-poppler \
      --with-system-xpdf \
      --with-system-freetype2 \
-     --with-system-graphite \
+     --without-system-graphite \
      --with-system-icu \
      --with-freetype2-libdir=/usr/lib \
      --with-freetype2-include=/usr/include/freetype2 \
@@ -222,6 +223,8 @@ package() {
    # clean updmap.cfg
    sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
    sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
+   # Don't list formats which need removed packages to work.
+   sed -i '/csplain\|mex\|jadetex/d' $pkgdir/etc/texmf/web2c/fmtutil.cnf
 
    #############################################################
    ### install
diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index 7e3f9b587..a018b87a6 100644
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -3,72 +3,65 @@
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom@home.se>
 pkgname=thunderbird-libre
-pkgver=3.1.10
-pkgrel=3
-pkgdesc="Standalone Mail/News reader, with GNUZilla addons"
+pkgver=8.0
+pkgrel=1
+pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
-url="http://www.mozilla.org/projects/thunderbird"
-depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils' 'libnotify')
-makedepends=('zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'autoconf2.13')
+url="http://www.mozilla.org/thunderbird/"
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
+makedepends=('p7zip-libre' 'zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'yasm' 'mesa')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
 provides=("thunderbird=$pkgver")
 install=thunderbird.install
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
         mozconfig
         thunderbird.desktop
         thunderbird-3.0-lang.patch
-        thunderbird-appversion.patch
-        thunderbird-shared-error.patch
-        xulrunner-png14.patch
-        python2.7.patch
-        gcc46.patch
-        gnuzilla-addons.patch)
+        thunderbird-install-dir.patch
+        channel-prefs.js)
+md5sums=('332f60036aebdce7dec6ee2b1af4941d'
+         'ca98c2bf1017b33e19dae22fdcef2e73'
+         'af3e5b344d2edf1c7d61bb0a5a96de9a'
+         '25b6fe16ac24cd5c852213e5c1adb272'
+         'aea906acf72c43dd82ead2fabcc1c6db'
+         '476ec205162340fb0679f522c9d31c3b')
 
 build() {
-  cd "${srcdir}/comm-1.9.2"
-  patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch"
-  patch -Np1 -i "${srcdir}/thunderbird-appversion.patch"
-  patch -Np1 -i "${srcdir}/thunderbird-shared-error.patch"
-  patch -Np1 -i "${srcdir}/gcc46.patch"
-  patch -Np0 -i "${srcdir}/xulrunner-png14.patch"
-  patch -Np0 -i "${srcdir}/python2.7.patch"
+  cd "$srcdir/comm-release"
+  patch -Np1 -i "$srcdir/thunderbird-3.0-lang.patch"
+  patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
 
-  pushd mail/app/profile >/dev/null
-  patch -Np0 -i "${srcdir}/gnuzilla-addons.patch"
-  popd >/dev/null
+  cp "$srcdir/mozconfig" .mozconfig
 
-  cp "${srcdir}/mozconfig" .mozconfig
-  unset CXXFLAGS
-  unset CFLAGS
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
+  export PYTHON="/usr/bin/python2"
 
-  export CXXFLAGS="-fpermissive"
-  export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.1"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
 }
 
 package() {
-  cd "${srcdir}/comm-1.9.2"
-  make -j1 DESTDIR="${pkgdir}" install
-
-  #Remove included dictionaries, add symlink to system myspell path.
-  #Note: this will cause file conflicts when users have installed dictionaries in the old location
-  rm -rf "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries"
-  ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries"
-
-  rm -rf "${pkgdir}/usr/bin/defaults"
-
-  install -m755 -d "${pkgdir}/usr/share/applications"
+  cd "$srcdir/comm-release"
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -d "$pkgdir/usr/share/icons/hicolor/$i/apps"
-      cp other-licenses/branding/thunderbird/mailicon${i/x*/}.png "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
+      install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
+          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
   done
 
-  install -m644 "${srcdir}/thunderbird.desktop" "${pkgdir}/usr/share/applications/"
+  install -Dm644 "$srcdir/thunderbird.desktop" \
+      "$pkgdir/usr/share/applications/thunderbird.desktop"
+
+  rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation}
+  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries"
+  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation"
+
+  # We don't want the development stuff
+  rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl}
 
-  rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc
+# Recommend free addons
+  cp --remove-destination "${srcdir}/channel-prefs.js" \
+     "${pkgdir}/usr/lib/thunderbird/defaults/pref/channel-prefs.js"
 }
diff --git a/libre/thunderbird-libre/channel-prefs.js b/libre/thunderbird-libre/channel-prefs.js
new file mode 100644
index 000000000..13b1ba388
--- /dev/null
+++ b/libre/thunderbird-libre/channel-prefs.js
@@ -0,0 +1,9 @@
+//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js"
+pref("app.update.channel", "default");
+
+//Recommend free addons
+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
diff --git a/libre/thunderbird-libre/mozconfig b/libre/thunderbird-libre/mozconfig
index 9cdf366f5..85ed8a648 100644
--- a/libre/thunderbird-libre/mozconfig
+++ b/libre/thunderbird-libre/mozconfig
@@ -1,45 +1,40 @@
 mk_add_options MOZ_CO_PROJECT=mail
 ac_add_options --enable-application=mail
 
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
 ac_add_options --with-system-png
-ac_add_options --with-system-mng
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
-ac_add_options --with-pthreads
-ac_add_options --disable-debug
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-crashreporter
-ac_add_options --disable-official-branding
-ac_add_options --disable-xprint
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-strip
-ac_add_options --enable-pango
-ac_add_options --enable-xft
+ac_add_options --enable-system-ffi
 ac_add_options --enable-system-cairo
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-optimize
-ac_add_options --prefix=/usr
-#ac_add_options --with-branding=mail/branding/unofficial
-ac_add_options --enable-official-branding
-
-ac_add_options --disable-pedantic
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
 
+# Features
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-startup-notification
 ac_add_options --enable-gio
+
 ac_add_options --disable-gnomevfs
-ac_add_options --enable-gconf
-ac_add_options --enable-libnotify
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
 
-export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-export USE_SHORT_LIBNAME=1
-mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options USE_SHORT_LIBNAME=1
-
diff --git a/libre/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD
index e71f6ad78..1e382761c 100644
--- a/libre/thunderbird-libre/rePKGBUILD
+++ b/libre/thunderbird-libre/rePKGBUILD
@@ -12,16 +12,15 @@ options=(!strip)
 source=(PKGBUILD
 	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
 	# files for pkg modifications
-        gnuzilla-addons.patch)
+    channel-prefs.js)
 
 build() {
   cd "${srcdir}/"
   rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
 
-  pushd usr/lib/${pkgname%-libre}-3.1/defaults/pref/ >/dev/null
-  patch -Np0 -i "${srcdir}/gnuzilla-addons.patch"
-  popd >/dev/null
-  rm "${srcdir}/gnuzilla-addons.patch"
+# Recommend free addons
+  cp --remove-destination "${srcdir}/channel-prefs.js" \
+     "${srcdir}/usr/lib/thunderbird/defaults/pref/channel-prefs.js"
 }
 
 package() {
diff --git a/libre/thunderbird-libre/thunderbird-install-dir.patch b/libre/thunderbird-libre/thunderbird-install-dir.patch
new file mode 100644
index 000000000..fc6e24c4c
--- /dev/null
+++ b/libre/thunderbird-libre/thunderbird-install-dir.patch
@@ -0,0 +1,43 @@
+diff -Nur comm-beta.orig/config/autoconf.mk.in comm-beta/config/autoconf.mk.in
+--- comm-beta.orig/config/autoconf.mk.in	2011-11-06 14:39:51.064983780 +0000
++++ comm-beta/config/autoconf.mk.in	2011-11-06 14:42:57.216735333 +0000
+@@ -65,8 +65,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ 
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ MOZDEPTH	= $(DEPTH)/mozilla
+ DIST		= $(MOZDEPTH)/dist
+diff -Nur comm-beta.orig/mozilla/config/autoconf.mk.in comm-beta/mozilla/config/autoconf.mk.in
+--- comm-beta.orig/mozilla/config/autoconf.mk.in	2011-11-06 14:39:41.771562967 +0000
++++ comm-beta/mozilla/config/autoconf.mk.in	2011-11-06 14:44:18.404165515 +0000
+@@ -68,8 +68,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ 
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+diff -Nur comm-beta.orig/mozilla/js/src/config/autoconf.mk.in comm-beta/mozilla/js/src/config/autoconf.mk.in
+--- comm-beta.orig/mozilla/js/src/config/autoconf.mk.in	2011-11-06 14:39:48.014955070 +0000
++++ comm-beta/mozilla/js/src/config/autoconf.mk.in	2011-11-06 14:44:32.977635875 +0000
+@@ -61,8 +61,8 @@
+ datadir		= @datadir@
+ mandir		= @mandir@
+ 
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ TOP_DIST	= @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
+
diff --git a/social/seeks/PKGBUILD b/social/seeks/PKGBUILD
new file mode 100644
index 000000000..2997e1be6
--- /dev/null
+++ b/social/seeks/PKGBUILD
@@ -0,0 +1,67 @@
+# Co-maintainer: Gitus < git at shroomrider dot com >
+# Co-maintainer: Enjolras < 0enjolras0 at laposte dot net >
+
+pkgname=seeks
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="An open decentralized platform for collaborative search content"
+arch=('i686' 'x86_64')
+url="http://www.seeks-project.info"
+license=('AGPL3')
+backup=('etc/logrotate.d/seeks'
+    'etc/conf.d/seeks'
+    'etc/seeks/config')
+depends=('curl' 'libevent'  'protobuf' 'tokyotyrant' 'opencv' 'icu')
+makedepends=('docbook2x' 'pkg-config' )
+source=("http://downloads.sourceforge.net/project/seeks/hippy/seeks-0.4.0.tar.gz"
+    'seeks'
+    'seeks.conf.d'
+    'seeks.logrotate'
+    'logfile.patch')
+install='install'
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+
+    autoreconf -ivs
+    sed -i s/docbook2x-man/docbook2man/ ./configure
+    ./configure LDFLAGS="-Wl,--no-as-needed" \
+	--prefix=/usr --sysconfdir=/etc \
+	--enable-opencv --enable-httpserv-plugin --enable-image-websearch-plugin=yes \
+	--enable-xslserializer-plugin --enable-personalization --enable-keepalive --enable-extended-host-patterns
+    
+    sed -i s/cxflann.h/cv.h/ src/plugins/img_websearch/ocvsurf.cpp
+    sed -i s/,--as-needed,/,/ config.status
+    
+    make
+    
+}
+
+package() {
+    cd  "$srcdir/$pkgname-$pkgver/src/"
+
+    #Changing logdir and logfile options
+    #disable plugins cf and query-capture in config
+    patch -p0 < "$srcdir/logfile.patch"
+    
+    cd "$srcdir/$pkgname-$pkgver"
+
+    make DESTDIR="$pkgdir" install
+   
+    install -D -m644 Licenses  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -m644 AGPL-3.txt  "${pkgdir}/usr/share/licenses/${pkgname}/"
+    install -m644 BSD-yui.txt  "${pkgdir}/usr/share/licenses/${pkgname}/"
+    install -D -m755 ../seeks  "${pkgdir}"/etc/rc.d/seeks
+    install -D -m644 ../seeks.conf.d "${pkgdir}"/etc/conf.d/seeks
+    install -D -m600 ../seeks.logrotate  "${pkgdir}"/etc/logrotate.d/seeks
+}
+md5sums=('dd80c832f80c34c392be5872239a8d9f'
+         '33e6da05cca492019e6aff39684aed26'
+         '52e7e06a28974547041012a1cf3207f3'
+         'd1aba6739972239c6cd09178807e196f'
+         'e352306f5396a1af4dfc81a18bfc5a71')
+md5sums=('a2d0b6e7b91036883c0b327ead5e93c0'
+         '33e6da05cca492019e6aff39684aed26'
+         '52e7e06a28974547041012a1cf3207f3'
+         'd1aba6739972239c6cd09178807e196f'
+         'e352306f5396a1af4dfc81a18bfc5a71')
diff --git a/social/seeks/install b/social/seeks/install
new file mode 100644
index 000000000..35f383a3c
--- /dev/null
+++ b/social/seeks/install
@@ -0,0 +1,18 @@
+post_install() {
+    getent group seeks  >/dev/null || groupadd -r seeks
+    getent passwd seeks >/dev/null || useradd -r -c "Seeks daemon" -g seeks -M -d /var/run/seeks -s /bin/false seeks
+    passwd -l seeks &>/dev/null
+    touch var/log/seeks.log
+    chown seeks:log var/log/seeks.log
+    mkdir -p var/lib/seeks
+    touch var/lib/seeks/seeks.db
+    chown -R seeks:seeks var/lib/seeks
+}
+
+pre_remove() {
+    getent passwd seeks &>/dev/null && userdel seeks >/dev/null
+    getent group seeks &>/dev/null && groupdel seeks >/dev/null
+    return 0
+}
+
+
diff --git a/social/seeks/logfile.patch b/social/seeks/logfile.patch
new file mode 100644
index 000000000..9f4ab9b02
--- /dev/null
+++ b/social/seeks/logfile.patch
@@ -0,0 +1,29 @@
+--- config	2011-10-21 10:42:20.000000000 +0200
++++ config.patch	2011-11-17 18:48:48.914516206 +0100
+@@ -193,7 +193,7 @@
+ #
+ #      No trailing "/", please.
+ #
+-logdir .
++logdir /var/log/
+ #
+ #
+ #  2.4. logfile
+@@ -239,7 +239,7 @@
+ #      Any log files must be writable by whatever user Seeks is
+ #      being run as.
+ #
+-logfile logfile
++logfile seeks.log
+ #
+ #
+ # 2.5. plugindir
+@@ -377,7 +377,7 @@
+ #      Unset. This means the db is located in $HOME/.seeks/seeks_user.db 
+ #      as default location.
+ #
+-# user-db-file /path/to/file.db
++user-db-file /var/lib/seeks/seeks.db
+ #
+ #  2.10. user-db-address
+ #  =====================
diff --git a/social/seeks/seeks b/social/seeks/seeks
new file mode 100755
index 000000000..01f34a432
--- /dev/null
+++ b/social/seeks/seeks
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+daemon_name="seeks"
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/$daemon_name
+
+get_pid() {
+	pidof -o %PPID $daemon_name
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting $daemon_name daemon"
+
+    PID=$(get_pid)
+    if [ -z "$PID" ]; then
+      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
+      # RUN
+      $daemon_name $SEEKS_ARGS 2> /dev/null 
+      #
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        echo $(get_pid) > /var/run/$daemon_name.pid
+        add_daemon $daemon_name
+        stat_done
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping $daemon_name daemon"
+    PID=$(get_pid)
+    # KILL
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    #
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm -f /var/run/$daemon_name.pid &> /dev/null
+      rm_daemon $daemon_name
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+
+  status)
+    stat_busy "Checking $daemon_name status";
+    ck_status $daemon_name
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart|status}"
+esac
+
+exit 0
diff --git a/social/seeks/seeks.conf.d b/social/seeks/seeks.conf.d
new file mode 100644
index 000000000..21ed0526a
--- /dev/null
+++ b/social/seeks/seeks.conf.d
@@ -0,0 +1,6 @@
+#
+# Array for your vde config files
+SEEKS_CONFIG=""
+
+# Parameters to be passed to seeks
+SEEKS_ARGS="--daemon --user seeks $SEEKS_CONFIG"
diff --git a/social/seeks/seeks.logrotate b/social/seeks/seeks.logrotate
new file mode 100644
index 000000000..24b6f539f
--- /dev/null
+++ b/social/seeks/seeks.logrotate
@@ -0,0 +1,6 @@
+/var/log/seeks.log {
+    missingok
+    notifempty
+    size 30k
+    create
+}
diff --git a/social/tokyocabinet/PKGBUILD b/social/tokyocabinet/PKGBUILD
new file mode 100644
index 000000000..6e9b7969d
--- /dev/null
+++ b/social/tokyocabinet/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Mark Foxwell <fastfret79@archlinux.org.uk>
+# Contributor: Nicolas Martyanoff <khaelin@gmail.com> 
+
+pkgname=tokyocabinet
+pkgver=1.4.47
+pkgrel=1
+pkgdesc="a modern implementation of DBM"
+arch=('i686' 'x86_64')
+url="http://fallabs.com/tokyocabinet/"
+license=('LGPL')
+makedepends=('gcc>=3.1' 'make' 'pkgconfig')
+depends=('zlib' 'bzip2')
+source=("http://fallabs.com/tokyocabinet/${pkgname}-${pkgver}.tar.gz")
+md5sums=('3d94fe2aebf5d9ff0478ed895bc46fc9')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --enable-off64 --enable-fastest
+  make
+}
+
+# uncomment check routine if needed (can take ~5mins to run check)
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/social/tokyotyrant/PKGBUILD b/social/tokyotyrant/PKGBUILD
new file mode 100755
index 000000000..74da4570c
--- /dev/null
+++ b/social/tokyotyrant/PKGBUILD
@@ -0,0 +1,33 @@
+# # Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Paul Sadauskas <psadauskas@gmail.com>
+
+pkgname=tokyotyrant
+pkgver=1.1.41
+pkgrel=2
+pkgdesc="Network interface to TokyoCabinet"
+arch=('i686' 'x86_64')
+url="http://www.fallabs.com"
+license=('LGPL')
+makedepends=('gcc>=3.1' 'make' 'pkgconfig')
+depends=('zlib' 'bzip2' 'tokyocabinet>=1.4.27')
+source=("http://fallabs.com/$pkgname/$pkgname-$pkgver.tar.gz"
+        "tokyotyrant.rc"
+        "tokyotyrant.conf")
+
+md5sums=('a47e58897bd1cbbac173d5a66cc32ae3'
+         '3ed9229c9cfb8e1b3055b814d5038799'
+         '2558846ece69d1f265ee1ba5728c39cd')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr  
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+  install -m 644 -D ${srcdir}/tokyotyrant.conf $pkgdir/etc/conf.d/ttserver
+  install -m 755 -D ${srcdir}/tokyotyrant.rc $pkgdir/etc/rc.d/ttserver
+}
+
diff --git a/social/tokyotyrant/tokyotyrant.conf b/social/tokyotyrant/tokyotyrant.conf
new file mode 100755
index 000000000..77c299a81
--- /dev/null
+++ b/social/tokyotyrant/tokyotyrant.conf
@@ -0,0 +1,21 @@
+# /etc/conf.d/ttserver: config file for /etc/init.d/ttserver
+
+# TCP port TokyoTyrant server should listen on
+TYRANT_PORT="1978"
+
+# Location of the TokyoTyrant server database
+# Also put addional options here, eg, #bnum
+# See 'ttserver' man page
+TYRANT_DB="/var/lib/tokyotyrant/tokyotyrant.tch"
+
+# Location of the TokyoTyrant server log file
+TYRANT_LOG_FILE="/var/log/ttserver.log"
+
+# Location of the TokyoTyrant server PID file
+TYRANT_PID_FILE="/var/run/ttserver.pid"
+
+# Pass extra options to TokyoTyrant server
+# Example: TYRANT_EXTRA_OPTS="-ld" - enables logging of debug messages
+# See the 'ttserver' man page for more
+TYRANT_EXTRA_OPTS=""
+
diff --git a/social/tokyotyrant/tokyotyrant.rc b/social/tokyotyrant/tokyotyrant.rc
new file mode 100755
index 000000000..eaecb0af0
--- /dev/null
+++ b/social/tokyotyrant/tokyotyrant.rc
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# source config
+[ -f /etc/conf.d/ttserver ] && . /etc/conf.d/ttserver
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting TokyoTyrant Server"
+    /usr/bin/ttserver ${TYRANT_EXTRA_OPTS} -dmn -pid ${TYRANT_PID_FILE} -log ${TYRANT_LOG_FILE} -port ${TYRANT_PORT} ${TYRANT_DB}
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon ttserver
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping TokyoTyrant Server"
+    if [ -f $TYRANT_PID_FILE ]; then
+      pid=`cat "$TYRANT_PID_FILE"`
+      kill -TERM "$pid"
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        rm_daemon ttserver
+        stat_done
+      fi
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD
index 81cc7981d..dc6b251dd 100644
--- a/~fauno/notmuch/PKGBUILD
+++ b/~fauno/notmuch/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Richard Murri <admin@richardmurri.com>
 
 pkgname=notmuch
-pkgver=0.10
+pkgver=0.10.2
 pkgrel=1
 pkgdesc="Notmuch is not much of an email program"
 arch=(i686 x86_64 mips64el)
@@ -60,4 +60,4 @@ package(){
   sed -i -e 's,/site_ruby,,g' Makefile
   make prefix=${pkgdir}/usr install
 }
-md5sums=('58c005357395bb6f66d06cfa07534d22')
+md5sums=('d3905ae96546ef33f4c186e53f19ec56')
diff --git a/~mtjm/python-coverage/LICENSE b/~mtjm/python-coverage/LICENSE
new file mode 100644
index 000000000..304031cb6
--- /dev/null
+++ b/~mtjm/python-coverage/LICENSE
@@ -0,0 +1,29 @@
+# COPYRIGHT AND LICENSE
+#
+# Copyright 2001 Gareth Rees.  All rights reserved.
+# Copyright 2004-2010 Ned Batchelder.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
diff --git a/~mtjm/python-coverage/PKGBUILD b/~mtjm/python-coverage/PKGBUILD
new file mode 100644
index 000000000..f9acc0d94
--- /dev/null
+++ b/~mtjm/python-coverage/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+
+pkgname=(python-coverage python2-coverage)
+pkgver=3.5.1
+pkgrel=1
+pkgdesc="Code coverage measurement for Python"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://nedbatchelder.com/code/coverage/"
+license=('BSD')
+makedepends=('python' 'python2' 'python-distribute' 'python2-distribute')
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=(!emptydirs)
+install=
+source=("http://pypi.python.org/packages/source/c/coverage/coverage-${pkgver}.tar.gz" LICENSE)
+md5sums=('410d4c8155a4dab222f2bc51212d4a24'
+         'f86a7dcb9a1bc636cdbcc19a96d19b2c')
+
+# Tests are not run, since upstream removes them from release tarballs.
+
+build() {
+  cd $srcdir
+  cp -r coverage-$pkgver build-py2k
+  cp -r coverage-$pkgver build-py3k
+  cd build-py2k
+  python2 setup.py build
+  cd ../build-py3k
+  python setup.py build
+}
+
+package_python-coverage() {
+  depends=('python' 'python-distribute')
+  cd "$srcdir/build-py3k"
+  python setup.py install --root="$pkgdir/" --optimize=1
+  install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python2-coverage() {
+  depends=('python2' 'python2-distribute')
+  cd "$srcdir/build-py2k"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+  # Name the script differently.
+  mv $pkgdir/usr/bin/coverage $pkgdir/usr/bin/coverage2
+  install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}