OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Sep-2004 17:45:26
Branch: HEAD Handle: 2004092316452600
Modified files:
openpkg-src/openldap openldap.patch openldap.spec
Log:
fix GNU pth not being initialized before use; fix signal(3C)
redefinition on Solaris by relocating slapd.h include
Summary:
Revision Changes Path
1.9 +30 -0 openpkg-src/openldap/openldap.patch
1.120 +2 -1 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 openldap.patch
--- openpkg-src/openldap/openldap.patch 28 Jul 2004 06:46:52 -0000 1.8
+++ openpkg-src/openldap/openldap.patch 23 Sep 2004 15:45:26 -0000 1.9
@@ -33,4 +33,34 @@
- $(LN_S) $(libexecdir)/slapd$(EXEEXT) $$i$(EXEEXT); \
+ $(LN_S) $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $$i$(EXEEXT); \
done
+
+Index: servers/slapd/main.c
+--- servers/slapd/main.c.orig 2004-06-16 20:19:56 +0200
++++ servers/slapd/main.c 2004-09-23 13:43:19 +0200
+@@ -404,6 +404,11 @@
+ }
+ }
+
++ /* initialize thread environment -> otherwise first ldap_ segfaults
++ * return code broken for GNU pth -> ignore
++ */
++ (void)ldap_pvt_thread_initialize();
++
+ #ifdef NEW_LOGGING
+ lutil_log_initialize( argc, argv );
+ #else
+Index: /ltmp/thl/openpkg/openldap-2.2.17/servers/slapd/daemon.c
+--- servers/slapd/daemon.c.orig 2004-08-30 17:44:19 +0200
++++ servers/slapd/daemon.c 2004-09-23 15:53:38 +0200
+@@ -34,10 +34,10 @@
+ #include <ac/time.h>
+ #include <ac/unistd.h>
+
++#include "slap.h"
+ #include "ldap_pvt.h"
+ #include "ldap_pvt_thread.h"
+ #include "lutil.h"
+-#include "slap.h"
+
+ #include "ldap_rq.h"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.119 -r1.120 openldap.spec
--- openpkg-src/openldap/openldap.spec 14 Sep 2004 07:45:52 -0000 1.119
+++ openpkg-src/openldap/openldap.spec 23 Sep 2004 15:45:26 -0000 1.120
@@ -34,7 +34,7 @@
Group: Database
License: GPL
Version: 2.2.17
-Release: 20040914
+Release: 20040923
# package options
%option with_fsl yes
@@ -157,6 +157,7 @@
--enable-slurpd
# build toolkit
+ %{l_make} %{l_mflags} depend
%{l_make} %{l_mflags}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
