Merge remote-tracking branch 'stevee/squid-zph-qos' into beyond-next

[people/teissler/ipfire-2.x.git] / lfs / dnsmasq

diff --git a/lfs/dnsmasq b/lfs/dnsmasq
index faae59c8fd24e63cc9b68121e63a91eb95c92b24..29fb9b38dfc3c7b10f9054b451226c4a4d4c3a5d 100644 (file)
--- a/lfs/dnsmasq
+++ b/lfs/dnsmasq
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.40
+VER        = 2.45
 
 THISAPP    = dnsmasq-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 91b6063ae81146b9d70b4381b2f3e44f
+$(DL_FILE)_MD5 = b7956e15c9766e05b3eca3ce88fdb616
 
 install : $(TARGET)
 
@@ -70,10 +70,12 @@ $(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) && PREFIX=/usr make install
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)