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

Conflicts:
	community/frogatto/PKGBUILD
	community/python-psycopg2/PKGBUILD
	core/libtirpc/PKGBUILD
	extra/cd-discid/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gperf/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kismet/PKGBUILD
	extra/lzo/PKGBUILD
	extra/mutt/PKGBUILD
	extra/obconf/PKGBUILD
	extra/opensp/PKGBUILD
	extra/qt3/PKGBUILD
	extra/re2c/PKGBUILD
	extra/samba/PKGBUILD
	extra/sharutils/PKGBUILD
	extra/wireshark/PKGBUILD

3 files changed, 71 insertions, 10 deletions

diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index e417a95b5..2aa9a2351 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,36 +1,52 @@
-# $Id: PKGBUILD 75335 2010-04-01 10:43:20Z allan $
+# $Id: PKGBUILD 122168 2011-05-02 15:13:37Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=4
+pkgrel=5
 pkgdesc="SASL authentication daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://asg.web.cmu.edu/cyrus/download/"
-depends=('pam>=1.0.1-2' 'heimdal>=1.3.1' 'libldap' 'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7')
+depends=('pam>=1.0.1-2' 'krb5' 'libldap' 'cyrus-sasl-plugins' 'db>=5.0')
 replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql)
 backup=(etc/conf.d/saslauthd)
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${pkgname}-${pkgver}.tar.gz
-	saslauthd
-	saslauthd.conf.d) 
+        saslauthd
+        saslauthd.conf.d
+        cyrus-sasl-2.1.23-gcc4.patch
+        cyrus-sasl-2.1.23+db-5.0.patch)
 md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
          '697dfb51206c398bc976ce9f4cffe72d'
-         '96d8a2f6189501f8044838e04d5cae7f')
+         '96d8a2f6189501f8044838e04d5cae7f'
+         '3a71688df7d5724cd55a8de17d74f34e'
+         '35c189c8e93ad37e3ae3c49386fdeb2c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix building with db v5.x
+  patch -Np1 -i ../cyrus-sasl-2.1.23+db-5.0.patch
+
+  # Fix error: #elif with no expression
+  patch -Np1 -i ../cyrus-sasl-2.1.23-gcc4.patch
+
   ./configure --prefix=/usr --mandir=/usr/share/man \
     --host=$CHOST \
     --build=$CHOST \
     --target=$CHOST \
     --with-ldap=/usr --with-saslauthd=/var/run/saslauthd
+    --disable-krb4 --with-gss_impl=mit --disable-otp
   cd saslauthd
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  make testsaslauthd || return 1
-  install -m755 testsaslauthd "${pkgdir}/usr/sbin" || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/saslauthd"
+  make DESTDIR="${pkgdir}" install
+  make testsaslauthd
+  install -m755 testsaslauthd "${pkgdir}/usr/sbin"
 
   install -dm766 "${pkgdir}/var/run/saslauthd"
   install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
new file mode 100644
index 000000000..62df3e67e
--- /dev/null
+++ b/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
@@ -0,0 +1,24 @@
+diff -Naur cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c cyrus-sasl-2.1.23/sasldb/db_berkeley.c
+--- cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c	2009-04-28 08:09:18.000000000 -0700
++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c	2011-05-02 07:16:42.748675977 -0700
+@@ -100,7 +100,7 @@
+     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_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+diff -Naur cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c cyrus-sasl-2.1.23/utils/dbconverter-2.c
+--- cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c	2003-02-13 11:56:17.000000000 -0800
++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c	2011-05-02 07:16:42.748675977 -0700
+@@ -214,7 +214,7 @@
+     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_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ 	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/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
new file mode 100644
index 000000000..0d8627b1f
--- /dev/null
+++ b/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
@@ -0,0 +1,21 @@
+diff -Naur cyrus-sasl-2.1.23.ori/plugins/digestmd5.c cyrus-sasl-2.1.23/plugins/digestmd5.c
+--- cyrus-sasl-2.1.23.ori/plugins/digestmd5.c	2009-04-28 08:09:17.000000000 -0700
++++ cyrus-sasl-2.1.23/plugins/digestmd5.c	2011-05-02 07:56:55.375403814 -0700
+@@ -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,