disable mediation support

the clearsilver build-dep FTBFS for now so disable the dependency until
it's fixed

3 files changed, 9 insertions, 10 deletions

diff --git a/debian/control b/debian/control
index 5854beebf..d5957c06a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-swan/strongswan.git;a=summa
 Vcs-Git: git://anonscm.debian.org/pkg-swan/strongswan.git
 Build-Depends: bison,
                bzip2,
-               clearsilver-dev,
                debhelper (>= 9),
                dh-autoreconf,
                dh-systemd (>= 1.5),
@@ -20,7 +19,6 @@ Build-Depends: bison,
                iptables-dev,
                libcap-dev [linux-any],
                libcurl4-openssl-dev | libcurl3-dev | libcurl2-dev,
-               libfcgi-dev,
                libgcrypt20-dev | libgcrypt11-dev,
                libgmp3-dev,
                libkrb5-dev,
diff --git a/debian/libcharon-extra-plugins.install b/debian/libcharon-extra-plugins.install
index 0292297f2..a429c4e3d 100644
--- a/debian/libcharon-extra-plugins.install
+++ b/debian/libcharon-extra-plugins.install
@@ -6,8 +6,8 @@ usr/lib/ipsec/plugins/libstrongswan-error-notify.so
 usr/lib/ipsec/plugins/libstrongswan-ha.so
 usr/lib/ipsec/plugins/libstrongswan-led.so
 usr/lib/ipsec/plugins/libstrongswan-lookip.so
-usr/lib/ipsec/plugins/libstrongswan-medsrv.so
-usr/lib/ipsec/plugins/libstrongswan-medcli.so
+#usr/lib/ipsec/plugins/libstrongswan-medsrv.so
+#usr/lib/ipsec/plugins/libstrongswan-medcli.so
 usr/lib/ipsec/plugins/libstrongswan-tnc-tnccs.so
 usr/lib/ipsec/plugins/libstrongswan-unity.so
 usr/lib/ipsec/plugins/libstrongswan-xauth-*.so
@@ -19,8 +19,8 @@ usr/share/strongswan/templates/config/plugins/error-notify.conf
 usr/share/strongswan/templates/config/plugins/ha.conf
 usr/share/strongswan/templates/config/plugins/led.conf
 usr/share/strongswan/templates/config/plugins/lookip.conf
-usr/share/strongswan/templates/config/plugins/medsrv.conf
-usr/share/strongswan/templates/config/plugins/medcli.conf
+#usr/share/strongswan/templates/config/plugins/medsrv.conf
+#usr/share/strongswan/templates/config/plugins/medcli.conf
 usr/share/strongswan/templates/config/plugins/tnc-tnccs.conf
 usr/share/strongswan/templates/config/plugins/unity.conf
 usr/share/strongswan/templates/config/plugins/xauth-*.conf
@@ -33,13 +33,13 @@ etc/strongswan.d/charon/error-notify.conf
 etc/strongswan.d/charon/ha.conf
 etc/strongswan.d/charon/led.conf
 etc/strongswan.d/charon/lookip.conf
-etc/strongswan.d/charon/medsrv.conf
-etc/strongswan.d/charon/medcli.conf
+#etc/strongswan.d/charon/medsrv.conf
+#etc/strongswan.d/charon/medcli.conf
 etc/strongswan.d/charon/tnc-tnccs.conf
 etc/strongswan.d/charon/unity.conf
 etc/strongswan.d/charon/xauth-*.conf
 # support libs
-usr/lib/ipsec/libfast.so*
+#usr/lib/ipsec/libfast.so*
 usr/lib/ipsec/libpttls.so*
 usr/lib/ipsec/libradius.so*
 usr/lib/ipsec/libsimaka.so*
diff --git a/debian/rules b/debian/rules
index 6bc1a670c..51e843df8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \
 		--enable-ldap --enable-curl \
 		--enable-pkcs11 \
-		--enable-mediation --enable-medsrv --enable-medcli \
 		--enable-openssl --enable-agent \
 		--enable-ctr --enable-ccm --enable-gcm --enable-addrblock \
 		--enable-eap-radius --enable-eap-identity --enable-eap-md5 \
@@ -30,6 +29,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 \
 
 # get the various DEB_BUILD/DEB_HOST variables
 include /usr/share/dpkg/architecture.mk