Hinzugefügt:

  * fcclassic (auch SMP)
Geändert:
  * Benedikt aus den Credits rausgenommen. Willer nich. :(

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

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f84b460c1ca9551fbec1ddc91ef357d744836bd4..9dd49afcc7ac2fdaed35762a4748987e8e2a98cc 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -71,6 +71,7 @@
   * ethtool-3
   * expat-1.95.7
   * ez-ipupdate-3.0.11b8
+  * fcclassic-suse8.2-03.11.02
   * fcdsl-suse8.2-03.11.02
   * fcdsl2-suse9.0-03.11.04
   * fcdslsl-suse8.2-03.11.02
@@ -194,6 +195,7 @@
   * snort-2.3.3
   * spandsp-0.0.2pre25
   * speedtouch-1.2
+  * squid-2.5.STABLE13_1st
   * squid-2.5.STABLE14
   * squid-graph-3.1
   * startscripts

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 6f016f86f876d08b93a47058e519e4e263236574..ac0d1436a154cfde942d7131c4582c2b7bc5801a 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -38,8 +38,10 @@ Projektmitglied & Sponsor - Detlef Lampart
 (<a href='mailto:info\@delaco.de'>info\@delaco.de</a>)<br />
 Projektmitglied &amp; Supporter - Silvio Rechenbach
 (<a href='mailto:sr\@tne.de'>sr\@tne.de</a>)<br />
+<!--
 Webinterfacedesign &amp; Inspiration - Benedikt Correll
 (<a href='mailto:benedikt_correll\@hotmail.com'>benedikt_correll\@hotmail.com</a>)<br />
+-->
 Sponsor - Karsten Rechenbach
 (<a href='mailto:email\@fehlt.com'>email\@fehlt.com</a>)<br />
 Betatester - Sebastian Winter

diff --git a/lfs/fcclassic b/lfs/fcclassic
new file mode 100644 (file)
index 0000000..e4a742c
--- /dev/null
+++ b/lfs/fcclassic
@@ -0,0 +1,112 @@
+###############################################################################
+# 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        = suse8.2-03.11.02
+
+THISAPP    = fcclassic-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/fritz
+ifeq "$(SMP)" ""
+  TARGET     = $(DIR_INFO)/$(THISAPP)
+else
+  TARGET     = $(DIR_INFO)/$(THISAPP)-smp
+endif
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 938dfec45897c34c0a59a5a0c2eb8248
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+#dist: 
+#      make-packages.sh fcclassic $(THISAPP)-ipfire-beta-1
+
+###############################################################################
+# 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)/src.drv && patch -Np1 < $(DIR_SRC)/src/patches/fcpci-suse8.2-03.11.02-compiler.patch
+ifeq "$(SMP)" ""
+       cd $(DIR_APP) && sed -i \
+           -e 's/$$(shell uname -m)/$(MACHINE)/' \
+           -e 's/$$(shell uname -r)/$(KVER)/' \
+           -e 's/`uname -r`/$(KVER)/' \
+           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
+           -e '\+^CCFLAGS+a\ \
+                 -include \$$(KRNLINCL)/linux/modversions.h' \
+           -e '/^DEFINES/a\ \
+                 -DMODVERSIONS \\' src.drv/makefile
+else
+       cd $(DIR_APP) && sed -i \
+           -e 's/$$(shell uname -m)/$(MACHINE)/' \
+           -e 's/$$(shell uname -r)/$(KVER)-smp/' \
+           -e 's/`uname -r`/$(KVER)-smp/' \
+           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
+           -e '\+^CCFLAGS+a\ \
+                 -include \$$(KRNLINCL)/linux/modversions.h' \
+           -e '/^DEFINES/a\ \
+                 -DMODVERSIONS \\' src.drv/makefile
+endif
+       cd $(DIR_APP) && CC="$(KGCC)" make
+       cd $(DIR_APP) && CC="$(KGCC)" make install
+ifeq "$(SMP)" ""
+       find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
+else
+       find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
+endif
+#      @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
\ No newline at end of file

diff --git a/make.sh b/make.sh
index 4719b2c354242df8a0b308ca10e0a54d239db8f7..7072e0d945222b8b117fcabff9bafa74972af326 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -543,6 +543,7 @@ buildipcop() {
        ipcopmake fcdslusb      SMP=1
        ipcopmake fcdslslusb    SMP=1
        ipcopmake fcpci SMP=1
+       ipcopmake fcclassic     SMP=1
        ipcopmake pulsar        SMP=1
        ipcopmake unicorn       SMP=1
   fi
@@ -563,7 +564,8 @@ buildipcop() {
        ipcopmake fcdslsl       
        ipcopmake fcdslusb      
        ipcopmake fcdslslusb 
-       ipcopmake fcpci 
+       ipcopmake fcpci
+       ipcopmake fcclassic
        ipcopmake pulsar        
        ipcopmake unicorn       
   fi
@@ -1093,6 +1095,7 @@ update)
 commit)
        echo "Upload the changed files:"
        svn commit
+       ./make.sh sync
        svn up > /dev/null
        ;;
 make)

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 4222681a14fc043701ad5573197a8f3dc4c116be..7dceacf8838942605d51d3989cb28ea5d0f45209 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -22115,6 +22115,16 @@ usr/bin/ez-ipupdate
 ##
 #lib/modules/2.4.31-smp/misc/fcdslslusb.o.gz
 ##
+## fcpci
+##
+lib/modules/2.4.31/misc/fcpci.o.gz
+lib/modules/2.4.31-smp/misc/fcpci.o.gz
+##
+## fcclassic
+##
+lib/modules/2.4.31/misc/fcclassic.o.gz
+lib/modules/2.4.31-smp/misc/fcclassic.o.gz
+##
 ## fcron-2.0.2
 ##
 etc/fcron.allow