summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dnsmasq/patches/patch-Makefile10
-rw-r--r--package/dnsmasq/patches/patch-src_config_h6
3 files changed, 10 insertions, 8 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 80cecd281..66d35df7b 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= dnsmasq
PKG_VERSION:= 2.71
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 9e2e4d59c75e71ee3ca817ff0f9be69e
PKG_DESCR:= lightweight dns, dhcp and tftp server
PKG_SECTION:= net/dns
diff --git a/package/dnsmasq/patches/patch-Makefile b/package/dnsmasq/patches/patch-Makefile
index c84c4cc5a..5b26ccb75 100644
--- a/package/dnsmasq/patches/patch-Makefile
+++ b/package/dnsmasq/patches/patch-Makefile
@@ -1,6 +1,6 @@
---- dnsmasq-2.61.orig/Makefile 2012-04-29 17:01:28.000000000 +0200
-+++ dnsmasq-2.61/Makefile 2012-06-02 20:50:33.000000000 +0200
-@@ -18,13 +18,13 @@
+--- dnsmasq-2.71.orig/Makefile 2014-05-16 21:21:55.000000000 +0200
++++ dnsmasq-2.71/Makefile 2014-06-29 10:49:15.437148455 +0200
+@@ -18,14 +18,14 @@
# Variables you may well want to override.
@@ -12,7 +12,9 @@
BUILDDIR = $(SRC)
DESTDIR =
-CFLAGS = -Wall -W -O2
+-LDFLAGS =
+CFLAGS ?= -Wall
- LDFLAGS =
++LDFLAGS ?=
COPTS =
RPM_OPT_FLAGS =
+ LIBS =
diff --git a/package/dnsmasq/patches/patch-src_config_h b/package/dnsmasq/patches/patch-src_config_h
index 78f715f2d..ddddec708 100644
--- a/package/dnsmasq/patches/patch-src_config_h
+++ b/package/dnsmasq/patches/patch-src_config_h
@@ -1,6 +1,6 @@
---- dnsmasq-2.61.orig/src/config.h 2012-04-29 17:01:28.000000000 +0200
-+++ dnsmasq-2.61/src/config.h 2012-06-02 20:51:50.000000000 +0200
-@@ -138,7 +138,7 @@ RESOLVFILE
+--- dnsmasq-2.71.orig/src/config.h 2014-05-16 21:21:55.000000000 +0200
++++ dnsmasq-2.71/src/config.h 2014-06-29 10:47:26.948602860 +0200
+@@ -166,7 +166,7 @@ RESOLVFILE
# elif defined(__ANDROID__)
# define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
# else