head 1.22; access; symbols OPENPKG_E1_MP_HEAD:1.13 OPENPKG_E1_MP:1.13 OPENPKG_E1_MP_2_STABLE:1.13 OPENPKG_E1_FP:1.13 OPENPKG_2_STABLE_MP:1.13 OPENPKG_2_STABLE_20061018:1.13 OPENPKG_2_STABLE_20060622:1.13 OPENPKG_2_STABLE:1.13.0.4 OPENPKG_2_STABLE_BP:1.13 OPENPKG_2_5_RELEASE:1.13 OPENPKG_2_5_SOLID:1.13.0.2 OPENPKG_2_5_SOLID_BP:1.13 OPENPKG_2_4_RELEASE:1.11 OPENPKG_2_4_SOLID:1.11.0.4 OPENPKG_2_4_SOLID_BP:1.11 OPENPKG_CW_FP:1.11 OPENPKG_2_3_RELEASE:1.11 OPENPKG_2_3_SOLID:1.11.0.2 OPENPKG_2_3_SOLID_BP:1.11 OPENPKG_2_2_RELEASE:1.9 OPENPKG_2_2_SOLID:1.9.0.2 OPENPKG_2_2_SOLID_BP:1.9 OPENPKG_2_1_RELEASE:1.7 OPENPKG_2_1_SOLID:1.7.0.2 OPENPKG_2_1_SOLID_BP:1.7 OPENPKG_2_0_RELEASE:1.6 OPENPKG_2_0_SOLID:1.6.0.2 OPENPKG_2_0_SOLID_BP:1.6 OPENPKG_1_3_RELEASE:1.2 OPENPKG_1_3_SOLID:1.2.0.6 OPENPKG_1_3_SOLID_BP:1.2 OPENPKG_1_2_SOLID:1.2.0.4 OPENPKG_1_2_SOLID_BP:1.2 OPENPKG_1_STABLE:1.2.0.2 OPENPKG_1_STABLE_BP:1.2 OPENPKG_1_1_RELEASE:1.1 OPENPKG_1_1_SOLID:1.1.0.2 OPENPKG_1_1_SOLID_BP:1.1; locks; strict; comment @# @; 1.22 date 2008.10.13.09.51.42; author rse; state Exp; branches; next 1.21; commitid tBLPs0H81qazXrmt; 1.21 date 2008.07.30.19.19.21; author rse; state Exp; branches; next 1.20; commitid Ik3ZgWg948xLvRct; 1.20 date 2008.06.09.06.55.05; author rse; state Exp; branches; next 1.19; commitid dor94lhW0GQ42f6t; 1.19 date 2007.12.22.16.12.27; author rse; state Exp; branches; next 1.18; commitid zsZnvjTYFo05ArKs; 1.18 date 2007.11.03.11.11.09; author rse; state Exp; branches; next 1.17; commitid 4YdvVqyB4ILmu7Es; 1.17 date 2007.10.31.16.34.54; author rse; state Exp; branches; next 1.16; commitid NU9FNVF52ZBonLDs; 1.16 date 2007.10.27.08.32.50; author cs; state Exp; branches; next 1.15; commitid 2dWQlsPTjg8ZPcDs; 1.15 date 2007.10.18.09.55.15; author rse; state Exp; branches; next 1.14; commitid n4Jj9wD64dZcA3Cs; 1.14 date 2007.09.22.17.22.25; author rse; state Exp; branches; next 1.13; commitid omEhxvKWwi2qTKys; 1.13 date 2005.10.07.08.16.46; author rse; state Exp; branches 1.13.2.1; next 1.12; 1.12 date 2005.06.25.11.02.04; author rse; state Exp; branches; next 1.11; 1.11 date 2004.11.29.06.38.00; author rse; state Exp; branches 1.11.2.1 1.11.4.1; next 1.10; 1.10 date 2004.11.13.14.53.38; author rse; state Exp; branches; next 1.9; 1.9 date 2004.09.23.15.45.26; author thl; state Exp; branches; next 1.8; 1.8 date 2004.07.28.06.46.52; author tho; state Exp; branches; next 1.7; 1.7 date 2004.04.16.07.58.27; author rse; state Exp; branches; next 1.6; 1.6 date 2003.12.06.08.31.29; author rse; state Exp; branches; next 1.5; 1.5 date 2003.12.05.21.02.24; author rse; state Exp; branches; next 1.4; 1.4 date 2003.11.15.15.27.39; author rse; state Exp; branches; next 1.3; 1.3 date 2003.11.14.20.11.11; author rse; state Exp; branches; next 1.2; 1.2 date 2002.10.19.10.02.28; author rse; state dead; branches; next 1.1; 1.1 date 2002.08.26.13.58.22; author rse; state Exp; branches; next ; 1.13.2.1 date 2006.05.22.19.39.02; author rse; state Exp; branches; next ; commitid f1rla5undnOPk3yr; 1.11.2.1 date 2006.05.22.20.07.56; author rse; state Exp; branches; next ; commitid U1lVZMp7hIvKu3yr; 1.11.4.1 date 2006.05.22.19.59.12; author rse; state Exp; branches; next ; commitid oF5kDMk8fvWKr3yr; desc @@ 1.22 log @upgrading package: openldap 2.4.11 -> 2.4.12 @ text @Index: include/ac/fdset.h --- include/ac/fdset.h.orig 2008-02-12 00:26:40 +0100 +++ include/ac/fdset.h 2008-10-13 11:38:23 +0200 @@@@ -22,6 +22,13 @@@@ #ifndef _AC_FDSET_H #define _AC_FDSET_H +#if defined(HAVE_SYS_TYPES_H) +#include +#endif +#if defined(HAVE_SYS_SELECT_H) +#include +#endif + #if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE ) # define OPENLDAP_FD_SETSIZE 4096 #endif Index: include/ldap_int_thread.h --- include/ldap_int_thread.h.orig 2008-02-12 00:26:40 +0100 +++ include/ldap_int_thread.h 2008-10-13 11:38:23 +0200 @@@@ -100,6 +100,7 @@@@ * * ***********************************/ +#define _POSIX_PTHREAD_SEMANTICS #define PTH_SYSCALL_SOFT 1 #include Index: libraries/libldap_r/tpool.c --- libraries/libldap_r/tpool.c.orig 2008-03-21 01:46:03 +0100 +++ libraries/libldap_r/tpool.c 2008-10-13 11:38:23 +0200 @@@@ -950,6 +950,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 2008-02-12 00:26:47 +0100 +++ servers/slapd/back-perl/config.c 2008-10-13 11:38:23 +0200 @@@@ -49,6 +49,9 @@@@ } #ifdef PERL_IS_5_6 + if (argc > 2) + snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", argv[2] ); + else snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", argv[1] ); eval_pv( eval_str, 0 ); @ 1.21 log @try to fix building under Solaris @ text @d3 1 a3 1 +++ include/ac/fdset.h 2008-06-09 08:32:46 +0200 d18 11 d31 1 a31 1 +++ libraries/libldap_r/tpool.c 2008-06-09 08:32:46 +0200 a39 72 Index: servers/slapd/back-bdb/back-bdb.h --- servers/slapd/back-bdb/back-bdb.h.orig 2008-05-01 23:39:35 +0200 +++ servers/slapd/back-bdb/back-bdb.h 2008-06-09 08:48:39 +0200 @@@@ -59,7 +59,7 @@@@ #endif /* 4.6.18 redefines cursor->locker */ -#if DB_VERSION_FULL >= 0x04060012 +#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000 struct __db_locker { u_int32_t id; @@@@ -310,7 +310,7 @@@@ #endif /* BDB 4.6.18 makes locker a struct instead of an int */ -#if DB_VERSION_FULL >= 0x04060012 +#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000 #undef TXN_ID #define TXN_ID(txn) (txn)->locker #endif Index: servers/slapd/back-bdb/cache.c --- servers/slapd/back-bdb/cache.c.orig 2008-05-01 23:39:35 +0200 +++ servers/slapd/back-bdb/cache.c 2008-06-09 08:47:39 +0200 @@@@ -1444,7 +1444,7 @@@@ u_int32_t lockid; int rc; -#if DB_VERSION_FULL >= 0x04060012 +#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000 BDB_LOCKER lptr = data; lockid = lptr->id; #else @@@@ -1508,7 +1508,7 @@@@ if ( rc != 0) { return rc; } -#if DB_VERSION_FULL >= 0x04060012 +#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000 { BDB_LOCKER lptr; __lock_getlocker( env->lk_handle, lockid, 0, &lptr ); data = lptr; @@@@ -1527,7 +1527,7 @@@@ } else { lockid = (long)data; } -#if DB_VERSION_FULL >= 0x04060012 +#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000 *locker = data; #else *locker = lockid; Index: servers/slapd/back-bdb/init.c --- servers/slapd/back-bdb/init.c.orig 2008-02-12 00:26:45 +0100 +++ servers/slapd/back-bdb/init.c 2008-06-09 08:46:19 +0200 @@@@ -503,7 +503,7 @@@@ } if ( !quick ) { -#if DB_VERSION_FULL >= 0x04060012 +#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000 u_int32_t lid; XLOCK_ID(bdb->bi_dbenv, &lid); __lock_getlocker(bdb->bi_dbenv->lk_handle, lid, 0, &bdb->bi_cache.c_locker); @@@@ -601,7 +601,7 @@@@ if( bdb->bi_dbenv ) { /* Free cache locker if we enabled locking */ if ( !( slapMode & SLAP_TOOL_QUICK ) && bdb->bi_cache.c_locker ) { -#if DB_VERSION_FULL >= 0x04060012 +#if DB_VERSION_FULL >= 0x04060012 && DB_VERSION_FULL < 0x04070000 XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker->id); #else XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker); d42 1 a42 1 +++ servers/slapd/back-perl/config.c 2008-06-09 08:32:46 +0200 a52 11 Index: include/ldap_int_thread.h --- include/ldap_int_thread.h.orig 2008-02-12 00:26:40 +0100 +++ include/ldap_int_thread.h 2008-07-30 21:07:22 +0200 @@@@ -100,6 +100,7 @@@@ * * ***********************************/ +#define _POSIX_PTHREAD_SEMANTICS #define PTH_SYSCALL_SOFT 1 #include @ 1.20 log @upgrading package: openldap 2.4.9 -> 2.4.10 @ text @d114 11 @ 1.19 log @remove all slurpd(8) stuff -- replication (and more) is now done via syncrepl in slapd(8) @ text @d2 2 a3 2 --- include/ac/fdset.h.orig 2007-09-01 01:13:54 +0200 +++ include/ac/fdset.h 2007-11-03 11:57:26 +0100 d19 3 a21 3 --- 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 @@@@ d29 72 d102 2 a103 2 --- servers/slapd/back-perl/config.c.orig 2007-09-01 01:14:04 +0200 +++ servers/slapd/back-perl/config.c 2007-11-03 11:57:26 +0100 @ 1.18 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) @ text @a41 23 Index: servers/slapd/slapd.conf --- servers/slapd/slapd.conf.orig 2007-02-13 21:22:22 +0100 +++ servers/slapd/slapd.conf 2007-11-03 11:57:26 +0100 @@@@ -63,3 +63,19 @@@@ directory %LOCALSTATEDIR%/openldap-data # Indices to maintain index objectClass eq + +####################################################################### +# replication via slurpd(8) +####################################################################### + +# master server configuration +#replogfile %LOCALSTATEDIR%/openldap-slurp +#replica-pidfile %LOCALSTATEDIR%/slurpd.pid +#replica host=slave.example.com:389 +# binddn="cn=admin,dc=example,dc=org" +# bindmethod=simple credentials=secret + +# slave server(s) configuration +#updatedn "cn=admin,dc=example,dc=org" +#updateref ldap://master.example.org + @ 1.17 log @upgrading package: openldap 2.3.39 -> 2.4.6 @ text @d3 1 a3 1 +++ include/ac/fdset.h 2007-10-31 17:15:42 +0100 d18 11 d31 1 a31 1 +++ servers/slapd/back-perl/config.c 2007-10-31 17:15:42 +0100 d44 1 a44 1 +++ servers/slapd/slapd.conf 2007-10-31 17:15:42 +0100 @ 1.16 log @upgrading package: openldap 2.3.38 -> 2.3.39 @ text @d2 2 a3 2 --- include/ac/fdset.h.orig 2007-01-02 22:43:47 +0100 +++ include/ac/fdset.h 2007-10-18 11:46:32 +0200 d19 2 a20 2 --- servers/slapd/back-perl/config.c.orig 2007-01-02 22:44:06 +0100 +++ servers/slapd/back-perl/config.c 2007-10-18 11:46:32 +0200 d32 3 a34 3 --- servers/slapd/slapd.conf.orig 2004-06-18 04:49:08 +0200 +++ servers/slapd/slapd.conf 2007-10-18 11:46:32 +0200 @@@@ -65,3 +65,19 @@@@ @ 1.15 log @fix two termios.h related checks @ text @a17 24 Index: include/ac/termios.h --- include/ac/termios.h.orig 2007-01-02 22:43:47 +0100 +++ include/ac/termios.h 2007-10-18 11:47:55 +0200 @@@@ -17,7 +17,7 @@@@ #ifndef _AC_TERMIOS_H #define _AC_TERMIOS_H -#ifdef HAVE_POSIX_TERMIOS +#ifdef HAVE_TERMIOS_H #include #ifdef GCWINSZ_IN_SYS_IOCTL Index: libraries/liblutil/getpass.c --- libraries/liblutil/getpass.c.orig 2007-01-02 22:43:52 +0100 +++ libraries/liblutil/getpass.c 2007-10-18 11:48:27 +0200 @@@@ -60,7 +60,7 @@@@ char * lutil_getpass( const char *prompt ) { -#if !defined(HAVE_POSIX_TERMIOS) && !defined(HAVE_SGTTY_H) +#if !defined(HAVE_TERMIOS_H) && !defined(HAVE_SGTTY_H) static char buf[256]; int i, c; @ 1.14 log @add support for 'perlModule in addition to 'perlModule ' in the slapd Perl backend to let us load Perl module from arbitrary filenames (which have no correlation to the package it defines) @ text @d3 1 a3 1 +++ include/ac/fdset.h 2007-09-22 19:03:32 +0200 d18 24 d44 1 a44 1 +++ servers/slapd/back-perl/config.c 2007-09-22 19:13:23 +0200 d57 1 a57 1 +++ servers/slapd/slapd.conf 2007-09-22 19:03:32 +0200 @ 1.13 log @fix building under FreeBSD 4 @ text @d1 30 d33 1 a33 1 +++ servers/slapd/slapd.conf 2005-06-18 12:26:38 +0200 a53 17 Index: include/ac/fdset.h --- include/ac/fdset.h.orig 2005-01-20 19:03:49 +0100 +++ include/ac/fdset.h 2005-10-07 10:07:52 +0200 @@@@ -22,6 +22,13 @@@@ #ifndef _AC_FDSET_H #define _AC_FDSET_H +#if defined(HAVE_SYS_TYPES_H) +#include +#endif +#if defined(HAVE_SYS_SELECT_H) +#include +#endif + #if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE ) # define OPENLDAP_FD_SETSIZE 4096 #endif @ 1.13.2.1 log @apply security fix @ text @a40 22 ----------------------------------------------------------------------------- Security Issue: Buffer Overflow on Large Hostnames (http://secunia.com/advisories/20126) Index: servers/slurpd/st.c --- servers/slurpd/st.c 2006-01-03 23:16:26 +0100 +++ servers/slurpd/st.c 2006-05-09 19:43:12 +0200 @@@@ -246,10 +246,9 @@@@ } if ( found ) { char tbuf[ 255 ]; - sprintf( tbuf, "%s:%s (timestamp %s.%s)", hostname, port, - timestamp, seq ); + sprintf( tbuf, "%s.%s", timestamp, seq ); Debug( LDAP_DEBUG_ARGS, - "Retrieved state information for %s\n", tbuf, 0, 0 ); + "Retrieved state information for %s:%s (timestamp %s)\n", hostname, port, tbuf ); } else { Debug( LDAP_DEBUG_ANY, "Warning: saved state for %s:%s, not a known replica\n", @ 1.12 log @upgrading package: openldap 2.2.27 -> 2.3.4 @ text @d26 2 a27 2 +++ include/ac/fdset.h 2005-06-25 12:29:21 +0200 @@@@ -22,6 +22,10 @@@@ d31 3 @ 1.11 log @upgrading package: openldap 2.2.18 -> 2.2.19 @ text @a0 41 Index: servers/slapd/Makefile.in --- servers/slapd/Makefile.in.orig 2004-07-26 00:31:04 +0200 +++ servers/slapd/Makefile.in 2004-11-29 07:31:35 +0100 @@@@ -421,6 +421,6 @@@@ cd $(DESTDIR)$(sbindir); \ rm -f $(SLAPTOOLS); \ for i in $(SLAPTOOLS); do \ - $(LN_S) $(libexecdir)/slapd$(EXEEXT) $$i$(EXEEXT); \ + $(LN_S) $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $$i$(EXEEXT); \ done Index: servers/slapd/daemon.c --- servers/slapd/daemon.c.orig 2004-11-24 05:29:21 +0100 +++ servers/slapd/daemon.c 2004-11-29 07:31:35 +0100 @@@@ -34,10 +34,10 @@@@ #include #include +#include "slap.h" #include "ldap_pvt.h" #include "ldap_pvt_thread.h" #include "lutil.h" -#include "slap.h" #include "ldap_rq.h" Index: servers/slapd/main.c --- servers/slapd/main.c.orig 2004-10-09 06:26:50 +0200 +++ servers/slapd/main.c 2004-11-29 07:31:35 +0100 @@@@ -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 d2 2 a3 2 --- servers/slapd/slapd.conf.orig 2004-06-29 23:45:50 +0200 +++ servers/slapd/slapd.conf 2004-11-29 07:32:51 +0100 d24 14 @ 1.11.2.1 log @apply security fix @ text @a64 27 ----------------------------------------------------------------------------- Security Issue: Buffer Overflow on Large Hostnames (http://secunia.com/advisories/20126) Index: servers/slurpd/st.c --- servers/slurpd/st.c.orig 2005-01-20 18:01:19 +0100 +++ servers/slurpd/st.c 2006-05-22 21:51:05 +0200 @@@@ -257,14 +257,13 @@@@ } if ( found ) { char tbuf[ 255 ]; - sprintf( tbuf, "%s:%s (timestamp %s.%s)", hostname, port, - timestamp, seq ); + sprintf( tbuf, "%s.%s", timestamp, seq ); #ifdef NEW_LOGGING LDAP_LOG ( SLURPD, DETAIL1, "St_write: " - "Retrieved state information for %s\n", tbuf, 0, 0 ); + "Retrieved state information for %s:%s (timestamp %s)\n", hostname, port, tbuf ); #else Debug( LDAP_DEBUG_ARGS, - "Retrieved state information for %s\n", tbuf, 0, 0 ); + "Retrieved state information for %s:%s (timestamp %s)\n", hostname, port, tbuf ); #endif } else { #ifdef NEW_LOGGING @ 1.11.4.1 log @apply security fix @ text @a64 27 ----------------------------------------------------------------------------- Security Issue: Buffer Overflow on Large Hostnames (http://secunia.com/advisories/20126) Index: servers/slurpd/st.c --- servers/slurpd/st.c.orig 2005-01-20 18:01:19 +0100 +++ servers/slurpd/st.c 2006-05-22 21:51:05 +0200 @@@@ -257,14 +257,13 @@@@ } if ( found ) { char tbuf[ 255 ]; - sprintf( tbuf, "%s:%s (timestamp %s.%s)", hostname, port, - timestamp, seq ); + sprintf( tbuf, "%s.%s", timestamp, seq ); #ifdef NEW_LOGGING LDAP_LOG ( SLURPD, DETAIL1, "St_write: " - "Retrieved state information for %s\n", tbuf, 0, 0 ); + "Retrieved state information for %s:%s (timestamp %s)\n", hostname, port, tbuf ); #else Debug( LDAP_DEBUG_ARGS, - "Retrieved state information for %s\n", tbuf, 0, 0 ); + "Retrieved state information for %s:%s (timestamp %s)\n", hostname, port, tbuf ); #endif } else { #ifdef NEW_LOGGING @ 1.10 log @Upgrade from DB 4.2 to 4.3 @ text @a0 25 Index: servers/slapd/slapd.conf --- servers/slapd/slapd.conf.orig 2003-05-25 01:19:14.000000000 +0200 +++ servers/slapd/slapd.conf 2003-12-05 10:43:58.000000000 +0100 @@@@ -64,4 +64,21 @@@@ # Mode 700 recommended. directory %LOCALSTATEDIR%/openldap-data # Indices to maintain + index objectClass eq + +####################################################################### +# replication via slurpd(8) +####################################################################### + +# master server configuration +#replogfile %LOCALSTATEDIR%/openldap-slurp +#replica-pidfile %LOCALSTATEDIR%/slurpd.pid +#replica host=slave.example.com:389 +# binddn="cn=admin,dc=example,dc=org" +# bindmethod=simple credentials=secret + +# slave server(s) configuration +#updatedn "cn=admin,dc=example,dc=org" +#updateref ldap://master.example.org + d3 1 a3 1 +++ servers/slapd/Makefile.in 2004-07-28 08:38:37 +0200 a10 7 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 @@@@ } } d12 3 a14 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 d27 6 a32 6 Index: servers/slapd/back-bdb/error.c --- servers/slapd/back-bdb/error.c.orig 2004-01-01 19:16:36 +0100 +++ servers/slapd/back-bdb/error.c 2004-11-13 14:03:28 +0100 @@@@ -22,7 +22,7 @@@@ #include "slap.h" #include "back-bdb.h" d34 31 a64 17 -void bdb_errcall( const char *pfx, char * msg ) +void bdb_errcall( const DB_ENV *dbenv, const char *pfx, const char * msg ) { #ifdef HAVE_EBCDIC if ( msg[0] > 0x7f ) Index: servers/slapd/back-bdb/proto-bdb.h --- servers/slapd/back-bdb/proto-bdb.h.orig 2004-07-16 21:51:43 +0200 +++ servers/slapd/back-bdb/proto-bdb.h 2004-11-13 14:03:46 +0100 @@@@ -139,7 +139,7 @@@@ */ #define bdb_errcall BDB_SYMBOL(errcall) -void bdb_errcall( const char *pfx, char * msg ); +void bdb_errcall( const DB_ENV *dbenv, const char *pfx, const char * msg ); #ifdef HAVE_EBCDIC #define ebcdic_dberror BDB_SYMBOL(ebcdic_dberror) @ 1.9 log @fix GNU pth not being initialized before use; fix signal(3C) redefinition on Solaris by relocating slapd.h include @ text @d67 24 @ 1.8 log @upgrading package: openldap 2.2.14 -> 2.2.15 @ text @d36 30 @ 1.7 log @upgrading package: openldap 2.2.8 -> 2.2.9 @ text @d27 2 a28 2 --- servers/slapd/Makefile.in.orig 2004-04-12 20:07:40.000000000 +0200 +++ servers/slapd/Makefile.in 2004-04-16 09:48:49.000000000 +0200 d33 2 a34 2 - $(LN_S) $(libexecdir)/slapd $$i; \ + $(LN_S) $(DESTDIR)$(libexecdir)/slapd $$i; \ @ 1.6 log @upgrading package: openldap 2.1.24 -> 2.1.25 @ text @d26 11 @ 1.5 log @upgrading package: openldap 2.1.23 -> 2.1.24 @ text @a25 14 Index: build/top.mk --- build/top.mk.orig 2003-12-03 02:48:54.000000000 +0100 +++ build/top.mk 2003-12-05 21:57:14.000000000 +0100 @@@@ -148,8 +148,8 @@@@ LDAP_LIBLDAP_LA = $(LDAP_LIBDIR)/libldap/libldap.la LDAP_LIBLDAP_R_LA = $(LDAP_LIBDIR)/libldap_r/libldap_r.la -LDAP_LIBLDBMA_A_no = -LDAP_LIBLDBMA_A_yes = $(LDAP_LIBDIR)/libldbm/libldbm.a +LDAP_LIBLDBM_A_no = +LDAP_LIBLDBM_A_yes = $(LDAP_LIBDIR)/libldbm/libldbm.a LDAP_LIBAVL_A = $(LDAP_LIBDIR)/libavl/libavl.a LDAP_LIBLDBM_A = $(LDAP_LIBLDBM_A_@@BUILD_LDBM@@) @ 1.4 log @bump up the volume: enable mostly all backends, including optionally the Perl backend @ text @d3 1 a3 1 +++ servers/slapd/slapd.conf 2003-11-14 20:27:06.000000000 +0100 d26 14 a39 15 Index: configure --- configure.orig 2003-11-15 15:39:31.000000000 +0100 +++ configure 2003-11-15 15:44:31.000000000 +0100 @@@@ -7809,9 +7809,9 @@@@ else PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`" if test x"$ol_with_perl_module" = "xstatic" ; then - SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`" + SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e 's/-lc$//' -e 's/-lc / /'`" else - MOD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`" + MOD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e 's/-lc$//' -e 's/-lc / /'`" fi ol_link_perl=yes fi @ 1.3 log @blindly add optional support for replication service via slurpd(8) @ text @d16 1 a16 1 +#replogfile %LOCALSTATEDIR%/replog d26 15 @ 1.2 log @upgrading package: openldap 2.1.6 -> 2.1.8 @ text @d1 25 a25 14 --- include/ldap_pvt_uc.h.orig 2002-05-22 16:25:44.000000000 +0200 +++ include/ldap_pvt_uc.h 2002-08-23 20:35:42.000000000 +0200 @@@@ -20,11 +20,7 @@@@ #include /* get ber_slen_t */ -#ifdef _MSC_VER #include "../libraries/liblunicode/ucdata/ucdata.h" -#else -#include "../libraries/liblunicode/ucdata.h" -#endif LDAP_BEGIN_DECL @ 1.1 log @upgrading package: openldap 2.1.3 -> 2.1.4 @ text @@