summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-07-23 08:47:32 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-07-23 08:47:32 +0000
commit97b27732c6f53c93c5b5f16954961481887897bf (patch)
treeb81b0e5516d39a56feb31520b21474a3ade6cc7f
parent9633b737bce94c0acb934769a351182623e35ac6 (diff)
Bump version of dnsmasq, with new patches
-rw-r--r--package/dnsmasq/dnsmasq.mk4
-rw-r--r--package/dnsmasq/dnsmasq2-100-include-correct-prctl-header.patch12
2 files changed, 15 insertions, 1 deletions
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index fdedd92a0..6927b5a08 100644
--- 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
index 000000000..52246a3c5
--- /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