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 ef8507e38194c5d52bf5ed4ce688eaaf18a864bd..29fb9b38dfc3c7b10f9054b451226c4a4d4c3a5d 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,7 +24,7 @@
 
 include Config
 
-VER        = 2.22
+VER        = 2.45
 
 THISAPP    = dnsmasq-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b38f33cd0703fa664a37a4595d918189
+$(DL_FILE)_MD5 = b7956e15c9766e05b3eca3ce88fdb616
 
 install : $(TARGET)
 
@@ -72,13 +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%^BINDIR.*$$%BINDIR = /usr/sbin%' \
-           -e 's%^MANDIR.*$$%MANDIR = /usr/share/man%' Makefile
-       cd $(DIR_APP) && sed -i \
-           -e 's/linux\/netlink.h/linux\/types.h/' src/netlink.c
-       cd $(DIR_APP)/src && sed -i 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
-       cd $(DIR_APP) && make
+       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)
        @$(POSTBUILD)