Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/config/rootfiles/common/daq-0.4 b/config/rootfiles/common/daq-0.4
new file mode 100644 (file)
index 0000000..0391a4b
--- /dev/null
+++ b/config/rootfiles/common/daq-0.4
@@ -0,0 +1,33 @@
+usr/bin/daq-modules-config
+#usr/include/daq.h
+#usr/include/daq_api.h
+#usr/include/daq_common.h
+#usr/include/sfbpf.h
+#usr/include/sfbpf_dlt.h
+usr/lib/daq
+#usr/lib/daq/daq_afpacket.la
+#usr/lib/daq/daq_afpacket.so
+#usr/lib/daq/daq_dump.la
+#usr/lib/daq/daq_dump.so
+#usr/lib/daq/daq_ipfw.la
+#usr/lib/daq/daq_ipfw.so
+#usr/lib/daq/daq_ipq.la
+#usr/lib/daq/daq_ipq.so
+#usr/lib/daq/daq_nfq.la
+#usr/lib/daq/daq_nfq.so
+#usr/lib/daq/daq_pcap.la
+#usr/lib/daq/daq_pcap.so
+usr/lib/libdaq.a
+usr/lib/libdaq.la
+usr/lib/libdaq.so
+usr/lib/libdaq.so.0
+usr/lib/libdaq.so.0.0.1
+usr/lib/libdaq_static.a
+usr/lib/libdaq_static.la
+usr/lib/libdaq_static_modules.a
+usr/lib/libdaq_static_modules.la
+usr/lib/libsfbpf.a
+usr/lib/libsfbpf.la
+usr/lib/libsfbpf.so
+usr/lib/libsfbpf.so.0
+usr/lib/libsfbpf.so.0.0.1

diff --git a/config/rootfiles/common/libdnet-1.11 b/config/rootfiles/common/libdnet-1.11
new file mode 100644 (file)
index 0000000..07917ed
--- /dev/null
+++ b/config/rootfiles/common/libdnet-1.11
@@ -0,0 +1,26 @@
+usr/bin/dnet-config
+#usr/include/dnet
+#usr/include/dnet.h
+#usr/include/dnet/addr.h
+#usr/include/dnet/arp.h
+#usr/include/dnet/blob.h
+#usr/include/dnet/eth.h
+#usr/include/dnet/fw.h
+#usr/include/dnet/icmp.h
+#usr/include/dnet/intf.h
+#usr/include/dnet/ip.h
+#usr/include/dnet/ip6.h
+#usr/include/dnet/os.h
+#usr/include/dnet/rand.h
+#usr/include/dnet/route.h
+#usr/include/dnet/tcp.h
+#usr/include/dnet/tun.h
+#usr/include/dnet/udp.h
+usr/lib/libdnet
+usr/lib/libdnet.1
+usr/lib/libdnet.1.0.1
+usr/lib/libdnet.a
+usr/lib/libdnet.la
+#usr/man/man3/dnet.3
+#usr/man/man8/dnet.8
+usr/sbin/dnet

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 62e6c70a1de92fe38d6c365d5503d09f92f1ccf5..a4faf8d8926c14f2e8c99ac07db7598f07f0f32b 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -264,14 +264,14 @@ if (-e "/etc/snort/snort.conf") {
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
        #$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
-       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2861_s.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902_s.tar.gz/$snortsettings{'OINKCODE'}";
        #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
        #$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
-       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2861.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902.tar.gz/$snortsettings{'OINKCODE'}";
        #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz";
 } else {
-       $url="http://rules.emergingthreats.net/open/snort-2.8.6/emerging.rules.tar.gz";
+       $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
 }
 
 if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" )

diff --git a/lfs/daq b/lfs/daq
new file mode 100644 (file)
index 0000000..106a380
--- /dev/null
+++ b/lfs/daq
@@ -0,0 +1,77 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program 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 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.4
+
+THISAPP    = daq-$(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 = eb48e99247f75951e1af1fcc6b2cbaa7
+
+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) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/libdnet b/lfs/libdnet
new file mode 100644 (file)
index 0000000..66adfb2
--- /dev/null
+++ b/lfs/libdnet
@@ -0,0 +1,77 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program 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 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.11
+
+THISAPP    = libdnet-$(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 = 04c394ed8e1e7fc455456e79e908916d
+
+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) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/snort b/lfs/snort
index c44b14e384a610795792245ed4379d9429a32064..47b8b5aadef6e2a27b5ec496c75b4297d1e7ce12 100644 (file)
--- a/lfs/snort
+++ b/lfs/snort
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.8.6.1
+VER        = 2.9.0.2
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b1119396a32e9df0d80404e4b6c49166
+$(DL_FILE)_MD5 = 5d4dabe98bccbea166bbc86e2439f22a
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 979215cfd88c90e2125f8c3de3f19cfe6192a54d..77e3ba9bc4e50f823479f39f5885a154f1a526a6 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -520,6 +520,8 @@ buildipfire() {
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
+  ipfiremake libdnet
+  ipfiremake daq
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid