Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/curlftpfs/PKGBUILD
	core/libcap/PKGBUILD
	core/libsasl/PKGBUILD
	core/udev/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dbus/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/mercurial/PKGBUILD
	extra/redland/PKGBUILD
	extra/soprano/PKGBUILD
	multilib/lib32-curl/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/wine/PKGBUILD

30 files changed, 1003 insertions, 160 deletions

diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD
index a9d2505b4..a40373afa 100644
--- a/core/dbus-core/PKGBUILD
+++ b/core/dbus-core/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 128605 2011-06-24 14:03:41Z ibiru $
+# $Id: PKGBUILD 134377 2011-08-03 11:19:59Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-core
-pkgver=1.4.12
+pkgver=1.4.14
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -16,7 +16,7 @@ options=(!libtool)
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
         dbus)
-md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
+md5sums=('ae6de2562a57516cfabaf56903375ba9'
          '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD
index 864b82ab4..e7d35ff14 100644
--- a/core/dialog/PKGBUILD
+++ b/core/dialog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113956 2011-03-10 22:08:22Z eric $
+# $Id: PKGBUILD 133064 2011-07-27 11:49:01Z stephane $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=dialog
-pkgver=1.1_20110302
+pkgver=1.1_20110707
 pkgrel=1
 pkgdesc="A tool to display dialog boxes from shell scripts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ url="http://invisible-island.net/dialog/"
 license=('LGPL2.1')
 depends=('ncurses')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz)
-md5sums=('2eaa82055b86006e205d2c3f74d9b800')
-sha1sums=('ba4e79abaf579e0d23f247ae65196437f8d8e031')
+md5sums=('34d01aaacbb2932b77774e6c1eec8d2a')
+sha1sums=('31e0e3c40cd51629cc802d7ee0b1a4e1ada90f00')
 
 build() {
   cd "${srcdir}/$pkgname-${pkgver/_/-}"
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD
index 6b1d9377d..a982f8124 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131726 2011-07-14 01:54:47Z allan $
+# $Id: PKGBUILD 134479 2011-08-04 09:59:01Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=file
-pkgver=5.07
-pkgrel=4
+pkgver=5.08
+pkgrel=1
 pkgdesc="File type identification utility"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -12,17 +12,12 @@ groups=('base')
 url="http://www.darwinsys.com/file/"
 depends=('glibc' 'zlib')
 options=('!libtool')
-source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz 
-        file-5.07-zip-detect.patch)
-md5sums=('b8d1f9a8a644067bd0a703cebf3f4858'
-         'ac155cf89af6665dfee76738c27366d8')
+source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('6a2a263c20278f01fe3bb0f720b27d4e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's#\$(datadir)/misc#\$(datadir)#' configure 
-
-  # combined upstream patches to fix zip file detection
-  patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch
+  sed -i 's#\$(datadir)/misc#\$(datadir)#' configure
   
   ./configure --prefix=/usr --datadir=/usr/share/file
   make 
diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD
index 0a0258b22..fe3fc5845 100644
--- a/core/keyutils/PKGBUILD
+++ b/core/keyutils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 116950 2011-03-26 15:07:29Z tpowa $
+# $Id: PKGBUILD 133067 2011-07-27 11:57:16Z stephane $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=keyutils
-pkgver=1.4
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="Linux Key Management Utilities"
 arch=(i686 x86_64 'mips64el')
@@ -9,16 +9,16 @@ url="http://www.kernel.org"
 license=('GPL2' 'LGPL2.1')
 depends=('glibc' 'sh')
 backup=(etc/request-key.conf)
-source=(http://people.redhat.com/~dhowells/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('19811ee31f683058a9aae3e6a3a23a7f')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i "s|/lib64|/lib|g" Makefile
   make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
-md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b')
diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD
index 3a5f21eef..53495e583 100644
--- a/core/libcap/PKGBUILD
+++ b/core/libcap/PKGBUILD
@@ -1,17 +1,17 @@
-#$Id: PKGBUILD 122049 2011-05-02 01:47:02Z allan $
+#$Id: PKGBUILD 132720 2011-07-25 12:05:15Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libcap
-pkgver=2.21
+pkgver=2.22
 pkgrel=1
 pkgdesc="POSIX 1003.1e capabilities"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
-license=('GPL')
+url="http://sites.google.com/site/fullycapable/"
+license=('GPL2')
 depends=('glibc' 'attr')
 source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz)
-md5sums=('61966ef40f2dee8731b69db895e4548d')
+md5sums=('b4896816b626bea445f0b3849bdd4077')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/libsasl/0003_saslauthd_mdoc.patch b/core/libsasl/0003_saslauthd_mdoc.patch
new file mode 100644
index 000000000..694f4bb67
--- /dev/null
+++ b/core/libsasl/0003_saslauthd_mdoc.patch
@@ -0,0 +1,35 @@
+0003_saslauthd_mdoc.dpatch by  <fabbe@debian.org>
+
+Use the correct path for the saslauthd.conf file, and use another
+date format (cosmetic).
+
+diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc
+--- trunk~/saslauthd/saslauthd.mdoc	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/saslauthd.mdoc	2006-07-12 15:05:25.000000000 +0300
+@@ -10,7 +10,7 @@
+ .\" manpage in saslauthd.8 whenever you change this source
+ .\" version. Only the pre-formatted manpage is installed.
+ .\"
+-.Dd 10 24 2002
++.Dd October 24 2002
+ .Dt SASLAUTHD 8
+ .Os "CMU-SASL"
+ .Sh NAME
+@@ -216,7 +216,7 @@
+ .Em (All platforms that support OpenLDAP 2.0 or higher)
+ .Pp
+ Authenticate against an ldap server.  The ldap configuration parameters are
+-read from /usr/local/etc/saslauthd.conf.  The location of this file can be
++read from /etc/saslauthd.conf.  The location of this file can be
+ changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
+ distribution for the list of available parameters.
+ .It Li sia
+@@ -249,7 +249,7 @@
+ .Bl -tag -width "/var/run/saslauthd/mux"
+ .It Pa /var/run/saslauthd/mux
+ The default communications socket.
+-.It Pa /usr/local/etc/saslauthd.conf
++.It Pa /etc/saslauthd.conf
+ The default configuration file for ldap support.
+ .El
+ .Sh SEE ALSO
diff --git a/core/libsasl/0010_maintainer_mode.patch b/core/libsasl/0010_maintainer_mode.patch
new file mode 100644
index 000000000..cf3d02a08
--- /dev/null
+++ b/core/libsasl/0010_maintainer_mode.patch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0010_maintainer_mode.dpatch by  <fabbe@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable maintainer mode to avoid auto* problems.
+
+@DPATCH@
+diff -urNad trunk~/configure.in trunk/configure.in
+--- trunk~/configure.in	2006-05-29 22:52:46.000000000 +0300
++++ trunk/configure.in	2006-11-01 23:24:55.000000000 +0200
+@@ -62,6 +62,8 @@
+ AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22)
+ CMU_INIT_AUTOMAKE
+ 
++AM_MAINTAINER_MODE
++
+ # and include our config dir scripts
+ ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"
+ 
diff --git a/core/libsasl/0011_saslauthd_ac_prog_libtool.patch b/core/libsasl/0011_saslauthd_ac_prog_libtool.patch
new file mode 100644
index 000000000..3805b4857
--- /dev/null
+++ b/core/libsasl/0011_saslauthd_ac_prog_libtool.patch
@@ -0,0 +1,15 @@
+0011_saslauthd_ac_prog_libtool.dpatch by  <fabbe@debian.org>
+
+Enable libtool use.
+
+diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in
+--- trunk~/saslauthd/configure.in	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/configure.in	2006-11-01 23:41:51.000000000 +0200
+@@ -25,6 +25,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+ 
+ dnl Checks for build foo
+ CMU_C___ATTRIBUTE__
diff --git a/core/libsasl/0012_xopen_crypt_prototype.patch b/core/libsasl/0012_xopen_crypt_prototype.patch
new file mode 100644
index 000000000..d50ec8343
--- /dev/null
+++ b/core/libsasl/0012_xopen_crypt_prototype.patch
@@ -0,0 +1,20 @@
+0012_xopen_crypt_prototype.dpatch by  <dannf@debian.org>
+
+When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h>
+will define a correct function prototype for the crypt function.
+This avoids segfaults on architectures where the size of a pointer
+is greater than the size of an integer (ia64 and amd64 are examples).
+This may be detected by looking for build log lines such as the
+following:
+auth_shadow.c:183: warning: implicit declaration of function ‘crypt’
+auth_shadow.c:183: warning: cast to pointer from integer of different
+size
+
+diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c
+--- trunk~/saslauthd/auth_shadow.c	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/auth_shadow.c	2006-11-08 13:44:23.000000000 +0200
+@@ -1,3 +1,4 @@
++#define _XOPEN_SOURCE
+ #define PWBUFSZ 256 /***SWB***/
+ 
+ /* MODULE: auth_shadow */
diff --git a/core/libsasl/0016_pid_file_lock_creation_mask.patch b/core/libsasl/0016_pid_file_lock_creation_mask.patch
new file mode 100644
index 000000000..e9170cef3
--- /dev/null
+++ b/core/libsasl/0016_pid_file_lock_creation_mask.patch
@@ -0,0 +1,27 @@
+0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org>
+
+pid_file_lock is created with a mask of 644 instead of 0644.
+This patch fixes this octal/decimal confusion as well as the
+(harmless) one in the previous umask() call.
+
+diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c
+--- trunk~/saslauthd/saslauthd-main.c	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/saslauthd-main.c	2007-06-26 12:07:10.000000000 +0300
+@@ -276,7 +276,7 @@
+ 		exit(1);
+ 	}
+ 
+-	umask(077);
++	umask(0077);
+ 
+ 	pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
+ 	if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
+@@ -287,7 +287,7 @@
+ 	strlcpy(pid_file_lock, run_path, pid_file_size);
+ 	strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
+ 
+-	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) {
++	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) {
+ 		rc = errno;
+ 		logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock);
+ 		logger(L_ERR, L_FUNC, "open: %s", strerror(rc));
diff --git a/core/libsasl/0018_auth_rimap_quotes.patch b/core/libsasl/0018_auth_rimap_quotes.patch
new file mode 100644
index 000000000..13fa999f0
--- /dev/null
+++ b/core/libsasl/0018_auth_rimap_quotes.patch
@@ -0,0 +1,35 @@
+0016_auth_rimap_quotes.dpatch by  <fabbe@debian.org>
+
+All lines beginning with `## DP:' are a description of the patch.
+Avoid infinite loop when username/password has a double quote character.
+Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13
+
+diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c
+--- etch~/saslauthd/auth_rimap.c	2007-03-29 15:16:20.000000000 +0300
++++ etch/saslauthd/auth_rimap.c	2008-02-13 13:42:53.000000000 +0200
+@@ -162,6 +162,7 @@
+     num_quotes = 0;
+     p1 = s;
+     while ((p1 = strchr(p1, '"')) != NULL) {
++	p1++;
+ 	num_quotes++;
+     }
+     
+@@ -438,7 +439,7 @@
+ 	syslog(LOG_WARNING, "auth_rimap: writev: %m");
+ 	memset(qlogin, 0, strlen(qlogin));
+ 	free(qlogin);
+-	memset(qpass, 0, strlen(qlogin));
++	memset(qpass, 0, strlen(qpass));
+ 	free(qpass);
+ 	(void)close(s);
+ 	return strdup(RESP_IERROR);
+@@ -447,7 +448,7 @@
+     /* don't need these any longer */
+     memset(qlogin, 0, strlen(qlogin));
+     free(qlogin);
+-    memset(qpass, 0, strlen(qlogin));
++    memset(qpass, 0, strlen(qpass));
+     free(qpass);
+ 
+     /* read and parse the LOGIN response */
diff --git a/core/libsasl/0019_ldap_deprecated.patch b/core/libsasl/0019_ldap_deprecated.patch
new file mode 100644
index 000000000..8825256cb
--- /dev/null
+++ b/core/libsasl/0019_ldap_deprecated.patch
@@ -0,0 +1,22 @@
+0019_ldap_deprecated.dpatch by  dann frazier <dannf@debian.org>
+
+The function ldap_get_values, used in saslauthd/lak.c, is deprecated.
+Therefore, its prototype is not included by default when compiling
+against the ldap.h headers. As a result, the compiler cannot know the
+return type of the function at compile time, and will implicitly
+convert to a pointer. This has implications on 64-bit systems.
+This patch sets the deprecation mode on, so that the function prototype
+gets included when compiling.
+(Description by Fabian Fagerholm <fabbe@debian.org>)
+
+diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c
+--- trunk~/saslauthd/lak.c	2006-06-04 12:26:20.000000000 +0300
++++ trunk/saslauthd/lak.c	2008-02-15 14:32:11.000000000 +0200
+@@ -55,6 +55,7 @@
+ #include <openssl/des.h>
+ #endif
+ 
++#define LDAP_DEPRECATED 1
+ #include <ldap.h>
+ #include <lber.h>
+ #include <sasl.h>
diff --git a/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch b/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch
new file mode 100644
index 000000000..a49b553f0
--- /dev/null
+++ b/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch
@@ -0,0 +1,26 @@
+0022_gcc4.4_preprocessor_syntax.dpatch by  <fabbe@paniq.net>
+
+The #elif preprocessor directive requires a test condition.
+GCC 4.4 enforces this rule.
+
+diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c
+--- trunk~/plugins/digestmd5.c	2006-06-04 12:26:19.000000000 +0300
++++ trunk/plugins/digestmd5.c	2009-01-26 13:29:40.000000000 +0200
+@@ -2715,7 +2715,7 @@
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,
diff --git a/core/libsasl/0025_ld_as_needed.patch b/core/libsasl/0025_ld_as_needed.patch
new file mode 100644
index 000000000..67b48b4a4
--- /dev/null
+++ b/core/libsasl/0025_ld_as_needed.patch
@@ -0,0 +1,27 @@
+Author: Matthias Klose <doko@ubuntu.com>
+Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
+it.
+--- a/saslauthd/Makefile.am
++++ b/saslauthd/Makefile.am
+@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
+ saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
+ saslauthd_LDADD	= @SASL_KRB_LIB@ \
+ 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
+-		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
++		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
+ 
+ testsaslauthd_SOURCES = testsaslauthd.c utils.c
+ testsaslauthd_LDADD = @LIB_SOCKET@
+--- a/sasldb/Makefile.am
++++ b/sasldb/Makefile.am
+@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
+ 
+ libsasldb_la_SOURCES = allockey.c sasldb.h
+ EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
+-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
+-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
+ 
+ # Prevent make dist stupidity
+ libsasldb_a_SOURCES =
diff --git a/core/libsasl/0026_drop_krb5support_dependency.patch b/core/libsasl/0026_drop_krb5support_dependency.patch
new file mode 100644
index 000000000..cc00867ef
--- /dev/null
+++ b/core/libsasl/0026_drop_krb5support_dependency.patch
@@ -0,0 +1,14 @@
+Author: Roberto C. Sanchez <roberto@connexer.com>
+Description: Drop gratuitous dependency on krb5support
+--- a/cmulocal/sasl2.m4
++++ b/cmulocal/sasl2.m4
+@@ -112,9 +112,6 @@ if test "$gssapi" != no; then
+   fi
+ 
+   if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
+-    # check for libkrb5support first
+-    AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
+-
+     gss_failed=0
+     AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
+                  ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
diff --git a/core/libsasl/0027_db5_support.patch b/core/libsasl/0027_db5_support.patch
new file mode 100644
index 000000000..522824074
--- /dev/null
+++ b/core/libsasl/0027_db5_support.patch
@@ -0,0 +1,24 @@
+Author: Ondřej Surý <ondrej@debian.org>
+Description: Support newer Berkeley DB versions
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- a/utils/dbconverter-2.c
++++ b/utils/dbconverter-2.c
+@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/core/libsasl/0030-dont_use_la_files_for_opening_plugins.patch b/core/libsasl/0030-dont_use_la_files_for_opening_plugins.patch
new file mode 100644
index 000000000..14a322496
--- /dev/null
+++ b/core/libsasl/0030-dont_use_la_files_for_opening_plugins.patch
@@ -0,0 +1,134 @@
+--- a/lib/dlopen.c
++++ b/lib/dlopen.c
+@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi
+     return result;
+ }
+ 
+-/* this returns the file to actually open.
+- *  out should be a buffer of size PATH_MAX
+- *  and may be the same as in. */
+-
+-/* We'll use a static buffer for speed unless someone complains */
+-#define MAX_LINE 2048
+-
+-static int _parse_la(const char *prefix, const char *in, char *out) 
+-{
+-    FILE *file;
+-    size_t length;
+-    char line[MAX_LINE];
+-    char *ntmp = NULL;
+-
+-    if(!in || !out || !prefix || out == in) return SASL_BADPARAM;
+-
+-    /* Set this so we can detect failure */
+-    *out = '\0';
+-
+-    length = strlen(in);
+-
+-    if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) {
+-	if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) {
+-	    /* check for a .la file */
+-	    strcpy(line, prefix);
+-	    strcat(line, in);
+-	    length = strlen(line);
+-	    *(line + (length - strlen(SO_SUFFIX))) = '\0';
+-	    strcat(line, LA_SUFFIX);
+-	    file = fopen(line, "r");
+-	    if(file) {
+-		/* We'll get it on the .la open */
+-		fclose(file);
+-		return SASL_FAIL;
+-	    }
+-	}
+-	strcpy(out, prefix);
+-	strcat(out, in);
+-	return SASL_OK;
+-    }
+-
+-    strcpy(line, prefix);
+-    strcat(line, in);
+-
+-    file = fopen(line, "r");
+-    if(!file) {
+-	_sasl_log(NULL, SASL_LOG_WARN,
+-		  "unable to open LA file: %s", line);
+-	return SASL_FAIL;
+-    }
+-    
+-    while(!feof(file)) {
+-	if(!fgets(line, MAX_LINE, file)) break;
+-	if(line[strlen(line) - 1] != '\n') {
+-	    _sasl_log(NULL, SASL_LOG_WARN,
+-		      "LA file has too long of a line: %s", in);
+-	    return SASL_BUFOVER;
+-	}
+-	if(line[0] == '\n' || line[0] == '#') continue;
+-	if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) {
+-	    /* We found the line with the name in it */
+-	    char *end;
+-	    char *start;
+-	    size_t len;
+-	    end = strrchr(line, '\'');
+-	    if(!end) continue;
+-	    start = &line[sizeof("dlname=")-1];
+-	    len = strlen(start);
+-	    if(len > 3 && start[0] == '\'') {
+-		ntmp=&start[1];
+-		*end='\0';
+-		/* Do we have dlname="" ? */
+-		if(ntmp == end) {
+-		    _sasl_log(NULL, SASL_LOG_DEBUG,
+-			      "dlname is empty in .la file: %s", in);
+-		    return SASL_FAIL;
+-		}
+-		strcpy(out, prefix);
+-		strcat(out, ntmp);
+-	    }
+-	    break;
+-	}
+-    }
+-    if(ferror(file) || feof(file)) {
+-	_sasl_log(NULL, SASL_LOG_WARN,
+-		  "Error reading .la: %s\n", in);
+-	fclose(file);
+-	return SASL_FAIL;
+-    }
+-    fclose(file);
+-
+-    if(!(*out)) {
+-	_sasl_log(NULL, SASL_LOG_WARN,
+-		  "Could not find a dlname line in .la file: %s", in);
+-	return SASL_FAIL;
+-    }
+-
+-    return SASL_OK;
+-}
+ #endif /* DO_DLOPEN */
+ 
+ /* loads a plugin library */
+@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_
+ 		if (length + pos>=PATH_MAX) continue; /* too big */
+ 
+ 		if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)),
+-			   SO_SUFFIX)
+-		    && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)),
+-			   LA_SUFFIX))
++			   SO_SUFFIX))
+ 		    continue;
+ 
++		/* We only use .so files for loading plugins */
++
+ 		memcpy(name,dir->d_name,length);
+ 		name[length]='\0';
+ 
+-		result = _parse_la(prefix, name, tmp);
+-		if(result != SASL_OK)
+-		    continue;
+-		
++		/* Create full name with path */
++		strncpy(tmp, prefix, PATH_MAX);
++		strncat(tmp, name, PATH_MAX);
++
+ 		/* skip "lib" and cut off suffix --
+ 		   this only need be approximate */
+ 		strcpy(plugname, name + 3);
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index 4b6dee538..4ea188ad9 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,56 +1,204 @@
-# $Id: PKGBUILD 127649 2011-06-17 13:03:28Z stephane $
+# $Id: PKGBUILD 134437 2011-08-03 20:35:03Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
+# This package spans multiple repositories. 
+# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
+
+#pkgbase=('cyrus-sasl')
+#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=6
+pkgrel=7
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
 license=('custom')
-depends=('db>=4.8')
-optdepends=('cyrus-sasl: saslauthd'
-            'cyrus-sasl-plugins: authentication plugins other than sasldb')
+options=('!makeflags' '!libtool')
+makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
-	cyrus-sasl-2.1.19-checkpw.c.patch
-	cyrus-sasl-db.patch)
-options=('!makeflags')
+        cyrus-sasl-2.1.19-checkpw.c.patch
+        cyrus-sasl-2.1.22-crypt.patch
+        cyrus-sasl-2.1.22-qa.patch
+        cyrus-sasl-2.1.22-automake-1.10.patch
+        cyrus-sasl-2.1.23-authd-fix.patch
+        0003_saslauthd_mdoc.patch
+        0010_maintainer_mode.patch
+        0011_saslauthd_ac_prog_libtool.patch
+        0012_xopen_crypt_prototype.patch
+        0016_pid_file_lock_creation_mask.patch
+        0018_auth_rimap_quotes.patch
+        0019_ldap_deprecated.patch
+        0022_gcc4.4_preprocessor_syntax.patch
+        0025_ld_as_needed.patch
+        0026_drop_krb5support_dependency.patch
+        0027_db5_support.patch
+        0030-dont_use_la_files_for_opening_plugins.patch
+        saslauthd.conf.d
+        saslauthd)
 md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
          'e27ddff076342e7a3041c4759817d04b'
-         '0658201497aad359c0d66b0ab8032859')
+         'd7e6886e88af04d05f3dec7f0a59ccf7'
+         '79b8a5e8689989e2afd4b7bda595a7b1'
+         'f4131b077ddb5240b375d749162f1b7a'
+         'c7ad2c70c1ef814eb4b119f316c064f2'
+         'caeeac3feba19cbbd36e7345cc805600'
+         'f45d8b60e8f74dd7f7c2ec1665fa602a'
+         '9d93880514cb5ff5da969f1ceb64a661'
+         'dfdc052a7e678db9f687482c5d52f34e'
+         '4a09f6b24b91f8450892a78e378860da'
+         '213abe7c5dfe0d7f446992787da1e780'
+         '5a0321177ad30cb5518c8b6812e3961a'
+         '0c965748970eea29fa295524821d43f0'
+         '62bf892fe4d1df41ff748e91a1afaf67'
+         'b7848957357e7c02d6490102be496bf9'
+         'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
+         '8e7106f32e495e9ade69014fd1b3352a'
+         '49219af5641150edec288a3fdb65e7c1'
+         '75542f613185d5a90520ad0d7d926a20')
 
 build() {
   cd "${srcdir}/cyrus-sasl-${pkgver}"
-  patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch
-  patch -Np1 -i ${srcdir}/cyrus-sasl-db.patch
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch"
+  patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch"
+  patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch"
+  patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
+  patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
+  patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch"
+  patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch"
+  patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch"
+  patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch"
+  patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch"
+  patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
+  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
+  patch -Np1 -i "${srcdir}/0027_db5_support.patch"
+  patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
+
+  rm -f config/config.guess config/config.sub 
+  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
+  rm -fr autom4te.cache
+  libtoolize -c
+  aclocal -I config -I cmulocal
+  automake -a -c
+  autoheader
+  autoconf
+
+  pushd saslauthd
+  rm -f config/config.guess config/config.sub 
+  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
+  rm -fr autom4te.cache
+  libtoolize -c
+  aclocal -I config -I ../cmulocal -I ../config
+  automake -a -c
+  autoheader
+  autoconf
+  popd
+
   ./configure --prefix=/usr \
-              --host=$CHOST \
-              --build=$CHOST \
-  	--sysconfdir=/etc \
-  	--localstatedir=/var \
-	--disable-anon \
-	--disable-cram \
-	--disable-digest \
-	--disable-gssapi \
-	--enable-login \
-	--disable-otp \
-	--enable-plain \
-        --mandir=/usr/share/man
-  for dir in include lib sasldb plugins utils; do
-    pushd ${dir}
-    make
-    popd
-  done
+      --host=$CHOST \
+      --build=$CHOST \
+      --mandir=/usr/share/man \
+      --infodir=/usr/share/info \
+      --disable-static \
+      --enable-shared \
+      --enable-alwaystrue \
+      --enable-checkapop \
+      --enable-cram \
+      --enable-digest \
+      --disable-otp \
+      --disable-srp \
+      --disable-srp-setpass \
+      --disable-krb4 \
+      --enable-gssapi \
+      --enable-auth-sasldb \
+      --enable-plain \
+      --enable-anon \
+      --enable-login \
+      --enable-ntlm \
+      --disable-passdss \
+      --enable-sql \
+      --enable-ldapdb \
+      --disable-macos-framework \
+      --with-pam \
+      --with-saslauthd=/var/run/saslauthd \
+      --with-ldap \
+      --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
+      --sysconfdir=/etc \
+      --with-devrandom=/dev/urandom
+  make
 }
 
-package() {
+package_libsasl() {
+  pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library"
+  depends=('openssl')
+  provides=('cyrus-sasl-plugins')
+  conflicts=('cyrus-sasl-plugins')
+
   cd "${srcdir}/cyrus-sasl-${pkgver}"
   for dir in include lib sasldb plugins utils; do
-    pushd ${dir} || return 1
+    pushd ${dir}
     make DESTDIR="${pkgdir}" install
     popd
   done
+  rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so*
+  rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so*
+  rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so*
+  install -m755 -d "${pkgdir}/usr/share/licenses/libsasl"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/"
+}
+
+package_cyrus-sasl() {
+  depends=("libsasl=${pkgver}-${pkgrel}")
+  pkgdesc="Cyrus saslauthd SASL authentication daemon"
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/etc/rc.d"
+  install -m755 -d "${pkgdir}/etc/conf.d"
+  install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/"
+  install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/"
+}
+
+package_cyrus-sasl-gssapi() {
+  pkgdesc="GSSAPI authentication mechanism for Cyrus SASL"
+  depends=("libsasl=${pkgver}-${pkgrel}" 'krb5')
+  replaces=('cyrus-sasl-plugins')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  install -m755 -d "${pkgdir}/usr/lib/sasl2"
+  cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/"
+}
+
+package_cyrus-sasl-ldap() {
+  pkgdesc="ldapdb auxprop module for Cyrus SASL"
+  depends=("libsasl=${pkgver}-${pkgrel}" 'libldap')
+  replaces=('cyrus-sasl-plugins')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  install -m755 -d "${pkgdir}/usr/lib/sasl2"
+  cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/"
+}
+
+package_cyrus-sasl-sql() {
+  pkgdesc="SQL auxprop module for Cyrus SASL"
+  depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient')
+  replaces=('cyrus-sasl-plugins')
+
+  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  install -m755 -d "${pkgdir}/usr/lib/sasl2"
+  cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
 
-  # install license
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/"
 }
diff --git a/core/libsasl/cyrus-sasl-2.1.22-as-needed.patch b/core/libsasl/cyrus-sasl-2.1.22-as-needed.patch
new file mode 100644
index 000000000..1294cb507
--- /dev/null
+++ b/core/libsasl/cyrus-sasl-2.1.22-as-needed.patch
@@ -0,0 +1,11 @@
+--- saslauthd/configure.in.orig	2006-05-23 15:53:17.000000000 -0700
++++ saslauthd/configure.in	2006-05-23 15:53:33.000000000 -0700
+@@ -77,7 +77,7 @@
+   AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
+   SASL_DB_PATH_CHECK()
+   SASL_DB_CHECK()
+-  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
++  SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB"
+ fi
+ 
+ AC_ARG_ENABLE(httpform, [  --enable-httpform       enable HTTP form authentication [[no]] ],
diff --git a/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch b/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch
new file mode 100644
index 000000000..8cd71c0c5
--- /dev/null
+++ b/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch
@@ -0,0 +1,94 @@
+Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was
+originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building
+using automake 1.10.
+
+--- cyrus-sasl-2.1.22/plugins/Makefile.am		2006-05-17 18:46:16.000000000 +0200
++++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110		2007-02-16 15:42:07.000000000 +0100
+@@ -82,73 +82,73 @@
+ 	libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
+ 
+ libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
+-libplain_la_LDFLAGS = -version-info $(plain_version)
++libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version)
+ libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
+ 
+ libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
+-libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
++libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version)
+ libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libanonymous_la_LIBADD = $(COMPAT_OBJS)
+ 
+ libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources)
+-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
++libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version)
+ libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
+-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
++libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version)
+ libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
+-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
++libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version)
+ libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libcrammd5_la_LIBADD = $(COMPAT_OBJS)
+ 
+ libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
+-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
++libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version)
+ libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ liblogin_la_SOURCES = login.c login_init.c $(common_sources)
+-liblogin_la_LDFLAGS = -version-info $(login_version)
++liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version)
+ liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
+ liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
+ 
+ libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
+-libsrp_la_LDFLAGS = -version-info $(srp_version)
++libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version)
+ libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
+ 
+ libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
+-libotp_la_LDFLAGS = -version-info $(otp_version)
++libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version)
+ libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
+ 
+ libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
+-libntlm_la_LDFLAGS = -version-info $(ntlm_version)
++libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version)
+ libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
+ 
+ libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
+-libpassdss_la_LDFLAGS = -version-info $(passdss_version)
++libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version)
+ libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
+ 
+ # Auxprop Plugins
+ libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
+-libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
++libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version)
+ libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
+ 
+ libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
+-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
++libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version)
+ libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libldapdb_la_LIBADD = $(COMPAT_OBJS)
+ 
+ libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
+-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
++libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
+ libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsql_la_LIBADD = $(COMPAT_OBJS)
+ 
diff --git a/core/libsasl/cyrus-sasl-2.1.22-crypt.patch b/core/libsasl/cyrus-sasl-2.1.22-crypt.patch
new file mode 100644
index 000000000..fd356327b
--- /dev/null
+++ b/core/libsasl/cyrus-sasl-2.1.22-crypt.patch
@@ -0,0 +1,71 @@
+http://bugs.gentoo.org/152544
+
+--- cyrus-sasl-2.1.22/lib/Makefile.am
++++ cyrus-sasl-2.1.22/lib/Makefile.am
+@@ -45,6 +45,7 @@ sasl_version = 2:22:0
+ 
+ INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
+ 
++AM_CFLAGS = -fPIC
+ EXTRA_DIST = windlopen.c staticopen.h NTMakefile
+ EXTRA_LIBRARIES = libsasl2.a
+ noinst_LIBRARIES = @SASL_STATIC_LIBS@
+--- cyrus-sasl-2.1.22/plugins/Makefile.am
++++ cyrus-sasl-2.1.22/plugins/Makefile.am
+@@ -63,6 +63,7 @@ srp_version = 2:22:0
+ 
+ INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
+ AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
++AM_CFLAGS = -fPIC
+ 
+ COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
+ 
+--- cyrus-sasl-2.1.22/sasldb/Makefile.am
++++ cyrus-sasl-2.1.22/sasldb/Makefile.am
+@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
+ 
+ extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
+ 
++AM_CFLAGS = -fPIC
+ EXTRA_DIST = NTMakefile
+ 
+ noinst_LTLIBRARIES = libsasldb.la
+--- cyrus-sasl-2.1.22/utils/Makefile.am
++++ cyrus-sasl-2.1.22/utils/Makefile.am
+@@ -42,7 +42,7 @@
+ #
+ ################################################################
+ 
+-all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
++all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT)
+ all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
+ 
+ sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
+--- cyrus-sasl-2.1.22/sample/Makefile.am
++++ cyrus-sasl-2.1.22/sample/Makefile.am
+@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c
+ server_SOURCES = server.c common.c common.h
+ client_SOURCES = client.c common.c common.h
+ 
+-server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
+-client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
++server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
++client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
+ 
+-sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
+-sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
++sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
++sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
+ 
+ EXTRA_DIST = NTMakefile
+--- cyrus-sasl-2.1.22/lib/Makefile.am
++++ cyrus-sasl-2.1.22/lib/Makefile.am
+@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la
+ libsasl2_la_SOURCES = $(common_sources) $(common_headers)
+ libsasl2_la_LDFLAGS = -version-info $(sasl_version)
+ libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
+-libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
++libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT)
+ 
+ if MACOSX
+ framedir = /Library/Frameworks/SASL2.framework
diff --git a/core/libsasl/cyrus-sasl-2.1.22-qa.patch b/core/libsasl/cyrus-sasl-2.1.22-qa.patch
new file mode 100644
index 000000000..4f7b04f13
--- /dev/null
+++ b/core/libsasl/cyrus-sasl-2.1.22-qa.patch
@@ -0,0 +1,22 @@
+fix missing prototype warnings
+
+--- cyrus-sasl-2.1.22/lib/auxprop.c
++++ cyrus-sasl-2.1.22/lib/auxprop.c
+@@ -43,6 +43,7 @@
+  */
+ 
+ #include <config.h>
++#include <stdio.h>
+ #include <sasl.h>
+ #include <prop.h>
+ #include <ctype.h>
+--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
+@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF
+ ******************************************************************/
+ 
+ #include <shadow.h>
++#include <string.h>
+ 
+ extern char *crypt();
+ 
diff --git a/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch b/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch
new file mode 100644
index 000000000..f5f372d17
--- /dev/null
+++ b/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch
@@ -0,0 +1,28 @@
+fix warnings:
+
+auth_sasldb.c: In function ‘auth_sasldb’:
+auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’
+
+auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type
+../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’
+
+--- saslauthd/auth_sasldb.c
++++ saslauthd/auth_sasldb.c
+@@ -41,6 +41,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <pwd.h>
++#include <unistd.h>
+ /* END PUBLIC DEPENDENCIES */
+ 
+ #define RETURN(x) return strdup(x)
+@@ -131,7 +132,8 @@
+     /* VARIABLES */
+     char pw[1024];			/* pointer to passwd file entry */
+     sasl_utils_t utils;
+-    int ret, outsize;
++    int ret;
++    size_t outsize;
+     const char *use_realm;
+     char realm_buf[MAXHOSTNAMELEN];
+     /* END VARIABLES */
diff --git a/core/libsasl/saslauthd b/core/libsasl/saslauthd
new file mode 100644
index 000000000..6afafae0b
--- /dev/null
+++ b/core/libsasl/saslauthd
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# source application-specific settings
+[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="saslauthd"
+SASLAUTHD_BIN=/usr/sbin/saslauthd
+SASLAUTHD_RUN=/var/run/saslauthd
+SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
+
+case "$1" in
+  start)
+    stat_busy "Starting $DAEMON_NAME"
+    [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd
+    if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then
+      add_daemon $DAEMON_NAME
+      stat_done
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping $DAEMON_NAME"
+    [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm_daemon $DAEMON_NAME
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+# vim: ts=2 sw=2 et ft=sh
diff --git a/core/libsasl/saslauthd.conf.d b/core/libsasl/saslauthd.conf.d
new file mode 100644
index 000000000..167211290
--- /dev/null
+++ b/core/libsasl/saslauthd.conf.d
@@ -0,0 +1 @@
+SASLAUTHD_OPTS="-a pam"
diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD
index 319a0ae16..6c165e745 100644
--- a/core/pcmciautils/PKGBUILD
+++ b/core/pcmciautils/PKGBUILD
@@ -1,20 +1,18 @@
-# $Id: PKGBUILD 113400 2011-03-08 14:24:47Z stephane $
+# $Id: PKGBUILD 134400 2011-08-03 16:55:02Z tomegun $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pcmciautils
-pkgver=017
-pkgrel=2
+pkgver=018
+pkgrel=1
 pkgdesc="Utilities for inserting and removing PCMCIA cards"
 arch=(i686 x86_64 'mips64el')
 url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 license=('GPL')
 groups=('base')
-depends=('glibc' 'sysfsutils' 'module-init-tools>=3.2pre9')
+# sysfsutils will not be required in the next release
+depends=('udev' 'sysfsutils')
 conflicts=('pcmcia-cs')
-source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2
-        60-pcmcia.rules)
+source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2)
 options=(!makeflags)
-md5sums=('5245af28eeba57ec0606a874d44d10f7'
-         'f88ac464ab9c75fe1565af551e6553a2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,8 +23,5 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  # fix lspcmcia symlink
-  ln -sf pccardctl "${pkgdir}"/sbin/lspcmcia
-  # add fixed rules file
-  install -D -m644 "${srcdir}"/60-pcmcia.rules "${pkgdir}"/lib/udev/rules.d/
 }
+md5sums=('5d85669b3440baa4532363da6caaf1b4')
diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules
index cd4e3e9b4..71f1a883b 100644
--- a/core/udev/81-arch.rules
+++ b/core/udev/81-arch.rules
@@ -26,8 +26,7 @@ KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660"
 SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical"
 
 # permissions for SCSI CD devices
-SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", SYMLINK+="scd%n", GROUP="optical"
-SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", GROUP="optical"
+SUBSYSTEMS=="scsi", KERNEL=="s[rg][0-9]*", ATTRS{type}=="5", GROUP="optical"
 
 # permissions for removable devices like cardreaders or sticks
 KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage"
@@ -61,23 +60,12 @@ KERNEL=="radio[0-9]*",	GROUP="video"
 KERNEL=="video0",	SYMLINK+="video"
 KERNEL=="vtx0",		SYMLINK+="vtx"
 
-# video devices
-### xorg resets those permissions, adjust your xorg.conf!
-KERNEL=="3dfx*",	GROUP="video"
-KERNEL=="fb[0-9]*",	GROUP="video"
-
 # misc
 KERNEL=="sgi_fetchop",	MODE="0666"
 KERNEL=="sonypi",	MODE="0666"
 
 # USB devices
 KERNEL=="legousbtower*", MODE="0666"
-
-# kbd devices
-KERNEL=="kbd", MODE="0664"
-
-# miscellaneous
-KERNEL=="rtc|rtc0", GROUP="audio", MODE="0664"
 #######################################
 # Permissions and Symlinks - end
 #######################################
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 474fceb5b..bcfffb91a 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126202 2011-06-02 14:49:12Z tomegun $
+# $Id: PKGBUILD 134147 2011-08-02 11:38:00Z tomegun $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
@@ -6,8 +6,8 @@
 
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
-pkgver=171
-pkgrel=2
+pkgver=173
+pkgrel=3
 arch=(i686 x86_64 mips64el)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license=('GPL')
@@ -16,15 +16,13 @@ groups=('base')
 options=(!makeflags !libtool)
 makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
-        81-arch.rules
-	static-audio-nodes-group.patch
-	static-nodes-permissions.patch)
+	bluetooth.patch
+        81-arch.rules)
 
 build() {
   cd $srcdir/$pkgbase-$pkgver
-  # fix https://bugs.archlinux.org/task/24362 (will be in udev-172)
-  patch -Np1 -i ../static-audio-nodes-group.patch
-  patch -Np1 -i ../static-nodes-permissions.patch
+  # fix https://bugs.archlinux.org/task/25356 (submitted upstream)
+  patch -Np1 -i ../bluetooth.patch
 
   if [ "$CARCH" = "mips64el" ]; then
     msg "Remove -Wl,--gc-sections"
@@ -32,9 +30,13 @@ build() {
     sed -i "753d" Makefile.in
   fi
 
-  ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\
-              --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\
-              --disable-rule-generator
+  ./configure --sysconfdir=/etc\
+              --with-rootlibdir=/lib\
+              --libexecdir=/lib/udev\
+              --sbindir=/sbin\
+              --with-systemdsystemunitdir=/lib/systemd/system\
+              --disable-rule-generator\
+              --enable-udev_acl
   make
 }
   
@@ -43,8 +45,7 @@ package_udev() {
   depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2'
            'module-init-tools>=3.11' 'pciutils')
   install=udev.install
-  backup=(etc/udev/udev.conf
-          etc/modprobe.d/framebuffer_blacklist.conf)
+  backup=(etc/udev/udev.conf)
   conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07')
   replaces=('devfsd')
   
@@ -54,14 +55,33 @@ package_udev() {
   install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules
 
   # create framebuffer blacklist
-  mkdir -p $pkgdir/etc/modprobe.d/
+  mkdir -p $pkgdir/lib/modprobe.d/
   for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do 
   	echo "blacklist $mod" 
-  done | sort -u > $pkgdir/etc/modprobe.d/framebuffer_blacklist.conf
+  done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf
 
+  # these static devices are created for convenience, to autoload the modules if necessary
+  # /dev/loop0
+  mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0
+  chgrp disk ${pkgdir}/lib/udev/devices/loop0
+
+  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
+  for i in $pkgdir/lib/udev/rules.d/*.rules; do
+    sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
+               s#GROUP="tape"#GROUP="storage"#g;
+               s#GROUP="cdrom"#GROUP="optical"#g' $i
+  done
+}
+
+package_udev-compat() {
+  pkgdesc="The userspace dev tools (udev) - additional rules for older kernels"
+  depends=('udev')
+  groups=('')
+  cd $srcdir/$pkgbase-$pkgver
+  install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d
+  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
   # create static devices in /lib/udev/devices/
-  mkdir ${pkgdir}/lib/udev/devices/pts
-  mkdir ${pkgdir}/lib/udev/devices/shm
+  mkdir -p ${pkgdir}/lib/udev/devices/{pts,shm}
 
   mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1
   mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3
@@ -75,9 +95,6 @@ package_udev() {
   ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core
 
   # these static devices are created for convenience, to autoload the modules if necessary
-  # /dev/loop0
-  mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0
-  chgrp disk ${pkgdir}/lib/udev/devices/loop0
   # /dev/net/tun
   mkdir ${pkgdir}/lib/udev/devices/net
   mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200
@@ -85,24 +102,7 @@ package_udev() {
   mknod -m 0666 ${pkgdir}/lib/udev/devices/fuse c 10 229 
   # /dev/ppp
   mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  for i in $pkgdir/lib/udev/rules.d/*.rules; do
-    sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
-               s#GROUP="tape"#GROUP="storage"#g;
-               s#GROUP="cdrom"#GROUP="optical"#g' $i
-  done
-}
-
-package_udev-compat() {
-  pkgdesc="The userspace dev tools (udev) - additional rules for older kernels"
-  depends=('udev')
-  groups=('')
-  cd $srcdir/$pkgbase-$pkgver
-  install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
 }
-md5sums=('bdf4617284be2ecac11767437417e209'
-         '6ee44e3feb8e0f037947e7d4ca273f12'
-         '4f625aea95a5597afd8cdf189421f193'
-         'f9e50b8dfcd2215f5423ff9bc04ecf68')
+md5sums=('91a88a359b60bbd074b024883cc0dbde'
+         '36cb9bfb55a8d931b7498d2e46730745'
+         'ec529eb1ddaabb70c61b38f80bb8462a')
diff --git a/core/udev/bluetooth.patch b/core/udev/bluetooth.patch
new file mode 100644
index 000000000..96f5d6901
--- /dev/null
+++ b/core/udev/bluetooth.patch
@@ -0,0 +1,36 @@
+From 7462d61442f606cc118722e0572ac8db48fa2540 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Tue, 2 Aug 2011 10:56:33 +0200
+Subject: [PATCH] rules: input - fix detection of bluetooth hid devices in
+ Xorg
+
+Commit c49df20758e0f22778cfc93b598f2929f4c86272 prevented udev from
+creating broken symlinks for bluetooth hid devices. Unfortunately,
+it also removed the ID_INPUT=1 and ID_INPUT_{KEY,MOUSE}=1 properties
+from those devices. Xorg relies on these properties for cold- and
+hotplugging of input devices.
+
+With this patch, udev still omits the broken symlinks, but also
+imports the input_id properties again.
+---
+ rules/rules.d/60-persistent-input.rules |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/rules/rules.d/60-persistent-input.rules b/rules/rules.d/60-persistent-input.rules
+index 65a6381..28d50d2 100644
+--- a/rules/rules.d/60-persistent-input.rules
++++ b/rules/rules.d/60-persistent-input.rules
+@@ -2,9 +2,9 @@
+ 
+ ACTION=="remove", GOTO="persistent_input_end"
+ SUBSYSTEM!="input", GOTO="persistent_input_end"
+-SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end"
+ 
+ ENV{ID_INPUT}=="", IMPORT{program}="input_id %p"
++SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end"
+ SUBSYSTEMS=="usb", ENV{ID_BUS}=="", IMPORT{program}="usb_id --export %p"
+ 
+ # determine class name for persistent symlinks
+-- 
+1.7.6
+
diff --git a/core/udev/udev.install b/core/udev/udev.install
index 5c02dd15b..272ab60c0 100644
--- a/core/udev/udev.install
+++ b/core/udev/udev.install
@@ -2,40 +2,47 @@
 # arg 2:  the old package version
 
 post_upgrade() {
-  if [ "$(vercmp $2 100)" -lt 0 ]; then
-    echo "ATTENTION UDEV:"
-    echo "----------"
-    echo "udev >=098 rules syntax has changed, please update your own rules."
-    echo "udev >=099 Added persistent network and CD/DVD Symlink generator rules."
-    echo "Please read the instructions carefully before reboot."
-    echo "They are located in /etc/udev/readme-udev-arch.txt"
-    echo "----------"
-  fi
-  if [ "$(vercmp $2 169)" -lt 0 ]; then
-    echo "ATTENTION UDEV:"
-    echo "---------------"
-    echo "Kernel 2.6.32 or newer is now required."
-    echo "OSS emulation modules are not loaded by default, add to rc.conf if needed."
-    echo "Arch specific cd symlinks are now no longer created."
-    echo "cd and net persistent rules will no longer be autogenerated,"
-    echo "see <https://wiki.archlinux.org/index.php/Udev> for details."
-    echo "Errors are now logged (possibly to the console) by default."
-    echo "---------------"
-  fi
   if [ "$(vercmp $2 172)" -lt 0 ]; then
     echo "ATTENTION UDEV:"
-    echo "---------------"
-    echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
-    echo "blacklisting in MODULES no longer works."
-    echo "See 'man modprobe.conf' for a replacement to blacklisting."
-    echo "To disable a module mod1 on the kernel command line, use"
-    echo "mod1.disable=1"
-    echo "or"
-    echo "modprobe.blacklist=mod1"
+    echo "----------"
+    if [ "$(vercmp $2 168)" -lt 0 ]; then
+      echo "Kernel 2.6.32 or newer is now required."
+      echo "  --"
+      echo "OSS emulation modules are not loaded by default, add to rc.conf if needed."
+      echo "  --"
+      echo "Arch specific cd symlinks are now no longer created."
+      echo "  --"
+      echo "cd and net persistent rules will no longer be autogenerated,"
+      echo "see <https://wiki.archlinux.org/index.php/Udev> for details."
+      echo "  --"
+      echo "Errors are now logged (possibly to the console) by default."
+      echo "  --"
+    fi
+    if [ "$(vercmp $2 171)" -lt 0 ]; then
+      echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
+      echo "blacklisting in MODULES no longer works."
+      echo "See 'man modprobe.conf' for a replacement to blacklisting."
+      echo "To disable a module mod1 on the kernel command line, use"
+      echo "mod1.disable=1"
+      echo "or"
+      echo "modprobe.blacklist=mod1"
+      echo "  --"
+      echo "The following modules are no longer unconditionally loaded:"
+      echo "  pcspkr irtty-sir analog lp ppdev ide-generic"
+      echo "Add them to MODULES in rc.conf if you need them."
+      echo "  --"
+    fi
+    echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat."
+    echo "  --"
+    echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
+    echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
+    echo "takes precedence."
+    echo "  --"
+    echo "kbd and rtc devices are no longer world readable."
     echo "  --"
-    echo "The following modules are no longer unconditionally loaded:"
-    echo "  pcspkr irtty-sir analog lp ppdev ide-generic"
-    echo "Add them to MODULES in rc.conf if you need them."
+    echo "rtc is no longer in the audio group and fb devices are no longer in"
+    echo "the video group, as permissions and ownership of fb devices are controlled"
+    echo "by X."
     echo "---------------"
   fi
 }