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, next has been updated via f2665db1adb48ecbdfc59619c4693525be21974a (commit) via 7bcfd0dd83873ac476cb49caceb753abb64dfc7f (commit) via ba47633494e56d63a23ee54377007772aa59cbfb (commit) from 919a50208bc63214cda9c0cab7845c8f9391b8c2 (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 f2665db1adb48ecbdfc59619c4693525be21974a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Aug 10 20:10:00 2013 +0200

snort: update to 2.9.5.3.

commit 7bcfd0dd83873ac476cb49caceb753abb64dfc7f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Aug 10 20:09:03 2013 +0200

daq: update to 2.0.1.

commit ba47633494e56d63a23ee54377007772aa59cbfb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Aug 10 18:48:16 2013 +0200

snort: enable non-ether-decoder for ppp support.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/daq | 2 +- config/rootfiles/core/72/exclude | 1 + config/rootfiles/{oldcore/44 => core/72}/filelists/daq | 0 config/rootfiles/core/72/filelists/files | 1 + config/rootfiles/core/{71 => 72}/filelists/snort | 0 config/rootfiles/core/72/update.sh | 3 ++- html/cgi-bin/ids.cgi | 2 +- lfs/daq | 6 +++--- lfs/snort | 5 +++-- 9 files changed, 12 insertions(+), 8 deletions(-) copy config/rootfiles/{oldcore/44 => core/72}/filelists/daq (100%) copy config/rootfiles/core/{71 => 72}/filelists/snort (100%)

Difference in files: diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq index 10ec777..4467545 100644 --- a/config/rootfiles/common/daq +++ b/config/rootfiles/common/daq @@ -21,7 +21,7 @@ usr/lib/daq #usr/lib/libdaq.la #usr/lib/libdaq.so usr/lib/libdaq.so.2 -usr/lib/libdaq.so.2.0.0 +usr/lib/libdaq.so.2.0.1 #usr/lib/libdaq_static.a #usr/lib/libdaq_static.la #usr/lib/libdaq_static_modules.a diff --git a/config/rootfiles/core/72/exclude b/config/rootfiles/core/72/exclude index 321a931..a524207 100644 --- a/config/rootfiles/core/72/exclude +++ b/config/rootfiles/core/72/exclude @@ -15,3 +15,4 @@ etc/ssh/ssh_config etc/ssh/sshd_config etc/ssl/openssl.cnf var/state/dhcp/dhcpd.leases +etc/snort/snort.conf diff --git a/config/rootfiles/core/72/filelists/daq b/config/rootfiles/core/72/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/72/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/72/filelists/files b/config/rootfiles/core/72/filelists/files index baa5d6c..47eb358 100644 --- a/config/rootfiles/core/72/filelists/files +++ b/config/rootfiles/core/72/filelists/files @@ -2,6 +2,7 @@ etc/system-release etc/issue etc/rc.d/init.d/firewall srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/local/bin/openvpnctrl usr/local/bin/setddns.pl diff --git a/config/rootfiles/core/72/filelists/snort b/config/rootfiles/core/72/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/72/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/72/update.sh b/config/rootfiles/core/72/update.sh index 4a5b943..6ed39c5 100644 --- a/config/rootfiles/core/72/update.sh +++ b/config/rootfiles/core/72/update.sh @@ -35,7 +35,7 @@ done # #Stop services ipsec stop - +/etc/init.d/snort stop

# #Extract files @@ -44,6 +44,7 @@ extract_files

# #Start services +/etc/init.d/snort start ipsec start

# diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 62bb03a..4bd0128 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -263,7 +263,7 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control #################################

if ($snortsettings{'RULES'} eq 'subscripted') { - $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2950.tar.gz/$snortsetting..."; + $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2953.tar.gz/$snortsetting..."; } elsif ($snortsettings{'RULES'} eq 'registered') { $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2950.tar.gz/$snortsetting..."; } elsif ($snortsettings{'RULES'} eq 'community') { diff --git a/lfs/daq b/lfs/daq index cac012b..e6fd8fb 100644 --- a/lfs/daq +++ b/lfs/daq @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 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.0.0 +VER = 2.0.1

THISAPP = daq-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = a00855a153647df76d47f1ea454f74ae +$(DL_FILE)_MD5 = 044aa3663d44580d005293eeb8ccf175

install : $(TARGET)

diff --git a/lfs/snort b/lfs/snort index daec621..2d5d04a 100644 --- a/lfs/snort +++ b/lfs/snort @@ -24,7 +24,7 @@

include Config

-VER = 2.9.5 +VER = 2.9.5.3

THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = f5fc0e176afca5989d47509478758fc7 +$(DL_FILE)_MD5 = f99465c0734a6173bfca899dcb72266b

install : $(TARGET)

@@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-linux-smp-stats --enable-smb-alerts \ --enable-gre --enable-mpls --enable-targetbased \ --enable-decoder-preprocessor-rules --enable-ppm \ + --enable-non-ether-decoders \ --enable-perfprofiling --enable-zlib --enable-active-response \ --enable-normalizer --enable-reload --enable-react --enable-flexresp3 cd $(DIR_APP) && make

hooks/post-receive -- IPFire 2.x development tree