[Pkg-swan-devel] [strongswan] 04/05: Make the connmark plugin Linux-onlu

[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 8badd84de6f723bd528e765a37b03ba9e8b18187
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Sun May 29 21:02:03 2016 +0200

    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.
---
 debian/changelog                              | 7 ++++++-
 debian/control                                | 2 +-
 debian/libstrongswan-standard-plugins.install | 3 ---
 debian/rules                                  | 6 +++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 05418fd..f449c2a 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 at debian.org>  Mon, 23 May 2016 10:52:31 +0200
+ -- Yves-Alexis Perez <corsac at 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 d5957c0..e2f1514 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 f286e63..d97a36a 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 51e843d..f1c30b1 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 \

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