X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fdnsmasq;h=d4eb9d4ce6f40c12655a5885c348baa5b3136daf;hb=6b696830535fd20ba0dc22e2615548e124c3328d;hp=29fb9b38dfc3c7b10f9054b451226c4a4d4c3a5d;hpb=a0df4b06c17e60aa51c8caa00f39c57b41ce2259;p=ipfire-2.x.git

diff --git a/lfs/dnsmasq b/lfs/dnsmasq
index 29fb9b38df..d4eb9d4ce6 100644
--- a/lfs/dnsmasq
+++ b/lfs/dnsmasq
@@ -24,14 +24,17 @@
 
 include Config
 
-VER        = 2.45
+VER        = 1062667
 
 THISAPP    = dnsmasq-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP)-20150201.tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+# We cannot use INOTIFY because our ISC reader code does not support that
+COPTS      = -DHAVE_ISC_READER -DNO_INOTIFY
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b7956e15c9766e05b3eca3ce88fdb616
+$(DL_FILE)_MD5 = ee58d033a892faa69b099ed598f500c2
 
 install : $(TARGET)
 
@@ -69,13 +72,16 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && sed -i -e 's|/usr/local|/usr|g' Makefile
-	cd $(DIR_APP)/src && sed -i \
-		-e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \
-		-e 's|^#define HAVE_TFTP *$$|//#define HAVE_TFTP|' \
-		-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch
+	cd $(DIR_APP) && sed -i src/config.h \
+		-e 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' \
+		-e 's|/\* #define HAVE_DNSSEC \*/|#define HAVE_DNSSEC|g' \
+		-e 's|#define HAVE_DHCP|//#define HAVE_DHCP|g' \
+		-e 's|#define HAVE_DHCP6|//#define HAVE_DHCP6|g' \
+		-e 's|#define HAVE_TFTP|//#define HAVE_TFTP|g'
+
+	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" COPTS="$(COPTS)" \
+		PREFIX=/usr all install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)