aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2013-03-31 19:48:00 +0200
committerAndreas Steffen <andreas.steffen@strongswan.org>2013-03-31 19:48:07 +0200
commitfec7c824b85b587e2e999d4b1c7209396b32b201 (patch)
tree577a6062ed476ca45037cb8204c47820c2055a56
parent0cf4dc53c721e9e6aa55458d0f07ac6a1409c211 (diff)
downloadstrongswan-fec7c824b85b587e2e999d4b1c7209396b32b201.tar.bz2
strongswan-fec7c824b85b587e2e999d4b1c7209396b32b201.tar.xz
fix start of wpa_supplicant
-rw-r--r--testing/scripts/recipes/004_wpa_supplicant.mk (renamed from testing/scripts/recipes/012_wpa_supplicant.mk)0
-rw-r--r--testing/scripts/recipes/patches/wpa_supplicant-eap-tnc24
-rwxr-xr-xtesting/start-testing3
3 files changed, 21 insertions, 6 deletions
diff --git a/testing/scripts/recipes/012_wpa_supplicant.mk b/testing/scripts/recipes/004_wpa_supplicant.mk
index 14b64ea78..14b64ea78 100644
--- a/testing/scripts/recipes/012_wpa_supplicant.mk
+++ b/testing/scripts/recipes/004_wpa_supplicant.mk
diff --git a/testing/scripts/recipes/patches/wpa_supplicant-eap-tnc b/testing/scripts/recipes/patches/wpa_supplicant-eap-tnc
index 6767d8a08..2e00e5b44 100644
--- a/testing/scripts/recipes/patches/wpa_supplicant-eap-tnc
+++ b/testing/scripts/recipes/patches/wpa_supplicant-eap-tnc
@@ -1,6 +1,18 @@
-diff -urN wpa_supplicant-2.0/wpa_supplicant/defconfig wpa_supplicant-2.0-patched/wpa_supplicant/defconfig
---- wpa_supplicant-2.0/wpa_supplicant/defconfig 2013-01-12 16:42:53.000000000 +0100
-+++ wpa_supplicant-2.0-patched/wpa_supplicant/defconfig 2013-03-11 10:19:58.012981151 +0100
+diff -urN wpa_supplicant-2.0.ori/src/eap_peer/tncc.c wpa_supplicant-2.0/src/eap_peer/tncc.c
+--- wpa_supplicant-2.0.ori/src/eap_peer/tncc.c 2013-01-12 16:42:53.000000000 +0100
++++ wpa_supplicant-2.0/src/eap_peer/tncc.c 2013-03-23 13:10:22.151059154 +0100
+@@ -465,7 +465,7 @@
+ return -1;
+ }
+ #else /* CONFIG_NATIVE_WINDOWS */
+- imc->dlhandle = dlopen(imc->path, RTLD_LAZY);
++ imc->dlhandle = dlopen(imc->path, RTLD_LAZY | RTLD_GLOBAL);
+ if (imc->dlhandle == NULL) {
+ wpa_printf(MSG_ERROR, "TNC: Failed to open IMC '%s' (%s): %s",
+ imc->name, imc->path, dlerror());
+diff -urN wpa_supplicant-2.0.ori/wpa_supplicant/defconfig wpa_supplicant-2.0/wpa_supplicant/defconfig
+--- wpa_supplicant-2.0.ori/wpa_supplicant/defconfig 2013-01-12 16:42:53.000000000 +0100
++++ wpa_supplicant-2.0/wpa_supplicant/defconfig 2013-03-23 13:06:08.759052370 +0100
@@ -86,7 +86,7 @@
CONFIG_DRIVER_WEXT=y
@@ -19,9 +31,9 @@ diff -urN wpa_supplicant-2.0/wpa_supplicant/defconfig wpa_supplicant-2.0-patched
# Wi-Fi Protected Setup (WPS)
#CONFIG_WPS=y
-diff -urN wpa_supplicant-2.0/wpa_supplicant/Makefile wpa_supplicant-2.0-patched/wpa_supplicant/Makefile
---- wpa_supplicant-2.0/wpa_supplicant/Makefile 2013-01-12 16:42:53.000000000 +0100
-+++ wpa_supplicant-2.0-patched/wpa_supplicant/Makefile 2013-03-11 10:38:03.020998741 +0100
+diff -urN wpa_supplicant-2.0.ori/wpa_supplicant/Makefile wpa_supplicant-2.0/wpa_supplicant/Makefile
+--- wpa_supplicant-2.0.ori/wpa_supplicant/Makefile 2013-01-12 16:42:53.000000000 +0100
++++ wpa_supplicant-2.0/wpa_supplicant/Makefile 2013-03-23 13:06:08.759052370 +0100
@@ -6,8 +6,8 @@
CFLAGS = -MMD -O2 -Wall -g
endif
diff --git a/testing/start-testing b/testing/start-testing
index 46aa4a2cb..45cf4c9b9 100755
--- a/testing/start-testing
+++ b/testing/start-testing
@@ -46,3 +46,6 @@ do
echo 2 > $vnet/multicast_router
done
done
+
+echo 0x08 > /sys/devices/virtual/net/test-br0/bridge/group_fwd_mask
+