summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/cyrus-sasl/ChangeLog6
-rw-r--r--dev-libs/cyrus-sasl/Manifest14
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild18
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.21.ebuild18
-rw-r--r--dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r32
5 files changed, 33 insertions, 25 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 38ef890fe742..e6ccf90e2983 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/cyrus-sasl
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.124 2005/05/25 06:56:05 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.125 2005/06/03 17:54:19 langthang Exp $
+
+ 03 Jun 2005; Tuấn Văn <langthang@gentoo.org>
+ cyrus-sasl-2.1.20-r3.ebuild, cyrus-sasl-2.1.21.ebuild:
+ Don't try to create /etc/sasl2/sasldb if -berkdb and -gdbm.
*cyrus-sasl-2.1.21 (25 May 2005)
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 20cb86e03db3..f0be60427a59 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -4,10 +4,10 @@ Hash: SHA1
MD5 04c0b54fe6928e86aef07b627b88765f cyrus-sasl-2.1.18-r2.ebuild 5430
MD5 54f2bd76be47e4beec9b53b237d0e44f cyrus-sasl-2.1.19-r1.ebuild 7161
MD5 267cd40a5fb6cc0d346ff563ff1d9aca cyrus-sasl-2.1.20-r2.ebuild 9524
-MD5 8079230c412ae9418eff6d8f6923e8e8 cyrus-sasl-2.1.21.ebuild 9150
+MD5 449b680b5253bc3e9af3862872f735c4 cyrus-sasl-2.1.21.ebuild 9198
MD5 62922ef59be6add5b73bc4f12b9041ea cyrus-sasl-2.1.20-r1.ebuild 8558
-MD5 5697414f5f798e7e5d9e2d4aaa81bee1 cyrus-sasl-2.1.20-r3.ebuild 9143
-MD5 e1f907fa90109576b5e076ba2fba9135 ChangeLog 21824
+MD5 d9fda6c54c37d9a72b5ec222a0f942cb cyrus-sasl-2.1.20-r3.ebuild 9191
+MD5 8d9c6c6feca0be209001fbb92f9d5366 ChangeLog 21998
MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
MD5 503215dd515be5cf6f826c80915ce026 cyrus-sasl-2.1.20.ebuild 7351
MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
@@ -17,7 +17,7 @@ MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r2 70
MD5 d6d8b3c7c3a2aacf656f970a043d3158 files/digest-cyrus-sasl-2.1.19-r1 70
MD5 c355c365d74408c00cdaa25beea6d4f7 files/digest-cyrus-sasl-2.1.20-r1 70
MD5 459aa1c6826a31cb3c0efe7a1c5ebbc4 files/digest-cyrus-sasl-2.1.20-r2 149
-MD5 459aa1c6826a31cb3c0efe7a1c5ebbc4 files/digest-cyrus-sasl-2.1.20-r3 149
+MD5 c142fbeff7892e6a0e970da00929395c files/digest-cyrus-sasl-2.1.20-r3 149
MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752
MD5 f8ad054201be2531b337375299c4c39b files/cyrus-sasl-2.1.20-gcc4.patch 462
@@ -53,7 +53,7 @@ MD5 6e3a4b0f3a097e9aadfe5ac4efe8a7bf files/digest-cyrus-sasl-2.1.21 156
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFClmlQ5FrxP71izLARAibmAKDX2Sd0Youh1Cs8nsMcU2x3A++1QgCgnekA
-jD76keqQ5x+prKefWMtD/Vo=
-=Ak2K
+iD8DBQFCoJlH5FrxP71izLARAtE/AJ4o5jdG7cnk+ZN3uFMagRaiyGoAPQCgzYci
+xxwuVoGnEqO4I/9gGDJNink=
+=cSQ1
-----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild
index 039733a4d074..a2c5cc01d122 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild,v 1.4 2005/05/23 17:31:50 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r3.ebuild,v 1.5 2005/06/03 17:54:19 langthang Exp $
inherit eutils gnuconfig flag-o-matic java-pkg multilib
@@ -231,13 +231,15 @@ src_install () {
fi
# Generate an empty sasldb2 with correct permissions.
- LD_OLD="${LD_LIBRARY_PATH}"
- export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/sasl2"
- echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login
- "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login
- export LD_LIBRARY_PATH="${LD_OLD}"
- chown root:mail "${D}/etc/sasl2/sasldb2"
- chmod 0640 "${D}/etc/sasl2/sasldb2"
+ if use berkdb || use gdbm; then
+ LD_OLD="${LD_LIBRARY_PATH}"
+ export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/sasl2"
+ echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login
+ "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login
+ export LD_LIBRARY_PATH="${LD_OLD}"
+ chown root:mail "${D}/etc/sasl2/sasldb2"
+ chmod 0640 "${D}/etc/sasl2/sasldb2"
+ fi
docinto ""
dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21.ebuild
index 70bb7835ce3f..2655eb681c60 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21.ebuild,v 1.1 2005/05/25 06:56:05 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.21.ebuild,v 1.2 2005/06/03 17:54:19 langthang Exp $
inherit eutils gnuconfig flag-o-matic java-pkg multilib
@@ -231,13 +231,15 @@ src_install () {
fi
# Generate an empty sasldb2 with correct permissions.
- LD_OLD="${LD_LIBRARY_PATH}"
- export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/sasl2"
- echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login
- "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login
- export LD_LIBRARY_PATH="${LD_OLD}"
- chown root:mail "${D}/etc/sasl2/sasldb2"
- chmod 0640 "${D}/etc/sasl2/sasldb2"
+ if use berkdb || use gdbm; then
+ LD_OLD="${LD_LIBRARY_PATH}"
+ export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" SASL_PATH="${D}/usr/$(get_libdir)/sasl2"
+ echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login
+ "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login
+ export LD_LIBRARY_PATH="${LD_OLD}"
+ chown root:mail "${D}/etc/sasl2/sasldb2"
+ chmod 0640 "${D}/etc/sasl2/sasldb2"
+ fi
docinto ""
dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3
index 7364412cd6ab..372798c1de6c 100644
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3
+++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20-r3
@@ -1,2 +1,2 @@
MD5 268ead27f4ac39bcfe17d9e38e0f2977 cyrus-sasl-2.1.20.tar.gz 1775163
-MD5 a3a8fcefa0874e1fb97787a034880d9f cyrus-sasl-ntlm_impl-spnego.patch.gz 7430
+MD5 d64bbea794c39fcdd4b6fabee4fe3a45 cyrus-sasl-ntlm_impl-spnego.patch.gz 7458