[arch-commits] Commit in cyrus-sasl-plugins/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Sunday, January 30, 2011 @ 17:08:04
  Author: andyrtr
Revision: 108383

upgpkg: cyrus-sasl-plugins 2.1.23-3
MySQL rebuild; add db5 buildfix; remove libtool files

Added:
  cyrus-sasl-plugins/trunk/cyrus-sasl-2.1.23-db5-fix.patch
Modified:
  cyrus-sasl-plugins/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   24 ++++++++++++++++--------
 cyrus-sasl-2.1.23-db5-fix.patch |   23 +++++++++++++++++++++++
 2 files changed, 39 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-30 21:50:14 UTC (rev 108382)
+++ PKGBUILD	2011-01-30 22:08:04 UTC (rev 108383)
@@ -3,21 +3,25 @@
 
 pkgname=cyrus-sasl-plugins
 pkgver=2.1.23
-pkgrel=2
+pkgrel=3
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
-depends=('postgresql-libs>=8.4.1' 'heimdal>=1.2-1' 'libldap>2.4' 'libmysqlclient')
+depends=('postgresql-libs>=8.4.1' 'heimdal>=1.2-1' 'libldap>2.4' 'libmysqlclient>=5.5.8')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
-        cyrus-sasl-2.1.22-gcc44.patch)
+        cyrus-sasl-2.1.22-gcc44.patch
+	cyrus-sasl-2.1.23-db5-fix.patch)
 md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
-         '5deb4d67b53ecba20c7887fc8fdebee1')
+         '5deb4d67b53ecba20c7887fc8fdebee1'
+         '3ae4347705141145f31cf786c38ea9ef')
+options=('!libtool')
 
 build() {
   cd ${srcdir}/cyrus-sasl-${pkgver}
-  patch -Np1 -i $srcdir/cyrus-sasl-2.1.22-gcc44.patch || return 1
-
+  patch -Np1 -i $srcdir/cyrus-sasl-2.1.22-gcc44.patch
+  # from http://bugs.gentoo.org/show_bug.cgi?id=319935
+  patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.23-db5-fix.patch
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -34,8 +38,12 @@
   cd sasldb
   make
   cd ../plugins
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
+
+package () {
+  cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
+  make DESTDIR=${pkgdir} install
   
   install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 

Added: cyrus-sasl-2.1.23-db5-fix.patch
===================================================================
--- cyrus-sasl-2.1.23-db5-fix.patch	                        (rev 0)
+++ cyrus-sasl-2.1.23-db5-fix.patch	2011-01-30 22:08:04 UTC (rev 108383)
@@ -0,0 +1,23 @@
+--- sasldb/db_berkeley.c.orig	2010-10-04 21:11:15.044010468 -0400
++++ sasldb/db_berkeley.c	2010-10-04 21:12:18.921998718 -0400
+@@ -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);
+
+--- utils/dbconverter-2.c.orig	2010-10-04 21:23:39.778000256 -0400
++++ utils/dbconverter-2.c	2010-10-04 21:24:50.384999893 -0400
+@@ -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);