[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3a13d0270de51c7055cff8a8c6a0f99b82e47a10 - IPFire-SCM

6 Dec 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
       via  3a13d0270de51c7055cff8a8c6a0f99b82e47a10 (commit)
       via  ac93c5d0aaecf0118b679f9af2717d02f86bb6de (commit)
       via  853b75593e34945f90f96096c5e967f6d693058f (commit)
       via  8e3c9336de3ca4a9feafa871ba946cf6ce78052b (commit)
       via  edcb2fabbd251b2fb7e17743e5469ac9877d2c83 (commit)
      from  27f2be1853f7a2761b7495321c2bc3cb109a9b6a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3a13d0270de51c7055cff8a8c6a0f99b82e47a10
Merge: ac93c5d 27f2be1
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Mon Dec 6 18:47:29 2010 +0100
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
commit ac93c5d0aaecf0118b679f9af2717d02f86bb6de
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Mon Dec 6 18:46:37 2010 +0100
Updated snort to stable 2.9.0.2, need to check configs.
commit 853b75593e34945f90f96096c5e967f6d693058f
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Mon Dec 6 18:46:09 2010 +0100
Added daq and libdnet to build.
commit 8e3c9336de3ca4a9feafa871ba946cf6ce78052b
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Mon Dec 6 18:45:39 2010 +0100
Added libdnet needed by snort 2.9.
commit edcb2fabbd251b2fb7e17743e5469ac9877d2c83
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Mon Dec 6 18:45:01 2010 +0100
Added daq needed by snort 2.9.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/daq-0.4      |   33 +++++++++++++++++++++++++++++++++
 config/rootfiles/common/libdnet-1.11 |   26 ++++++++++++++++++++++++++
 html/cgi-bin/ids.cgi                 |    6 +++---
 lfs/{ethtool => daq}                 |    8 ++++----
 lfs/{ethtool => libdnet}             |    8 ++++----
 lfs/snort                            |    6 +++---
 make.sh                              |    2 ++
 7 files changed, 75 insertions(+), 14 deletions(-)
 create mode 100644 config/rootfiles/common/daq-0.4
 create mode 100644 config/rootfiles/common/libdnet-1.11
 copy lfs/{ethtool => daq} (95%)
 copy lfs/{ethtool => libdnet} (95%)
Difference in files:

diff --git a/config/rootfiles/common/daq-0.4 b/config/rootfiles/common/daq-0.4
new file mode 100644
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
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 62e6c70..a4faf8d 100644
--- 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=$sn...";
-	$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2861_s.tar.gz/$snortsetti...";
+	$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902_s.tar.gz/$snortsetti...";
    #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings%7B%27OINKCODE%27%...";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
    #$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snor...";
-	$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2861.tar.gz/$snortsetting...";
+	$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902.tar.gz/$snortsetting...";
    #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings%7B%27OINKCODE%27%...";
 } 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
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
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 c44b14e..47b8b5a 100644
--- 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 979215c..77e3ba9 100755
--- 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
hooks/post-receive
--
IPFire 2.x development tree

    