From afe991a529368298b225400fc743f8b5cd1ffc33 Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 1 Aug 2007 14:24:47 +0000 Subject: [PATCH] Den Guardian mal korrigiert, einen Tippfehler korrigiert und versucht die Jetway GigaNics ans laufen zu bekommen mittels der neuen NAPI. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@728 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/kernel/kernel.config.i586 | 21 +++++---------------- config/kernel/kernel.config.i586.smp | 10 +++++----- doc/packages-list.txt | 2 +- lfs/guardian | 11 +++++------ src/install+setup/install/main.c | 4 ++-- 5 files changed, 18 insertions(+), 30 deletions(-) diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index 33edca760..721306909 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.50-ipfire -# Wed Jul 18 11:24:55 2007 +# Wed Aug 1 13:18:33 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -1158,9 +1158,9 @@ CONFIG_IBMLANA=m CONFIG_NET_PCI=y CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m -# CONFIG_AMD8111E_NAPI is not set +CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE=m -# CONFIG_ADAPTEC_STARFIRE_NAPI is not set +CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_AC3200=m CONFIG_APRICOT=m CONFIG_B44=m @@ -1200,13 +1200,13 @@ CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m CONFIG_E1000=m -# CONFIG_E1000_NAPI is not set +CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set +CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m @@ -2002,17 +2002,6 @@ CONFIG_USB_XUSBATM=m # USB Gadget Support # # CONFIG_USB_GADGET is not set -# CONFIG_USB_GADGET_NET2280 is not set -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -# CONFIG_USB_ZERO is not set -# CONFIG_USB_ETH is not set -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set # # MMC/SD Card support diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp index aa3e5b40c..e10dec109 100644 --- a/config/kernel/kernel.config.i586.smp +++ b/config/kernel/kernel.config.i586.smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.50-ipfire -# Wed Jul 18 11:25:20 2007 +# Wed Aug 1 13:18:55 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -1162,9 +1162,9 @@ CONFIG_IBMLANA=m CONFIG_NET_PCI=y CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m -# CONFIG_AMD8111E_NAPI is not set +CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE=m -# CONFIG_ADAPTEC_STARFIRE_NAPI is not set +CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_AC3200=m CONFIG_APRICOT=m CONFIG_B44=m @@ -1204,13 +1204,13 @@ CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m CONFIG_E1000=m -# CONFIG_E1000_NAPI is not set +CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set +CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 062d74f33..e34c45b9a 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -104,7 +104,7 @@ * grep-2.5.1a * groff-1.18.1.1 * grub-0.97 -* guardian-1.7.0 +* guardian-ipfire * gzip-1.3.5 * hddtemp-0.3-beta14 * hdparm-6.6 diff --git a/lfs/guardian b/lfs/guardian index 4109c0a8b..30ddca000 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -32,10 +32,10 @@ THISAPP = guardian-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = guardian -PAK_VER = 1.7 +PAK_VER = 1 -DESCDE = "Guardian ist Sicherheitstool, welches das Snort IDS Log auswertet und IP´s mit Hilfe von iptables block." -DESCEN = "Guardian is a security tool which will issue commands to the OS to block ip addresses which attacks may be coming from. Guardian requires an IDS (Intrusion detection system), and currently only works with snort." +DESCDE = "Guardian ist ein Sicherheitstool, welches das Snort IDS Log auswertet und IPs mit Hilfe von iptables blockt." +DESCEN = "Guardian is a security tool which will issue commands to the OS to block ip addresses which attacks may be coming from." ############################################################################### # Top-level Rules @@ -60,10 +60,9 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - -mkdir -p /var/ipfire/guardian/ - -mkdir -p /var/log/guardian/ + -mkdir -p /var/ipfire/guardian /var/log/guardian touch /var/log/guardian/guardian.log - install -v -m 755 $(DIR_SRC)/config/guardian/guardian.conf /var/ipfire/guardian/ + install -v -m 644 $(DIR_SRC)/config/guardian/guardian.conf /var/ipfire/guardian/ install -v -m 755 $(DIR_SRC)/config/guardian/guardian.pl /usr/local/bin/ install -v -m 755 $(DIR_SRC)/config/guardian/guardian_block.sh /usr/local/bin/ install -v -m 755 $(DIR_SRC)/config/guardian/guardian_unblock.sh /usr/local/bin/ diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 1c0566979..0a944da93 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -163,8 +163,8 @@ int main(int argc, char *argv[]) mysystem("/sbin/modprobe iso9660"); mysystem("/sbin/modprobe ext2"); - // Loading the via_rhine driver because it isn't detected correctly - mysystem("/sbin/modprobe via_rhine"); + // Loading the via_rhine driver because it isn't detected correctly (sometimes) + mysystem("/sbin/modprobe via-rhine"); } if (unattended) { -- 2.39.2