summaryrefslogtreecommitdiff
path: root/testing/scripts
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@corsac.net>2018-02-19 18:17:21 +0100
committerYves-Alexis Perez <corsac@corsac.net>2018-02-20 11:09:03 +0100
commit94218f4dc079e5fcf76b3468b9e40072181246f2 (patch)
tree05db24c85038c8ab49a30c98bd93dc7ff126390b /testing/scripts
parentfd2deca589bc3d067f1cbfe59a25d3a90625e02b (diff)
downloadvyos-strongswan-94218f4dc079e5fcf76b3468b9e40072181246f2.tar.gz
vyos-strongswan-94218f4dc079e5fcf76b3468b9e40072181246f2.zip
New upstream version 5.6.2
Diffstat (limited to 'testing/scripts')
-rwxr-xr-xtesting/scripts/function.sh2
-rw-r--r--testing/scripts/recipes/005_anet.mk2
-rw-r--r--testing/scripts/recipes/006_tkm-rpc.mk2
-rw-r--r--testing/scripts/recipes/010_tkm.mk2
-rw-r--r--testing/scripts/recipes/013_strongswan.mk4
-rw-r--r--testing/scripts/recipes/patches/freeradius-tnc-fhh2
6 files changed, 8 insertions, 6 deletions
diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh
index 9a32c44ab..c512b8add 100755
--- a/testing/scripts/function.sh
+++ b/testing/scripts/function.sh
@@ -50,7 +50,7 @@ execute()
# $1 - command to execute
execute_chroot()
{
- execute "chroot $LOOPDIR $@"
+ execute "chroot $LOOPDIR env PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin $@"
}
# write green status message to console
diff --git a/testing/scripts/recipes/005_anet.mk b/testing/scripts/recipes/005_anet.mk
index b02d63094..a6af5df5c 100644
--- a/testing/scripts/recipes/005_anet.mk
+++ b/testing/scripts/recipes/005_anet.mk
@@ -2,7 +2,7 @@
PKG = anet
SRC = http://git.codelabs.ch/git/$(PKG).git
-REV = v0.3.1
+REV = c9bdee807f2fcd2b6ec2ad8fe4c814e1abb71358
PREFIX = /usr/local/ada
diff --git a/testing/scripts/recipes/006_tkm-rpc.mk b/testing/scripts/recipes/006_tkm-rpc.mk
index 5c98123d6..5f2e207c8 100644
--- a/testing/scripts/recipes/006_tkm-rpc.mk
+++ b/testing/scripts/recipes/006_tkm-rpc.mk
@@ -2,7 +2,7 @@
PKG = tkm-rpc
SRC = http://git.codelabs.ch/git/$(PKG).git
-REV = v0.2
+REV = 9a70e4f88e054d7a2a8fd35245e147880bce4809
PREFIX = /usr/local/ada
diff --git a/testing/scripts/recipes/010_tkm.mk b/testing/scripts/recipes/010_tkm.mk
index 8799d424d..03ee5b526 100644
--- a/testing/scripts/recipes/010_tkm.mk
+++ b/testing/scripts/recipes/010_tkm.mk
@@ -2,7 +2,7 @@
PKG = tkm
SRC = http://git.codelabs.ch/git/$(PKG).git
-REV = v0.1.3
+REV = 53d224a7312124516aa6220743355c896be6345a
export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
diff --git a/testing/scripts/recipes/013_strongswan.mk b/testing/scripts/recipes/013_strongswan.mk
index 80f779c7d..52462d077 100644
--- a/testing/scripts/recipes/013_strongswan.mk
+++ b/testing/scripts/recipes/013_strongswan.mk
@@ -104,7 +104,9 @@ CONFIG_OPTS = \
--enable-bliss \
--enable-sha3 \
--enable-newhope \
- --enable-systemd
+ --enable-systemd \
+ --enable-counters \
+ --enable-save-keys
export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
diff --git a/testing/scripts/recipes/patches/freeradius-tnc-fhh b/testing/scripts/recipes/patches/freeradius-tnc-fhh
index 26a233d48..6460c86a3 100644
--- a/testing/scripts/recipes/patches/freeradius-tnc-fhh
+++ b/testing/scripts/recipes/patches/freeradius-tnc-fhh
@@ -5363,7 +5363,7 @@ diff -u -r -N freeradius-server-2.2.0.orig/src/modules/rlm_eap/types/rlm_eap_tnc
-#define VLAN_ACCESS 2
-/*
- ****
-- * EAP - MD5 doesnot specify code, id & length but chap specifies them,
+- * EAP - MD5 does not specify code, id & length but chap specifies them,
- * for generalization purpose, complete header should be sent
- * and not just value_size, value and name.
- * future implementation.