OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Nov-2007 12:11:09
Branch: HEAD Handle: 2007110311110900
Modified files:
openpkg-src/openldap openldap.patch openldap.spec
Log:
Oh, I see: this time the crashes were actually not related to DB 4.6,
but more to GNU Pth. So revert back to DB 4.6 but apply a baindaid so
that OpenLDAP slapd does not crash when dereferencing a NULL pointer
(the reason why this context pointer is NULL under GNU Pth I've still
not figured out)
Summary:
Revision Changes Path
1.18 +14 -3 openpkg-src/openldap/openldap.patch
1.207 +5 -5 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.patch
============================================================================
$ cvs diff -u -r1.17 -r1.18 openldap.patch
--- openpkg-src/openldap/openldap.patch 31 Oct 2007 16:34:54 -0000
1.17
+++ openpkg-src/openldap/openldap.patch 3 Nov 2007 11:11:09 -0000
1.18
@@ -1,6 +1,6 @@
Index: include/ac/fdset.h
--- include/ac/fdset.h.orig 2007-09-01 01:13:54 +0200
-+++ include/ac/fdset.h 2007-10-31 17:15:42 +0100
++++ include/ac/fdset.h 2007-11-03 11:57:26 +0100
@@ -22,6 +22,13 @@
#ifndef _AC_FDSET_H
#define _AC_FDSET_H
@@ -15,9 +15,20 @@
#if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE )
# define OPENLDAP_FD_SETSIZE 4096
#endif
+Index: libraries/libldap_r/tpool.c
+--- libraries/libldap_r/tpool.c.orig 2007-10-19 03:56:47 +0200
++++ libraries/libldap_r/tpool.c 2007-11-03 12:05:18 +0100
+@@ -868,6 +868,6 @@
+ {
+ ldap_int_thread_userctx_t *ctx = vctx;
+
+- return ctx->ltu_id;
++ return ctx != NULL ? ctx->ltu_id : 0;
+ }
+ #endif /* LDAP_THREAD_HAVE_TPOOL */
Index: servers/slapd/back-perl/config.c
--- servers/slapd/back-perl/config.c.orig 2007-09-01 01:14:04 +0200
-+++ servers/slapd/back-perl/config.c 2007-10-31 17:15:42 +0100
++++ servers/slapd/back-perl/config.c 2007-11-03 11:57:26 +0100
@@ -49,6 +49,9 @@
}
@@ -30,7 +41,7 @@
Index: servers/slapd/slapd.conf
--- servers/slapd/slapd.conf.orig 2007-02-13 21:22:22 +0100
-+++ servers/slapd/slapd.conf 2007-10-31 17:15:42 +0100
++++ servers/slapd/slapd.conf 2007-11-03 11:57:26 +0100
@@ -63,3 +63,19 @@
directory %LOCALSTATEDIR%/openldap-data
# Indices to maintain
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.206 -r1.207 openldap.spec
--- openpkg-src/openldap/openldap.spec 3 Nov 2007 08:50:12 -0000
1.206
+++ openpkg-src/openldap/openldap.spec 3 Nov 2007 11:11:09 -0000
1.207
@@ -57,8 +57,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: readline, openssl, db45
-PreReq: readline, openssl, db45
+BuildPreReq: readline, openssl, db >= 4.5
+PreReq: readline, openssl, db >= 4.5
%if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
BuildPreReq: fsl
PreReq: fsl
@@ -105,8 +105,8 @@
# configuration: standard build flags
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
- export CPPFLAGS="%{l_cppflags db45 .}"
- export LDFLAGS="%{l_ldflags db45 .}"
+ export CPPFLAGS="%{l_cppflags}"
+ export LDFLAGS="%{l_ldflags}"
export LIBS=""
export ARGS=""
ARGS="$ARGS --prefix=%{l_prefix}"
@@ -195,7 +195,7 @@
# configuration: use hard-links and make sure our Berkeley-DB is
picked up first
%{l_shtool} subst \
-e 's;ln -s;ln;g' \
- -e 's;-ldb4[1-9];%{l_prefix}/lib/db45/libdb.a;g' \
+ -e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \
-e 's;<db\.h>;"db.h";g' \
configure
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
