new upstream release

Resolves: #947235
This commit is contained in:
Jan Synacek 2013-04-02 13:31:35 +02:00
parent 024749b3fb
commit 8e640ac8d6
4 changed files with 7 additions and 29 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/openldap-2.4.33.tgz /openldap-2.4.33.tgz
/openldap-2.4.34.tgz /openldap-2.4.34.tgz
/ltb-project-openldap-ppolicy-check-password-1.1.tar.gz /ltb-project-openldap-ppolicy-check-password-1.1.tar.gz
/openldap-2.4.35.tgz

View File

@ -1,24 +0,0 @@
Resolves: #920482
commit 575ad77adba06acfbcb2d44a06240794d00a8b9c
Author: Howard Chu <hyc@openldap.org>
Date: Thu Mar 14 06:39:46 2013 -0700
ITS#7531 check updateCookie status for INTERMEDIATEs
Was already being checked for other message types.
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index d00ba0c..1fba0b7 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1344,6 +1344,9 @@ do_syncrep2(
ldap_memfree( retoid );
ber_bvfree( retdata );
+ if ( rc )
+ goto done;
+
} else {
Debug( LDAP_DEBUG_ANY, "do_syncrep2: %s "
"unknown intermediate response (%d)\n",

View File

@ -8,8 +8,8 @@
%global check_password_version 1.1 %global check_password_version 1.1
Name: openldap Name: openldap
Version: 2.4.34 Version: 2.4.35
Release: 2%{?dist} Release: 1%{?dist}
Summary: LDAP support libraries Summary: LDAP support libraries
Group: System Environment/Daemons Group: System Environment/Daemons
License: OpenLDAP License: OpenLDAP
@ -46,7 +46,6 @@ Patch12: openldap-tls-no-reuse-of-tls_session.patch
Patch13: openldap-nss-regex-search-hashed-cacert-dir.patch Patch13: openldap-nss-regex-search-hashed-cacert-dir.patch
Patch14: openldap-nss-ignore-certdb-type-prefix.patch Patch14: openldap-nss-ignore-certdb-type-prefix.patch
Patch15: openldap-nss-certs-from-certdb-fallback-pem.patch Patch15: openldap-nss-certs-from-certdb-fallback-pem.patch
Patch16: openldap-syncrepl-delete-retry.patch
# Fedora specific patches # Fedora specific patches
Patch100: openldap-autoconf-pkgconfig-nss.patch Patch100: openldap-autoconf-pkgconfig-nss.patch
@ -165,7 +164,6 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1 %patch15 -p1
%patch16 -p1
%patch102 -p1 %patch102 -p1
@ -646,6 +644,9 @@ exit 0
%{evolution_connector_prefix}/ %{evolution_connector_prefix}/
%changelog %changelog
* Tue Apr 02 2013 Jan Synáček <jsynacek@redhat.com> 2.4.35-1
- new upstream release (#947235)
* Mon Mar 18 2013 Jan Synáček <jsynacek@redhat.com> 2.4.34-2 * Mon Mar 18 2013 Jan Synáček <jsynacek@redhat.com> 2.4.34-2
- fix: syncrepl push DELETE operation does not recover (#920482) - fix: syncrepl push DELETE operation does not recover (#920482)
- run autoreconf every build, drop autoreconf patch (#926280) - run autoreconf every build, drop autoreconf patch (#926280)

View File

@ -1,2 +1,2 @@
df93a62e396ac312333cdeab0c5b48b6 openldap-2.4.34.tgz cd75d82ca89fb0280cba66ca6bd97448 openldap-2.4.35.tgz
3535b7cd46dcf41c9a9480efa9e64618 ltb-project-openldap-ppolicy-check-password-1.1.tar.gz 3535b7cd46dcf41c9a9480efa9e64618 ltb-project-openldap-ppolicy-check-password-1.1.tar.gz