[Pkg-openldap-devel] [openldap] 207/208: New upstream release.

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit c8a1826b036908af90c12da725e0cc8864ded1ea
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Thu Dec 31 14:23:10 2015 -0800

    New upstream release.
---
 debian/changelog                                   | 12 +++++++++++
 .../patches/ITS8240-remove-obsolete-assert.patch   | 25 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d03d164..15af66a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+openldap (2.4.43+dfsg-1) UNRELEASED; urgency=medium
+
+  * !!! DO NOT UPLOAD this until updating the ppolicy schema on upgrade is 
+    dealt with, otherwise ppolicy users will be broken!
+
+  * New upstream release.
+    - Fixed ppolicy not unlocking policy entry after initialization failure 
+      (ITS#7537) (Closes: #702414)
+  * Drop ITS8240-remove-obsolete-assert.patch, included upstream.
+
+ -- Ryan Tandy <ryan at nardis.ca>  Thu, 31 Dec 2015 14:08:53 -0800
+
 openldap (2.4.42+dfsg-2) unstable; urgency=medium
 
   [ Ryan Tandy ]
diff --git a/debian/patches/ITS8240-remove-obsolete-assert.patch b/debian/patches/ITS8240-remove-obsolete-assert.patch
deleted file mode 100644
index 97bf6d7..0000000
--- a/debian/patches/ITS8240-remove-obsolete-assert.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6fe51a9ab04fd28bbc171da3cf12f1c1040d6629 Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc at openldap.org>
-Date: Thu, 10 Sep 2015 00:37:32 +0100
-Subject: [PATCH] ITS#8240 remove obsolete assert
-
----
- libraries/liblber/io.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
-index 85c3e23..c05dcf8 100644
---- a/libraries/liblber/io.c
-+++ b/libraries/liblber/io.c
-@@ -679,7 +679,7 @@ done:
- 		return (ber->ber_tag);
- 	}
- 
--	assert( 0 ); /* ber structure is messed up ?*/
-+	/* invalid input */
- 	return LBER_DEFAULT;
- }
- 
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 0a2027e..e39010c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,4 +23,3 @@ switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
 no-bdb-ABI-second-guessing
 heimdal-fix
 ITS6035-olcauthzregex-needs-restart.patch
-ITS8240-remove-obsolete-assert.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git