dnsmasq: update to version 2.47

4 files changed, 4 insertions, 68 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d9d1eb2414..c7123298a1 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -4362,6 +4362,10 @@ sha256=7b5b456e6ccb3a36cc96b84b79ba148850ab59ac45316b759a090a1121f93e13
 md5=79ec740d1a10ee75f13efa4ff36d0250
 sha256=9888d96d7d91e518c96a034dc863f8f7d961acd9334a1acde849c6022e540212
 
+[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.47.tar.gz]
+md5=4524081e56d0b935717d493e8e8d3e11
+sha256=f2716a43eb05b232c640a4ad647fd0fc21dd0c4f4ad20c9f5303568742399e5d
+
 [http://www.docbook.org/sgml/3.1/docbk31.zip]
 md5=432749c0c806dbae81c8bcb70da3b5d3
 sha256=20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538
diff --git a/packages/dnsmasq/dnsmasq-dbus_2.46.bb b/packages/dnsmasq/dnsmasq-dbus_2.47.bb
index f6070a1987..d03dbdb06e 100644
--- a/packages/dnsmasq/dnsmasq-dbus_2.46.bb
+++ b/packages/dnsmasq/dnsmasq-dbus_2.47.bb
@@ -2,12 +2,9 @@
 
 require dnsmasq.inc
 
-PR = "r1"
 DEPENDS = "dbus"
 EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS"
 
-SRC_URI += "file://dbus_introspection.patch;patch=1"
-
 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/packages/dnsmasq/dnsmasq_2.46.bb b/packages/dnsmasq/dnsmasq_2.47.bb
index 9a79c6e76f..83aea1d299 100644
--- a/packages/dnsmasq/dnsmasq_2.46.bb
+++ b/packages/dnsmasq/dnsmasq_2.47.bb
@@ -1,3 +1 @@
-PR = "r1"
-
 require dnsmasq.inc
diff --git a/packages/dnsmasq/files/dbus_introspection.patch b/packages/dnsmasq/files/dbus_introspection.patch
deleted file mode 100644
index 52cbb6e25b..0000000000
--- a/packages/dnsmasq/files/dbus_introspection.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -urN dnsmasq-2.46.orig/src/dbus.c dnsmasq-2.46/src/dbus.c
---- dnsmasq-2.46.orig/src/dbus.c	2008-11-14 21:02:08.000000000 +0100
-+++ dnsmasq-2.46/src/dbus.c	2008-12-15 10:45:48.000000000 +0100
-@@ -21,6 +21,42 @@
- #define DBUS_API_SUBJECT_TO_CHANGE
- #include <dbus/dbus.h>
- 
-+const char* introspection_xml =
-+"<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n"
-+"\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
-+"<node name=\"" DNSMASQ_PATH "\">\n"
-+"  <interface name=\"org.freedesktop.DBus.Introspectable\">\n"
-+"    <method name=\"Introspect\">\n"
-+"      <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
-+"    </method>\n"
-+"  </interface>\n"
-+"  <interface name=\"" DNSMASQ_SERVICE "\">\n"
-+"    <method name=\"ClearCache\">\n"
-+"    </method>\n"
-+"    <method name=\"GetVersion\">\n"
-+"      <arg name=\"version\" direction=\"out\" type=\"s\"/>\n"
-+"    </method>\n"
-+"    <method name=\"SetServers\">\n"
-+"      <arg name=\"servers\" direction=\"in\" type=\"av\"/>\n"
-+"    </method>\n"
-+"    <signal name=\"DhcpLeaseAdded\">\n"
-+"      <arg name=\"ipaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hwaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hostname\" type=\"s\"/>\n"
-+"    </signal>\n"
-+"    <signal name=\"DhcpLeaseDeleted\">\n"
-+"      <arg name=\"ipaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hwaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hostname\" type=\"s\"/>\n"
-+"    </signal>\n"
-+"    <signal name=\"DhcpLeaseUpdated\">\n"
-+"      <arg name=\"ipaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hwaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hostname\" type=\"s\"/>\n"
-+"    </signal>\n"
-+"  </interface>\n"
-+"</node>\n";
-+
- struct watch {
-   DBusWatch *watch;      
-   struct watch *next;
-@@ -229,7 +265,15 @@
- {
-   char *method = (char *)dbus_message_get_member(message);
-    
--  if (strcmp(method, "GetVersion") == 0)
-+  if (dbus_message_is_method_call(message, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-+    {
-+      DBusMessage *reply = dbus_message_new_method_return(message);
-+
-+      dbus_message_append_args(reply, DBUS_TYPE_STRING, &introspection_xml, DBUS_TYPE_INVALID);
-+      dbus_connection_send (connection, reply, NULL);
-+      dbus_message_unref (reply);
-+    }
-+  else if (strcmp(method, "GetVersion") == 0)
-     {
-       char *v = VERSION;
-       DBusMessage *reply = dbus_message_new_method_return(message);