openldap: update to version 2.4.23

SVN-Revision: 24055

diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile
index 826af7886b4ea9371d94e0571f4852f6d16fed1f..e61dbc620d38afcfa6fcb7700c7b75c7bd8b0060 100644 (file)
--- a/libs/openldap/Makefile
+++ b/libs/openldap/Makefile
@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openldap
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openldap

-PKG_VERSION:=2.4.19
-PKG_RELEASE:=2
+PKG_VERSION:=2.4.23
+PKG_RELEASE:=1

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
        ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
        ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
        ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
        ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
        ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
        ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/

-PKG_MD5SUM:=4a6dab2711fcf141f19bb680bc335887
+PKG_MD5SUM:=90150b8c0d0192e10b30157e68844ddf

 
 PKG_FIXUP = libtool
 
 
 PKG_FIXUP = libtool
 

diff --git a/libs/openldap/patches/010-fix-asserts.patch b/libs/openldap/patches/010-fix-asserts.patch
deleted file mode 100644 (file)
index 0141092..0000000
--- a/libs/openldap/patches/010-fix-asserts.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -u --recursive openldap-2.4.19-vanilla/servers/slapd/connection.c openldap-2.4.19/servers/slapd/connection.c
---- openldap-2.4.19-vanilla/servers/slapd/connection.c 2009-11-17 19:04:26.000000000 -0500
-+++ openldap-2.4.19/servers/slapd/connection.c 2009-11-17 19:09:02.000000000 -0500
-@@ -783,7 +783,9 @@
- {
-       assert( connections != NULL );
-       assert( c != NULL );
--      assert( c->c_struct_state == SLAP_C_USED );
-+
-+      if ( c->c_struct_state != SLAP_C_USED ) return;
-+
-       assert( c->c_conn_state != SLAP_C_INVALID );
- 
-       /* c_mutex must be locked by caller */
-@@ -816,7 +818,9 @@
- {
-       assert( connections != NULL );
-       assert( c != NULL );
--      assert( c->c_struct_state == SLAP_C_USED );
-+
-+      if ( c->c_struct_state != SLAP_C_USED ) return;
-+
-       assert( c->c_conn_state == SLAP_C_CLOSING );
- 
-       /* NOTE: c_mutex should be locked by caller */
-diff -u --recursive openldap-2.4.19-vanilla/servers/slapd/daemon.c openldap-2.4.19/servers/slapd/daemon.c
---- openldap-2.4.19-vanilla/servers/slapd/daemon.c     2009-11-17 19:04:26.000000000 -0500
-+++ openldap-2.4.19/servers/slapd/daemon.c     2009-11-17 19:10:54.000000000 -0500
-@@ -989,13 +989,17 @@
- void
- slapd_set_read( ber_socket_t s, int wake )
- {
-+      int do_wake = 1;
-       ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- 
--      assert( SLAP_SOCK_IS_ACTIVE( s ));
--      if (!SLAP_SOCK_IS_READ( s )) SLAP_SOCK_SET_READ( s );
--
-+      if( SLAP_SOCK_IS_ACTIVE( s ) && !SLAP_SOCK_IS_READ( s )) {
-+              SLAP_SOCK_SET_READ( s );
-+      } else {
-+              do_wake = 0;
-+      }
-       ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
--      WAKE_LISTENER(wake);
-+      if ( do_wake )
-+              WAKE_LISTENER(wake);
- }
- 
- time_t

diff --git a/libs/openldap/patches/020-autofs-schema.patch b/libs/openldap/patches/020-autofs-schema.patch
index cf2d14eb230371a5f2306bb5befb596f3b6d7cdb..093270fc72da2e8c117e06e7743013b066b4900e 100644 (file)
--- a/libs/openldap/patches/020-autofs-schema.patch
+++ b/libs/openldap/patches/020-autofs-schema.patch
@@ -1,6 +1,5 @@
-diff -u --recursive --new-file openldap-2.4.19-vanilla/servers/slapd/schema/autofs.schema openldap-2.4.19/servers/slapd/schema/autofs.schema
---- openldap-2.4.19-vanilla/servers/slapd/schema/autofs.schema 1969-12-31 19:00:00.000000000 -0500
-+++ openldap-2.4.19/servers/slapd/schema/autofs.schema 2010-01-03 19:34:36.235296300 -0500
+--- /dev/null
++++ b/servers/slapd/schema/autofs.schema

 @@ -0,0 +1,23 @@
 +attributetype ( 1.3.6.1.1.1.1.31 NAME 'automountMapName'
 +      DESC 'Automount map name'
 @@ -0,0 +1,23 @@
 +attributetype ( 1.3.6.1.1.1.1.31 NAME 'automountMapName'
 +      DESC 'Automount map name'

diff --git a/libs/openldap/patches/750-no-strip.patch b/libs/openldap/patches/750-no-strip.patch
index 80a91302ca64f5a9adbd3ee2795ed7f025ab8195..a3b1cc62fb26ed3eb93741b4108fb2f986a7058c 100644 (file)
--- a/libs/openldap/patches/750-no-strip.patch
+++ b/libs/openldap/patches/750-no-strip.patch
@@ -1,7 +1,6 @@
-diff -ruN openldap-2.4.16-orig/clients/tools/Makefile.in openldap-2.4.16/clients/tools/Makefile.in
---- openldap-2.4.16-orig/clients/tools/Makefile.in
-+++ openldap-2.4.16/clients/tools/Makefile.in
-@@ -120,7 +120,7 @@
+--- a/clients/tools/Makefile.in
++++ b/clients/tools/Makefile.in
+@@ -120,7 +120,7 @@ install-local:     FORCE

        -$(MKDIR) $(DESTDIR)$(bindir)
        @(                                                              \
            for prg in $(PROGRAMS); do                                  \
        -$(MKDIR) $(DESTDIR)$(bindir)
        @(                                                              \
            for prg in $(PROGRAMS); do                                  \


@@ -10,10 +9,9 @@ diff -ruN openldap-2.4.16-orig/clients/tools/Makefile.in openldap-2.4.16/clients
                    $(DESTDIR)$(bindir);                                \
            done                                                        \
        )
                    $(DESTDIR)$(bindir);                                \
            done                                                        \
        )

-diff -ruN openldap-2.4.16-orig/servers/slapd/Makefile.in openldap-2.4.16-1/servers/slapd/Makefile.in
---- openldap-2.4.16-orig/servers/slapd/Makefile.in
-+++ openldap-2.4.16/servers/slapd/Makefile.in
-@@ -375,7 +375,7 @@
+--- a/servers/slapd/Makefile.in
++++ b/servers/slapd/Makefile.in
+@@ -375,7 +375,7 @@ install-local-srv: install-slapd install

  install-slapd: FORCE
        -$(MKDIR) $(DESTDIR)$(libexecdir)
        -$(MKDIR) $(DESTDIR)$(localstatedir)/run
  install-slapd: FORCE
        -$(MKDIR) $(DESTDIR)$(libexecdir)
        -$(MKDIR) $(DESTDIR)$(localstatedir)/run