summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Wagner <rw@handhelds.org>2005-03-05 13:16:09 +0000
committerRene Wagner <rw@handhelds.org>2005-03-05 13:16:09 +0000
commit6bc4682daf3834bebae515a83c5f13134ce7a4b2 (patch)
treea6f9a2d627787982fc6fdb14b21a4ee9248c73ef
parent7b0bd57d9c86f95c7f5ff733292cb36bb2078c24 (diff)
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
-rw-r--r--packages/openswan/openswan-2.2.0/ld-library-path-breakage.patch0
-rw-r--r--packages/openswan/openswan_2.2.0.bb7
2 files changed, 4 insertions, 3 deletions
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
--- /dev/null
+++ b/packages/openswan/openswan-2.2.0/ld-library-path-breakage.patch
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"