[Pkg-openldap-devel] [openldap] 65/65: Remove Build-Depends on libslp-dev

[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 0478183f97ea38cbb4f66234f0b1f7534e399254
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Tue Mar 15 04:13:37 2016 +0000

    Remove Build-Depends on libslp-dev
---
 debian/changelog         | 2 ++
 debian/configure.options | 2 +-
 debian/control           | 1 -
 debian/rules             | 3 +--
 debian/slapd.NEWS        | 9 +++++++++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e97938..cb244a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ openldap (2.4.44+dfsg-1) UNRELEASED; urgency=medium
     includes a build/ directory.
   * Correct the list of files to be cleaned for the pw-sha2 contrib module.
   * Fix a typo (slpad -> slapd) in the Catalan debconf translation.
+  * Disable OpenSLP support and remove libslp-dev from Build-Depends.
+    (Closes: #815364)
 
  -- Ryan Tandy <ryan at nardis.ca>  Tue, 15 Mar 2016 03:45:08 +0000
 
diff --git a/debian/configure.options b/debian/configure.options
index b18fc91..08a55e0 100644
--- a/debian/configure.options
+++ b/debian/configure.options
@@ -108,7 +108,7 @@
 #    --enable-slapi        enable SLAPI support (experimental) [no]
 --enable-slapi
 #    --enable-slp          enable SLPv2 support [no]
---enable-slp
+--disable-slp
 #    --enable-wrappers	  enable tcp wrapper support [no]
 --enable-wrappers
 #
diff --git a/debian/control b/debian/control
index 033da2d..cd062e3 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Build-Depends: debhelper (>= 9.20141010),
                libltdl-dev <!stage1>,
                libperl-dev (>= 5.8.0) <!stage1>,
                libsasl2-dev,
-               libslp-dev <!stage1>,
                libwrap0-dev <!stage1>,
                nettle-dev <!stage1>,
                perl:any,
diff --git a/debian/rules b/debian/rules
index be94fbd..3f79d0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,7 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	CONFIG += --disable-bdb --disable-hdb --disable-mdb
 endif
 ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
-	# --disable-slapd should imply --disable-slp, ITS#8224
-	CONFIG += --disable-slapd --disable-slp
+	CONFIG += --disable-slapd
 endif
 
 # Ensure CC is set correctly for cross builds, unless it has already 
diff --git a/debian/slapd.NEWS b/debian/slapd.NEWS
index ae37e25..2590f7a 100644
--- a/debian/slapd.NEWS
+++ b/debian/slapd.NEWS
@@ -1,3 +1,12 @@
+openldap (2.4.44+dfsg-1) unstable; urgency=medium
+
+    The slapd package no longer includes OpenSLP support. The
+    openslp-dfsg package is being retired due to lack of maintenance and
+    security concerns. Please see <https://bugs.debian.org/795428> for
+    more information.
+
+ -- Ryan Tandy <ryan at nardis.ca>  Tue, 15 Mar 2016 03:59:27 +0000
+
 openldap (2.4.23-3) unstable; urgency=low
 
    The OpenLDAP packages in Debian now use the slapd.d LDIF-based

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