openldap: Downgrade back to 2.3.20.

diff --git a/config/rootfiles/common/openldap b/config/rootfiles/common/openldap
index bb43588b18ea6cebac854cf24cef13a185f5ef4f..6a72df8b1c060d4194e30ccfa9d8401fb1e1335f 100644 (file)
--- a/config/rootfiles/common/openldap
+++ b/config/rootfiles/common/openldap
@@ -41,19 +41,119 @@
 #usr/include/slapi-plugin.h
 usr/lib/liblber-2.3.so.0
 usr/lib/liblber-2.3.so.0.2.8
-#usr/lib/liblber.a
 #usr/lib/liblber.la
-usr/lib/liblber.so
+#usr/lib/liblber.so
 usr/lib/libldap-2.3.so.0
 usr/lib/libldap-2.3.so.0.2.8
-#usr/lib/libldap.a
 #usr/lib/libldap.la
-usr/lib/libldap.so
+#usr/lib/libldap.so
 usr/lib/libldap_r-2.3.so.0
 usr/lib/libldap_r-2.3.so.0.2.8
-#usr/lib/libldap_r.a
 #usr/lib/libldap_r.la
-usr/lib/libldap_r.so
+#usr/lib/libldap_r.so
+#usr/lib/openldap
+#usr/lib/openldap/accesslog-2.3.so.0
+#usr/lib/openldap/accesslog-2.3.so.0.2.8
+#usr/lib/openldap/accesslog.la
+#usr/lib/openldap/accesslog.so
+#usr/lib/openldap/back_bdb-2.3.so.0
+#usr/lib/openldap/back_bdb-2.3.so.0.2.8
+#usr/lib/openldap/back_bdb.la
+#usr/lib/openldap/back_bdb.so
+#usr/lib/openldap/back_dnssrv-2.3.so.0
+#usr/lib/openldap/back_dnssrv-2.3.so.0.2.8
+#usr/lib/openldap/back_dnssrv.la
+#usr/lib/openldap/back_dnssrv.so
+#usr/lib/openldap/back_hdb-2.3.so.0
+#usr/lib/openldap/back_hdb-2.3.so.0.2.8
+#usr/lib/openldap/back_hdb.la
+#usr/lib/openldap/back_hdb.so
+#usr/lib/openldap/back_ldap-2.3.so.0
+#usr/lib/openldap/back_ldap-2.3.so.0.2.8
+#usr/lib/openldap/back_ldap.la
+#usr/lib/openldap/back_ldap.so
+#usr/lib/openldap/back_ldbm-2.3.so.0
+#usr/lib/openldap/back_ldbm-2.3.so.0.2.8
+#usr/lib/openldap/back_ldbm.la
+#usr/lib/openldap/back_ldbm.so
+#usr/lib/openldap/back_meta-2.3.so.0
+#usr/lib/openldap/back_meta-2.3.so.0.2.8
+#usr/lib/openldap/back_meta.la
+#usr/lib/openldap/back_meta.so
+#usr/lib/openldap/back_monitor-2.3.so.0
+#usr/lib/openldap/back_monitor-2.3.so.0.2.8
+#usr/lib/openldap/back_monitor.la
+#usr/lib/openldap/back_monitor.so
+#usr/lib/openldap/back_null-2.3.so.0
+#usr/lib/openldap/back_null-2.3.so.0.2.8
+#usr/lib/openldap/back_null.la
+#usr/lib/openldap/back_null.so
+#usr/lib/openldap/back_passwd-2.3.so.0
+#usr/lib/openldap/back_passwd-2.3.so.0.2.8
+#usr/lib/openldap/back_passwd.la
+#usr/lib/openldap/back_passwd.so
+#usr/lib/openldap/back_relay-2.3.so.0
+#usr/lib/openldap/back_relay-2.3.so.0.2.8
+#usr/lib/openldap/back_relay.la
+#usr/lib/openldap/back_relay.so
+#usr/lib/openldap/back_shell-2.3.so.0
+#usr/lib/openldap/back_shell-2.3.so.0.2.8
+#usr/lib/openldap/back_shell.la
+#usr/lib/openldap/back_shell.so
+#usr/lib/openldap/denyop-2.3.so.0
+#usr/lib/openldap/denyop-2.3.so.0.2.8
+#usr/lib/openldap/denyop.la
+#usr/lib/openldap/denyop.so
+#usr/lib/openldap/dyngroup-2.3.so.0
+#usr/lib/openldap/dyngroup-2.3.so.0.2.8
+#usr/lib/openldap/dyngroup.la
+#usr/lib/openldap/dyngroup.so
+#usr/lib/openldap/dynlist-2.3.so.0
+#usr/lib/openldap/dynlist-2.3.so.0.2.8
+#usr/lib/openldap/dynlist.la
+#usr/lib/openldap/dynlist.so
+#usr/lib/openldap/lastmod-2.3.so.0
+#usr/lib/openldap/lastmod-2.3.so.0.2.8
+#usr/lib/openldap/lastmod.la
+#usr/lib/openldap/lastmod.so
+#usr/lib/openldap/pcache-2.3.so.0
+#usr/lib/openldap/pcache-2.3.so.0.2.8
+#usr/lib/openldap/pcache.la
+#usr/lib/openldap/pcache.so
+#usr/lib/openldap/ppolicy-2.3.so.0
+#usr/lib/openldap/ppolicy-2.3.so.0.2.8
+#usr/lib/openldap/ppolicy.la
+#usr/lib/openldap/ppolicy.so
+#usr/lib/openldap/refint-2.3.so.0
+#usr/lib/openldap/refint-2.3.so.0.2.8
+#usr/lib/openldap/refint.la
+#usr/lib/openldap/refint.so
+#usr/lib/openldap/retcode-2.3.so.0
+#usr/lib/openldap/retcode-2.3.so.0.2.8
+#usr/lib/openldap/retcode.la
+#usr/lib/openldap/retcode.so
+#usr/lib/openldap/rwm-2.3.so.0
+#usr/lib/openldap/rwm-2.3.so.0.2.8
+#usr/lib/openldap/rwm.la
+#usr/lib/openldap/rwm.so
+#usr/lib/openldap/syncprov-2.3.so.0
+#usr/lib/openldap/syncprov-2.3.so.0.2.8
+#usr/lib/openldap/syncprov.la
+#usr/lib/openldap/syncprov.so
+#usr/lib/openldap/translucent-2.3.so.0
+#usr/lib/openldap/translucent-2.3.so.0.2.8
+#usr/lib/openldap/translucent.la
+#usr/lib/openldap/translucent.so
+#usr/lib/openldap/unique-2.3.so.0
+#usr/lib/openldap/unique-2.3.so.0.2.8
+#usr/lib/openldap/unique.la
+#usr/lib/openldap/unique.so
+#usr/lib/openldap/valsort-2.3.so.0
+#usr/lib/openldap/valsort-2.3.so.0.2.8
+#usr/lib/openldap/valsort.la
+#usr/lib/openldap/valsort.so
+#usr/lib/slapd
+#usr/lib/slurpd
 #usr/man/man1/ldapadd.1
 #usr/man/man1/ldapcompare.1
 #usr/man/man1/ldapdelete.1
@@ -257,9 +357,7 @@ usr/lib/libldap_r.so
 #usr/sbin/slapadd
 #usr/sbin/slapauth
 #usr/sbin/slapcat
-#usr/sbin/slapd
 #usr/sbin/slapdn
 #usr/sbin/slapindex
 #usr/sbin/slappasswd
 #usr/sbin/slaptest
-#usr/sbin/slurpd

diff --git a/lfs/openldap b/lfs/openldap
index b2d3167099547384881aa0e51925fb797983d03c..a18d7e16200c48f22b9c6ea48f54e18216ec4cb2 100644 (file)
--- a/lfs/openldap
+++ b/lfs/openldap
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.32
+VER        = 2.3.20
 
 THISAPP    = openldap-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -36,6 +36,8 @@ PAK_VER    = 3
 
 DEPS       = ""
 
+export CPPFLAGS = -D_GNU_SOURCE
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6a3e85cf61860ca5e8a1eba6753dd9d0
+$(DL_FILE)_MD5 = 49d2c5b9378a7b57e1fb03948acb8e32
 
 install : $(TARGET)
 
@@ -77,6 +79,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/openldap-gcc44-fixes.patch
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --libexecdir=/usr/lib \

diff --git a/src/patches/openldap-gcc44-fixes.patch b/src/patches/openldap-gcc44-fixes.patch
new file mode 100644 (file)
index 0000000..53b8ea0
--- /dev/null
+++ b/src/patches/openldap-gcc44-fixes.patch
@@ -0,0 +1,31 @@
+--- include/ldap_pvt_thread.h~ 2008-11-12 07:37:16.000000000 +0000
++++ include/ldap_pvt_thread.h  2008-11-12 08:01:45.000000000 +0000
+@@ -59,12 +59,12 @@
+ 
+ #ifndef LDAP_PVT_THREAD_H_DONE
+ #define       LDAP_PVT_THREAD_SET_STACK_SIZE
+-#ifndef LDAP_PVT_THREAD_STACK_SIZE
+-      /* LARGE stack. Will be twice as large on 64 bit machine. */
+-#define LDAP_PVT_THREAD_STACK_SIZE    ( 1 * 1024 * 1024 * sizeof(void *) )
+ /* May be explicitly defined to zero to disable it */
+-#elif LDAP_PVT_THREAD_STACK_SIZE == 0
++#if LDAP_PVT_THREAD_STACK_SIZE == 0
+ #undef LDAP_PVT_THREAD_SET_STACK_SIZE
++#elif !defined(LDAP_PVT_THREAD_STACK_SIZE)
++      /* LARGE stack. Will be twice as large on 64 bit machine. */
++#define LDAP_PVT_THREAD_STACK_SIZE    ( 1 * 1024 * 1024 * sizeof(void *) )
+ #endif
+ #endif /* !LDAP_PVT_THREAD_H_DONE */
+ 
+--- libraries/libldap/os-ip.c~ 2008-11-12 07:33:10.000000000 +0000
++++ libraries/libldap/os-ip.c  2008-11-12 07:33:31.000000000 +0000
+@@ -690,7 +690,7 @@
+               char *herr;
+ #ifdef NI_MAXHOST
+               char hbuf[NI_MAXHOST];
+-#elif defined( MAXHOSTNAMELEN
++#elif defined( MAXHOSTNAMELEN )
+               char hbuf[MAXHOSTNAMELEN];
+ #else
+               char hbuf[256];
+