Zwischencommit fuer LFS.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@322 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/aboot/aboot.conf b/config/aboot/aboot.conf
deleted file mode 100644 (file)
index f5697a8..0000000
--- a/config/aboot/aboot.conf
+++ /dev/null
@@ -1 +0,0 @@
-0:1/vmlinuz root=ROOT panic=10 ro

diff --git a/config/aboot/scsiaboot.conf b/config/aboot/scsiaboot.conf
deleted file mode 100644 (file)
index 4915e41..0000000
--- a/config/aboot/scsiaboot.conf
+++ /dev/null
@@ -1 +0,0 @@
-0:1/vmlinuz root=ROOT panic=10 initrd=ipfirerd.img init=/linuxrc rw

diff --git a/config/etc/syslog.conf b/config/etc/syslog.conf
index 495d4a9ca8f3f2aa7d4238e564b2d50f3deec262..bd49f61ed90679b11d6f80b6c29a8047bbf3c749 100644 (file)
--- a/config/etc/syslog.conf
+++ b/config/etc/syslog.conf
@@ -5,10 +5,13 @@
 # Log anything (except mail) of level info or higher.
 # Don't log private authentication messages!
 # local0.* any dhcpcd log (even debug) in messages
 # Log anything (except mail) of level info or higher.
 # Don't log private authentication messages!
 # local0.* any dhcpcd log (even debug) in messages

-daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*;cron.*  /var/log/messages
+daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.* /var/log/messages
+
+# Log crons
+cron.*                                                 -/var/log/cron.log

 
 # Everybody gets emergency messages
 
 # Everybody gets emergency messages

-*.emerg                                                        *
+*.emerg                                                *

 
 # Save boot messages also to boot.log
 local7.*                                               /var/log/boot.log
 
 # Save boot messages also to boot.log
 local7.*                                               /var/log/boot.log

diff --git a/lfs/perl-GD b/lfs/GD
similarity index 82%
rename from lfs/perl-GD
rename to lfs/GD
index 538ad306e4574c6e9f4518f95ccc51641a085a50..392f704b3aca5995ed2fcc24be6d240a93443554 100644 (file)
--- a/lfs/perl-GD
+++ b/lfs/GD
@@ -1,86 +1,80 @@
-###############################################################################\r
-# This file is part of the IPCop Firewall.                                    #\r
-#                                                                             #\r
-# IPCop is free software; you can redistribute it and/or modify               #\r
-# it under the terms of the GNU General Public License as published by        #\r
-# the Free Software Foundation; either version 2 of the License, or           #\r
-# (at your option) any later version.                                         #\r
-#                                                                             #\r
-# IPCop is distributed in the hope that it will be useful,                    #\r
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #\r
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #\r
-# GNU General Public License for more details.                                #\r
-#                                                                             #\r
-# You should have received a copy of the GNU General Public License           #\r
-# along with IPCop; if not, write to the Free Software                        #\r
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #\r
-#                                                                             #\r
-# Makefiles are based on LFSMake, which is                                    #\r
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #\r
-#                                                                             #\r
-# Modifications by:                                                           #\r
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #\r
-#          - Modified Makefile for IPCop build                                #\r
-#                                                                             #\r
-# $Id: GD,v 1.5.2.3 2005/02/05 15:38:14 gespinasse Exp $\r
-#                                                                             #\r
-###############################################################################\r
-\r
-###############################################################################\r
-# Definitions\r
-###############################################################################\r
-\r
-include Config\r
-\r
-VER        = 2.12\r
-\r
-THISAPP    = GD-$(VER)\r
-DL_FILE    = $(THISAPP).tar.gz\r
-DL_FROM    = $(URL_CPAN)/GD\r
-DIR_APP    = $(DIR_SRC)/$(THISAPP)\r
-TARGET     = $(DIR_INFO)/$(THISAPP)\r
-\r
-###############################################################################\r
-# Top-level Rules\r
-###############################################################################\r
-\r
-objects = $(DL_FILE)\r
-\r
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)\r
-\r
-$(DL_FILE)_MD5 = 84de3734fb32947d08c0d3d1e68201a6\r
-\r
-install : $(TARGET)\r
-\r
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))\r
-\r
-download :$(patsubst %,$(DIR_DL)/%,$(objects))\r
-\r
-md5 : $(subst %,%_MD5,$(objects))\r
-\r
-###############################################################################\r
-# Downloading, checking, md5sum\r
-###############################################################################\r
-\r
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :\r
-       @$(CHECK)\r
-\r
-$(patsubst %,$(DIR_DL)/%,$(objects)) :\r
-       @$(LOAD)\r
-\r
-$(subst %,%_MD5,$(objects)) :\r
-       @$(MD5)\r
-\r
-###############################################################################\r
-# Installation Details\r
-###############################################################################\r
-\r
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))\r
-       @$(PREBUILD)\r
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)\r
-       cd $(DIR_APP) && sed -i "s%,'y'%,'n'%" Makefile.PL\r
-       cd $(DIR_APP) && yes 'n' | perl Makefile.PL\r
-       cd $(DIR_APP) && make\r
-       cd $(DIR_APP) && make install\r
-       @rm -rf $(DIR_APP)\r
-       @$(POSTBUILD)\r
+###############################################################################
+# 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.35
+
+THISAPP    = GD-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+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 = dfc3e16e85a17aab7ee1029fbe307fca
+
+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 zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && sed -i "s%,'y'%,'n'%" Makefile.PL
+       cd $(DIR_APP) && yes 'n' | perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/ethtool b/lfs/ethtool
index 99d89b369ec773dd2f3de48d2d3764fc1753f698..d0476328fe3998d901e892735f11a441e5271849 100644 (file)
--- a/lfs/ethtool
+++ b/lfs/ethtool
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # 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: ethtool,v 1.1.2.1 2005/06/21 20:10:18 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
        @$(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)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/ez-ipupdate b/lfs/ez-ipupdate
index 0eb7f1e6d77df4a79eea80237c0a6f71b2e1b96e..1873cdcdb164c8c0dc8e20ce3a63d0c766fe2257 100644 (file)
--- a/lfs/ez-ipupdate
+++ b/lfs/ez-ipupdate
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # 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: ez-ipupdate,v 1.4.2.4 2005/02/05 15:38:14 gespinasse Exp $
-#                                                                             #

 ###############################################################################
 
 ###############################################################################
 ###############################################################################
 
 ###############################################################################


@@ -36,7 +30,7 @@ VER        = 3.0.11b8
 
 THISAPP    = ez-ipupdate-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 THISAPP    = ez-ipupdate-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

-DL_FROM    = http://www.whyi.org/help/software
+DL_FROM    = $(URL_IPFIRE)

 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 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) && patch -Np0 < $(DIR_SRC)/src/patches/ez-ipupdate.formstring.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ez-ipupdate.formstring.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)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/fcron b/lfs/fcron
index b829fdb35a33a36c2e34615a315bb5a3cb782e42..2a6d4934f05ff947bdd9eefe2f6abb497d8a456a 100644 (file)
--- a/lfs/fcron
+++ b/lfs/fcron
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # 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: fcron,v 1.5.2.5 2006/09/07 00:27:44 franck78 Exp $
-#                                                                             #

 ###############################################################################
 
 ###############################################################################
 ###############################################################################
 
 ###############################################################################


@@ -36,7 +30,7 @@ VER        = 3.0.1
 
 THISAPP    = fcron-$(VER)
 DL_FILE    = $(THISAPP).src.tar.gz
 
 THISAPP    = fcron-$(VER)
 DL_FILE    = $(THISAPP).src.tar.gz

-DL_FROM    = http://fcron.free.fr/archives
+DL_FROM    = $(URL_IPFIRE)

 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 


@@ -78,21 +72,21 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)

-       cd $(DIR_APP) && ./configure            \
+       cd $(DIR_APP) && ./configure    \

            --prefix=/usr                       \
            --disable-nls                       \
            --prefix=/usr                       \
            --disable-nls                       \

-           --without-sendmail                  \
+           --without-sendmail          \

            --with-spooldir=/var/spool/cron     \
            --with-fifodir=/var/run             \
            --with-username=cron                \
            --with-groupname=cron               \
            --with-run-non-privileged=no        \
            --with-spooldir=/var/spool/cron     \
            --with-fifodir=/var/run             \
            --with-username=cron                \
            --with-groupname=cron               \
            --with-run-non-privileged=no        \

-           --with-fcrondyn=no                  \
+           --with-fcrondyn=no          \

            --with-sysfcrontab=no               \
            --with-boot-install=no              \
            --with-pam=no                       \
            --with-selinux=no
            --with-sysfcrontab=no               \
            --with-boot-install=no              \
            --with-pam=no                       \
            --with-selinux=no

-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)

        cd $(DIR_APP) && make install
        echo "root" > /etc/fcron.allow
        echo "all"  > /etc/fcron.deny
        cd $(DIR_APP) && make install
        echo "root" > /etc/fcron.allow
        echo "all"  > /etc/fcron.deny

diff --git a/lfs/gnupg b/lfs/gnupg
index 4fbe821078a8c009b7491417405a3bcf23b41490..e240bab60d451057310caab500676c4d34a5f9d1 100644 (file)
--- a/lfs/gnupg
+++ b/lfs/gnupg
@@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -rf /home/nobody/.gnupg /root/.gnupg
        cd $(DIR_APP) && ./configure --prefix=/usr --enable-minimal --disable-nls \
                --disable-dns-srv --disable-dns-pka --disable-dns-cert
        rm -rf /home/nobody/.gnupg /root/.gnupg
        cd $(DIR_APP) && ./configure --prefix=/usr --enable-minimal --disable-nls \
                --disable-dns-srv --disable-dns-pka --disable-dns-cert

-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)

        cd $(DIR_APP) && make install
        gpg --import $(DIR_SRC)/config/cfgroot/ipcop.gpg
        @rm -rf $(DIR_APP)
        cd $(DIR_APP) && make install
        gpg --import $(DIR_SRC)/config/cfgroot/ipcop.gpg
        @rm -rf $(DIR_APP)

diff --git a/lfs/hdparm b/lfs/hdparm
index ca7a0b372014812f037c30a649b4bd0f403879f8..88e2d06c6e0fc3d993aa5d7e35e4456f9df5a3f5 100644 (file)
--- a/lfs/hdparm
+++ b/lfs/hdparm
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # 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: hdparm,v 1.3.2.7 2006/01/15 08:55:50 gespinasse Exp $
-#                                                                             #

 ###############################################################################
 
 ###############################################################################
 ###############################################################################
 
 ###############################################################################


@@ -32,7 +26,7 @@
 
 include Config
 
 
 include Config
 

-VER        = 6.3
+VER        = 6.6

 
 THISAPP    = hdparm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 THISAPP    = hdparm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz


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

-$(DL_FILE)_MD5 = 0c12672f3a09c14ad0b0882f15fc9389
+$(DL_FILE)_MD5 = ecea69f775396e4ab6112dcf9066239f

 
 install : $(TARGET)
 
 
 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)
 $(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)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/ibod b/lfs/ibod
index e6ca43c65591ffc73e8f000c0714228b97539481..bfeeed7a0e0d2902dc912d439acf04dd7ccaf3bb 100644 (file)
--- a/lfs/ibod
+++ b/lfs/ibod
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # 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: ibod,v 1.5.2.2 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #

 ###############################################################################
 
 ###############################################################################
 ###############################################################################
 
 ###############################################################################


@@ -32,6 +26,8 @@
 
 include Config
 
 
 include Config
 

+VER = ipfire
+

 THISAPP    = ibod
 DIR_APP    = $(DIR_SRC)/src/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 THISAPP    = ibod
 DIR_APP    = $(DIR_SRC)/src/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

diff --git a/lfs/initscripts b/lfs/initscripts
index 24dc94d999810a8b679bf90f0ac23e31771c8502..152618dd73d99259bcf55394ac5b7904ed03bb9d 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -26,6 +26,8 @@
 
 include Config
 
 
 include Config
 

+VER = ipfire
+

 THISAPP    = initscripts
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 THISAPP    = initscripts
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

diff --git a/lfs/ipac-ng b/lfs/ipac-ng
index 6754995cf99373da37a125c6d17f1f5192d61727..c8aede171557647afa3fb91c0f932135a61444c2 100644 (file)
--- a/lfs/ipac-ng
+++ b/lfs/ipac-ng
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # 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: ipac-ng,v 1.5.2.6 2006/01/14 16:41:15 gespinasse Exp $
-#                                                                             #

 ###############################################################################
 
 ###############################################################################
 ###############################################################################
 
 ###############################################################################


@@ -36,7 +30,7 @@ VER        = 1.31
 
 THISAPP    = ipac-ng-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 THISAPP    = ipac-ng-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

-DL_FROM    = $(URL_SFNET)/ipac-ng
+DL_FROM    = $(URL_IPFIRE)

 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/iptables b/lfs/iptables
index 13b162c85a3b56b6b2f7669e3e8684730e99d85b..8e92c400e375a4d16cd859d74b957aa1d31c7fb5 100644 (file)
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # 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: iptables,v 1.5.2.4 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #

 ###############################################################################
 
 ###############################################################################
 ###############################################################################
 
 ###############################################################################


@@ -43,7 +37,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 ###############################################################################
 # Top-level Rules
 ###############################################################################

-

 objects =      $(DL_FILE) \
                        iptables-1.3.0-imq1.diff \
                        netfilter-layer7-v2.1.tar.gz
 objects =      $(DL_FILE) \
                        iptables-1.3.0-imq1.diff \
                        netfilter-layer7-v2.1.tar.gz


@@ -53,8 +46,8 @@ iptables-1.3.0-imq1.diff              = http://www.linuximq.net/patchs/iptables-1.3.0-imq1.
 netfilter-layer7-v2.1.tar.gz   = http://mesh.dl.sourceforge.net/sourceforge/l7-filter/netfilter-layer7-v2.1.tar.gz
 
 $(DL_FILE)_MD5 = 00fb916fa8040ca992a5ace56d905ea5
 netfilter-layer7-v2.1.tar.gz   = http://mesh.dl.sourceforge.net/sourceforge/l7-filter/netfilter-layer7-v2.1.tar.gz
 
 $(DL_FILE)_MD5 = 00fb916fa8040ca992a5ace56d905ea5

-iptables-1.3.0-imq1.diff_MD5           = 9adae8be9562775a176fc1b275b3cb29
-netfilter-layer7-v2.1.tar.gz_MD5       = 551626a158c2a2cbfd937d27ecc7fac1
+iptables-1.3.0-imq1.diff_MD5 = 9adae8be9562775a176fc1b275b3cb29
+netfilter-layer7-v2.1.tar.gz_MD5 = 551626a158c2a2cbfd937d27ecc7fac1

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -86,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # iptables-fixed.tar.gz is made in the linux kernel build process
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/iptables-fixed.tar.gz
        @rm -rf $(DIR_DL)/netfilter-layer7-v2.1 && cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.1.tar.gz
        # iptables-fixed.tar.gz is made in the linux kernel build process
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/iptables-fixed.tar.gz
        @rm -rf $(DIR_DL)/netfilter-layer7-v2.1 && cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.1.tar.gz

-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.1/iptables-layer7-2.1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.6/iptables-layer7-2.6.patch

 
 #      # Appears that libipt_set/SET maybe a little broken, fix it for now...
 #      cd $(DIR_APP)/extensions && sed -i -e 's/#include\ \"..\/ipset\/libipt_set.h\"//' libipt_set.c
 
 #      # Appears that libipt_set/SET maybe a little broken, fix it for now...
 #      cd $(DIR_APP)/extensions && sed -i -e 's/#include\ \"..\/ipset\/libipt_set.h\"//' libipt_set.c


@@ -98,7 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present
        cd $(DIR_APP) && sed -i -e 's/DO_IPV6:=1/DO_IPV6:=0/' Makefile
 
        # hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present
        cd $(DIR_APP) && sed -i -e 's/DO_IPV6:=1/DO_IPV6:=0/' Makefile
 

-       cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib
+       cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib $(MAKETUNING)

        cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
        cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/iptstate b/lfs/iptstate
index 23d5028f75c92de8a3f9148adbaf9d5e45eab2ce..2f982eb76e57d1b18bcb0be6eca97e351ea28450 100644 (file)
--- a/lfs/iptstate
+++ b/lfs/iptstate
@@ -18,11 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #

-# Modifications by:                                                           #
-#     2005-jul  - Created ipstate lfs file from Mark's traceroute file             #
-#                                                                             #
-# $Id: iptstate,v 1.1.2.1 2005/07/07 19:14:06 franck78 Exp $
-#                                                                             #

 ###############################################################################
 
 ###############################################################################
 ###############################################################################
 
 ###############################################################################


@@ -31,11 +26,11 @@
 
 include Config
 
 
 include Config
 

-VER        = 1.4
+VER        = 2.1

 
 THISAPP    = iptstate-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 
 THISAPP    = iptstate-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2

-DL_FROM    = http://www.phildev.net/iptstate/
+DL_FROM    = $(URL_IPFIRE)

 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 


@@ -47,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = 717b13d5b6521ac1b8683caf1dc247a0
+$(DL_FILE)_MD5 = c99e19c66645689b44a871428e003ec7

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -77,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)

-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)

        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/iputils b/lfs/iputils
index 1c90fa37f8efe12921f7e16d0f68d1ef1d59405a..e7ad9d70c215f39547f2a9775d6f92ffd4088d06 100644 (file)
--- a/lfs/iputils
+++ b/lfs/iputils
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # 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: iputils,v 1.1.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #

 ###############################################################################
 
 ###############################################################################
 ###############################################################################
 
 ###############################################################################


@@ -36,7 +30,7 @@ VER        = ss020927
 
 THISAPP    = iputils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 THISAPP    = iputils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

-DL_FROM    = ftp://ftp.tux.org/people/alexey-kuznetsov/ip-routing
+DL_FROM    = $(URL_IPFIRE)

 DIR_APP    = $(DIR_SRC)/iputils
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 DIR_APP    = $(DIR_SRC)/iputils
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/subversion b/lfs/subversion
index c9ef0caf1095f519205ed832ceddc4a7c48714da..90e0420bdd03096acae0673a5666338dee54de3c 100644 (file)
--- a/lfs/subversion
+++ b/lfs/subversion
@@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                --with-installbuilddir=/usr/lib/apr-0 \
                                --with-ssl --disable-nls \
                                --disable-mod-activation
                                --with-installbuilddir=/usr/lib/apr-0 \
                                --with-ssl --disable-nls \
                                --disable-mod-activation

-       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make

        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index f2eb614d184d6a54b8c6e7a68c52828bd9a21a9f..e76dc57d406861cf2cecd16a49b1dbaff206dce9 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -256,7 +256,6 @@ buildbase() {
     LOGFILE="$BASEDIR/log/_build.base.log"
     export LOGFILE
     lfsmake2 stage2
     LOGFILE="$BASEDIR/log/_build.base.log"
     export LOGFILE
     lfsmake2 stage2

-#    lfsmake2 makedev

     lfsmake2 linux-libc-header
     lfsmake2 man-pages
     lfsmake2 glibc
     lfsmake2 linux-libc-header
     lfsmake2 man-pages
     lfsmake2 glibc


@@ -399,11 +398,10 @@ buildipfire() {
   ipfiremake cdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
   ipfiremake cdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools

-exit 1

   ipfiremake ethtool
   ipfiremake ez-ipupdate
   ipfiremake fcron
   ipfiremake ethtool
   ipfiremake ez-ipupdate
   ipfiremake fcron

-  ipfiremake perl-GD
+  ipfiremake GD

   ipfiremake gnupg
   ipfiremake hdparm
   ipfiremake ibod
   ipfiremake gnupg
   ipfiremake hdparm
   ipfiremake ibod


@@ -411,9 +409,9 @@ exit 1
   ipfiremake iptables
   ipfiremake ipac-ng
   ipfiremake ipaddr
   ipfiremake iptables
   ipfiremake ipac-ng
   ipfiremake ipaddr

-  ipfiremake iproute2

   ipfiremake iptstate
   ipfiremake iptstate

-  ipfiremake iputils
+#  ipfiremake iputils
+exit 1

   ipfiremake l7-protocols
   ipfiremake isapnptools
   ipfiremake isdn4k-utils
   ipfiremake l7-protocols
   ipfiremake isapnptools
   ipfiremake isdn4k-utils