webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-22 17:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

strongswan: Update to 5.6.1

Browse Source 
Drop support for Padlock which is not in wide usage
any more and creates some rootfile trouble every time.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-11-29 12:39:04 +00:00
parent 4406bd1525
commit 87ad0c591b
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/common/i586/strongswan-padlock
View File

@@ -1,3 +0,0 @@
etc/strongswan.d/charon/padlock.conf
usr/lib/ipsec/plugins/libstrongswan-padlock.so
#usr/share/strongswan/templates/config/plugins/padlock.conf

9
config/rootfiles/common/strongswan
View File

@@ -19,6 +19,7 @@ etc/strongswan.d/charon/attr.conf
etc/strongswan.d/charon/ccm.conf
etc/strongswan.d/charon/cmac.conf
etc/strongswan.d/charon/constraints.conf
etc/strongswan.d/charon/counters.conf
etc/strongswan.d/charon/ctr.conf
etc/strongswan.d/charon/curl.conf
etc/strongswan.d/charon/curve25519.conf
@@ -39,9 +40,9 @@ etc/strongswan.d/charon/gmp.conf
etc/strongswan.d/charon/hmac.conf
etc/strongswan.d/charon/kernel-netlink.conf
etc/strongswan.d/charon/md5.conf
etc/strongswan.d/charon/mgf1.conf
etc/strongswan.d/charon/nonce.conf
etc/strongswan.d/charon/openssl.conf
#etc/strongswan.d/charon/padlock.conf
etc/strongswan.d/charon/pem.conf
etc/strongswan.d/charon/pgp.conf
etc/strongswan.d/charon/pkcs1.conf
@@ -123,6 +124,7 @@ usr/lib/ipsec/plugins/libstrongswan-attr.so
usr/lib/ipsec/plugins/libstrongswan-ccm.so
usr/lib/ipsec/plugins/libstrongswan-cmac.so
usr/lib/ipsec/plugins/libstrongswan-constraints.so
usr/lib/ipsec/plugins/libstrongswan-counters.so
usr/lib/ipsec/plugins/libstrongswan-ctr.so
usr/lib/ipsec/plugins/libstrongswan-curl.so
usr/lib/ipsec/plugins/libstrongswan-curve25519.so
@@ -143,9 +145,9 @@ usr/lib/ipsec/plugins/libstrongswan-gmp.so
usr/lib/ipsec/plugins/libstrongswan-hmac.so
usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so
usr/lib/ipsec/plugins/libstrongswan-md5.so
usr/lib/ipsec/plugins/libstrongswan-mgf1.so
usr/lib/ipsec/plugins/libstrongswan-nonce.so
usr/lib/ipsec/plugins/libstrongswan-openssl.so
#usr/lib/ipsec/plugins/libstrongswan-padlock.so
usr/lib/ipsec/plugins/libstrongswan-pem.so
usr/lib/ipsec/plugins/libstrongswan-pgp.so
usr/lib/ipsec/plugins/libstrongswan-pkcs1.so
@@ -207,6 +209,7 @@ usr/sbin/swanctl
#usr/share/strongswan/templates/config/plugins/ccm.conf
#usr/share/strongswan/templates/config/plugins/cmac.conf
#usr/share/strongswan/templates/config/plugins/constraints.conf
#usr/share/strongswan/templates/config/plugins/counters.conf
#usr/share/strongswan/templates/config/plugins/ctr.conf
#usr/share/strongswan/templates/config/plugins/curl.conf
#usr/share/strongswan/templates/config/plugins/curve25519.conf
@@ -227,9 +230,9 @@ usr/sbin/swanctl
#usr/share/strongswan/templates/config/plugins/hmac.conf
#usr/share/strongswan/templates/config/plugins/kernel-netlink.conf
#usr/share/strongswan/templates/config/plugins/md5.conf
#usr/share/strongswan/templates/config/plugins/mgf1.conf
#usr/share/strongswan/templates/config/plugins/nonce.conf
#usr/share/strongswan/templates/config/plugins/openssl.conf
#usr/share/strongswan/templates/config/plugins/padlock.conf
#usr/share/strongswan/templates/config/plugins/pem.conf
#usr/share/strongswan/templates/config/plugins/pgp.conf
#usr/share/strongswan/templates/config/plugins/pkcs1.conf

13
lfs/strongswan
View File

@@ -24,7 +24,7 @@
include Config
VER = 5.6.0
VER = 5.6.1
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,14 +32,6 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/strongswan-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
ifeq "$(BUILD_ARCH)" "i586"
CONFIGURE_OPTIONS = \
--enable-padlock
else
CONFIGURE_OPTIONS = \
--disable-padlock
endif
###############################################################################
# Top-level Rules
###############################################################################
@@ -48,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = befb5e827d02433fea6669c20e11530a
$(DL_FILE)_MD5 = cb2241f1b96c524cd15b1c0f50ed9a27
install : $(TARGET)
@@ -100,6 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-eap-peap \
--enable-eap-mschapv2 \
--enable-eap-identity \
--disable-padlock \
--disable-chapoly \
$(CONFIGURE_OPTIONS)