diff --git a/openldap-2.3.37.dif b/openldap-2.3.37.dif index c416cb0..55b1194 100644 --- a/openldap-2.3.37.dif +++ b/openldap-2.3.37.dif @@ -20,18 +20,6 @@ Index: build/top.mk LINT = lint 5LINT = 5lint -@@ -175,9 +175,9 @@ SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_L - WRAP_LIBS = @WRAP_LIBS@ - # AutoConfig generated - AC_CC = @CC@ --AC_CFLAGS = @CFLAGS@ -+AC_CFLAGS = @CFLAGS@ $(PIE_CFLAGS) - AC_DEFS = @CPPFLAGS@ # @DEFS@ --AC_LDFLAGS = @LDFLAGS@ -+AC_LDFLAGS = @LDFLAGS@ $(PIE_LDFLAGS) - AC_LIBS = @LIBS@ - - KRB4_LIBS = @KRB4_LIBS@ Index: configure.in =================================================================== --- configure.in.orig diff --git a/openldap-2.4.10.tar.bz2 b/openldap-2.4.10.tar.bz2 deleted file mode 100644 index 720d767..0000000 --- a/openldap-2.4.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6faed098add5c69c6358c01dc08254391003531318154cfa1390a9f0c394829 -size 3552078 diff --git a/openldap-2.4.11.tar.bz2 b/openldap-2.4.11.tar.bz2 new file mode 100644 index 0000000..63dff6e --- /dev/null +++ b/openldap-2.4.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ae8ed1e1f2ea7b4a0b34d75aa83d4195a955f9dd74f9a4e0d6e701d472da140 +size 3947545 diff --git a/openldap2-client.changes b/openldap2-client.changes index c63758f..a933ea5 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,4 +1,45 @@ ------------------------------------------------------------------- +Thu Jul 31 11:40:35 CEST 2008 - rhafer@suse.de + +- Enable back-config delete support + +------------------------------------------------------------------- +Tue Jul 29 15:32:05 CEST 2008 - rhafer@suse.de + +- Update to Version 2.4.11. Most important changes: + * Fixed liblber ber_get_next length decoding (ITS#5580) + * Added libldap assertion control (ITS#5560) + * Fixed liblutil missing return code (ITS#5615) + * Fixed slapd cert serial number parsing (ITS#5588) + * Fixed slapd check for structural_class failures (ITS#5540) + * Fixed slapd config backend renumbering (ITS#5571) + * Fixed slapd configContext OID (ITS#5383) + * Fixed slapd crash with no listeners (ITS#5563) + * Fixed slapd sets memory leak (ITS#5557) + * Fixed slapd sortvals binary search (ITS#5578) + * Fixed slapd syncrepl updates with multiple masters (ITS#5597) + * Fixed slapd syncrepl superior objectClass delete/add (ITS#5600) + * Fixed slapd syncrepl/slapo-syncprov contextCSN updates as internal ops (ITS#5596) + * Fixed slapo-memberof replace handling (ITS#5584) + * Added slapo-nssov contrib module + * Fixed slapo-pcache handling of negative search caches (ITS#5546) + * Fixed slapo-ppolicy DNs with whitespaces (ITS#5552) + * Fixed slapo-ppolicy modify with internal ops (ITS#5569) + * Fixed slapo-syncprov ACL evaluation (ITS#5548) + * Fixed slapo-syncprov crash with delcsn (ITS#5589) + * Fixed slapo-syncprov full reload (ITS#5564) + * Fixed slapo-syncprov missing olcSpReloadHint attr(ITS#5591) + * Fixed slapo-unique filter normalization (ITS#5581) + +------------------------------------------------------------------- +Mon Jun 30 16:32:10 CEST 2008 - rhafer@suse.de + +- Only apply -fPIE patch to recent Distributions +- removed -fPIE from the slapcat-2.3 build +- Adjust BuildRequires for older Distributions + +------------------------------------------------------------------- + Fri Jun 27 10:57:53 CEST 2008 - coolo@suse.de - make sure the subpacks are only in one spec file declared diff --git a/openldap2-client.spec b/openldap2-client.spec index 5a16602..87a9b0a 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,5 +1,5 @@ # -# spec file for package openldap2-client (Version 2.4.10) +# spec file for package openldap2-client (Version 2.4.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,6 +13,12 @@ Name: openldap2-client BuildRequires: cyrus-sasl-devel db-devel openslp-devel openssl-devel tcpd-devel +%if %sles_version == 9 +BuildRequires: -pwdutils +%endif +%if %sles_version == 10 +BuildRequires: -db-devel -pwdutils libdb-4_5-devel +%endif Url: http://www.openldap.org License: BSD 3-Clause %if "%{name}" == "openldap2" @@ -28,8 +34,8 @@ Conflicts: openldap-client Summary: OpenLDAP Client Utilities %endif AutoReqProv: on -Version: 2.4.10 -Release: 5 +Version: 2.4.11 +Release: 1 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: addonschema.tar.gz @@ -144,7 +150,9 @@ Authors: %patch4 %patch5 %patch6 +%if %suse_version > 920 %patch7 +%endif %patch8 -p1 %patch9 -p1 cp %{SOURCE5} . @@ -155,7 +163,7 @@ cd ../openldap-2.3.37 %{?suse_update_config:%{suse_update_config -f build}} libtoolize --force autoreconf -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS" +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE" ./configure --prefix=/usr \ --exec-prefix=/usr \ --sysconfdir=%{_sysconfdir} \ @@ -472,6 +480,37 @@ fi %endif %changelog +* Thu Jul 31 2008 rhafer@suse.de +- Enable back-config delete support +* Tue Jul 29 2008 rhafer@suse.de +- Update to Version 2.4.11. Most important changes: + * Fixed liblber ber_get_next length decoding (ITS#5580) + * Added libldap assertion control (ITS#5560) + * Fixed liblutil missing return code (ITS#5615) + * Fixed slapd cert serial number parsing (ITS#5588) + * Fixed slapd check for structural_class failures (ITS#5540) + * Fixed slapd config backend renumbering (ITS#5571) + * Fixed slapd configContext OID (ITS#5383) + * Fixed slapd crash with no listeners (ITS#5563) + * Fixed slapd sets memory leak (ITS#5557) + * Fixed slapd sortvals binary search (ITS#5578) + * Fixed slapd syncrepl updates with multiple masters (ITS#5597) + * Fixed slapd syncrepl superior objectClass delete/add (ITS#5600) + * Fixed slapd syncrepl/slapo-syncprov contextCSN updates as internal ops (ITS#5596) + * Fixed slapo-memberof replace handling (ITS#5584) + * Added slapo-nssov contrib module + * Fixed slapo-pcache handling of negative search caches (ITS#5546) + * Fixed slapo-ppolicy DNs with whitespaces (ITS#5552) + * Fixed slapo-ppolicy modify with internal ops (ITS#5569) + * Fixed slapo-syncprov ACL evaluation (ITS#5548) + * Fixed slapo-syncprov crash with delcsn (ITS#5589) + * Fixed slapo-syncprov full reload (ITS#5564) + * Fixed slapo-syncprov missing olcSpReloadHint attr(ITS#5591) + * Fixed slapo-unique filter normalization (ITS#5581) +* Mon Jun 30 2008 rhafer@suse.de +- Only apply -fPIE patch to recent Distributions +- removed -fPIE from the slapcat-2.3 build +- Adjust BuildRequires for older Distributions * Fri Jun 27 2008 coolo@suse.de - make sure the subpacks are only in one spec file declared * Tue Jun 24 2008 rhafer@suse.de diff --git a/openldap2.changes b/openldap2.changes index c63758f..a933ea5 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,4 +1,45 @@ ------------------------------------------------------------------- +Thu Jul 31 11:40:35 CEST 2008 - rhafer@suse.de + +- Enable back-config delete support + +------------------------------------------------------------------- +Tue Jul 29 15:32:05 CEST 2008 - rhafer@suse.de + +- Update to Version 2.4.11. Most important changes: + * Fixed liblber ber_get_next length decoding (ITS#5580) + * Added libldap assertion control (ITS#5560) + * Fixed liblutil missing return code (ITS#5615) + * Fixed slapd cert serial number parsing (ITS#5588) + * Fixed slapd check for structural_class failures (ITS#5540) + * Fixed slapd config backend renumbering (ITS#5571) + * Fixed slapd configContext OID (ITS#5383) + * Fixed slapd crash with no listeners (ITS#5563) + * Fixed slapd sets memory leak (ITS#5557) + * Fixed slapd sortvals binary search (ITS#5578) + * Fixed slapd syncrepl updates with multiple masters (ITS#5597) + * Fixed slapd syncrepl superior objectClass delete/add (ITS#5600) + * Fixed slapd syncrepl/slapo-syncprov contextCSN updates as internal ops (ITS#5596) + * Fixed slapo-memberof replace handling (ITS#5584) + * Added slapo-nssov contrib module + * Fixed slapo-pcache handling of negative search caches (ITS#5546) + * Fixed slapo-ppolicy DNs with whitespaces (ITS#5552) + * Fixed slapo-ppolicy modify with internal ops (ITS#5569) + * Fixed slapo-syncprov ACL evaluation (ITS#5548) + * Fixed slapo-syncprov crash with delcsn (ITS#5589) + * Fixed slapo-syncprov full reload (ITS#5564) + * Fixed slapo-syncprov missing olcSpReloadHint attr(ITS#5591) + * Fixed slapo-unique filter normalization (ITS#5581) + +------------------------------------------------------------------- +Mon Jun 30 16:32:10 CEST 2008 - rhafer@suse.de + +- Only apply -fPIE patch to recent Distributions +- removed -fPIE from the slapcat-2.3 build +- Adjust BuildRequires for older Distributions + +------------------------------------------------------------------- + Fri Jun 27 10:57:53 CEST 2008 - coolo@suse.de - make sure the subpacks are only in one spec file declared diff --git a/openldap2.spec b/openldap2.spec index 0be69cd..ab52c71 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -1,5 +1,5 @@ # -# spec file for package openldap2 (Version 2.4.10) +# spec file for package openldap2 (Version 2.4.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,6 +13,12 @@ Name: openldap2 BuildRequires: cyrus-sasl-devel db-devel openslp-devel openssl-devel tcpd-devel +%if %sles_version == 9 +BuildRequires: -pwdutils +%endif +%if %sles_version == 10 +BuildRequires: -db-devel -pwdutils libdb-4_5-devel +%endif Url: http://www.openldap.org License: BSD 3-Clause; openldap 2.8 %if "%{name}" == "openldap2" @@ -28,8 +34,8 @@ Conflicts: openldap-client Summary: The OpenLDAP Server %endif AutoReqProv: on -Version: 2.4.10 -Release: 5 +Version: 2.4.11 +Release: 1 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: addonschema.tar.gz @@ -147,7 +153,9 @@ Authors: %patch4 %patch5 %patch6 +%if %suse_version > 920 %patch7 +%endif %patch8 -p1 %patch9 -p1 cp %{SOURCE5} . @@ -158,7 +166,7 @@ cd ../openldap-2.3.37 %{?suse_update_config:%{suse_update_config -f build}} libtoolize --force autoreconf -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS" +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE" ./configure --prefix=/usr \ --exec-prefix=/usr \ --sysconfdir=%{_sysconfdir} \ @@ -475,6 +483,37 @@ fi %endif %changelog +* Thu Jul 31 2008 rhafer@suse.de +- Enable back-config delete support +* Tue Jul 29 2008 rhafer@suse.de +- Update to Version 2.4.11. Most important changes: + * Fixed liblber ber_get_next length decoding (ITS#5580) + * Added libldap assertion control (ITS#5560) + * Fixed liblutil missing return code (ITS#5615) + * Fixed slapd cert serial number parsing (ITS#5588) + * Fixed slapd check for structural_class failures (ITS#5540) + * Fixed slapd config backend renumbering (ITS#5571) + * Fixed slapd configContext OID (ITS#5383) + * Fixed slapd crash with no listeners (ITS#5563) + * Fixed slapd sets memory leak (ITS#5557) + * Fixed slapd sortvals binary search (ITS#5578) + * Fixed slapd syncrepl updates with multiple masters (ITS#5597) + * Fixed slapd syncrepl superior objectClass delete/add (ITS#5600) + * Fixed slapd syncrepl/slapo-syncprov contextCSN updates as internal ops (ITS#5596) + * Fixed slapo-memberof replace handling (ITS#5584) + * Added slapo-nssov contrib module + * Fixed slapo-pcache handling of negative search caches (ITS#5546) + * Fixed slapo-ppolicy DNs with whitespaces (ITS#5552) + * Fixed slapo-ppolicy modify with internal ops (ITS#5569) + * Fixed slapo-syncprov ACL evaluation (ITS#5548) + * Fixed slapo-syncprov crash with delcsn (ITS#5589) + * Fixed slapo-syncprov full reload (ITS#5564) + * Fixed slapo-syncprov missing olcSpReloadHint attr(ITS#5591) + * Fixed slapo-unique filter normalization (ITS#5581) +* Mon Jun 30 2008 rhafer@suse.de +- Only apply -fPIE patch to recent Distributions +- removed -fPIE from the slapcat-2.3 build +- Adjust BuildRequires for older Distributions * Fri Jun 27 2008 coolo@suse.de - make sure the subpacks are only in one spec file declared * Tue Jun 24 2008 rhafer@suse.de