Quellenupdate:

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

diff --git a/lfs/dnsmasq b/lfs/dnsmasq
index 574cd1f966dcecabdbd660fa5096dada175398b4..77cc4318a622faa76dd332567280ee8955d0652c 100644 (file)
--- a/lfs/dnsmasq
+++ b/lfs/dnsmasq
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: dnsmasq,v 1.4.2.7 2005/04/28 19:34:48 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 2.22
+VER        = 2.33
 
 THISAPP    = dnsmasq-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://thekelleys.org.uk/dnsmasq
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b38f33cd0703fa664a37a4595d918189
+$(DL_FILE)_MD5 = 45696461b6e6bc929273b1191ca50447
 
 install : $(TARGET)
 
@@ -78,13 +72,10 @@ $(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)/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) && make install
+       cd $(DIR_APP) && PREFIX=/usr make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)