Maj openldap#2.4.13-1

5 files changed, 34 insertions, 101 deletions

diff --git a/extra/openldap/.footprint b/extra/openldap/.footprint
index 8ee3c15de..004fda5e2 100644
--- a/extra/openldap/.footprint
+++ b/extra/openldap/.footprint
@@ -16,7 +16,6 @@ drwxr-xr-x	root/root	etc/openldap/schema/
 -r--r--r--	root/root	etc/openldap/schema/inetorgperson.schema
 -r--r--r--	root/root	etc/openldap/schema/java.schema
 -r--r--r--	root/root	etc/openldap/schema/misc.schema
--r--r--r--	root/root	etc/openldap/schema/nadf.schema
 -r--r--r--	root/root	etc/openldap/schema/nis.ldif
 -r--r--r--	root/root	etc/openldap/schema/nis.schema
 -r--r--r--	root/root	etc/openldap/schema/openldap.ldif
@@ -27,21 +26,23 @@ drwxr-xr-x	root/root	etc/openldap/schema/
 -rw-------	root/root	etc/openldap/slapd.conf.default
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/slapd
+-rwxr-xr--	root/root	etc/rc.d/init.d/openldap
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K29slapd -> ../init.d/slapd
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K46openldap -> ../init.d/openldap
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K29slapd -> ../init.d/slapd
+lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K46openldap -> ../init.d/openldap
 drwxr-xr-x	root/root	etc/rc.d/rc2.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S21slapd -> ../init.d/slapd
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K46openldap -> ../init.d/openldap
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S21slapd -> ../init.d/slapd
+lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S25openldap -> ../init.d/openldap
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S21slapd -> ../init.d/slapd
+lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S25openldap -> ../init.d/openldap
 drwxr-xr-x	root/root	etc/rc.d/rc5.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S21slapd -> ../init.d/slapd
+lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S25openldap -> ../init.d/openldap
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K29slapd -> ../init.d/slapd
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K46openldap -> ../init.d/openldap
+drwxr-xr-x	root/root	etc/rc.d/rcsysinit.d/
+drwxr-xr-x	root/root	etc/sysconfig/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/ldapadd -> ldapmodify
@@ -64,23 +65,23 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/ldap_utf8.h
 -rw-r--r--	root/root	usr/include/slapi-plugin.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/liblber-2.4.so.2 -> liblber-2.4.so.2.3.0
--rw-r--r--	root/root	usr/lib/liblber-2.4.so.2.3.0
+lrwxrwxrwx	root/root	usr/lib/liblber-2.4.so.2 -> liblber-2.4.so.2.5.4
+-rw-r--r--	root/root	usr/lib/liblber-2.4.so.2.5.4
 -rw-r--r--	root/root	usr/lib/liblber.a
 -rw-r--r--	root/root	usr/lib/liblber.la
-lrwxrwxrwx	root/root	usr/lib/liblber.so -> liblber-2.4.so.2.3.0
+lrwxrwxrwx	root/root	usr/lib/liblber.so -> liblber-2.4.so.2.5.4
 lrwxrwxrwx	root/root	usr/lib/liblber.so.2 -> liblber.so
-lrwxrwxrwx	root/root	usr/lib/libldap-2.4.so.2 -> libldap-2.4.so.2.3.0
--rw-r--r--	root/root	usr/lib/libldap-2.4.so.2.3.0
+lrwxrwxrwx	root/root	usr/lib/libldap-2.4.so.2 -> libldap-2.4.so.2.5.4
+-rw-r--r--	root/root	usr/lib/libldap-2.4.so.2.5.4
 -rw-r--r--	root/root	usr/lib/libldap.a
 -rw-r--r--	root/root	usr/lib/libldap.la
-lrwxrwxrwx	root/root	usr/lib/libldap.so -> libldap-2.4.so.2.3.0
+lrwxrwxrwx	root/root	usr/lib/libldap.so -> libldap-2.4.so.2.5.4
 lrwxrwxrwx	root/root	usr/lib/libldap.so.2 -> libldap.so
-lrwxrwxrwx	root/root	usr/lib/libldap_r-2.4.so.2 -> libldap_r-2.4.so.2.3.0
--rw-r--r--	root/root	usr/lib/libldap_r-2.4.so.2.3.0
+lrwxrwxrwx	root/root	usr/lib/libldap_r-2.4.so.2 -> libldap_r-2.4.so.2.5.4
+-rw-r--r--	root/root	usr/lib/libldap_r-2.4.so.2.5.4
 -rw-r--r--	root/root	usr/lib/libldap_r.a
 -rw-r--r--	root/root	usr/lib/libldap_r.la
-lrwxrwxrwx	root/root	usr/lib/libldap_r.so -> libldap_r-2.4.so.2.3.0
+lrwxrwxrwx	root/root	usr/lib/libldap_r.so -> libldap_r-2.4.so.2.5.4
 lrwxrwxrwx	root/root	usr/lib/libldap_r.so.2 -> libldap_r.so
 drwxr-xr-x	root/root	usr/sbin/
 lrwxrwxrwx	root/root	usr/sbin/slapacl -> slapd
@@ -91,6 +92,7 @@ lrwxrwxrwx	root/root	usr/sbin/slapcat -> slapd
 lrwxrwxrwx	root/root	usr/sbin/slapdn -> slapd
 lrwxrwxrwx	root/root	usr/sbin/slapindex -> slapd
 lrwxrwxrwx	root/root	usr/sbin/slappasswd -> slapd
+lrwxrwxrwx	root/root	usr/sbin/slapschema -> slapd
 lrwxrwxrwx	root/root	usr/sbin/slaptest -> slapd
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
@@ -98,6 +100,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 lrwxrwxrwx	root/root	usr/share/man/man1/ldapadd.1.gz -> ldapmodify.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ldapcompare.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ldapdelete.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/ldapexop.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ldapmodify.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ldapmodrdn.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ldappasswd.1.gz
@@ -321,6 +324,7 @@ lrwxrwxrwx	root/root	usr/share/man/man5/slapd-hdb.5.gz -> slapd-bdb.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/slapo-refint.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/slapo-retcode.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/slapo-rwm.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/slapo-sssvlv.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/slapo-syncprov.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/slapo-translucent.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/slapo-unique.5.gz
@@ -334,6 +338,7 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/slapdn.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/slapindex.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/slappasswd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/slapschema.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/slaptest.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/openldap/
diff --git a/extra/openldap/.md5sum b/extra/openldap/.md5sum
index ef210ba76..164bf36af 100644
--- a/extra/openldap/.md5sum
+++ b/extra/openldap/.md5sum
@@ -1,3 +1 @@
-5382bbb4c67172c48c871b6d24b7f8cc  openldap-2.4.13.tgz
-c52623f4efcca3345f13249eab9199b0  openldap-config.patch
-ebb794d08b1f5408d65aa0f2d83f5a0b  slapd
+e7128c57b2bacd940e8906057c94ff26  openldap-2.4.21.tgz
diff --git a/extra/openldap/Pkgfile b/extra/openldap/Pkgfile
index db345eb01..c7700eeeb 100644
--- a/extra/openldap/Pkgfile
+++ b/extra/openldap/Pkgfile
@@ -3,18 +3,17 @@
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
 # Depends on: cyrus-sasl
+
 name=openldap
-version=2.4.13
+version=2.4.21
 release=1
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$name-$version.tgz \
-	$name-config.patch slapd)
+source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$name-$version.tgz)
 
 build() {
+        source /etc/blfs-bootscripts
+        wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+        tar xvf $scripts-$scriptsversion.tar.bz2	
 	cd $name-$version
-#	patch -p0 -i $SRC/$name-config.patch
-
-	# Workaround for: (ITS#5464) ucred guarded by __USE_GNU in glibc 2.8
-	# http://www.openldap.org/lists/openldap-bugs/200804/msg00074.html
 	export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 
 	./configure --prefix=/usr \
@@ -62,24 +61,9 @@ build() {
 	 ln -s liblber.so liblber.so.2;
 	 ln -s libldap.so libldap.so.2;
 	 ln -s libldap_r.so libldap_r.so.2) || exit 1
-
-	mkdir -p $PKG/etc/rc.d/init.d
-	mkdir -p $PKG/etc/rc.d/rc0.d
-	mkdir -p $PKG/etc/rc.d/rc1.d
-	mkdir -p $PKG/etc/rc.d/rc2.d
-	mkdir -p $PKG/etc/rc.d/rc3.d
-	mkdir -p $PKG/etc/rc.d/rc4.d
-	mkdir -p $PKG/etc/rc.d/rc5.d
-	mkdir -p $PKG/etc/rc.d/rc6.d
-	install -m 755 $SRC/slapd $PKG/etc/rc.d/init.d/slapd
-	ln -s ../init.d/slapd $PKG/etc/rc.d/rc0.d/K29slapd
-	ln -s ../init.d/slapd $PKG/etc/rc.d/rc1.d/K29slapd
-	ln -s ../init.d/slapd $PKG/etc/rc.d/rc2.d/S21slapd
-	ln -s ../init.d/slapd $PKG/etc/rc.d/rc3.d/S21slapd
-	ln -s ../init.d/slapd $PKG/etc/rc.d/rc4.d/S21slapd
-	ln -s ../init.d/slapd $PKG/etc/rc.d/rc5.d/S21slapd
-	ln -s ../init.d/slapd $PKG/etc/rc.d/rc6.d/K29slapd
-
-
+	# Installation of the script
+        cd ../$scripts-$scriptsversion
+        make DESTDIR=$PKG install-openldap1
+	
 	rm -f $PKG/etc/openldap/schema/README
 }
diff --git a/extra/openldap/openldap-config.patch b/extra/openldap/openldap-config.patch
deleted file mode 100644
index d96e05632..000000000
--- a/extra/openldap/openldap-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: servers/slapd/slapd.conf
---- servers/slapd/slapd.conf.orig 2003-05-25 01:19:14.000000000 +0200
-+++ servers/slapd/slapd.conf 2003-12-05 10:43:58.000000000 +0100
-@@ -64,4 +64,21 @@
- # Mode 700 recommended.
- directory%LOCALSTATEDIR%/openldap-data
- # Indices to maintain
-+
- indexobjectClasseq
-+
-+#######################################################################
-+# replication via slurpd(8)
-+#######################################################################
-+
-+# master server configuration
-+#replogfile      %LOCALSTATEDIR%/openldap-slurp
-+#replica-pidfile %LOCALSTATEDIR%/slurpd.pid
-+#replica         host=slave.example.com:389
-+#                binddn="cn=admin,dc=example,dc=org"
-+#                bindmethod=simple credentials=secret
-+
-+# slave server(s) configuration
-+#updatedn        "cn=admin,dc=example,dc=org"
-+#updateref       ldap://master.example.org
-+
diff --git a/extra/openldap/slapd b/extra/openldap/slapd
deleted file mode 100644
index 6a5e7d205..000000000
--- a/extra/openldap/slapd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# /etc/rc.d/slapd: start/stop Stand-alone LDAP Daemon
-#
-
-SLAPD_PID=/var/openldap/run/slapd.pid
-
-case  in
-start)
-/usr/sbin/slapd
-;;
-stop)
-if [ -f  ]; then
-kill -INT 
-else
-killall -q /usr/sbin/slapd
-fi
-;;
-restart)
--su stop
-sleep 2
--su start
-;;
-*)
-echo "usage: -su [start|stop|restart]"
-;;
-esac
-
-# End of file