Zwischencommit fuer LFS.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@324 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-28 03:33:25 +02:00 · 2006-10-15 20:25:07 +00:00
parent fe6d84cbb5
commit fd3e7da032
54 changed files with 476 additions and 218 deletions
--- a/lfs/amavisd
+++ b/lfs/amavisd
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = amavisd
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1

 ###############################################################################
 # Top-level Rules
--- a/lfs/bridge-utils
+++ b/lfs/bridge-utils
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/clamav
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/cups
+++ b/lfs/cups
@@ -28,13 +28,13 @@ include Config

 VER        = 1.2.2

-THISAPP    = cups-$(VER)-source
-DL_FILE    = $(THISAPP).tar.bz2
+THISAPP    = cups-$(VER)
+DL_FILE    = $(THISAPP)-source.tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1

 ###############################################################################
 # Top-level Rules
@@ -78,10 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 #	cd $(DIR_APP) && sed -i -e "s@pam/pam@security/pam@g" {config-scripts/cups-pam.m4,scheduler/auth.c,configure}
-#	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/patches/cups-1.1.23-testsuite_fix-1.patch
 	cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire
 	cd $(DIR_APP) && make
-#	cd $(DIR_APP) && make check
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
 	@rm -rf $(DIR_APP)
--- a/lfs/cyrusimap
+++ b/lfs/cyrusimap
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cyrusimap
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1

 ###############################################################################
 # Top-level Rules
@@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-acceptinvalidfrom.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.3.3-deleteacl_invalid_identifier_fix.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-notify_sms.patch
-	# cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch
 	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/timsieved_reset_sasl_conn.patch
 	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/allow_auth_plain_proxying.patch
 	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/authid_normalize.patch
@@ -104,7 +104,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 				--with-auth=unix --with-perl --with-sasl --with-idle=idled \
 				--with-syslogfacility=MAIL --enable-listext --without-snmp
 	cd $(DIR_APP) && make depend
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	-mkdir /var/imap
 	chown cyrus:mail /var/imap
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --with-ssl --disable-nls --enable-fallback=procmail
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	echo "set logfile /var/log/fetchmail.log" > ~/.fetchmailrc
 	echo "set no bouncemail" >> ~/.fetchmailrc
--- a/lfs/fwhits
+++ b/lfs/fwhits
@@ -26,6 +26,8 @@

 include Config

+VER = ipfire
+
 THISAPP    = fwhits
 DL_FILE    = logtailfwhits
 DL_FROM    = $(URL_IPFIRE)
@@ -49,9 +51,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))

 md5 : $(subst %,%_MD5,$(objects))

-#dist: 
-#	make-packages.sh fwhits $(THISAPP)-ipfire-beta-1
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -28,8 +28,8 @@ include Config

 VER        = 8.15.1

-THISAPP    = espgs-$(VER)-source
-DL_FILE    = $(THISAPP).tar.bz2
+THISAPP    = espgs-$(VER)
+DL_FILE    = $(THISAPP)-source.tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/espgs-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -86,13 +86,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 	rmdir -v /usr/lib/ghostscript/8.15 /usr/lib/ghostscript
-#	ln -v -s ../ghostscript/8.15/doc /usr/share/doc/espgs-8.15.1
-#	for INSTFILE in `ls doc`
-#	do
-#	  if [ ! -f /usr/share/doc/espgs-8.15.1/$INSTFILE ]; then
-#	    install -v -m644 doc/$INSTFILE /usr/share/doc/espgs-8.15.1/
-#	  fi
-#	done
 	tar xfz $(DIR_SRC)/cache/ghostscript-fonts-std-8.11.tar.gz -C /usr/share/ghostscript
 	tar xfz $(DIR_SRC)/cache/gnu-gs-fonts-other-6.0.tar.gz -C /usr/share/ghostscript
 	chown -v root:root /usr/share/ghostscript/fonts/*
--- a/lfs/glib
+++ b/lfs/glib
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/hddtemp
+++ b/lfs/hddtemp
@@ -77,6 +77,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && cp -fv $(DIR_DL)/hddtemp.db /etc/hddtemp.db
 	cd $(DIR_APP) && ./configure --prefix=/usr --with-db-path=/etc/hddtemp.db
-	cd $(DIR_APP) && make && make install
+	cd $(DIR_APP) && make $(MAKETUNING) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/htop
+++ b/lfs/htop
@@ -52,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))

 md5 : $(subst %,%_MD5,$(objects))

-#dist: 
-#	make-packages.sh htop $(THISAPP)-ipfire-beta-1
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -76,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/iputils
+++ b/lfs/iputils
@@ -72,6 +72,9 @@ $(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) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-20020927-headers.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-20020927-rh.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-glibckernheaders.patch
 	cd $(DIR_APP) && make ping
 	cd $(DIR_APP) && install -m 0755 ping /usr/bin
 	@rm -rf $(DIR_APP)
--- a/lfs/libart
+++ b/lfs/libart
@@ -0,0 +1,79 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop 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           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop 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>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.3.17
+
+THISAPP    = libart_lgpl-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = dfca42529393c8a8f59dc4dc10675a46
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/libpcap
+++ b/lfs/libpcap
@@ -26,7 +26,7 @@

 include Config

-VER        = 0.9.4
+VER        = 0.8.3

 THISAPP    = libpcap-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 79025766e8027df154cb1f32de8a7974
+$(DL_FILE)_MD5 = 56a9d4615d8354fcfe8cff8c8443c77b

 install : $(TARGET)

@@ -72,8 +72,11 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/libpcap-0.8.3-shared.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/libpcap-0.8.3-ppp.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && cp -vf pcap-int.h /usr/include
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/libsafe
+++ b/lfs/libsafe
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsafe-functioncaching.diff
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsafe-alpha.diff
-	cd $(DIR_APP) && make libsafe
+	cd $(DIR_APP) && make libsafe $(MAKETUNING)
 	cd $(DIR_APP) && yes | make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/lynx
+++ b/lfs/lynx
@@ -53,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))

 dist: 
-	make-packages.sh lynx $(THISAPP)-ipfire-beta-1
+	@$(PAK)

 ###############################################################################
 # Downloading, checking, md5sum
@@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/etc --with-zlib --with-bzlib
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make docdir=/usr/share/doc/lynx-2.8.5/doc helpdir=/usr/share/doc/lynx-2.8.5/help install-full
 	cd $(DIR_APP) && chgrp -v -R root /usr/share/doc/lynx-2.8.5/doc
 	@rm -rf $(DIR_APP)
--- a/lfs/lzo
+++ b/lfs/lzo
@@ -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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 2.02

 THISAPP    = lzo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.uni-koeln.de/util/arc
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

@@ -79,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared 
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/mailx
+++ b/lfs/mailx
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make SENDMAIL=/usr/sbin/sendmail
+	cd $(DIR_APP) && make $(MAKETUNING) SENDMAIL=/usr/sbin/sendmail
 	cd $(DIR_APP) && make PREFIX=/usr UCBINSTALL=/usr/bin/install install
 	cd $(DIR_APP) && ln -v -sf mailx /usr/bin/mail
 	cd $(DIR_APP) && ln -v -sf mailx /usr/bin/nail
--- a/lfs/mc
+++ b/lfs/mc
@@ -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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -80,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --without-x --disable-nls \
 				--with-screen=mcslang # --with-samba
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/nash
+++ b/lfs/nash
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# 30-12-2003 Alan Hourihane <alanh@fairlite.demon.co.uk>                      #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: nash,v 1.2.2.2 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,6 +26,8 @@

 include Config

+VER = ipfire
+
 THISAPP    = nash
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
--- a/lfs/nasm
+++ b/lfs/nasm
@@ -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: nasm,v 1.3.2.2 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,11 +26,11 @@

 include Config

-VER        = 0.98.36
+VER        = 0.98.39

 THISAPP    = nasm-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/nasm
+DL_FILE    = $(THISAPP).tar.bz2
+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 = bb18ea66db23712fd055e7c609e2156e
+$(DL_FILE)_MD5 = 2032ad44c7359f7a9a166a40a633e772

 install : $(TARGET)

@@ -77,9 +71,10 @@ $(subst %,%_MD5,$(objects)) :

 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fix-1.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -26,7 +26,7 @@

 include Config

-VER        = 4.2.0
+VER        = 4.2.2

 THISAPP    = ntp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 0f8fabe87cf54f409b57c6283f0c0c3d
+$(DL_FILE)_MD5 = 111d879acdcc955e60f527575ab0a71a

 install : $(TARGET)

@@ -72,9 +72,9 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-linuxcaps.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --enable-linuxcaps
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/usr/sbin \
+					    --sysconfdir=/etc --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	-mkdir /etc/ntp
 	chown -R ntp:ntp /etc/ntp
--- a/lfs/oinkmaster
+++ b/lfs/oinkmaster
@@ -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: oinkmaster,v 1.1.2.3 2005/09/04 20:13:13 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -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: openssh,v 1.7.2.5 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,11 +26,11 @@

 include Config

-VER        = 3.9p1
+VER        = 4.3p2

 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
+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 = 8e1774d0b52aff08f817f3987442a16e
+$(DL_FILE)_MD5 = 7e9880ac20a9b9db0d3fea30a9ff3d46

 install : $(TARGET)

@@ -78,13 +72,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) && ./configure --sysconfdir=/etc/ssh --disable-nls \
-	    --prefix=/usr --target=$(MACHINE) \
-	    --with-privsep-path=/var/empty \
-	    --with-ipv4-default \
-	    --with-default-path=/bin:/usr/bin \
-	    --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
-	cd $(DIR_APP) && make -j 3
+	cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \
+		    --libexecdir=/usr/lib/openssh --with-md5-passwords \
+		    --with-privsep-path=/var/empty --disable-nls \
+		    --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	sed -i -e 's/^#\?Port .*$$/Port 222/' \
 	    -e 's/^#\?Protocol .*$$/Protocol 2/' \
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -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: openswan,v 1.6.2.17 2005/12/01 23:00:25 franck78 Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,11 +26,11 @@

 include Config

-VER        = 1.0.10
+VER        = 2.4.6

 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.openswan.org/download/
+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 = 3767814e3c080d146a8c7233dc31e0a9
+$(DL_FILE)_MD5 = b34d71ca49dedad017879b0e912d40dd

 install : $(TARGET)

@@ -78,19 +72,13 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-1.0.1-plutoctl.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-1.0.6-numif.patch
 	cd $(DIR_APP) && sed -i \
-	    -e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
-	    -e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
-	    -e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
-	#remove keywords that may be used to run scripts sf bug#1350181 (bash file=> easy to recover)
-	cd $(DIR_APP)/utils && sed -i \
-	    -e 's% prepluto postpluto%%' \
-	    -e 's% leftupdown%%' _confread
-	cd $(DIR_APP) && make programs
-	cd $(DIR_APP) && make install
-	mv -f /etc/rc.d/init.d/ipsec /etc/rc.d/
+		-e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
+		-e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
+		-e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
+	cd $(DIR_APP) && make $(MAKETUNING) programs
+	cd $(DIR_APP) && make $(MAKETUNING) install
+	#mv -f /etc/rc.d/init.d/ipsec /etc/rc.d/
 	rm -f /etc/ipsec.conf /etc/ipsec.secrets
 	ln -sf $(CONFIG_ROOT)/vpn/ipsec.conf /etc/ipsec.conf
 	ln -sf $(CONFIG_ROOT)/vpn/ipsec.secrets /etc/ipsec.secrets
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 2.0.7

 THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://openvpn.net/release
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

@@ -78,8 +72,9 @@ $(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) && ./configure --enable-pthread --sysconfdir=/var/ipfire/ovpn --prefix=/usr
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/ovpn \
+						--enable-pthread
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
 	chown -R nobody:nobody /var/ipfire/ovpn
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -26,6 +26,8 @@

 include Config

+VER = 0.99
+
 THISAPP    = pakfire
 DIR_APP    = /opt/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -80,7 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make -f Makefile.init makefiles \
 				'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" -DDEF_MANPAGE_DIR=\"/usr/share/man\" -DUSE_TLS -I/usr/include/openssl -DUSE_SALS_AUTH -I/usr/include/sasl -DHAS_MYSQL -I/usr/include/mysql' \
 				'AUXLIBS=-L/usr/lib -L/usr/lib/sasl2 -lz -lm  -lssl -lcrypto -lmysqlclient -L/usr/lib/mysql -lsasl2 -L/usr/lib'
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && sh postfix-install -non-interactive
 	## Install configuration
 	rm -vf /etc/postfix/main.cf.default
--- a/lfs/pptpclient
+++ b/lfs/pptpclient
@@ -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: pptpclient,v 1.4.2.4 2005/04/13 23:52:04 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,11 +26,11 @@

 include Config

-VER        = 1.6.0
+VER        = 1.7.1

 THISAPP    = pptp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/pptpclient
+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 = 9a706327fb9827541d7c86d48ceb9631
+$(DL_FILE)_MD5 = b47735ba5d6d37dfdbccb85afc044ede

 install : $(TARGET)

@@ -78,7 +72,7 @@ $(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) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/procmail
+++ b/lfs/procmail
@@ -40,7 +40,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = procmail
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1

 ###############################################################################
 # Top-level Rules
--- a/lfs/rrdtool
+++ b/lfs/rrdtool
@@ -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: rrdtool,v 1.5.2.6 2005/12/21 09:56:21 eoberlander Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,11 +26,11 @@

 include Config

-VER        = 1.0.49
+VER        = 1.2.15

 THISAPP    = rrdtool-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    =  http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x
+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 = fbe492dbf3d68abb1d86c2322e7ed44a
+$(DL_FILE)_MD5 = bde8b12c202bc4e27fb9a9588a0aaddf

 install : $(TARGET)

@@ -78,10 +72,11 @@ $(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) && sh configure --prefix=/usr/share/$(THISAPP) \
+	cd $(DIR_APP) && ./configure --prefix=/usr/share/$(THISAPP) \
 	    --exec-prefix=/usr --mandir=/usr/share/man \
-	    --enable-local-libpng --enable-local-zlib --with-pic --enable-latin2
-	cd $(DIR_APP) && make
+	    --enable-local-libpng --enable-local-zlib --with-pic --enable-latin2 \
+	    --disable-python --disable-tcl
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && make site-perl-install
 	-mkdir -p /home/httpd/html/graphs/
--- a/lfs/samba
+++ b/lfs/samba
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1

 ###############################################################################
 # Top-level Rules
--- a/lfs/screen
+++ b/lfs/screen
@@ -52,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))

 md5 : $(subst %,%_MD5,$(objects))

-#dist: 
-#	make-packages.sh screen $(THISAPP)-ipfire-beta-1
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -77,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --with-socket-dir=/var/run/screen --with-sys-screenrc=/etc/screenrc
 	cd $(DIR_APP) && sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/*
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && install -m 644 etc/etcscreenrc /etc/screenrc
 	@rm -rf $(DIR_APP)
--- a/lfs/setserial
+++ b/lfs/setserial
@@ -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: setserial,v 1.3.2.2 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -79,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/setup
+++ b/lfs/setup
@@ -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: setup,v 1.4.2.3 2006/01/11 01:01:38 franck78 Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,6 +26,8 @@

 include Config

+VER = ipfire
+
 THISAPP    = setup
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
--- a/lfs/smartmontools
+++ b/lfs/smartmontools
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/snort
+++ b/lfs/snort
@@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
 	    --sysconfdir=/etc/snort \
 	    --enable-linux-smp-stats
-	cd $(DIR_APP) && make -j 3
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	mv /usr/bin/snort /usr/sbin/
 	-mkdir /etc/snort
--- a/lfs/spandsp
+++ b/lfs/spandsp
@@ -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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,12 +26,12 @@

 include Config

-VER        = 0.0.2pre25
+VER        = 0.0.3pre24

 THISAPP    = spandsp-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://soft-switch.org/downloads/spandsp/spandsp-0.0.2pre25
-DIR_APP    = $(DIR_SRC)/spandsp-0.0.2
+DL_FILE    = $(THISAPP).tgz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/spandsp-0.0.3
 TARGET     = $(DIR_INFO)/$(THISAPP)

 ###############################################################################
@@ -48,7 +42,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 2bbd518eec1ac0214d1d0f8abb6772a3
+$(DL_FILE)_MD5 = 1546abc89df5b36170acac6622784799

 install : $(TARGET)

@@ -58,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))

 md5 : $(subst %,%_MD5,$(objects))

-dist: 
-	make-packages.sh spandsp $(THISAPP)-ipfire-beta-1
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -82,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/squid
+++ b/lfs/squid
@@ -90,7 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	   --enable-referer-log \
 	   --with-pthreads --with-dl

-	cd $(DIR_APP) && make -j 3
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install

 	rm -f /etc/squid/squid.conf
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \
 		--with-sg-logdir=/var/log/squidGuard --with-sg-dbhome=/var/lib/squidguard \
        	--with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install

 	# URL-Filter
--- a/lfs/startscripts
+++ b/lfs/startscripts
@@ -26,6 +26,8 @@

 include Config

+VER = ipfire
+
 THISAPP    = startscripts
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
--- a/lfs/sudo
+++ b/lfs/sudo
@@ -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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -82,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib \
 			    --enable-noargs-shell --with-ignore-dot --with-all-insults \
 			    --enable-shell-sets-home && \
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/tcpdump
+++ b/lfs/tcpdump
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-isis-dos.patch	#CAN 2005-1278
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-ldp-dos.patch	#CAN 2005-1279
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make DEFS="-D_U_=\"\" -DHAVE_CONFIG_H"
+	cd $(DIR_APP) && make $(MAKETUNING) DEFS="-D_U_=\"\" -DHAVE_CONFIG_H"
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/traceroute
+++ b/lfs/traceroute
@@ -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: traceroute,v 1.4.2.2 2005/02/05 15:38:16 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 1.4a12

 THISAPP    = traceroute-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.ee.lbl.gov
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

@@ -80,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -i 's|@prefix@|/usr|' Makefile.in
 	cd $(DIR_APP) && ./configure
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && make install-man
 	chmod u-s /usr/sbin/traceroute
--- a/lfs/vlan
+++ b/lfs/vlan
@@ -72,7 +72,7 @@ $(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) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && install -c -p -m 0755 vconfig /sbin
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/wget
+++ b/lfs/wget
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --with-ssl --disable-nls --disable-ipv6
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/wireless
+++ b/lfs/wireless
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -i 's#\# KERNEL_SRC#KERNEL_SRC#' Makefile
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make PREFIX=/usr install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/wput
+++ b/lfs/wput
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/xinetd
+++ b/lfs/xinetd
@@ -17,7 +17,7 @@
 #                                                                             #
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-
+#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = xinetd
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1

 ###############################################################################
 # Top-level Rules
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --with-loadavg --sysconfdir=/var/ipfire/xinetd
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && install -v -d -m755 /var/ipfire/xinetd/xinetd.d
 	echo "# Begin /var/ipfire/xinetd/xinetd.conf"	>  /var/ipfire/xinetd/xinetd.conf