From e626255b371b8bd7811ea870525b32c0a4b2f589 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Sat, 27 Mar 2021 13:37:21 -0600 Subject: [PATCH] strongswan: move ipsec conf files to subpackage These config files are only used by the ipsec interface to charon, and shouldn't be part of the base package. Signed-off-by: Philip Prindeville --- net/strongswan/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 98ef9e4911..24d30915ee 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan PKG_VERSION:=5.9.1 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ @@ -457,11 +457,6 @@ define Package/strongswan/install echo -e "\ninclude /var/ipsec/strongswan.conf" >> $(1)/etc/strongswan.conf $(INSTALL_DIR) $(1)/usr/lib/ipsec $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libstrongswan.so.* $(1)/usr/lib/ipsec/ - $(INSTALL_CONF) ./files/ipsec.secrets $(1)/etc/ - echo -e "\ninclude /var/ipsec/ipsec.secrets" >> $(1)/etc/ipsec.secrets - $(INSTALL_CONF) ./files/ipsec.user $(1)/etc/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/ipsec.init $(1)/etc/init.d/ipsec endef define Package/strongswan-default/install @@ -505,6 +500,11 @@ define Package/strongswan-ipsec/install $(INSTALL_DIR) $(1)/etc/ $(1)/usr/sbin $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/ipsec.conf $(1)/etc/ echo -e "\ninclude /var/ipsec/ipsec.conf" >> $(1)/etc/ipsec.conf + $(INSTALL_CONF) ./files/ipsec.secrets $(1)/etc/ + echo -e "\ninclude /var/ipsec/ipsec.secrets" >> $(1)/etc/ipsec.secrets + $(INSTALL_CONF) ./files/ipsec.user $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/ipsec.init $(1)/etc/init.d/ipsec $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ipsec $(1)/usr/sbin/ endef -- 2.30.2