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@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Michael Smith <msmith@cbnco.com>

diff --git a/recipes/bind/bind_9.3.1.bb b/recipes/bind/bind_9.3.1.bb
index 33b1de2..268253e 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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"