removed a bunch of duplicates

postgresql
samba
cups
libmng
xorg-utils-macro
java

20 files changed, 0 insertions, 1645 deletions

diff --git a/abs/core/cups/PKGBUILD b/abs/core/cups/PKGBUILD
deleted file mode 100644
index 5d59113..0000000
--- a/abs/core/cups/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 87481 2010-08-14 10:36:21Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=1.4.4
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0'  'acl' 'openslp' 'pam' 'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3'
-             'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-	cups-avahi.patch
-	http://www.cups.org/strfiles/3595/str3595.patch
-        cups cups.logrotate cups.pam)
-#options=('!emptydirs')
-md5sums=('8776403ad60fea9e85eab9c04d88560d'
-         'fce500e3e6e244f5b77fe8eaad87e022'
-         '0dd7329fc956d63a72085553171d62a2'
-         '5c85b7d8d2ddd02c2c64955cebbf55ea'
-         'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  # Avahi support in the dnssd backend. patch from Fedora
-  patch -Np1 -i ${srcdir}/cups-avahi.patch || return 1
-  
-  # fix  Brother HL-1440 failing with msg "Unable to write 8192 bytes to printer!" (http://bugs.archlinux.org/task/18167)
-  patch -Np0 -i ${srcdir}/str3595.patch || return 1
-  
-  # Rebuild configure script for --enable-avahi.
-  aclocal -I config-scripts
-  autoconf -I config-scripts
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-     --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \
-     --with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \
-     --disable-ldap --libdir=/usr/lib --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\
-     --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS"
-  make || return 1
-}
-
-package_libcups() {
-pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1' 'avahi')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs || return 1
-  # put this into the libs pkg to make other software find the libs(no pkg-config file included)
-  mkdir -p ${pkgdir}/usr/bin
-  install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-}
-
-package_cups() {
-pkgdesc="The CUPS Printing System - deamon package"
-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}" 'xdg-utils' 'poppler>=0.12.3' 'libusb' 'dbus-core' 'hicolor-icon-theme')
-optdepends=('php: for included phpcups.so module')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec || return 1
-
-  # 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/cups
-  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
-  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/abs/core/cups/cups b/abs/core/cups/cups
deleted file mode 100755
index 4afaf5a..0000000
--- a/abs/core/cups/cups
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/cupsd`
-case "$1" in
-  start)
-    stat_busy "Starting CUPS Daemon"
-    [ -z "$PID" ] && /usr/sbin/cupsd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $(pidof -o %PPID -x /usr/sbin/cupsd) > /var/run/cups.pid
-      add_daemon cups
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping CUPS Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/cups.pid
-      rm_daemon cups
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/core/cups/cups-avahi.patch b/abs/core/cups/cups-avahi.patch
deleted file mode 100644
index 9783cd4..0000000
--- a/abs/core/cups/cups-avahi.patch
+++ /dev/null
@@ -1,1088 +0,0 @@
-diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c
---- cups-1.4.0/backend/dnssd.c.avahi	2009-08-07 23:27:12.000000000 +0100
-+++ cups-1.4.0/backend/dnssd.c	2009-09-04 14:57:04.730388833 +0100
-@@ -22,6 +22,7 @@
-  *   exec_backend()          - Execute the backend that corresponds to the
-  *                             resolved service name.
-  *   get_device()            - Create or update a device.
-+*    find_device()
-  *   query_callback()        - Process query data.
-  *   sigterm_handler()       - Handle termination signals...
-  *   unquote()               - Unquote a name string.
-@@ -33,7 +34,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 */
- 
- 
- /*
-@@ -52,7 +64,12 @@ typedef enum
- 
- 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 */
-@@ -64,6 +81,20 @@ typedef struct
- 		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...
-@@ -77,6 +108,7 @@ static int		job_canceled = 0;
-  * Local functions...
-  */
- 
-+#ifdef HAVE_DNSSD
- static void		browse_callback(DNSServiceRef sdRef,
- 			                DNSServiceFlags flags,
- 				        uint32_t interfaceIndex,
-@@ -92,12 +124,6 @@ static void		browse_local_callback(DNSSe
- 					      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,
-@@ -106,9 +132,111 @@ static void		query_callback(DNSServiceRe
- 				       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 */
-+
-+
-+/*
-+ * cups_txt_records_t access functions
-+ */
-+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;
-+}
-+
-+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.
-@@ -119,6 +247,13 @@ main(int  argc,				/* I - Number of comm
-      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 */
-@@ -130,12 +265,11 @@ main(int  argc,				/* I - Number of comm
- 		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 */
-@@ -194,6 +328,49 @@ main(int  argc,				/* I - Number of comm
-   * 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 ("ERROR: Unable to create avahi client");
-+    return (1);
-+  }
-+
-+  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");
-@@ -245,6 +422,7 @@ main(int  argc,				/* I - Number of comm
-   riousbprint_ref = main_ref;
-   DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
-                    "_riousbprint._tcp", NULL, browse_callback, devices);
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * Loop until we are killed...
-@@ -252,6 +430,9 @@ main(int  argc,				/* I - Number of comm
- 
-   while (!job_canceled)
-   {
-+    int announce = 0;
-+
-+#ifdef HAVE_DNSSD
-     FD_ZERO(&input);
-     FD_SET(fd, &input);
- 
-@@ -271,11 +452,35 @@ main(int  argc,				/* I - Number of comm
-     }
-     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 */
-@@ -285,6 +490,7 @@ main(int  argc,				/* I - Number of comm
-                best = NULL, count = 0;
-            device;
- 	   device = (cups_device_t *)cupsArrayNext(devices))
-+#ifdef HAVE_DNSSD
-         if (!device->ref && !device->sent)
- 	{
- 	 /*
-@@ -313,14 +519,23 @@ main(int  argc,				/* I - Number of comm
- 	      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;
-@@ -372,6 +587,7 @@ main(int  argc,				/* I - Number of comm
-  * 'browse_callback()' - Browse devices.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- browse_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -405,12 +621,14 @@ browse_callback(
- 
-   get_device((cups_array_t *)context, serviceName, regtype, replyDomain);
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-  * 'browse_local_callback()' - Browse local devices.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- browse_local_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -456,6 +674,7 @@ browse_local_callback(
- 	  device->fullName);
-   device->sent = 1;
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-@@ -528,6 +747,32 @@ exec_backend(char **argv)		/* I - Comman
-   exit(CUPS_BACKEND_STOP);
- }
- 
-+static int
-+device_type (const char *regtype)
-+{
-+#ifdef HAVE_AVAHI
-+  if (!strcmp(regtype, "_ipp._tcp") ||
-+      !strcmp(regtype, "_ipp-tls._tcp"))
-+    return (CUPS_DEVICE_IPP);
-+  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.") ||
-+      !strcmp(regtype, "_ipp-tls._tcp."))
-+    return (CUPS_DEVICE_IPP);
-+  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.
-@@ -550,18 +795,7 @@ get_device(cups_array_t *devices,	/* I -
-   */
- 
-   key.name = (char *)serviceName;
--
--  if (!strcmp(regtype, "_ipp._tcp.") ||
--      !strcmp(regtype, "_ipp-tls._tcp."))
--    key.type = CUPS_DEVICE_IPP;
--  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;
-@@ -581,8 +815,14 @@ get_device(cups_array_t *devices,	/* I -
-         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);
-       }
-@@ -602,6 +842,9 @@ get_device(cups_array_t *devices,	/* I -
-   device->domain   = strdup(replyDomain);
-   device->type     = key.type;
-   device->priority = 50;
-+#ifdef HAVE_AVAHI
-+  device->resolved = 0;
-+#endif /* HAVE_AVAHI */
- 
-   cupsArrayAdd(devices, device);
- 
-@@ -609,7 +852,13 @@ get_device(cups_array_t *devices,	/* I -
-   * 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);
-@@ -620,6 +869,7 @@ get_device(cups_array_t *devices,	/* I -
-  * 'query_callback()' - Process query data.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- query_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -639,7 +889,7 @@ query_callback(
- 		*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\", "
-@@ -673,84 +923,212 @@ query_callback(
-   if ((ptr = strstr(name, "._")) != NULL)
-     *ptr = '\0';
- 
--  if (strstr(fullName, "_ipp._tcp.") ||
--      strstr(fullName, "_ipp-tls._tcp."))
--    dkey.type = CUPS_DEVICE_IPP;
--  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
-+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);
-+  }
-+}
-+
-+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);
-+}
-+
-+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;
- 
--  for (device = cupsArrayFind(devices, &dkey);
-+  case AVAHI_BROWSER_REMOVE:
-+  case AVAHI_BROWSER_ALL_FOR_NOW:
-+  case AVAHI_BROWSER_CACHE_EXHAUSTED:
-+    break;
-+  }  
-+}
-+#endif /* HAVE_AVAHI */
-+
-+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 (strcasecmp(device->name, dkey.name) ||
--        strcasecmp(device->domain, dkey.domain))
-+    if (strcasecmp(device->name, dkey->name) ||
-+        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;
-+	char *key;
-+	char *value;
- 
--        for (ptr = key; data < datanext && *data != '='; data ++)
--	  *ptr++ = *data;
--	*ptr = '\0';
--
--	if (data < datanext && *data == '=')
--	{
--	  data ++;
--
--	  if (data < datanext)
--	    memcpy(value, data, datanext - data);
--	  value[datanext - data] = '\0';
--	}
--	else
--	  continue;
-+	if (parse_txt_record_pair (txt))
-+	  goto next;
- 
-+	key = txt->key;
-+	value = txt->value;
-         if (!strncasecmp(key, "usb_", 4))
- 	{
- 	 /*
-@@ -805,6 +1183,10 @@ query_callback(
- 	  if (device->type == CUPS_DEVICE_PRINTER)
- 	    device->sent = 1;
- 	}
-+
-+      next:
-+	if (next_txt_record (txt) == NULL)
-+	  break;
-       }
- 
-       if (device->device_id)
-@@ -854,11 +1236,9 @@ query_callback(
-     }
-   }
- 
--  if (!device)
--    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+  return device;
- }
- 
--
- /*
-  * 'sigterm_handler()' - Handle termination signals...
-  */
-diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in
---- cups-1.4.0/config.h.in.avahi	2009-06-10 16:51:21.000000000 +0100
-+++ cups-1.4.0/config.h.in	2009-09-04 14:57:04.733388405 +0100
-@@ -336,6 +336,13 @@
- 
- 
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
-  * Do we have <sys/ioctl.h>?
-  */
- 
-diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4
---- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
-+++ cups-1.4.0/config-scripts/cups-dnssd.m4	2009-09-04 14:57:04.731388902 +0100
-@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
- 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
-diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
---- cups-1.4.0/cups/http-support.c.avahi	2009-06-12 01:21:58.000000000 +0100
-+++ cups-1.4.0/cups/http-support.c	2009-09-04 14:57:04.736398674 +0100
-@@ -55,6 +55,11 @@
- #  include <dns_sd.h>
- #  include <poll.h>
- #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 */
- 
- 
- /*
-@@ -121,6 +126,24 @@ static void		resolve_callback(DNSService
- 					 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
-@@ -1349,15 +1372,26 @@ _httpResolveURI(
- 
-   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
-     DNSServiceRef	ref,		/* DNS-SD master service reference */
- 			domainref,	/* DNS-SD service reference for domain */
- 			localref;	/* DNS-SD service reference for .local */
-     int			domainsent = 0;	/* Send the domain resolve? */
--    char		*regtype,	/* Pointer to type in hostname */
--			*domain;	/* Pointer to domain in hostname */
-     _http_uribuf_t	uribuf;		/* URI buffer */
-     struct pollfd	polldata;	/* Polling data */
-+#else /* HAVE_AVAHI */
-+    AvahiSimplePoll	*simple_poll;
-+    AvahiClient		*client;
-+    int			error;
-+    struct
-+    {
-+      AvahiSimplePoll	*poll;
-+      _http_uribuf_t	uribuf;
-+    } user_data;
-+#endif /* HAVE_DNSSD */
- 
- 
-     if (logit)
-@@ -1395,8 +1429,13 @@ _httpResolveURI(
-     if (domain)
-       *domain++ = '\0';
- 
-+#ifdef HAVE_DNSSD
-     uribuf.buffer  = resolved_uri;
-     uribuf.bufsize = resolved_size;
-+#else
-+    user_data.uribuf.buffer = resolved_uri;
-+    user_data.uribuf.bufsize = resolved_size;
-+#endif
- 
-     resolved_uri[0] = '\0';
- 
-@@ -1411,6 +1450,7 @@ _httpResolveURI(
- 
-     uri = NULL;
- 
-+#ifdef HAVE_DNSSD
-     if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
-     {
-       localref = ref;
-@@ -1486,6 +1526,36 @@ _httpResolveURI(
- 
-       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 (logit)
-     {
-@@ -1497,13 +1567,13 @@ _httpResolveURI(
-       fputs("STATE: -connecting-to-device\n", stderr);
-     }
- 
--#else
-+#else /* HAVE_DNSSD || HAVE_AVAHI */
-    /*
-     * No DNS-SD support...
-     */
- 
-     uri = NULL;
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-     if (logit && !uri)
-       _cupsLangPuts(stderr, _("Unable to find printer!\n"));
-@@ -1708,6 +1778,105 @@ resolve_callback(
- }
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+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);
-+}
-+
-+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 8705 2009-06-12 00:21:58Z mike $".
diff --git a/abs/core/cups/cups.install b/abs/core/cups/cups.install
deleted file mode 100644
index 97fda5a..0000000
--- a/abs/core/cups/cups.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/abs/core/cups/cups.logrotate b/abs/core/cups/cups.logrotate
deleted file mode 100644
index 9c49bbd..0000000
--- a/abs/core/cups/cups.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/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/abs/core/cups/cups.pam b/abs/core/cups/cups.pam
deleted file mode 100644
index 53724d1..0000000
--- a/abs/core/cups/cups.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/abs/core/libmng/PKGBUILD b/abs/core/libmng/PKGBUILD
deleted file mode 100644
index dc3958a..0000000
--- a/abs/core/libmng/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=libmng
-pkgver=1.0.10
-pkgrel=3
-pkgdesc="A collection of routines used to create and manipulate MNG format graphics files"
-arch=('i686' 'x86_64')
-url="http://www.libmng.com/"
-license=('custom')
-depends=('zlib' 'libjpeg>=7')
-options=(!libtool)
-source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('a464ae7d679781beebdf7440d144b7bd')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ln -s makefiles/configure.in .
-  ln -s makefiles/Makefile.am .
-  autoreconf --force --install
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/abs/core/python-pycurl/PKGBUILD b/abs/core/python-pycurl/PKGBUILD
deleted file mode 100644
index 3d17877..0000000
--- a/abs/core/python-pycurl/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 82 2009-07-17 19:56:55Z aaron $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
-# Contributor: kontrast <kontr4st@gmail.com> 
-pkgname=python-pycurl
-pkgver=7.19.0
-pkgrel=3
-pkgdesc="A Python interface to libcurl"
-arch=('i686' 'x86_64')
-url="http://pycurl.sourceforge.net"
-license=('GPL')
-depends=('python' 'curl>=7.19.0')
-replaces=('pycurl')
-provides=('pycurl')
-source=(http://pycurl.sourceforge.net/download/pycurl-$pkgver.tar.gz)
-md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b')
-
-build() {
-  cd $srcdir/pycurl-$pkgver
-  python setup.py install --curl-config=/usr/bin/curl-config --prefix $pkgdir/usr || return 1
-}
diff --git a/abs/core/recordproto/PKGBUILD b/abs/core/recordproto/PKGBUILD
deleted file mode 100644
index c71b2de..0000000
--- a/abs/core/recordproto/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=recordproto
-pkgver=1.13.2
-pkgrel=1
-pkgdesc="X11 Record extension wire protocol"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0ed4706564a34fc2aff724aa16d3ff00')
-sha1sums=('833ef2bc4b084281f85eeba5d4ba03441bd3a534')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
diff --git a/abs/core/samba/PKGBUILD b/abs/core/samba/PKGBUILD
deleted file mode 100644
index 44996c6..0000000
--- a/abs/core/samba/PKGBUILD
+++ /dev/null
@@ -1,139 +0,0 @@
-# $Id: PKGBUILD 64318 2010-01-19 19:31:39Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-pkgbase=samba
-pkgname=('smbclient' 'samba')
-pkgver=3.4.5
-# We use the 'A' to fake out pacman's version comparators.  Samba chooses
-# to append 'a','b',etc to their subsequent releases, which pamcan
-# misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.4.5
-pkgrel=3
-arch=(i686 x86_64)
-url="http://www.samba.org"
-license=('GPL3')
-makedepends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'libcap>=2.16' 'heimdal>=1.2-1' 'pam'  'gnutls>=2.4.1' 'talloc' 'tdb')
-options=(!makeflags)
-source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
-        samba samba.logrotate 
-        swat.xinetd 
-        samba.pam 
-        samba.conf.d)
-### UNINSTALL dmapi package before building!!!
-
-build() {
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib/ \
-              --localstatedir=/var \
-              --with-configdir=/etc/samba \
-              --with-lockdir=/var/cache/samba \
-              --with-piddir=/var/run/samba \
-              --with-fhs \
-              --with-pam \
-              --with-pam_smbpass \
-              --with-pammodulesdir=/lib/security \
-              --with-ads \
-              --with-acl-support \
-              --with-cifsmount \
-              --with-libsmbclient \
-              --with-syslog \
-              --enable-external-libtalloc \
-              --disable-dnssd \
-              --disable-avahi \
-              --without-libtdb  --disable-fam
-  make || return 1
-}
-
-package_smbclient () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline>=5.0.00' 'popt' 'libldap>=2.4.11-1' 'libcap>=2.16' 'heimdal>=1.2-1' 'db>=4.7' 'e2fsprogs' 'tdb' 'talloc')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/sbin ${pkgdir}/usr/lib
-  install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
-  install -m755 bin/{mount.cifs,umount.cifs} ${pkgdir}/sbin/
-  for i in libnetapi* libwbclient* libsmbclient*;do
-      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
-  done
-  install -m755 script/smbtar ${pkgdir}/usr/bin/
-  mkdir -p ${pkgdir}/usr/lib/cups/backend
-  ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
-  mkdir -p ${pkgdir}/usr/include
-  install -m644 include/libsmbclient.h ${pkgdir}/usr/include/
-  install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/
-  mkdir -p ${pkgdir}/usr/share/man/man{1,7,8}
-  for man in smbspool \
-      umount.cifs mount.cifs net; do
-      install -m644 ../docs/manpages/${man}.8 ${pkgdir}/usr/share/man/man8/
-  done
-  for man in rpcclient smbcacls smbclient smbcquotas smbget \
-      smbtree smbtar nmblookup; do
-      install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/
-  done
-  install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
-}
-
-package_samba () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-backup=(etc/logrotate.d/samba 
-        etc/pam.d/samba 
-        etc/samba/smb.conf
-        etc/xinetd.d/swat
-        etc/conf.d/samba)
-depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1' 'e2fsprogs' 'tdb' 'talloc')
-  cd ${srcdir}/samba-${_realver}/source3
-  mkdir -p ${pkgdir}/var/log/samba
-  mkdir -p ${pkgdir}/etc/samba/private
-  chmod 700 ${pkgdir}/etc/samba/private
-  make DESTDIR=${pkgdir} install || return 1
-  chmod 644 ${pkgdir}/usr/include/*.h
-  rm -rf ${pkgdir}/usr/var
-  (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
-  install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
-  install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
-  mkdir -p ${pkgdir}/etc/samba
-  cat ../examples/smb.conf.default | \
-    sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
-  install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba
-  install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat
-  install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba
-  # spool directory
-  install -d -m1777 ${pkgdir}/var/spool/samba
-  sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
-  # fix logrotate
-  sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
-  # nsswitch libraries
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
-  ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
-  # remove conflict files of smbclient
-  for man in libsmbclient smbspool \
-      umount.cifs mount.cifs net; do
-      rm -f ${pkgdir}/usr/share/man/man8/${man}.8
-  done
-  for i in libnetapi* libwbclient* libsmbclient*;do
-      rm -f ${pkgdir}/usr/lib/$i
-  done
-  for bin in net \
-      nmblookup rpcclient smbcacls smbclient \
-      smbcquotas smbget smbspool smbtar smbtree; do
-      rm -f ${pkgdir}/usr/bin/$bin
-  done
-  rm -f ${pkgdir}/usr/include/netapi.h
-  for man in rpcclient smbcacls smbclient smbcquotas \
-      smbtree smbtar nmblookup smbget; do
-      rm -f ${pkgdir}/usr/share/man/man1/${man}.1
-  done
-  rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7
-  rm -f ${pkgdir}/usr/include/libsmbclient.h
-  # remove conflict files of tdb
-  rm -f ${pkgdir}/usr/bin/{tdbbackup,tdbdump,tdbtool}
-  # copy ldap example
-  install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
-}
-md5sums=('8e8a484782f2b7716b6c6bd9a7d2bf71'
-         'e93533fa2296c07c1f645dfdd373657f'
-         '5697da77590ec092cc8a883bae06093c'
-         'a4bbfa39fee95bba2e7ad6b535fae7e6'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'f2f2e348acd1ccb566e95fa8a561b828')
diff --git a/abs/core/samba/__changelog b/abs/core/samba/__changelog
deleted file mode 100644
index 8af7e88..0000000
--- a/abs/core/samba/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-remove fam support
\ No newline at end of file
diff --git a/abs/core/samba/heimdal.patch b/abs/core/samba/heimdal.patch
deleted file mode 100644
index 5338c37..0000000
--- a/abs/core/samba/heimdal.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2005-09-21
-Initial Package Version: 3.0.20
-Upstream Status:         Not submitted (it is not an upstream Samba issue)
-Origin:                  Randy McMurchy
-Description:             Fixes an issue if you have Heimdal installed as
-                         Heimdal uses reserved C++ words and the Samba headers
-                         now look for these conflicts. This patch comments out
-                         the check for C++ reserved words. Heimdal is aware of
-                         the issue
-
-$LastChangedBy: randy $
-$Date: 2005/09/29 18:25:12 $
-
-
---- samba-3.0.20-orig/source/include/includes.h	2005-07-28 13:19:49.000000000 +0000
-+++ samba-3.0.20/source/include/includes.h	2005-09-04 13:45:01.000000000 +0000
-@@ -25,6 +25,7 @@
- #include "config.h"
- #endif
- 
-+/*
- #ifndef __cplusplus
- #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
- #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-@@ -36,6 +37,7 @@
- #define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
- #define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
- #endif
-+*/
- 
- #include "local.h"
- 
diff --git a/abs/core/samba/no-clients.patch b/abs/core/samba/no-clients.patch
deleted file mode 100644
index e06da8d..0000000
--- a/abs/core/samba/no-clients.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur samba-3.0.23-orig/source/Makefile.in samba-3.0.23/source/Makefile.in
---- samba-3.0.23-orig/source/Makefile.in	2006-07-10 09:27:55.000000000 -0700
-+++ samba-3.0.23/source/Makefile.in	2006-07-11 14:34:39.000000000 -0700
-@@ -138,14 +138,10 @@
- 
- ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
- 
--BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
--	bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@
--BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ bin/tdbbackup@EXEEXT@ \
--	bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ bin/tdbdump@EXEEXT@ \
--	bin/tdbtool@EXEEXT@
--BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
--	bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ bin/sharesec@EXEEXT@ \
--	bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@
-+BIN_PROGS1 = bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@
-+BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/tdbbackup@EXEEXT@ bin/pdbedit@EXEEXT@
-+BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ \
-+	bin/eventlogadm@EXEEXT@
- BIN_PROGS4 = bin/ldbedit@EXEEXT@ bin/ldbsearch@EXEEXT@ bin/ldbadd@EXEEXT@ \
- 	bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@ bin/ldbrename@EXEEXT@
- 
-@@ -160,7 +156,7 @@
- 
- PAM_MODULES = @PAM_MODULES@
- 
--SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
-+SCRIPTS = $(builddir)/script/findsmb
- 
- VFS_MODULES = @VFS_MODULES@
- PDB_MODULES = @PDB_MODULES@
diff --git a/abs/core/samba/samba b/abs/core/samba/samba
deleted file mode 100755
index bc7d527..0000000
--- a/abs/core/samba/samba
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba
-
-[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd)
-
-case "$1" in
-	start)
-		rc=0
-		stat_busy "Starting Samba Server"
-		for d in ${SAMBA_DAEMONS[@]}; do
-			PID=`pidof -o %PPID /usr/sbin/$d`
-			[ -z "$PID" ] && /usr/sbin/$d -D
-			rc=$(($rc+$?))
-		done
-		if [ $rc -gt 0 ]; then
-			stat_fail
-		else
-			add_daemon samba
-			stat_done
-		fi
-	;;
-	stop)
-		rc=0
-		stat_busy "Stopping Samba Server"
-		for d in ${SAMBA_DAEMONS[@]}; do
-			PID=`pidof -o %PPID /usr/sbin/$d`
-			[ -z "$PID" ] || kill $PID &> /dev/null
-			rc=$(($rc+$?))
-		done
-		if [ $rc -gt 0 ]; then
-			stat_fail
-		else
-			rm /var/run/samba/smbd.pid &>/dev/null
-			rm /var/run/samba/nmbd.pid &>/dev/null
-			rm /var/run/samba/winbindd.pid &>/dev/null
-			rm_daemon samba
-			stat_done
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/core/samba/samba-3.0.21a-ntlmssp.patch b/abs/core/samba/samba-3.0.21a-ntlmssp.patch
deleted file mode 100644
index 6b65449..0000000
--- a/abs/core/samba/samba-3.0.21a-ntlmssp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ntlmssp.c.old	Fri Jan 13 15:33:50 2006
-+++ ntlmssp.c	Fri Jan 13 15:33:16 2006
-@@ -399,8 +399,9 @@
- 			ntlmssp_state->session_key.data[6] = 0x38;
- 			ntlmssp_state->session_key.data[7] = 0xb0;
- 		}
--		ntlmssp_state->session_key.length = 8;
-+      /*		ntlmssp_state->session_key.length = 8; */
- 	}
-+
- }
- 
- /**
diff --git a/abs/core/samba/samba.conf.d b/abs/core/samba/samba.conf.d
deleted file mode 100644
index 8721f95..0000000
--- a/abs/core/samba/samba.conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Configuration for the samba init script
-#
-
-# space separated list of daemons to launch
-SAMBA_DAEMONS=(smbd nmbd)
-#SAMBA_DAEMONS=(smbd nmbd winbindd)
diff --git a/abs/core/samba/samba.logrotate b/abs/core/samba/samba.logrotate
deleted file mode 100644
index 581f4c3..0000000
--- a/abs/core/samba/samba.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log {
-   notifempty
-   missingok
-   sharedscripts
-   copytruncate
-   postrotate
-      /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/abs/core/samba/samba.pam b/abs/core/samba/samba.pam
deleted file mode 100644
index 53724d1..0000000
--- a/abs/core/samba/samba.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/abs/core/samba/swat.xinetd b/abs/core/samba/swat.xinetd
deleted file mode 100644
index 2e62a82..0000000
--- a/abs/core/samba/swat.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service swat
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/swat
-        log_on_success  += HOST DURATION
-        log_on_failure  += HOST
-        disable                 = yes
-}
diff --git a/abs/core/xorg-util-macros/PKGBUILD b/abs/core/xorg-util-macros/PKGBUILD
deleted file mode 100644
index 3ca4dfa..0000000
--- a/abs/core/xorg-util-macros/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 85383 2010-07-12 17:45:37Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xorg-util-macros
-pkgver=1.10.0
-pkgrel=1
-pkgdesc="X.Org Autotools macros"
-arch=(any)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-source=(${url}/releases/individual/util/util-macros-${pkgver}.tar.bz2)
-sha1sums=('01bd26de7f76907ad502b430a5d18f64a896dc81')
-
-build() {
-  cd "${srcdir}/util-macros-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib"
-  mv "${pkgdir}/usr/share/pkgconfig" "${pkgdir}/usr/lib/"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}