From: Rene Wagner <rw@handhelds.org>
Date: Sat, 5 Mar 2005 13:16:09 +0000 (+0000)
Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded
X-Git-Tag: Release-2010-05/1~14760
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bc4682daf3834bebae515a83c5f13134ce7a4b2;p=openembedded.git

Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/03/05 14:15:54+01:00 dyndns.org!reenoo
openswan: remove improper use of LD_LIBRARY_PATH from Makefiles; set CONFFILES regardless of DISTRO

BKrev: 4229b119k_WC-O6F1PZ1ZfJL7Mj8og
---

diff --git a/packages/openswan/openswan-2.2.0/ld-library-path-breakage.patch b/packages/openswan/openswan-2.2.0/ld-library-path-breakage.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/openswan/openswan_2.2.0.bb b/packages/openswan/openswan_2.2.0.bb
index f09f6c9faa..3661ae052d 100644
--- a/packages/openswan/openswan_2.2.0.bb
+++ b/packages/openswan/openswan_2.2.0.bb
@@ -7,10 +7,11 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 DEPENDS = "gmp flex-native"
 RRECOMMENDS = "kernel-module-ipsec"
 RDEPENDS_nylon = "perl"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.openswan.org/code/openswan-${PV}.tar.gz \
-	   file://openswan-2.2.0-gentoo.patch;patch=1"
+	   file://openswan-2.2.0-gentoo.patch;patch=1 \
+	   file://ld-library-path-breakage.patch;patch=1"
 S = "${WORKDIR}/openswan-${PV}"
 
 PARALLEL_MAKE = ""
@@ -31,4 +32,4 @@ do_install () {
 
 FILES_${PN} += "${libdir}/ipsec/"
 
-CONFFILES_${PN}_nylon = "${sysconfdir}/ipsec/ipsec.conf"
+CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf"