[oe-commits] Graham Gower : bind: Fix for DISTRO=micro: s|/usr/bin|${bindir}|

[git version control]

Module: openembedded.git
Branch: release-2010.12
Commit: b11996a514b0cab6211b295dda75559bde76c59c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b11996a514b0cab6211b295dda75559bde76c59c

Author: Graham Gower <graham.gower at gmail.com>
Date:   Fri Dec  3 12:09:48 2010 +1030

bind: Fix for DISTRO=micro: s|/usr/bin|${bindir}|

This is a conservative change to fix micro. Bind needs more attention
as the latest in tree version is from 2008 and several vulnerabilities
have been found and fixed since then. If you are doing anything
except using bind as a resolver, please don't use these recipes.

Signed-off-by: Graham Gower <graham.gower at gmail.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Acked-by: Michael Smith <msmith at cbnco.com>

---

 recipes/bind/bind_9.3.1.bb    |    2 +-
 recipes/bind/bind_9.3.4-P1.bb |    2 +-
 recipes/bind/bind_9.3.5-P1.bb |    2 +-
 recipes/bind/bind_9.3.6.bb    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/bind/bind_9.3.1.bb b/recipes/bind/bind_9.3.1.bb
index 33b1de2..268253e 100644
--- a/recipes/bind/bind_9.3.1.bb
+++ b/recipes/bind/bind_9.3.1.bb
@@ -17,7 +17,7 @@ INITSCRIPT_PARAMS = "defaults"
 
 
 do_install_append() {
-	rm "${D}/usr/bin/nslookup"
+	rm "${D}${bindir}/nslookup"
 	install -d "${D}/etc/bind"
 	install -d "${D}/etc/init.d"
 	install -m 644 ${S}/conf/* "${D}/etc/bind"
diff --git a/recipes/bind/bind_9.3.4-P1.bb b/recipes/bind/bind_9.3.4-P1.bb
index 45bf608..70c261e 100644
--- a/recipes/bind/bind_9.3.4-P1.bb
+++ b/recipes/bind/bind_9.3.4-P1.bb
@@ -19,7 +19,7 @@ INITSCRIPT_NAME = "bind"
 INITSCRIPT_PARAMS = "defaults"
 
 do_install_append() {
-	rm "${D}/usr/bin/nslookup"
+	rm "${D}${bindir}/nslookup"
 	install -d "${D}/etc/bind"
 	install -d "${D}/etc/init.d"
 	install -m 644 ${S}/conf/* "${D}/etc/bind"
diff --git a/recipes/bind/bind_9.3.5-P1.bb b/recipes/bind/bind_9.3.5-P1.bb
index d105dfc..bb98261 100644
--- a/recipes/bind/bind_9.3.5-P1.bb
+++ b/recipes/bind/bind_9.3.5-P1.bb
@@ -19,7 +19,7 @@ INITSCRIPT_NAME = "bind"
 INITSCRIPT_PARAMS = "defaults"
 
 do_install_append() {
-	rm "${D}/usr/bin/nslookup"
+	rm "${D}${bindir}/nslookup"
 	install -d "${D}/etc/bind"
 	install -d "${D}/etc/init.d"
 	install -m 644 ${S}/conf/* "${D}/etc/bind"
diff --git a/recipes/bind/bind_9.3.6.bb b/recipes/bind/bind_9.3.6.bb
index 1412a68..b10d6e8 100644
--- a/recipes/bind/bind_9.3.6.bb
+++ b/recipes/bind/bind_9.3.6.bb
@@ -24,7 +24,7 @@ FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/nslookup"
 FILES_${PN}-dev += "${bindir}/isc-config.h"
 
 do_install_append() {
-	rm "${D}/usr/bin/nslookup"
+	rm "${D}${bindir}/nslookup"
 	install -d "${D}/etc/bind"
 	install -d "${D}/etc/init.d"
 	install -m 644 ${S}/conf/* "${D}/etc/bind"