summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rwxr-xr-xdebian/rules5
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 8e5e14583..f1e3d6654 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@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 00aed577c..ad984684c 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