[Pkg-openldap-devel] [openldap] 03/13: Update Debian patches
Ryan Tandy
rtandy-guest at moszumanska.debian.org
Fri Jul 28 03:20:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
rtandy-guest pushed a commit to branch master
in repository openldap.
commit 743fc2e8043b8893aaffdb17e9b53e052d1c60e9
Author: Ryan Tandy <ryan at nardis.ca>
Date: Mon Jul 17 22:14:14 2017 -0700
Update Debian patches
---
debian/changelog | 7 ++++
debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch | 26 --------------
...S-8644-wait-for-slapd-to-start-in-test064.patch | 40 ----------------------
.../ITS-8655-paged-results-double-free.patch | 28 ---------------
debian/patches/do-not-second-guess-sonames | 14 ++++----
debian/patches/no-AM_INIT_AUTOMAKE | 4 +--
debian/patches/series | 3 --
7 files changed, 16 insertions(+), 106 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 21e6c47..1fdac3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,13 @@ openldap (2.4.45+dfsg-1) UNRELEASED; urgency=medium
(ITS#8648) (Closes: #860947) (LP: #1688575)
- fixed syncrepl infinite looping with multi-master delta-syncrepl
(ITS#8432) (Closes: #868753)
+ * Rebase patches to apply cleanly:
+ - do-not-second-guess-sonames
+ - no-AM_INIT_AUTOMAKE
+ * Drop patches applied upstream:
+ - ITS-8554-kFreeBSD-is-like-BSD.patch
+ - ITS-8644-wait-for-slapd-to-start-in-test064.patch
+ - ITS-8655-paged-results-double-free.patch
-- Ryan Tandy <ryan at nardis.ca> Mon, 17 Jul 2017 20:30:07 -0700
diff --git a/debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch b/debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch
deleted file mode 100644
index b127e1c..0000000
--- a/debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 74d64d0eb245ce07383abcd444c23e7438e8a083 Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc at openldap.org>
-Date: Wed, 28 Dec 2016 18:32:14 +0000
-Subject: [PATCH] ITS#8554 kFreeBSD is like BSD
-
-Doesn't have POSIX robust mutexes - GNU userland on BSD kernel
----
- libraries/liblmdb/mdb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
-index 7a181d4..23c1f00 100644
---- a/libraries/liblmdb/mdb.c
-+++ b/libraries/liblmdb/mdb.c
-@@ -120,7 +120,7 @@ typedef SSIZE_T ssize_t;
- #include <resolv.h> /* defines BYTE_ORDER on HPUX and Solaris */
- #endif
-
--#if defined(__APPLE__) || defined (BSD)
-+#if defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__)
- # define MDB_USE_POSIX_SEM 1
- # define MDB_FDATASYNC fsync
- #elif defined(ANDROID)
---
-2.1.4
-
diff --git a/debian/patches/ITS-8644-wait-for-slapd-to-start-in-test064.patch b/debian/patches/ITS-8644-wait-for-slapd-to-start-in-test064.patch
deleted file mode 100644
index 1e3f8b0..0000000
--- a/debian/patches/ITS-8644-wait-for-slapd-to-start-in-test064.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b622163ecf14a179d932f779164af5e393311dd8 Mon Sep 17 00:00:00 2001
-From: Ryan Tandy <ryan at nardis.ca>
-Date: Tue, 25 Apr 2017 01:28:25 +0000
-Subject: [PATCH] ITS#8644 wait for slapd to start in test064
-
----
- tests/scripts/test064-constraint | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/tests/scripts/test064-constraint b/tests/scripts/test064-constraint
-index 94f86be..2ac53ac 100755
---- a/tests/scripts/test064-constraint
-+++ b/tests/scripts/test064-constraint
-@@ -117,6 +117,23 @@ if test $WAIT != 0 ; then
- fi
- sleep 1
-
-+echo "Using ldapsearch to check that slapd is running..."
-+for i in 0 1 2 3 4 5; do
-+ $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
-+ 'objectclass=*' > /dev/null 2>&1
-+ RC=$?
-+ if test $RC = 0 ; then
-+ break
-+ fi
-+ echo "Waiting 5 seconds for slapd to start..."
-+ sleep 5
-+done
-+if test $RC != 0 ; then
-+ echo "ldapsearch failed ($RC)!"
-+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
-+ exit $RC
-+fi
-+
- echo "Adding basic structure..."
- $LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $ROOTLDIF &>/dev/null
- RC=$?
---
-2.1.4
-
diff --git a/debian/patches/ITS-8655-paged-results-double-free.patch b/debian/patches/ITS-8655-paged-results-double-free.patch
deleted file mode 100644
index 894b905..0000000
--- a/debian/patches/ITS-8655-paged-results-double-free.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0cee1ffb6021b1aae3fcc9581699da1c85a6dd6e Mon Sep 17 00:00:00 2001
-From: Ryan Tandy <ryan at nardis.ca>
-Date: Wed, 17 May 2017 20:07:39 -0700
-Subject: [PATCH] ITS#8655 fix double free on paged search with pagesize 0
-
-Fixes a double free when a search includes the Paged Results control
-with a page size of 0 and the search base matches the filter.
----
- servers/slapd/back-mdb/search.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c
-index 301d1a4..43442aa 100644
---- a/servers/slapd/back-mdb/search.c
-+++ b/servers/slapd/back-mdb/search.c
-@@ -1066,7 +1066,8 @@ notfound:
- /* check size limit */
- if ( get_pagedresults(op) > SLAP_CONTROL_IGNORED ) {
- if ( rs->sr_nentries >= ((PagedResultsState *)op->o_pagedresults_state)->ps_size ) {
-- mdb_entry_return( op, e );
-+ if (e != base)
-+ mdb_entry_return( op, e );
- e = NULL;
- send_paged_response( op, rs, &lastid, tentries );
- goto done;
---
-2.1.4
-
diff --git a/debian/patches/do-not-second-guess-sonames b/debian/patches/do-not-second-guess-sonames
index 31cf652..bbf099c 100644
--- a/debian/patches/do-not-second-guess-sonames
+++ b/debian/patches/do-not-second-guess-sonames
@@ -8,10 +8,10 @@ Upstream ITS #6302 filed.
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
-@@ -74,28 +74,6 @@ int ldap_int_sasl_init( void )
- /* XXX not threadsafe */
- static int sasl_initialized = 0;
-
+@@ -74,28 +74,6 @@
+ */
+ int ldap_int_sasl_init( void )
+ {
-#ifdef HAVE_SASL_VERSION
- /* stringify the version number, sasl.h doesn't do it for us */
-#define VSTR0(maj, min, pat) #maj "." #min "." #pat
@@ -34,9 +34,9 @@ Upstream ITS #6302 filed.
- }
- }
-#endif
- if ( sasl_initialized ) {
- return 0;
- }
+
+ /* SASL 2 takes care of its own memory completely internally */
+ #if SASL_VERSION_MAJOR < 2 && !defined(CSRIMALLOC)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1145,26 +1145,6 @@ int slap_sasl_init( void )
diff --git a/debian/patches/no-AM_INIT_AUTOMAKE b/debian/patches/no-AM_INIT_AUTOMAKE
index 825c231..3659575 100644
--- a/debian/patches/no-AM_INIT_AUTOMAKE
+++ b/debian/patches/no-AM_INIT_AUTOMAKE
@@ -6,9 +6,9 @@ Author: Steve Langasek <vorlon at debian.org>
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,8 @@ dnl Configure.in for OpenLDAP
- AC_COPYRIGHT([[Copyright 1998-2016 The OpenLDAP Foundation. All rights reserved.
+ AC_COPYRIGHT([[Copyright 1998-2017 The OpenLDAP Foundation. All rights reserved.
Restrictions apply, see COPYRIGHT and LICENSE files.]])
- AC_REVISION([$Id: 92de4e0c6b47b1e86946bc89185ac07f46bfc5e4 $])
+ AC_REVISION([$Id: b251b6b06c0fd22b0c26b2c8063e9bfd17b9f2c5 $])
-AC_INIT([OpenLDAP],,[http://www.openldap.org/its/])
+AC_INIT([OpenLDAP],[$OL_VERSION],[http://www.openldap.org/its/])
+AC_PROG_MAKE_SET
diff --git a/debian/patches/series b/debian/patches/series
index 90348d5..49adda9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,6 +23,3 @@ switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
no-bdb-ABI-second-guessing
ITS6035-olcauthzregex-needs-restart.patch
set-maintainer-name
-ITS-8554-kFreeBSD-is-like-BSD.patch
-ITS-8644-wait-for-slapd-to-start-in-test064.patch
-ITS-8655-paged-results-double-free.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git
More information about the Pkg-openldap-devel
mailing list