From e967f4332e999be44734e659f32a1b500ab60ca1 Mon Sep 17 00:00:00 2001 From: Graham Gower Date: Fri, 3 Dec 2010 11:51:48 +1030 Subject: [PATCH] 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 Signed-off-by: Khem Raj Acked-by: Michael Smith --- 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 33b1de28e3..268253e95f 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 45bf608fb3..70c261e9f7 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 d105dfc859..bb9826184d 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 1412a68573..b10d6e84ed 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" -- 2.39.5