[git.ipfire.org] IPFire 3.x development tree branch, master, updated. da6dc1c016038aed387b8f1fa4fd9baf2a7eaeea

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. da6dc1c016038aed387b8f1fa4fd9baf2a7eaeea

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3181 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  da6dc1c016038aed387b8f1fa4fd9baf2a7eaeea (commit)
       via  00a97de355cf5da516e84c5abaccf1daf93d0f23 (commit)
      from  1cf32763378a9a5d14649d8cd8c2f0f06dfd2bee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit da6dc1c016038aed387b8f1fa4fd9baf2a7eaeea
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Sep 16 14:57:33 2018 +0200

    iproute2: Update to 4.18.0
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 00a97de355cf5da516e84c5abaccf1daf93d0f23
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Sep 16 14:57:00 2018 +0200

    strongswan: Add network.conf with our own settings
    
    These settings are required to make everything in the
    network package work.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 iproute2/iproute2.nm     |  2 +-
 strongswan/network.conf  | 12 ++++++++++++
 strongswan/strongswan.nm |  6 +++++-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 strongswan/network.conf

Difference in files:
diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm
index 17abdda18..6582385e3 100644
--- a/iproute2/iproute2.nm
+++ b/iproute2/iproute2.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = iproute2
-version    = 4.15.0
+version    = 4.18.0
 release    = 1
 
 groups     = Networking/Tools
diff --git a/strongswan/network.conf b/strongswan/network.conf
new file mode 100644
index 000000000..635a5fdc7
--- /dev/null
+++ b/strongswan/network.conf
@@ -0,0 +1,12 @@
+#
+# Configuration options for IPFire
+#
+
+charon {
+	# Send Cisco Unity vendor ID payload (IKEv1 only)
+	cisco_unity = yes
+
+	# Install routes into a separate routing table for established IPsec
+	# tunnels.
+	install_routes = no
+}
diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm
index 62795d775..12505baf0 100644
--- a/strongswan/strongswan.nm
+++ b/strongswan/strongswan.nm
@@ -5,7 +5,7 @@
 
 name       = strongswan
 version    = 5.6.3
-release    = 1
+release    = 2
 
 groups     = Networking/VPN
 url        = http://www.strongswan.org/
@@ -86,6 +86,10 @@ build
 	install_cmds
 		mv -v %{BUILDROOT}%{unitdir}/strongswan{-swanctl,}.service
 
+		# Install network settings
+		install -v -m 644 %{DIR_SOURCE}/network.conf \
+			%{BUILDROOT}%{sysconfdir}/strongswan.d/
+
 		# Create directory for connections
 		mkdir -pv %{BUILDROOT}%{sysconfdir}/swanctl/connections
 		echo "include connections/*.conf" > \


hooks/post-receive
--
IPFire 3.x development tree