[Pkg-swan-devel] [strongswan] 10/11: re-enable mediation (but not medcli/medsrv) closes: #851507

[Yves-Alexis Perez]

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

corsac pushed a commit to branch master
in repository strongswan.

commit fe8f3531c661d8492eeb87614ec5b1c724a2ca9a
Author: Yves-Alexis Perez <corsac at corsac.net>
Date:   Mon Jan 16 12:58:22 2017 +0100

    re-enable mediation (but not medcli/medsrv)               closes: #851507
---
 debian/changelog | 5 +++++
 debian/rules     | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e5e145..f1e3d66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 strongswan (5.5.1-3) UNRELEASED; urgency=medium
 
+  [ Christian Ehrhardt ]
   * d/rules: Reorganize to ease maintenance
     - one enable option per line
     - sort enable options
@@ -17,6 +18,10 @@ strongswan (5.5.1-3) UNRELEASED; urgency=medium
     - this does no more provide different logcheck levels, but marks all
       common output to be acceptable
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - re-enable mediation (but not medcli/medsrv)               closes: #851507
+
  -- Christian Ehrhardt <christian.ehrhardt at canonical.com>  Tue, 20 Dec 2016 13:01:29 +0100
 
 strongswan (5.5.1-2) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 00aed57..ad98468 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \
 		--enable-ldap \
 		--enable-led \
 		--enable-lookip \
+		--enable-mediation \
 		--enable-openssl \
 		--enable-pkcs11 \
 		--enable-test-vectors \
@@ -42,8 +43,8 @@ CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \
 	# Don't --enable-cisco-quirks, because some other IPsec implementations
 	# (most notably the Phion one) have problems connecting when pluto 
 	# sends these Cisco options.
-	# don't enable mediation right now (20160523) since clearsilver FTBFS
-	#--enable-mediation --enable-medsrv --enable-medcli \
+	# don't enable medsrv/medcli right now (20160523) since clearsilver FTBFS
+	#--enable-medsrv --enable-medcli \
 
 # get the various DEB_BUILD/DEB_HOST variables
 include /usr/share/dpkg/architecture.mk

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