[Pkg-openldap-devel] [openldap] 279/281: Update patches for 2.4.41.
Ryan Tandy
rtandy-guest at moszumanska.debian.org
Thu Jul 9 01:43:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
rtandy-guest pushed a commit to branch master
in repository openldap.
commit c15a9cea3e0ec69c912495d539d98bf0175903c4
Author: Ryan Tandy <ryan at nardis.ca>
Date: Wed Jul 8 03:58:28 2015 +0000
Update patches for 2.4.41.
---
debian/changelog | 1 +
.../ITS-8056-fix-libdb-detection-with-gcc-5.patch | 43 ----------------------
.../patches/ITS7975-fix-mdb-onelevel-search.patch | 24 ------------
.../ITS8027-deref-reject-empty-attr-list.patch | 20 ----------
.../patches/ITS8046-fix-vrFilter_free-crash.patch | 28 --------------
debian/patches/autogroup-makefile | 2 +-
debian/patches/lastbind-makefile | 2 +-
debian/patches/no-AM_INIT_AUTOMAKE | 4 +-
debian/patches/pw-sha2-makefile | 2 +-
debian/patches/sasl-default-path | 6 +--
debian/patches/series | 4 --
debian/patches/smbk5pwd-makefile | 2 +-
12 files changed, 10 insertions(+), 128 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 083c8c3..cad44a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
openldap (2.4.41+dfsg-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Update patches for upstream changes, drop patches included upstream.
* debian/rules: Adjust get-orig-source target to add +dfsg to version.
-- Ryan Tandy <ryan at nardis.ca> Wed, 08 Jul 2015 02:53:48 +0000
diff --git a/debian/patches/ITS-8056-fix-libdb-detection-with-gcc-5.patch b/debian/patches/ITS-8056-fix-libdb-detection-with-gcc-5.patch
deleted file mode 100644
index be1b36e..0000000
--- a/debian/patches/ITS-8056-fix-libdb-detection-with-gcc-5.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2dfac1755cea5bfe960aeedbea31d40b2678c4c7 Mon Sep 17 00:00:00 2001
-From: Jan Synacek <jsynacek at redhat.com>
-Date: Wed, 11 Feb 2015 10:32:28 +0100
-Subject: [PATCH] ITS#8056 fix libdb detection with gcc 5
-
-The old cpp version generated:
-__db_version 5
-
-The new output:
-__db_version
- 5
-
-Running cpp with -P (inhibit linemarkers generation) fixes this when using gcc 5.
-Behavior with older versions of gcc is not changed.
----
- build/openldap.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/openldap.m4 b/build/openldap.m4
-index 5d27cc3..fa8ff03 100644
---- a/build/openldap.m4
-+++ b/build/openldap.m4
-@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
- #endif
- __db_version DB_VERSION_MAJOR
- ])
-- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
-+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
- ol_cv_bdb_major=${3}
- ])
- case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
-@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
- #endif
- __db_version DB_VERSION_MINOR
- ])
-- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
-+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
- ol_cv_bdb_minor=${3}
- ])
- case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
---
-2.1.4
-
diff --git a/debian/patches/ITS7975-fix-mdb-onelevel-search.patch b/debian/patches/ITS7975-fix-mdb-onelevel-search.patch
deleted file mode 100644
index a97081d..0000000
--- a/debian/patches/ITS7975-fix-mdb-onelevel-search.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e6e073d31e89089a731870799b43de797480306d Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc at openldap.org>
-Date: Wed, 29 Oct 2014 18:05:00 +0000
-Subject: [PATCH] ITS#7975 fix onelevel search
-
----
- servers/slapd/back-mdb/search.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c
-index 98b5f25..9089016 100644
---- a/servers/slapd/back-mdb/search.c
-+++ b/servers/slapd/back-mdb/search.c
-@@ -837,6 +837,7 @@ loop_begin:
- }
- /* Fall-thru */
- case LDAP_SCOPE_ONELEVEL:
-+ if ( id == base->e_id ) break;
- isc.id = id;
- isc.nscope = 0;
- rs->sr_err = mdb_idscopes( op, &isc );
---
-1.9.1
-
diff --git a/debian/patches/ITS8027-deref-reject-empty-attr-list.patch b/debian/patches/ITS8027-deref-reject-empty-attr-list.patch
deleted file mode 100644
index 8eba835..0000000
--- a/debian/patches/ITS8027-deref-reject-empty-attr-list.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit c32e74763f77675b9e144126e375977ed6dc562c
-Author: Howard Chu <hyc at openldap.org>
-Date: Mon Jan 19 22:25:53 2015 +0000
-
- ITS#8027 require non-empty AttributeList
-
-diff --git a/servers/slapd/overlays/deref.c b/servers/slapd/overlays/deref.c
-index 9420e3e..05aa890 100644
---- a/servers/slapd/overlays/deref.c
-+++ b/servers/slapd/overlays/deref.c
-@@ -183,7 +183,8 @@ deref_parseCtrl (
- ber_len_t cnt = sizeof(struct berval);
- ber_len_t off = 0;
-
-- if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR )
-+ if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR
-+ || !cnt )
- {
- rs->sr_text = "Dereference control: derefSpec decoding error";
- rs->sr_err = LDAP_PROTOCOL_ERROR;
diff --git a/debian/patches/ITS8046-fix-vrFilter_free-crash.patch b/debian/patches/ITS8046-fix-vrFilter_free-crash.patch
deleted file mode 100644
index 7a1b67f..0000000
--- a/debian/patches/ITS8046-fix-vrFilter_free-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 2f1a2dd329b91afe561cd06b872d09630d4edb6a
-Author: Howard Chu <hyc at openldap.org>
-Date: Wed Feb 4 02:03:55 2015 +0000
-
- ITS#8046 fix vrFilter_free
-
-diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
-index b859f73..22c81c8 100644
---- a/servers/slapd/filter.c
-+++ b/servers/slapd/filter.c
-@@ -1158,14 +1158,10 @@ get_vrFilter( Operation *op, BerElement *ber,
- void
- vrFilter_free( Operation *op, ValuesReturnFilter *vrf )
- {
-- ValuesReturnFilter *p, *next;
-+ ValuesReturnFilter *next;
-
-- if ( vrf == NULL ) {
-- return;
-- }
--
-- for ( p = vrf; p != NULL; p = next ) {
-- next = p->vrf_next;
-+ for ( ; vrf != NULL; vrf = next ) {
-+ next = vrf->vrf_next;
-
- switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
- case LDAP_FILTER_PRESENT:
diff --git a/debian/patches/autogroup-makefile b/debian/patches/autogroup-makefile
index d3f56c3..f43dc66 100644
--- a/debian/patches/autogroup-makefile
+++ b/debian/patches/autogroup-makefile
@@ -3,7 +3,7 @@
@@ -2,11 +2,11 @@
LDAP_SRC = ../../..
- LDAP_BUILD = ../../..
+ LDAP_BUILD = $(LDAP_SRC)
-LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
- $(LDAP_BUILD)/libraries/liblber/liblber.la
diff --git a/debian/patches/lastbind-makefile b/debian/patches/lastbind-makefile
index b7f9356..8b11f4c 100644
--- a/debian/patches/lastbind-makefile
+++ b/debian/patches/lastbind-makefile
@@ -3,7 +3,7 @@
@@ -12,11 +12,11 @@
LDAP_SRC = ../../..
- LDAP_BUILD = ../../..
+ LDAP_BUILD = $(LDAP_SRC)
-LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
- $(LDAP_BUILD)/libraries/liblber/liblber.la
diff --git a/debian/patches/no-AM_INIT_AUTOMAKE b/debian/patches/no-AM_INIT_AUTOMAKE
index 417dbd2..e3808d5 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-2014 The OpenLDAP Foundation. All rights reserved.
+ AC_COPYRIGHT([[Copyright 1998-2015 The OpenLDAP Foundation. All rights reserved.
Restrictions apply, see COPYRIGHT and LICENSE files.]])
- AC_REVISION([$Id: f63cfff0f30d7e5aaab41a7810ce0fa5e7d3b661 $])
+ AC_REVISION([$Id: 47c7929401c409f8d9308cfee042e7bef5a3b4bb $])
-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/pw-sha2-makefile b/debian/patches/pw-sha2-makefile
index 417d669..09ac161 100644
--- a/debian/patches/pw-sha2-makefile
+++ b/debian/patches/pw-sha2-makefile
@@ -3,7 +3,7 @@
@@ -2,11 +2,11 @@
LDAP_SRC = ../../../..
- LDAP_BUILD = ../../../..
+ LDAP_BUILD = $(LDAP_SRC)
-LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
- $(LDAP_BUILD)/libraries/liblber/liblber.la
diff --git a/debian/patches/sasl-default-path b/debian/patches/sasl-default-path
index 5ea240f..6d5c7b0 100644
--- a/debian/patches/sasl-default-path
+++ b/debian/patches/sasl-default-path
@@ -48,8 +48,8 @@ interest upstream.
#ifdef HAVE_CYRUS_SASL
int rc;
static sasl_callback_t server_callbacks[] = {
- { SASL_CB_LOG, &slap_sasl_log, NULL },
-+ { SASL_CB_GETCONFPATH, &slap_sasl_getconfpath, NULL },
- { SASL_CB_GETOPT, &slap_sasl_getopt, NULL },
+ { SASL_CB_LOG, (slap_sasl_cb_ft)&slap_sasl_log, NULL },
++ { SASL_CB_GETCONFPATH, (slap_sasl_cb_ft)&slap_sasl_getconfpath, NULL },
+ { SASL_CB_GETOPT, (slap_sasl_cb_ft)&slap_sasl_getopt, NULL },
{ SASL_CB_LIST_END, NULL, NULL }
};
diff --git a/debian/patches/series b/debian/patches/series
index edfe6df..613612b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,7 +21,3 @@ switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
no-bdb-ABI-second-guessing
heimdal-fix
ITS6035-olcauthzregex-needs-restart.patch
-ITS8027-deref-reject-empty-attr-list.patch
-ITS8046-fix-vrFilter_free-crash.patch
-ITS7975-fix-mdb-onelevel-search.patch
-ITS-8056-fix-libdb-detection-with-gcc-5.patch
diff --git a/debian/patches/smbk5pwd-makefile b/debian/patches/smbk5pwd-makefile
index 4669c48..b7a1039 100644
--- a/debian/patches/smbk5pwd-makefile
+++ b/debian/patches/smbk5pwd-makefile
@@ -3,7 +3,7 @@
@@ -14,34 +14,35 @@
LDAP_SRC = ../../..
- LDAP_BUILD = ../../..
+ LDAP_BUILD = $(LDAP_SRC)
-LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
- $(LDAP_BUILD)/libraries/liblber/liblber.la
--
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