On 10/23/2015 6:25 PM, Sam Nelson wrote:
- 5.2.1 version of strongswan expects config in changed format.
This patch adds the pkcs11_plugin.conf file to adapt to that.
Signed-off-by: Sam Nelson <sam.nel...@ti.com>
---
.../strongswan/files/pkcs11_plugin.conf | 15 +++++++++++++++
.../strongswan/files/strongswan_libsecstore.patch | 16 ----------------
.../strongswan/strongswan_%.bbappend | 4 ++--
3 files changed, 17 insertions(+), 18 deletions(-)
create mode 100644
meta-arago-distro/recipes-support/strongswan/files/pkcs11_plugin.conf
delete mode 100644
meta-arago-distro/recipes-support/strongswan/files/strongswan_libsecstore.patch
diff --git
a/meta-arago-distro/recipes-support/strongswan/files/pkcs11_plugin.conf
b/meta-arago-distro/recipes-support/strongswan/files/pkcs11_plugin.conf
new file mode 100644
index 0000000..6d8c1cb
--- /dev/null
+++ b/meta-arago-distro/recipes-support/strongswan/files/pkcs11_plugin.conf
@@ -0,0 +1,15 @@
+# strongswan.conf - strongSwan configuration file
+libstrongswan {
+
+ # set to no, the DH exponent size is optimized
+ # dh_exponent_ansi_x9_42 = no
+ plugins {
+ pkcs11 {
+ modules {
+ secstore {
+ path = /usr/lib/softhsm/libsecstore.so.1
+ }
+ }
+ }
+ }
+}
diff --git
a/meta-arago-distro/recipes-support/strongswan/files/strongswan_libsecstore.patch
b/meta-arago-distro/recipes-support/strongswan/files/strongswan_libsecstore.patch
deleted file mode 100644
index c16b05e..0000000
---
a/meta-arago-distro/recipes-support/strongswan/files/strongswan_libsecstore.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- strongswan-5.0.0/src/strongswan.conf 2010-10-22 10:33:30.000000000
-0400
-+++ strongswan-5.0.0.libsecstore/src/strongswan.conf 2014-04-03
18:31:17.228569896 -0400
-@@ -31,4 +31,13 @@
-
- # set to no, the DH exponent size is optimized
- # dh_exponent_ansi_x9_42 = no
-+ plugins {
-+ pkcs11 {
-+ modules {
-+ secstore {
-+ path = /usr/lib/softhsm/libsecstore.so.1
-+ }
-+ }
-+ }
-+ }
- }
diff --git a/meta-arago-distro/recipes-support/strongswan/strongswan_%.bbappend
b/meta-arago-distro/recipes-support/strongswan/strongswan_%.bbappend
index f065a63..74829e7 100644
--- a/meta-arago-distro/recipes-support/strongswan/strongswan_%.bbappend
+++ b/meta-arago-distro/recipes-support/strongswan/strongswan_%.bbappend
@@ -1,4 +1,4 @@
-PR_append = "-arago1"
+PR_append = "-arago2"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
DEPENDS_remove = "gmp"
@@ -11,4 +11,4 @@ EXTRA_OECONF += "--disable-gmp \
--disable-tools \
"
-#SRC_URI += "file://strongswan_libsecstore.patch"
+SRC_URI += "file://pkcs11_plugin.conf"
How is this file being installed?
Do you know if it is compatible with strongswan 5.3.1?
- Jake
_______________________________________________
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
