[oe-commits] Tom Rini : openswan: Fix a build race in libipsecconf

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30-2011-01-16
Commit: 1cdf9d0df10b17a1efb4d3958eacb151879a146c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1cdf9d0df10b17a1efb4d3958eacb151879a146c

Author: Tom Rini <tom_rini at mentor.com>
Date:   Thu Jan 27 11:20:57 2011 -0700

openswan: Fix a build race in libipsecconf

This has been upstreamed for the 2.6.33 release.

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 .../openswan-2.6.31/fix-parser-build-race.patch    |   13 +++++++++++++
 recipes/openswan/openswan_2.6.31.bb                |    5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/recipes/openswan/openswan-2.6.31/fix-parser-build-race.patch b/recipes/openswan/openswan-2.6.31/fix-parser-build-race.patch
new file mode 100644
index 0000000..61de427
--- /dev/null
+++ b/recipes/openswan/openswan-2.6.31/fix-parser-build-race.patch
@@ -0,0 +1,13 @@
+---
+ lib/libipsecconf/Makefile.depend.linux |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: openswan-2.6.31/lib/libipsecconf/Makefile.depend.linux
+===================================================================
+--- openswan-2.6.31.orig/lib/libipsecconf/Makefile.depend.linux
++++ openswan-2.6.31/lib/libipsecconf/Makefile.depend.linux
+@@ -124,3 +124,4 @@ virtif.o: virtif.c \
+   ../../include/ipsecconf/exec.h \
+   ../../include/ipsecconf/files.h \
+   ../../include/ipsecconf/starterlog.h
++parser.tab.c: parser.tab.h
diff --git a/recipes/openswan/openswan_2.6.31.bb b/recipes/openswan/openswan_2.6.31.bb
index 94b45aa..bae05d2 100644
--- a/recipes/openswan/openswan_2.6.31.bb
+++ b/recipes/openswan/openswan_2.6.31.bb
@@ -6,9 +6,10 @@ LICENSE = "GPLv2"
 DEPENDS = "gmp flex-native bison-native"
 RRECOMMENDS_${PN} = "kernel-module-ipsec"
 RDEPENDS_append_nylon = "perl"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz"
+SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
+           file://fix-parser-build-race.patch"
 
 EXTRA_OEMAKE = "DESTDIR=${D} \
                 USERCOMPILE="${CFLAGS}" \