[Pkg-swan-devel] [strongswan] 03/03: strongswan-libcharon: add bypass-lan plugin

[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 fd2deca589bc3d067f1cbfe59a25d3a90625e02b
Author: Yves-Alexis Perez <corsac at corsac.net>
Date:   Wed Jan 3 10:44:25 2018 +0100

    strongswan-libcharon: add bypass-lan plugin
    
    not loaded by default
---
 debian/control                             |  1 +
 debian/patches/02_disable-bypass-lan.patch | 13 +++++++++++++
 debian/patches/series                      |  1 +
 debian/rules                               |  1 +
 debian/strongswan-libcharon.install        |  4 ++++
 5 files changed, 20 insertions(+)

diff --git a/debian/control b/debian/control
index e5e09b4..1139f3e 100644
--- a/debian/control
+++ b/debian/control
@@ -225,6 +225,7 @@ Description: strongSwan charon library
  plugins:
    - socket-default
    - counters
+   - bypass-lan (disabled by default)
 
 Package: strongswan-charon
 Architecture: any
diff --git a/debian/patches/02_disable-bypass-lan.patch b/debian/patches/02_disable-bypass-lan.patch
new file mode 100644
index 0000000..1933371
--- /dev/null
+++ b/debian/patches/02_disable-bypass-lan.patch
@@ -0,0 +1,13 @@
+diff --git a/conf/plugins/bypass-lan.conf b/conf/plugins/bypass-lan.conf
+index ad496db67..e470ce68e 100644
+--- a/conf/plugins/bypass-lan.conf
++++ b/conf/plugins/bypass-lan.conf
+@@ -11,7 +11,7 @@ bypass-lan {
+ 
+     # Whether to load the plugin. Can also be an integer to increase the
+     # priority of this plugin.
+-    load = yes
++    load = no
+ 
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6d7cc1d..fde45f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_fix-manpages.patch
+02_disable-bypass-lan.patch
 03_systemd-service.patch
 04_disable-libtls-tests.patch
diff --git a/debian/rules b/debian/rules
index 6d160a9..8f5f922 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \
 		--enable-addrblock \
 		--enable-agent \
+		--enable-bypass-lan \
 		--enable-ccm \
 		--enable-certexpire \
 		--enable-cmd \
diff --git a/debian/strongswan-libcharon.install b/debian/strongswan-libcharon.install
index 6cc9e73..06b4859 100644
--- a/debian/strongswan-libcharon.install
+++ b/debian/strongswan-libcharon.install
@@ -13,3 +13,7 @@ usr/lib/ipsec/plugins/libstrongswan-updown.so
 usr/share/strongswan/templates/config/plugins/updown.conf
 etc/strongswan.d/charon/updown.conf
 usr/lib/ipsec/_updown
+# bypass-lan
+usr/lib/ipsec/plugins/libstrongswan-bypass-lan.so
+usr/share/strongswan/templates/config/plugins/bypass-lan.conf
+etc/strongswan.d/charon/bypass-lan.conf

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