Bump version of dnsmasq, with new patches

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index fdedd92a0dde970f13631148d251d15ff558108c..6927b5a081c59607b02bf8f6c7dc333223494a3c 100644 (file)
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -6,7 +6,7 @@
 
 DNSMASQ_SITE=http://thekelleys.org.uk/dnsmasq
 ifeq ($(filter $(TARGETS),dnsmasq1),)
-DNSMASQ_UPVER=2.22
+DNSMASQ_UPVER=2.39
 DNSMASQ_VERSION=dnsmasq2
 else
 DNSMASQ_UPVER=1.18
@@ -34,6 +34,8 @@ $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY): $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY)
        $(MAKE) BINDIR=/usr/sbin MANDIR=/usr/man \
                DESTDIR=$(TARGET_DIR) -C $(DNSMASQ_DIR) install
        $(STRIP) $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
+       mkdir -p $(TARGET_DIR)/var/lib/misc
+       ln -sf /tmp/dnsmasq.leases $(TARGET_DIR)/var/lib/misc/dnsmasq.leases
        rm -rf $(TARGET_DIR)/usr/man
 
 dnsmasq: uclibc $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)

diff --git a/package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch b/package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch
new file mode 100644 (file)
index 0000000..52246a3
--- /dev/null
+++ b/package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch
@@ -0,0 +1,12 @@
+diff -upr dnsmasq-2.39/src/dnsmasq.h dnsmasq-2.39-orig/src/dnsmasq.h
+--- dnsmasq-2.39/src/dnsmasq.h 2007-04-20 12:53:38.000000000 +0200
++++ dnsmasq-2.39-orig/src/dnsmasq.h    2007-06-12 11:12:19.000000000 +0200
+@@ -79,7 +79,7 @@
+ /* There doesn't seem to be a universally-available 
+    userpace header for this. */
+ extern int capset(cap_user_header_t header, cap_user_data_t data);
+-#include <sys/prctl.h>
++#include <linux/prctl.h>
+ #endif
+ 
+ /* Min buffer size: we check after adding each record, so there must be