summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2014-10-27 19:15:09 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2014-10-27 19:15:09 +0000
commit6129a73d4641ac19b0234c5b445a91019b9f58f8 (patch)
tree2b974a27f3ecb160a2104ddfd3cabafee3dbb7c1 /net-nds/openldap/files
parentadd version 1.0.5 (diff)
downloadgentoo-2-6129a73d4641ac19b0234c5b445a91019b9f58f8.tar.gz
gentoo-2-6129a73d4641ac19b0234c5b445a91019b9f58f8.tar.bz2
gentoo-2-6129a73d4641ac19b0234c5b445a91019b9f58f8.zip
Upstream OpenLDAP nixes bdb6 functionality. Read comment 15 on the bug 525110.
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-nds/openldap/files')
-rw-r--r--net-nds/openldap/files/openldap-2.4.40-db-6.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/net-nds/openldap/files/openldap-2.4.40-db-6.patch b/net-nds/openldap/files/openldap-2.4.40-db-6.patch
deleted file mode 100644
index 77c3759224f2..000000000000
--- a/net-nds/openldap/files/openldap-2.4.40-db-6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Re-allow building with >= BerkeleyDB-6.0.20.
-
-If you do build/link against this version, please note that the licenses
-PROHIBIT distribution of the binaries. We will enforce RESTRICT=bindist for
-this.
-
-X-Gentoo-Bug: 525110
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=525110
-
-diff -ur openldap-2.4.40/build/openldap.m4 openldap-2.4.40.fix/build/openldap.m4
---- openldap-2.4.40/build/openldap.m4 2014-09-19 05:48:49.000000000 +0400
-+++ openldap-2.4.40.fix/build/openldap.m4 2014-10-16 15:51:38.223985217 +0400
-@@ -553,13 +553,10 @@
-
- #define DB_VERSION_FULL ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
-
--/* require 4.4 or later, but less than 6.0.20 */
--#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
-+/* require 4.4 or later */
-+#if DB_VERSION_FULL >= 0x040400
- __db_version_compat
- #endif
--#if DB_VERSION_FULL >= 0x060014
--#error "BerkeleyDB 6.0.20+ license is incompatible with LDAP"
--#endif
- ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
- ])
-