bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openldap: update to version 2.4.23

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@24055 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke
2010-11-21 14:12:36 +00:00
parent 93708bdda8
commit 0c46859b77
4 changed files with 11 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
libs/openldap/patches/010-fix-asserts.patch
View File

@ -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

5
libs/openldap/patches/020-autofs-schema.patch
View File

@ -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'

14
libs/openldap/patches/750-no-strip.patch
View File

@ -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