From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by arago-project.org (Postfix) with ESMTPS id BDF8952976 for ; Tue, 3 Nov 2015 13:18:28 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id tA3DIRF7030042 for ; Tue, 3 Nov 2015 07:18:27 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id tA3DIQlg014045 for ; Tue, 3 Nov 2015 07:18:27 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Tue, 3 Nov 2015 07:18:26 -0600 Received: from [10.218.109.201] (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id tA3DIPI8007694; Tue, 3 Nov 2015 07:18:26 -0600 Message-ID: <5638B421.5040603@ti.com> Date: Tue, 3 Nov 2015 08:18:25 -0500 From: Jacob Stiffler User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Sam Nelson , References: <1445639140-9135-1-git-send-email-sam.nelson@ti.com> In-Reply-To: <1445639140-9135-1-git-send-email-sam.nelson@ti.com> Subject: Re: [PATCH] strongswan: Add back config patch for pkcs11 in 5.2.1 format X-BeenThere: meta-arago@arago-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Arago metadata layer for TI SDKs - OE-Core/Yocto compatible List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2015 13:18:29 -0000 Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit 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 > --- > .../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