From b8ea4461e461f0e1782e28b5810eb811423afa79 Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Thu, 19 May 2011 16:52:00 +0000
Subject: Thu May 19 16:52:00 UTC 2011

---
 testing/cyrus-sasl-plugins/PKGBUILD                | 52 ----------------------
 .../cyrus-sasl-2.1.22-gcc44.patch                  | 24 ----------
 .../cyrus-sasl-2.1.23-db5-fix.patch                | 23 ----------
 3 files changed, 99 deletions(-)
 delete mode 100644 testing/cyrus-sasl-plugins/PKGBUILD
 delete mode 100644 testing/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch
 delete mode 100644 testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch

(limited to 'testing/cyrus-sasl-plugins')

diff --git a/testing/cyrus-sasl-plugins/PKGBUILD b/testing/cyrus-sasl-plugins/PKGBUILD
deleted file mode 100644
index 5817bb657..000000000
--- a/testing/cyrus-sasl-plugins/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 122144 2011-05-02 13:27:49Z stephane $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=cyrus-sasl-plugins
-pkgver=2.1.23
-pkgrel=5
-pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
-arch=('i686' 'x86_64')
-url="http://cyrusimap.web.cmu.edu/"
-license=('custom')
-depends=('postgresql-libs>=9.0.3' 'krb5' 'libldap>2.4'
-        'libmysqlclient>=5.5.10')
-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.23-db5-fix.patch)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
-         '5deb4d67b53ecba20c7887fc8fdebee1'
-         '3ae4347705141145f31cf786c38ea9ef')
-options=('!libtool')
-
-build() {
-  cd ${srcdir}/cyrus-sasl-${pkgver}
-  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 \
-    --disable-login \
-    --disable-plain \
-    --enable-sql \
-    --disable-sqlite \
-    --enable-gssapi=/usr/include/gssapi \
-    --with-mysql=/usr \
-    --with-pgsql=/usr \
-    --enable-postgresql \
-    --enable-ldapdb \
-    --with-ldap=/usr
-  cd sasldb
-  make
-  cd ../plugins
-  make
-}
-
-package () {
-  cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
-  make DESTDIR=${pkgdir} install
-  
-  install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-
-  rm -f ${pkgdir}/usr/lib/sasl2/libsasldb.*
-}
diff --git a/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch b/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch
deleted file mode 100644
index e2621278b..000000000
--- a/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-fix warnings with gcc-4.4
-
-http://bugs.gentoo.org/248738
-
---- cyrus-sasl-2.1.22/plugins/digestmd5.c
-+++ cyrus-sasl-2.1.22/plugins/digestmd5.c
-@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv
- 	"DIGEST-MD5",			/* mech_name */
- #ifdef WITH_RC4
- 	128,				/* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else 
- 	1,
-@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie
- 	"DIGEST-MD5",
- #ifdef WITH_RC4				/* mech_name */
- 	128,				/* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else
- 	1,
diff --git a/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch b/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch
deleted file mode 100644
index 2ccd6cdb3..000000000
--- a/testing/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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);
-- 
cgit v1.2.3-54-g00ecf