From f7b26454666c1a09b298f9cde74684e364cf370dcb8625695101bd887e0ef5ae Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Thu, 10 Dec 2009 15:36:32 +0000 Subject: [PATCH] Accepting request 26203 from network:ldap:OpenLDAP:RE24 Copy from network:ldap:OpenLDAP:RE24/openldap2 via accept of submit request 26203 revision 55. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/26203 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=24 --- libldap-tls_chkhost-its6239.dif | 125 -------------------------------- openldap-2.4.17.tar.bz2 | 3 - openldap-2.4.20.tar.bz2 | 3 + openldap2-client.changes | 30 ++++++++ openldap2-client.spec | 22 +++--- openldap2.changes | 30 ++++++++ openldap2.spec | 18 ++--- pie-compile.dif | 106 ++++++++++++++++----------- slapo-collect-include.dif | 12 --- test056-monitor-its6213.dif | 36 --------- 10 files changed, 146 insertions(+), 239 deletions(-) delete mode 100644 libldap-tls_chkhost-its6239.dif delete mode 100644 openldap-2.4.17.tar.bz2 create mode 100644 openldap-2.4.20.tar.bz2 delete mode 100644 slapo-collect-include.dif delete mode 100644 test056-monitor-its6213.dif diff --git a/libldap-tls_chkhost-its6239.dif b/libldap-tls_chkhost-its6239.dif deleted file mode 100644 index a5b780a..0000000 --- a/libldap-tls_chkhost-its6239.dif +++ /dev/null @@ -1,125 +0,0 @@ -Index: libraries/libldap/tls_o.c -=================================================================== -RCS file: /repo/OpenLDAP/pkg/ldap/libraries/libldap/tls_o.c,v -retrieving revision 1.5.2.4 -retrieving revision 1.5.2.6 -diff -u -r1.5.2.4 -r1.5.2.6 ---- libraries/libldap/tls_o.c 1 Jul 2009 23:04:49 -0000 1.5.2.4 -+++ libraries/libldap/tls_o.c 13 Aug 2009 00:52:04 -0000 1.5.2.6 -@@ -466,7 +466,7 @@ - X509 *x; - const char *name; - char *ptr; -- int ntype = IS_DNS; -+ int ntype = IS_DNS, nlen; - #ifdef LDAP_PF_INET6 - struct in6_addr addr; - #else -@@ -480,6 +480,7 @@ - } else { - name = name_in; - } -+ nlen = strlen(name); - - x = tlso_get_cert(s); - if (!x) { -@@ -513,15 +514,14 @@ - ex = X509_get_ext(x, i); - alt = X509V3_EXT_d2i(ex); - if (alt) { -- int n, len1 = 0, len2 = 0; -+ int n, len2 = 0; - char *domain = NULL; - GENERAL_NAME *gn; - - if (ntype == IS_DNS) { -- len1 = strlen(name); - domain = strchr(name, '.'); - if (domain) { -- len2 = len1 - (domain-name); -+ len2 = nlen - (domain-name); - } - } - n = sk_GENERAL_NAME_num(alt); -@@ -539,7 +539,7 @@ - if (sl == 0) continue; - - /* Is this an exact match? */ -- if ((len1 == sl) && !strncasecmp(name, sn, len1)) { -+ if ((nlen == sl) && !strncasecmp(name, sn, nlen)) { - break; - } - -@@ -579,13 +579,28 @@ - - if (ret != LDAP_SUCCESS) { - X509_NAME *xn; -- char buf[2048]; -- buf[0] = '\0'; -+ X509_NAME_ENTRY *ne; -+ ASN1_OBJECT *obj; -+ ASN1_STRING *cn = NULL; -+ int navas; -+ -+ /* find the last CN */ -+ obj = OBJ_nid2obj( NID_commonName ); -+ if ( !obj ) goto no_cn; /* should never happen */ - - xn = X509_get_subject_name(x); -- if( X509_NAME_get_text_by_NID( xn, NID_commonName, -- buf, sizeof(buf)) == -1) -+ navas = X509_NAME_entry_count( xn ); -+ for ( i=navas-1; i>=0; i-- ) { -+ ne = X509_NAME_get_entry( xn, i ); -+ if ( !OBJ_cmp( ne->object, obj )) { -+ cn = X509_NAME_ENTRY_get_data( ne ); -+ break; -+ } -+ } -+ -+ if( !cn ) - { -+no_cn: - Debug( LDAP_DEBUG_ANY, - "TLS: unable to get common name from peer certificate.\n", - 0, 0, 0 ); -@@ -596,21 +611,20 @@ - ld->ld_error = LDAP_STRDUP( - _("TLS: unable to get CN from peer certificate")); - -- } else if (strcasecmp(name, buf) == 0 ) { -+ } else if ( cn->length == nlen && -+ strncasecmp( name, (char *) cn->data, nlen ) == 0 ) { - ret = LDAP_SUCCESS; - -- } else if (( buf[0] == '*' ) && ( buf[1] == '.' )) { -+ } else if (( cn->data[0] == '*' ) && ( cn->data[1] == '.' )) { - char *domain = strchr(name, '.'); - if( domain ) { -- size_t dlen = 0; -- size_t sl; -+ size_t dlen; - -- sl = strlen(name); -- dlen = sl - (domain-name); -- sl = strlen(buf); -+ dlen = nlen - (domain-name); - - /* Is this a wildcard match? */ -- if ((dlen == sl-1) && !strncasecmp(domain, &buf[1], dlen)) { -+ if ((dlen == cn->length-1) && -+ !strncasecmp(domain, (char *) &cn->data[1], dlen)) { - ret = LDAP_SUCCESS; - } - } -@@ -618,8 +632,8 @@ - - if( ret == LDAP_LOCAL_ERROR ) { - Debug( LDAP_DEBUG_ANY, "TLS: hostname (%s) does not match " -- "common name in certificate (%s).\n", -- name, buf, 0 ); -+ "common name in certificate (%.*s).\n", -+ name, cn->length, cn->data ); - ret = LDAP_CONNECT_ERROR; - if ( ld->ld_error ) { - LDAP_FREE( ld->ld_error ); diff --git a/openldap-2.4.17.tar.bz2 b/openldap-2.4.17.tar.bz2 deleted file mode 100644 index ea0fb88..0000000 --- a/openldap-2.4.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9420647e50819d5b21ce271f827a00e76ac60a06712ec5fa948aaeca160543b6 -size 4372683 diff --git a/openldap-2.4.20.tar.bz2 b/openldap-2.4.20.tar.bz2 new file mode 100644 index 0000000..b06b6c0 --- /dev/null +++ b/openldap-2.4.20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af0f2ceb0fbabd866bf25bc6ea2013d4bf0510d84f6d4bcde25c8f0c270b411c +size 4417900 diff --git a/openldap2-client.changes b/openldap2-client.changes index 0d808bc..97a563d 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon Nov 30 16:09:22 UTC 2009 - rhafer@novell.com + +- Update to 2.4.20 (fate#306593), most important fixes since 2.4.19 + * Fixed liblber embedded NUL values in BerValues (ITS#6353) + * Fixed libldap sasl buffer sizing (ITS#6327,ITS#6334) + * Fixed libldap uninitialized return value (ITS#6355) + * Fixed libldap unlimited timeout (ITS#6388) + * Added slapd handling of hex server IDs (ITS#6297) + * Fixed slapd checks of str2filter (ITS#6391) + * Fixed slapd configArgs initialization (ITS#6363) + * Fixed slapd db_open with connection_fake_init (ITS#6381) + * Fixed slapd with embedded \0 in bervals (ITS#6378,ITS#6379) + * Fixed slapd inclusion of ac/unistd.h (ITS#6342) + * Fixed slapd sl_free to better reclaim memory (ITS#6380) + * Fixed slapd syncrepl deletes in MirrorMode (ITS#6368) + * Fixed slapd syncrepl to use correct SID (ITS#6367) + * Fixed slapd tls_accept to retry in certain cases (ITS#6304) + * Fixed slapd-bdb/hdb cache corruption (ITS#6341) + * Fixed slapd-bdb/hdb entry cache (ITS#6360) + * Fixed slapo-syncprov checkpoint conversion (ITS#6370) + * Fixed slapo-syncprov deadlock (ITS#6335) + * Fixed slapo-syncprov out of order changes (ITS#6346) +- Added switch to enable/disable testsuite (%run_test_suite) + +------------------------------------------------------------------- +Tue Nov 3 19:13:32 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Mon Sep 28 13:59:18 UTC 2009 - rhafer@novell.com diff --git a/openldap2-client.spec b/openldap2-client.spec index 3a684f3..577d3a3 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,5 +1,5 @@ # -# spec file for package openldap2-client (Version 2.4.17) +# spec file for package openldap2 (Version 2.4.17) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,8 +17,9 @@ # norootforbuild +%define run_test_suite 1 -Name: openldap2-client +Name: openldap2-client BuildRequires: cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel %if %sles_version == 9 BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel @@ -26,8 +27,8 @@ BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-de %if %sles_version == 10 BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif -Version: 2.4.17 -Release: 4 +Version: 2.4.20 +Release: 2 Url: http://www.openldap.org License: BSD 3-clause (or similar) ; openldap 2.8 %if "%{name}" == "openldap2" @@ -41,6 +42,7 @@ Summary: The OpenLDAP commandline client tools %else Group: Productivity/Networking/LDAP/Clients Conflicts: openldap-client +Requires: libldap-2_4-2 = %{version} Summary: The OpenLDAP commandline client tools %endif AutoReqProv: on @@ -52,16 +54,13 @@ Source4: sasl-slapd.conf Source5: README.update Source6: schema2ldif Source100: openldap-2.3.37.tar.bz2 -Patch: openldap2.dif +Patch1: openldap2.dif Patch2: slapd_conf.dif Patch3: ldap_conf.dif Patch4: ldapi_url.dif -Patch5: test056-monitor-its6213.dif Patch6: libldap-gethostbyname_r.dif Patch7: pie-compile.dif Patch11: slapd-bconfig-del-db.dif -Patch14: slapo-collect-include.dif -Patch15: libldap-tls_chkhost-its6239.dif Patch100: openldap-2.3.37.dif Patch200: slapd_getaddrinfo_dupl.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -173,18 +172,15 @@ Authors: %prep %setup -q -n openldap-%{version} -a1 -a2 -b100 -%patch +%patch1 %patch2 %patch3 %patch4 -%patch5 %patch6 %if %suse_version > 920 %patch7 %endif %patch11 -%patch14 -p1 -%patch15 %if %suse_version == 1100 %patch200 -p1 %endif @@ -253,6 +249,7 @@ make %{?jobs:-j%jobs} %endif %check +%if %run_test_suite # calculate the base port to be use in the test-suite SLAPD_BASEPORT=10000 if [ -f /.buildenv ] ; then @@ -274,6 +271,7 @@ rm -f tests/scripts/test050-syncrepl-multimaster rm -f tests/scripts/test058-syncrepl-asymmetric make SLAPD_DEBUG=0 test %endif +%endif %install mkdir -p $RPM_BUILD_ROOT/etc/init.d diff --git a/openldap2.changes b/openldap2.changes index 0d808bc..97a563d 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon Nov 30 16:09:22 UTC 2009 - rhafer@novell.com + +- Update to 2.4.20 (fate#306593), most important fixes since 2.4.19 + * Fixed liblber embedded NUL values in BerValues (ITS#6353) + * Fixed libldap sasl buffer sizing (ITS#6327,ITS#6334) + * Fixed libldap uninitialized return value (ITS#6355) + * Fixed libldap unlimited timeout (ITS#6388) + * Added slapd handling of hex server IDs (ITS#6297) + * Fixed slapd checks of str2filter (ITS#6391) + * Fixed slapd configArgs initialization (ITS#6363) + * Fixed slapd db_open with connection_fake_init (ITS#6381) + * Fixed slapd with embedded \0 in bervals (ITS#6378,ITS#6379) + * Fixed slapd inclusion of ac/unistd.h (ITS#6342) + * Fixed slapd sl_free to better reclaim memory (ITS#6380) + * Fixed slapd syncrepl deletes in MirrorMode (ITS#6368) + * Fixed slapd syncrepl to use correct SID (ITS#6367) + * Fixed slapd tls_accept to retry in certain cases (ITS#6304) + * Fixed slapd-bdb/hdb cache corruption (ITS#6341) + * Fixed slapd-bdb/hdb entry cache (ITS#6360) + * Fixed slapo-syncprov checkpoint conversion (ITS#6370) + * Fixed slapo-syncprov deadlock (ITS#6335) + * Fixed slapo-syncprov out of order changes (ITS#6346) +- Added switch to enable/disable testsuite (%run_test_suite) + +------------------------------------------------------------------- +Tue Nov 3 19:13:32 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Mon Sep 28 13:59:18 UTC 2009 - rhafer@novell.com diff --git a/openldap2.spec b/openldap2.spec index 24b6736..dac897e 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -17,6 +17,7 @@ # norootforbuild +%define run_test_suite 1 Name: openldap2 BuildRequires: cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel @@ -26,8 +27,8 @@ BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-de %if %sles_version == 10 BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif -Version: 2.4.17 -Release: 4 +Version: 2.4.20 +Release: 2 Url: http://www.openldap.org License: BSD 3-clause (or similar) ; openldap 2.8 %if "%{name}" == "openldap2" @@ -41,6 +42,7 @@ Summary: The OpenLDAP commandline client tools %else Group: Productivity/Networking/LDAP/Clients Conflicts: openldap-client +Requires: libldap-2_4-2 = %{version} Summary: The OpenLDAP commandline client tools %endif AutoReqProv: on @@ -52,16 +54,13 @@ Source4: sasl-slapd.conf Source5: README.update Source6: schema2ldif Source100: openldap-2.3.37.tar.bz2 -Patch: openldap2.dif +Patch1: openldap2.dif Patch2: slapd_conf.dif Patch3: ldap_conf.dif Patch4: ldapi_url.dif -Patch5: test056-monitor-its6213.dif Patch6: libldap-gethostbyname_r.dif Patch7: pie-compile.dif Patch11: slapd-bconfig-del-db.dif -Patch14: slapo-collect-include.dif -Patch15: libldap-tls_chkhost-its6239.dif Patch100: openldap-2.3.37.dif Patch200: slapd_getaddrinfo_dupl.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -173,18 +172,15 @@ Authors: %prep %setup -q -n openldap-%{version} -a1 -a2 -b100 -%patch +%patch1 %patch2 %patch3 %patch4 -%patch5 %patch6 %if %suse_version > 920 %patch7 %endif %patch11 -%patch14 -p1 -%patch15 %if %suse_version == 1100 %patch200 -p1 %endif @@ -253,6 +249,7 @@ make %{?jobs:-j%jobs} %endif %check +%if %run_test_suite # calculate the base port to be use in the test-suite SLAPD_BASEPORT=10000 if [ -f /.buildenv ] ; then @@ -274,6 +271,7 @@ rm -f tests/scripts/test050-syncrepl-multimaster rm -f tests/scripts/test058-syncrepl-asymmetric make SLAPD_DEBUG=0 test %endif +%endif %install mkdir -p $RPM_BUILD_ROOT/etc/init.d diff --git a/pie-compile.dif b/pie-compile.dif index 0514654..0cede92 100644 --- a/pie-compile.dif +++ b/pie-compile.dif @@ -1,6 +1,8 @@ ---- build/top.mk 2005/06/22 09:26:29 1.3 -+++ build/top.mk 2005/06/22 12:20:52 -@@ -169,9 +169,9 @@ +Index: build/top.mk +=================================================================== +--- build/top.mk.orig ++++ build/top.mk +@@ -178,9 +178,9 @@ SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_L WRAP_LIBS = @WRAP_LIBS@ # AutoConfig generated AC_CC = @CC@ @@ -12,21 +14,25 @@ AC_LIBS = @LIBS@ KRB4_LIBS = @KRB4_LIBS@ ---- libraries/liblunicode/Makefile.in 2005/06/22 12:25:47 1.1 -+++ libraries/liblunicode/Makefile.in 2005/06/22 12:26:18 -@@ -29,6 +29,9 @@ - LDAP_INCDIR= ../../include - LDAP_LIBDIR= ../../libraries +Index: libraries/liblunicode/Makefile.in +=================================================================== +--- libraries/liblunicode/Makefile.in.orig ++++ libraries/liblunicode/Makefile.in +@@ -35,6 +35,9 @@ $(XXDIR)/uctable.h: $(XXDIR)/ucgendat.c + $(MAKE) ucgendat + ./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt +PIE_CFLAGS="-fPIE" +PIE_LDFLAGS="-pie" + ucgendat: $(XLIBS) ucgendat.o $(LTLINK) -o $@ ucgendat.o $(LIBS) - ./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt ---- libraries/liblutil/Makefile.in 2005/06/22 12:29:51 1.1 -+++ libraries/liblutil/Makefile.in 2005/06/22 12:30:20 -@@ -19,6 +19,9 @@ + +Index: libraries/liblutil/Makefile.in +=================================================================== +--- libraries/liblutil/Makefile.in.orig ++++ libraries/liblutil/Makefile.in +@@ -19,6 +19,9 @@ PROGRAM = testavl LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries @@ -36,9 +42,11 @@ NT_SRCS = ntservice.c NT_OBJS = ntservice.o slapdmsg.res ---- servers/slapd/Makefile.in 2005/06/22 09:28:52 1.1 -+++ servers/slapd/Makefile.in 2005/06/22 10:04:38 -@@ -67,6 +67,9 @@ +Index: servers/slapd/Makefile.in +=================================================================== +--- servers/slapd/Makefile.in.orig ++++ servers/slapd/Makefile.in +@@ -69,6 +69,9 @@ SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BA SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@ @@ -48,11 +56,13 @@ XDEFS = $(MODULES_CPPFLAGS) XLDFLAGS = $(MODULES_LDFLAGS) ---- servers/slapd/back-bdb/Makefile.in 2005/06/22 10:05:47 1.1 -+++ servers/slapd/back-bdb/Makefile.in 2005/06/22 10:06:22 -@@ -37,6 +37,9 @@ +Index: servers/slapd/back-bdb/Makefile.in +=================================================================== +--- servers/slapd/back-bdb/Makefile.in.orig ++++ servers/slapd/back-bdb/Makefile.in +@@ -37,6 +37,9 @@ mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(@BUILD_BDB@_DEFS) - MOD_LIBS = $(LDBM_LIBS) + MOD_LIBS = $(BDB_LIBS) +PIE_CFLAGS="-fPIE" +PIE_LDFLAGS="-pie" @@ -60,11 +70,13 @@ shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) ---- servers/slapd/back-hdb/Makefile.in 2005/06/22 11:31:01 1.1 -+++ servers/slapd/back-hdb/Makefile.in 2005/06/22 11:31:41 -@@ -39,6 +39,9 @@ +Index: servers/slapd/back-hdb/Makefile.in +=================================================================== +--- servers/slapd/back-hdb/Makefile.in.orig ++++ servers/slapd/back-hdb/Makefile.in +@@ -41,6 +41,9 @@ mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(@BUILD_HDB@_DEFS) - MOD_LIBS = $(LDBM_LIBS) + MOD_LIBS = $(BDB_LIBS) +PIE_CFLAGS="-fPIE" +PIE_LDFLAGS="-pie" @@ -72,9 +84,11 @@ shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) ---- servers/slapd/overlays/Makefile.in 2005/06/22 12:35:29 1.1 -+++ servers/slapd/overlays/Makefile.in 2005/06/22 12:35:47 -@@ -19,6 +19,9 @@ +Index: servers/slapd/overlays/Makefile.in +=================================================================== +--- servers/slapd/overlays/Makefile.in.orig ++++ servers/slapd/overlays/Makefile.in +@@ -45,6 +45,9 @@ LTONLY_MOD = $(LTONLY_mod) LDAP_INCDIR= ../../../include LDAP_LIBDIR= ../../../libraries @@ -84,9 +98,11 @@ MOD_DEFS = -DSLAPD_IMPORT shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) ---- servers/slapd/back-relay/Makefile.in 2005/09/23 09:59:31 1.1 -+++ servers/slapd/back-relay/Makefile.in 2005/09/23 09:59:12 -@@ -24,6 +24,9 @@ +Index: servers/slapd/back-relay/Makefile.in +=================================================================== +--- servers/slapd/back-relay/Makefile.in.orig ++++ servers/slapd/back-relay/Makefile.in +@@ -25,6 +25,9 @@ BUILD_MOD = @BUILD_RELAY@ mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(@BUILD_RELAY@_DEFS) @@ -96,9 +112,11 @@ shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE) ---- servers/slapd/back-ldif/Makefile.in 2005/09/23 09:58:52 1.1 -+++ servers/slapd/back-ldif/Makefile.in 2005/09/23 09:58:54 -@@ -25,6 +25,9 @@ +Index: servers/slapd/back-ldif/Makefile.in +=================================================================== +--- servers/slapd/back-ldif/Makefile.in.orig ++++ servers/slapd/back-ldif/Makefile.in +@@ -25,6 +25,9 @@ BUILD_MOD = yes mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(yes_DEFS) @@ -108,9 +126,11 @@ shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) ---- libraries/librewrite/Makefile.in 2005/09/23 10:16:37 1.1 -+++ libraries/librewrite/Makefile.in 2005/09/23 10:18:36 -@@ -26,6 +26,9 @@ +Index: libraries/librewrite/Makefile.in +=================================================================== +--- libraries/librewrite/Makefile.in.orig ++++ libraries/librewrite/Makefile.in +@@ -26,6 +26,9 @@ OBJS = config.o context.o info.o ldapmap LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries @@ -120,9 +140,11 @@ LIBRARY = librewrite.a PROGRAMS = rewrite XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \ ---- servers/slapd/back-ldap/Makefile.in 2005/12/09 08:58:44 1.1 -+++ servers/slapd/back-ldap/Makefile.in 2005/12/09 08:59:28 -@@ -27,6 +27,9 @@ +Index: servers/slapd/back-ldap/Makefile.in +=================================================================== +--- servers/slapd/back-ldap/Makefile.in.orig ++++ servers/slapd/back-ldap/Makefile.in +@@ -29,6 +29,9 @@ BUILD_MOD = @BUILD_LDAP@ mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(@BUILD_LDAP@_DEFS) @@ -132,9 +154,11 @@ shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) ---- servers/slapd/back-monitor/Makefile.in 2005/12/09 08:58:55 1.1 -+++ servers/slapd/back-monitor/Makefile.in 2005/12/09 08:59:48 -@@ -33,6 +33,9 @@ +Index: servers/slapd/back-monitor/Makefile.in +=================================================================== +--- servers/slapd/back-monitor/Makefile.in.orig ++++ servers/slapd/back-monitor/Makefile.in +@@ -33,6 +33,9 @@ BUILD_MOD = @BUILD_MONITOR@ mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(@BUILD_MONITOR@_DEFS) diff --git a/slapo-collect-include.dif b/slapo-collect-include.dif deleted file mode 100644 index 2a549b4..0000000 --- a/slapo-collect-include.dif +++ /dev/null @@ -1,12 +0,0 @@ -Index: openldap-2.4.12/servers/slapd/overlays/collect.c -=================================================================== ---- openldap-2.4.12.orig/servers/slapd/overlays/collect.c -+++ openldap-2.4.12/servers/slapd/overlays/collect.c -@@ -30,6 +30,7 @@ - - #include "slap.h" - #include "config.h" -+#include "lutil.h" - - /* This is a cheap hack to implement a collective attribute. - * diff --git a/test056-monitor-its6213.dif b/test056-monitor-its6213.dif deleted file mode 100644 index 5f15235..0000000 --- a/test056-monitor-its6213.dif +++ /dev/null @@ -1,36 +0,0 @@ -Index: tests/scripts/test056-monitor -=================================================================== -RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test056-monitor,v -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -r1.3 -r1.4 ---- tests/scripts/test056-monitor 2 Jul 2009 13:26:52 -0000 1.3 -+++ tests/scripts/test056-monitor 14 Jul 2009 11:35:56 -0000 1.4 -@@ -66,7 +66,7 @@ - echo "Filtering ldapsearch results..." - sed -e "$localrewrite" < $SEARCHOUT | . $LDIFFILTER > $SEARCHFLT - echo "Filtering expected data..." --sed -e "$localrewrite" < $MONITOROUT1 | . $LDIFFILTER > $LDIFFLT -+. $CONFFILTER < $MONITOROUT1 | sed -e "$localrewrite" | . $LDIFFILTER > $LDIFFLT - echo "Comparing filter output..." - $CMP $SEARCHFLT $LDIFFLT > $CMPOUT - -Index: tests/data/monitor1.out -=================================================================== -RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/monitor1.out,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -r1.1 -r1.2 ---- tests/data/monitor1.out 27 Jan 2009 09:09:51 -0000 1.1 -+++ tests/data/monitor1.out 14 Jul 2009 11:35:56 -0000 1.2 -@@ -9,8 +9,8 @@ - monitorConnectionRead: 2 - monitorConnectionWrite: 0 - monitorConnectionMask: rx --monitorConnectionListener: ldap://localhost:9011/ --monitorConnectionLocalAddress: IP=127.0.0.1:9011 -+monitorConnectionListener: ldap://localhost:@PORT1@/ -+monitorConnectionLocalAddress: IP=127.0.0.1:@PORT1@ - entryDN: cn=Connection 1,cn=Connections,cn=Monitor - - dn: cn=Connections,cn=Monitor