openswan: fix build with install wrapper

Signed-off-by: Chris Larson <chris_larson@mentor.com>

diff --git a/recipes/openswan/openswan-2.6.31/installcmd.patch b/recipes/openswan/openswan-2.6.31/installcmd.patch
new file mode 100644 (file)
index 0000000..432757a
--- /dev/null
+++ b/recipes/openswan/openswan-2.6.31/installcmd.patch
@@ -0,0 +1,17 @@
+---
+ Makefile.inc |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- openswan-2.6.31.orig/Makefile.inc
++++ openswan-2.6.31/Makefile.inc
+@@ -163,8 +163,8 @@ INSTALL=install
+ # how backup names are composed.
+ # Note that the install procedures will never overwrite an existing config
+ # file, which is why -b is not specified for them.
+-INSTBINFLAGS=-b --suffix=.old
+-INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
++INSTBINFLAGS=-b
++INSTSUIDFLAGS=-m u+rxs,g+rx,o+rx -g root -b
+ INSTMANFLAGS=
+ INSTCONFFLAGS=
+ # For OSX use

diff --git a/recipes/openswan/openswan_2.6.31.bb b/recipes/openswan/openswan_2.6.31.bb
index bae05d2..cf7c3a7 100644 (file)
--- a/recipes/openswan/openswan_2.6.31.bb
+++ b/recipes/openswan/openswan_2.6.31.bb
@@ -6,14 +6,15 @@ LICENSE = "GPLv2"
 DEPENDS = "gmp flex-native bison-native"
 RRECOMMENDS_${PN} = "kernel-module-ipsec"
 RDEPENDS_append_nylon = "perl"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
-           file://fix-parser-build-race.patch"
+           file://fix-parser-build-race.patch \
+           file://installcmd.patch"
 
 EXTRA_OEMAKE = "DESTDIR=${D} \
-                USERCOMPILE="${CFLAGS}" \
-                USERLINK="${LDFLAGS}" \
+                USERCOMPILE='${CFLAGS}' \
+                USERLINK='${LDFLAGS}' \
                 FINALCONFDIR=${sysconfdir}/ipsec \
                 FINALLIBDIR=${libdir}/ipsec \
                 FINALLIBEXECDIR=${libexecdir}/ipsec \