diff options
| -rw-r--r-- | main/cyrus-sasl/APKBUILD | 23 | ||||
| -rw-r--r-- | main/cyrus-sasl/cyrus-sasl-2.1.23-db5-fix.patch | 23 | ||||
| -rw-r--r-- | main/cyrus-sasl/db-4.7.patch | 20 |
3 files changed, 37 insertions, 29 deletions
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD index be51170ce9..685964c5ac 100644 --- a/main/cyrus-sasl/APKBUILD +++ b/main/cyrus-sasl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cyrus-sasl pkgver=2.1.23 -pkgrel=6 +pkgrel=7 pkgdesc="Cyrus Simple Authentication Service Layer (SASL)" url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" arch="all" @@ -12,16 +12,21 @@ makedepends="db-dev openssl-dev" source="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$pkgname-$pkgver.tar.gz saslauthd.initd cyrus-sasl-2.1.19-checkpw.c.patch - db-4.7.patch" + cyrus-sasl-2.1.23-db5-fix.patch + " -build () -{ - cd "$srcdir"/cyrus-sasl-$pkgver - for i in ../*.patch; do - msg "Applying $i..." - patch -p0 -i $i || return 1 +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac done +} +build() { + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -56,4 +61,4 @@ libsasl() { md5sums="2eb0e48106f0e9cd8001e654f267ecbc cyrus-sasl-2.1.23.tar.gz ba499a13d8d08d1b97bb0d5cb0b01bcc saslauthd.initd e27ddff076342e7a3041c4759817d04b cyrus-sasl-2.1.19-checkpw.c.patch -71a3b7454f4d7cc2966b347bdf03f2fc db-4.7.patch" +b60db0033f61106f8eb7740fa12feba5 cyrus-sasl-2.1.23-db5-fix.patch" diff --git a/main/cyrus-sasl/cyrus-sasl-2.1.23-db5-fix.patch b/main/cyrus-sasl/cyrus-sasl-2.1.23-db5-fix.patch new file mode 100644 index 0000000000..d9437d0912 --- /dev/null +++ b/main/cyrus-sasl/cyrus-sasl-2.1.23-db5-fix.patch @@ -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); diff --git a/main/cyrus-sasl/db-4.7.patch b/main/cyrus-sasl/db-4.7.patch deleted file mode 100644 index 8937d7633d..0000000000 --- a/main/cyrus-sasl/db-4.7.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- configure 2006-05-18 21:30:13.000000000 +0200 -+++ configure.new 2007-09-29 00:22:42.000000000 +0200 -@@ -5125,7 +5125,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in db-4.7 db4.7 db47 db-4.54 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -5882,7 +5882,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in db-4.7 db4.7 db47 db-4.54 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF |