Make the connmark plugin Linux-onlu

  - enable connmark only on Linux
  - install connmark plugins files only on Linux
  - make iptables-dev build-dep Linux-only.
  - stop installing connmark plugins files inconditionnaly.

4 files changed, 12 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 05418fdd5..f449c2a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,17 @@ strongswan (5.4.0-2) UNRELEASED; urgency=medium
   * debian/rules:
     - stop building web interface for now since clearsilver is not building
       right now.
+    - enable connmark only on Linux
+    - install connmark plugins files only on Linux
   * debian/control:
     - drop build-dep on clearsilver-dev and libfcgi-dev
+    - make iptables-dev build-dep Linux-only.
   * debian/libcharon-extra-plugins:
     - stop shipping medsrv and medcli plugin.
+  * debian/libstrongswan-standard-plugins.install:
+    - stop installing connmark plugins files inconditionnaly.
 
- -- Yves-Alexis Perez <corsac@debian.org>  Mon, 23 May 2016 10:52:31 +0200
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 23 May 2016 13:09:39 +0200
 
 strongswan (5.4.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index d5957c06a..e2f151496 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: bison,
                dpkg-dev (>= 1.16.2),
                flex,
                gperf,
-               iptables-dev,
+               iptables-dev [linux-any],
                libcap-dev [linux-any],
                libcurl4-openssl-dev | libcurl3-dev | libcurl2-dev,
                libgcrypt20-dev | libgcrypt11-dev,
diff --git a/debian/libstrongswan-standard-plugins.install b/debian/libstrongswan-standard-plugins.install
index f286e6312..d97a36ae4 100644
--- a/debian/libstrongswan-standard-plugins.install
+++ b/debian/libstrongswan-standard-plugins.install
@@ -1,14 +1,11 @@
 # libstrongswan plugins
 usr/lib/ipsec/plugins/libstrongswan-agent.so
-usr/lib/ipsec/plugins/libstrongswan-connmark.so
 usr/lib/ipsec/plugins/libstrongswan-gcm.so
 usr/lib/ipsec/plugins/libstrongswan-openssl.so
 # config file
 usr/share/strongswan/templates/config/plugins/agent.conf
-usr/share/strongswan/templates/config/plugins/connmark.conf
 usr/share/strongswan/templates/config/plugins/gcm.conf
 usr/share/strongswan/templates/config/plugins/openssl.conf
 etc/strongswan.d/charon/agent.conf
-etc/strongswan.d/charon/connmark.conf
 etc/strongswan.d/charon/gcm.conf
 etc/strongswan.d/charon/openssl.conf
diff --git a/debian/rules b/debian/rules
index 51e843df8..f1c30b16b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,6 @@ CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \
 		--enable-lookip \
 		--enable-error-notify \
 		--enable-unity \
-		--enable-connmark \
 		--disable-blowfish --disable-des # BSD-Young license
 	#--with-user=strongswan --with-group=nogroup
 	#	--enable-kernel-pfkey --enable-kernel-klips \
@@ -53,6 +52,7 @@ ifeq ($(DEB_BUILD_ARCH_OS),linux)
 		--enable-farp \
 		--enable-dhcp \
 		--enable-af-alg \
+		--enable-connmark \
 		--enable-systemd --enable-swanctl
 endif
 
@@ -89,6 +89,9 @@ override_dh_install-arch:
 	# first special cases
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
 	# handle Linux-only plugins
+	dh_install -p libstrongswan-standard-plugins usr/lib/ipsec/plugins/libstrongswan-connmark.so
+	dh_install -p libstrongswan-standard-plugins usr/share/strongswan/templates/config/plugins/connmark.conf
+	dh_install -p libstrongswan-standard-plugins etc/strongswan.d/charon/connmark.conf
 	dh_install -p libcharon-extra-plugins usr/lib/ipsec/plugins/libstrongswan-dhcp.so
 	dh_install -p libcharon-extra-plugins usr/share/strongswan/templates/config/plugins/dhcp.conf
 	dh_install -p libcharon-extra-plugins etc/strongswan.d/charon/dhcp.conf
@@ -148,6 +151,7 @@ endif
 	dh_install --fail-missing \
 		-X\.la -X\.a \
 		-Xmedsrv -Xman3 \
+		-Xlibstrongswan-connmark.so -X connmark.conf \
 		-Xlibstrongswan-kernel- -X kernel- \
 		-Xlibstrongswan-dhcp.so -X dhcp.conf \
 		-Xlibstrongswan-farp.so -X farp.conf \