dnsmasq: Update to 2.71.

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

diff --git a/lfs/dnsmasq b/lfs/dnsmasq
index 77cc4318a622faa76dd332567280ee8955d0652c..29de283d978de1221b35d4ddae387b6101d89330 100644 (file)
--- a/lfs/dnsmasq
+++ b/lfs/dnsmasq
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,14 +24,16 @@
 
 include Config
 
-VER        = 2.33
+VER        = 2.71
 
 THISAPP    = dnsmasq-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+COPTS      = -DHAVE_ISC_READER
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 45696461b6e6bc929273b1191ca50447
+$(DL_FILE)_MD5 = 9e2e4d59c75e71ee3ca817ff0f9be69e
 
 install : $(TARGET)
 
@@ -71,11 +71,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)/src && sed -i \
-               -e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \
-               -e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
-       cd $(DIR_APP) && make
-       cd $(DIR_APP) && PREFIX=/usr 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-2.70-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)" $(MAKETUNING)
+       cd $(DIR_APP) && make PREFIX=/usr install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)