From 02768bf7fb04752fac990c86afd07c34e3ede81d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 21 Nov 2010 14:12:36 +0000 Subject: [PATCH] openldap: update to version 2.4.23 SVN-Revision: 24055 --- libs/openldap/Makefile | 6 +-- libs/openldap/patches/010-fix-asserts.patch | 50 ------------------- libs/openldap/patches/020-autofs-schema.patch | 5 +- libs/openldap/patches/750-no-strip.patch | 14 +++--- 4 files changed, 11 insertions(+), 64 deletions(-) delete mode 100644 libs/openldap/patches/010-fix-asserts.patch diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index 826af7886b..e61dbc620d 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -8,15 +8,15 @@ 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_MD5SUM:=4a6dab2711fcf141f19bb680bc335887 +PKG_MD5SUM:=90150b8c0d0192e10b30157e68844ddf 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 index 01410928d4..0000000000 --- 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 cf2d14eb23..093270fc72 100644 --- 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' diff --git a/libs/openldap/patches/750-no-strip.patch b/libs/openldap/patches/750-no-strip.patch index 80a91302ca..a3b1cc62fb 100644 --- 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 \ @@ -10,10 +9,9 @@ diff -ruN openldap-2.4.16-orig/clients/tools/Makefile.in openldap-2.4.16/clients $(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 -- 2.30.2