From: Roman I Khimov <khimov@altell.ru>
Date: Fri, 19 Mar 2010 13:34:40 +0000 (+0300)
Subject: dnsmasq: add version 2.52
X-Git-Tag: Release-2010-05/1~339^2~20^2~51
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e399e99d2594c68ed0405368d52eb1b2c16bf3c8;p=openembedded.git

dnsmasq: add version 2.52

Fixes CVE-2009-2957 and CVE-2009-2958 among other things.

Signed-off-by: Roman I Khimov <khimov@altell.ru>
---

diff --git a/recipes/dnsmasq/dnsmasq-dbus_2.52.bb b/recipes/dnsmasq/dnsmasq-dbus_2.52.bb
new file mode 100644
index 0000000000..896952d53b
--- /dev/null
+++ b/recipes/dnsmasq/dnsmasq-dbus_2.52.bb
@@ -0,0 +1,13 @@
+# dnsmasq with support for DBus interface
+
+require dnsmasq_${PV}.bb
+
+S = "${WORKDIR}/dnsmasq-${PV}"
+
+DEPENDS = "dbus"
+EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS"
+
+do_install_append () {
+        install -d ${D}${sysconfdir}/dbus-1/system.d
+        install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/
+}
diff --git a/recipes/dnsmasq/dnsmasq.inc b/recipes/dnsmasq/dnsmasq.inc
index 68c6337306..fb478472df 100644
--- a/recipes/dnsmasq/dnsmasq.inc
+++ b/recipes/dnsmasq/dnsmasq.inc
@@ -4,7 +4,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 
 #at least versions 2.15 and prior are moved to the archive folder on the server
-SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(bb.data.getVar('PV',d,1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz \
+SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(bb.data.getVar('PV',d,1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \
            file://init \
            file://dnsmasq.conf"
 
diff --git a/recipes/dnsmasq/dnsmasq_2.52.bb b/recipes/dnsmasq/dnsmasq_2.52.bb
new file mode 100644
index 0000000000..f734816f92
--- /dev/null
+++ b/recipes/dnsmasq/dnsmasq_2.52.bb
@@ -0,0 +1,4 @@
+require dnsmasq.inc
+
+SRC_URI[dnsmasq-2.52.md5sum] = "1bb32fffdb4f977ead607802b5d701d0"
+SRC_URI[dnsmasq-2.52.sha256sum] = "a3724f875d0d30c0e2612a32926ad2b6c0a49fff7e224e737689e4c7e8b323d9"
\ No newline at end of file