[Astlinux-commits] SF.net SVN: astlinux:[7955] branches/1.0/package/strongswan

[<abe...@us...>]

Revision: 7955
          http://sourceforge.net/p/astlinux/code/7955
Author:   abelbeck
Date:     2016-11-13 21:41:18 +0000 (Sun, 13 Nov 2016)
Log Message:
-----------
strongswan, reference /stat/etc/strongswan/ plugins .conf by default, disable firewall updown, remove /usr/share/strongswan (again)

Modified Paths:
--------------
    branches/1.0/package/strongswan/ipsec.init
    branches/1.0/package/strongswan/strongswan.mk

Added Paths:
-----------
    branches/1.0/package/strongswan/strongswan-default-strongswan-conf.patch

Modified: branches/1.0/package/strongswan/ipsec.init
===================================================================
--- branches/1.0/package/strongswan/ipsec.init	2016-11-13 16:07:33 UTC (rev 7954)
+++ branches/1.0/package/strongswan/ipsec.init	2016-11-13 21:41:18 UTC (rev 7955)
@@ -16,6 +16,11 @@
     mkdir -p /mnt/kd/ipsec/strongswan
     if [ -d /stat/etc/strongswan ]; then
       cp -a /stat/etc/strongswan/* /mnt/kd/ipsec/strongswan/
+
+      ## Remove /mnt/kd/ipsec/strongswan/ plugin .conf files so they don't get stale.
+      ## File strongswan.conf references the /stat/etc/strongswan/ versions by default.
+      rm /mnt/kd/ipsec/strongswan/strongswan.d/*.conf
+      rm /mnt/kd/ipsec/strongswan/strongswan.d/charon/*.conf
     fi
   fi
 

Added: branches/1.0/package/strongswan/strongswan-default-strongswan-conf.patch
===================================================================
--- branches/1.0/package/strongswan/strongswan-default-strongswan-conf.patch	                        (rev 0)
+++ branches/1.0/package/strongswan/strongswan-default-strongswan-conf.patch	2016-11-13 21:41:18 UTC (rev 7955)
@@ -0,0 +1,15 @@
+--- strongswan-5.5.1/conf/strongswan.conf.orig	2016-11-13 14:37:20.044511922 -0600
++++ strongswan-5.5.1/conf/strongswan.conf	2016-11-13 14:39:31.565086615 -0600
+@@ -7,8 +7,10 @@
+ charon {
+ 	load_modular = yes
+ 	plugins {
+-		include strongswan.d/charon/*.conf
++		include /stat/etc/strongswan/strongswan.d/charon/*.conf
++		#include strongswan.d/charon/*.conf
+ 	}
+ }
+ 
+-include strongswan.d/*.conf
++include /stat/etc/strongswan/strongswan.d/*.conf
++#include strongswan.d/*.conf

Modified: branches/1.0/package/strongswan/strongswan.mk
===================================================================
--- branches/1.0/package/strongswan/strongswan.mk	2016-11-13 16:07:33 UTC (rev 7954)
+++ branches/1.0/package/strongswan/strongswan.mk	2016-11-13 21:41:18 UTC (rev 7955)
@@ -13,6 +13,7 @@
 STRONGSWAN_CONF_OPT += \
 	--disable-static \
 	--without-lib-prefix \
+	--enable-updown=no \
 	--enable-led=no \
 	--enable-pkcs11=no \
 	--enable-kernel-netlink=yes \
@@ -73,6 +74,7 @@
 	  rm -rf $(TARGET_DIR)/etc/$$i ; \
 	  ln -s /tmp/etc/strongswan/$$i $(TARGET_DIR)/etc/$$i ; \
 	done
+	rm -rf $(TARGET_DIR)/usr/share/strongswan
 	$(INSTALL) -m 0755 -D package/strongswan/ipsec.init $(TARGET_DIR)/etc/init.d/ipsec
 	ln -sf ../../init.d/ipsec $(TARGET_DIR)/etc/runlevels/default/S31ipsec
 	ln -sf ../../init.d/ipsec $(TARGET_DIR)/etc/runlevels/default/K20ipsec
@@ -86,7 +88,6 @@
 	rm -rf $(TARGET_DIR)/stat/etc/strongswan
 	rm -rf $(TARGET_DIR)/usr/lib/ipsec
 	rm -rf $(TARGET_DIR)/usr/libexec/ipsec
-	rm -rf $(TARGET_DIR)/usr/share/strongswan
 	rm -f $(addprefix $(TARGET_DIR)/etc/, $(STRONGSWAN_TARGET_ETC))
 	rm -f $(TARGET_DIR)/etc/init.d/ipsec
 	rm -f $(TARGET_DIR)/etc/runlevels/default/S31ipsec

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.