[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d0abcb92d28020f2d786cba29fef69fc2fecccb7
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 d0abcb92d28020f2d786cba29fef69fc2fecccb7 (commit) via 3e30714aa7ce83cc6717baae415f8618b0000b73 (commit) via ce22214b4c1d108b0c219a5751fbd07ddcf0d08d (commit) via 745d9c0717cc9bbf92e9d2a9fa48da7cc55ca3ba (commit) via 38288aeed180e2e9de3ec66d8ec5424c17b7cfb4 (commit) via a747603dc5a2813608cb44f05bac2a06011a9a8c (commit) via 4a29f8541b6233a119ebb357b04c2e3c4dab7156 (commit) from 7b0a7b562dd0689ed001220b41442b61627b118d (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 d0abcb92d28020f2d786cba29fef69fc2fecccb7 Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Sat Feb 2 11:56:41 2013 +0100
strongswan: rootfile update.
commit 3e30714aa7ce83cc6717baae415f8618b0000b73 Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Sat Feb 2 09:57:14 2013 +0100
snort: fix sourcefire rules downloads.
commit ce22214b4c1d108b0c219a5751fbd07ddcf0d08d Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Sat Feb 2 09:51:47 2013 +0100
snort: remove wrong core65 file create by the revert.
commit 745d9c0717cc9bbf92e9d2a9fa48da7cc55ca3ba Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Sat Feb 2 09:50:49 2013 +0100
Revert "Revert "snort: Update to 2.9.4.""
This reverts commit f17d112c0480e951771bdca5f5eace7592ecd2c2.
commit 38288aeed180e2e9de3ec66d8ec5424c17b7cfb4 Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Sat Feb 2 09:47:58 2013 +0100
qos: fix replacement of fq_codel with htb at qos start.
commit a747603dc5a2813608cb44f05bac2a06011a9a8c Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Sat Feb 2 09:42:05 2013 +0100
setclock: fix empty logfile check.
commit 4a29f8541b6233a119ebb357b04c2e3c4dab7156 Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Sat Feb 2 09:40:15 2013 +0100
vpnmain: disabled address check.
this temporary fixes bug #10294 until the check was fixed to check the complete source and dest net.
-----------------------------------------------------------------------
Summary of changes: config/qos/makeqosscripts.pl | 5 +++-- config/rootfiles/common/daq | 6 +++--- config/rootfiles/common/snort | 4 +++- config/rootfiles/common/strongswan | 1 + html/cgi-bin/ids.cgi | 6 +++--- html/cgi-bin/vpnmain.cgi | 18 +++++++++--------- lfs/daq | 4 ++-- lfs/snort | 4 ++-- lfs/strongswan | 6 +++--- src/initscripts/init.d/setclock | 2 +- 10 files changed, 30 insertions(+), 26 deletions(-) mode change 100755 => 100644 html/cgi-bin/vpnmain.cgi
Difference in files: diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 590808e..202bf4d 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team info@ipfire.org # +# 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 # @@ -166,6 +166,7 @@ case "$1" in #ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'}
### ADD HTB QDISC FOR $qossettings{'RED_DEV'} + tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1 tc qdisc add dev $qossettings{'RED_DEV'} root handle 1: htb default $qossettings{'DEFCLASS_OUT'}
### MAIN RATE LIMIT @@ -423,6 +424,7 @@ print <<END # ip link set dev $qossettings{'IMQ_DEV'} mtu $qossettings{'MTU'}
### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'} + tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1 tc qdisc add dev $qossettings{'IMQ_DEV'} root handle 2: htb default $qossettings{'DEFCLASS_INC'}
### MAIN RATE LIMIT @@ -693,7 +695,6 @@ print <<END killall qosd >/dev/null 2>&1 (sleep 3 && killall -9 qosd &>/dev/null) & # DELETE QDISCS - tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1 tc qdisc add root dev $qossettings{'RED_DEV'} fq_codel >/dev/null 2>&1 tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1 tc qdisc add root dev $qossettings{'IMQ_DEV'} fq_codel >/dev/null 2>&1 diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq index b23fd19..10ec777 100644 --- a/config/rootfiles/common/daq +++ b/config/rootfiles/common/daq @@ -1,4 +1,4 @@ -usr/bin/daq-modules-config +#usr/bin/daq-modules-config #usr/include/daq.h #usr/include/daq_api.h #usr/include/daq_common.h @@ -20,8 +20,8 @@ usr/lib/daq #usr/lib/libdaq.a #usr/lib/libdaq.la #usr/lib/libdaq.so -usr/lib/libdaq.so.1 -usr/lib/libdaq.so.1.0.0 +usr/lib/libdaq.so.2 +usr/lib/libdaq.so.2.0.0 #usr/lib/libdaq_static.a #usr/lib/libdaq_static.la #usr/lib/libdaq_static_modules.a diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index 90233a1..8404486 100644 --- a/config/rootfiles/common/snort +++ b/config/rootfiles/common/snort @@ -26,9 +26,10 @@ usr/bin/u2spewfoo #usr/include/snort/dynamic_output/snort_debug.h #usr/include/snort/dynamic_output/stream_api.h #usr/include/snort/dynamic_preproc -#usr/include/snort/dynamic_preproc/attribute_table_api.h #usr/include/snort/dynamic_preproc/bitop.h #usr/include/snort/dynamic_preproc/cpuclock.h +#usr/include/snort/dynamic_preproc/file_api.h +#usr/include/snort/dynamic_preproc/file_lib.h #usr/include/snort/dynamic_preproc/idle_processing.h #usr/include/snort/dynamic_preproc/ipv6_port.h #usr/include/snort/dynamic_preproc/mempool.h @@ -178,6 +179,7 @@ usr/sbin/snort #usr/share/doc/snort/README.dnp3 #usr/share/doc/snort/README.dns #usr/share/doc/snort/README.event_queue +#usr/share/doc/snort/README.file #usr/share/doc/snort/README.filters #usr/share/doc/snort/README.flowbits #usr/share/doc/snort/README.frag3 diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 9dbf4fb..2d5d42b 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -51,6 +51,7 @@ usr/lib/ipsec/plugins/libstrongswan-openssl.so usr/lib/ipsec/plugins/libstrongswan-pem.so usr/lib/ipsec/plugins/libstrongswan-pgp.so usr/lib/ipsec/plugins/libstrongswan-pkcs1.so +usr/lib/ipsec/plugins/libstrongswan-pkcs7.so usr/lib/ipsec/plugins/libstrongswan-pkcs8.so usr/lib/ipsec/plugins/libstrongswan-pubkey.so usr/lib/ipsec/plugins/libstrongswan-random.so diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index efbc3de..5c0bcff 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2011 IPFire Team info@ipfire.org # +# 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 # @@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control #################################
if ($snortsettings{'RULES'} eq 'subscripted') { - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931_s.tar.gz/$snortsetti..."; + $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2940.tar.gz/$snortsetting..."; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931.tar.gz/$snortsetting..."; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2940.tar.gz/$snortsetting..."; } else { $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi old mode 100755 new mode 100644 index 6bae487..161df4d --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # +# 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 # @@ -1367,14 +1367,14 @@ END goto VPNCONF_ERROR; }
- - if ($cgiparams{'TYPE'} eq 'net'){ - $errormessage=&General::checksubnets($cgiparams{'NAME'},$cgiparams{'REMOTE_SUBNET'}); - if ($errormessage ne ''){ - goto VPNCONF_ERROR; - } - - } +#temporary disabled (BUG 10294) +# if ($cgiparams{'TYPE'} eq 'net'){ +# $errormessage=&General::checksubnets($cgiparams{'NAME'},$cgiparams{'REMOTE_SUBNET'}); +# if ($errormessage ne ''){ +# goto VPNCONF_ERROR; +# } +# +# } if ($cgiparams{'AUTH'} eq 'psk') { if (! length($cgiparams{'PSK'}) ) { $errormessage = $Lang::tr{'pre-shared key is too short'}; diff --git a/lfs/daq b/lfs/daq index a0f7b25..cac012b 100644 --- a/lfs/daq +++ b/lfs/daq @@ -24,7 +24,7 @@
include Config
-VER = 1.1.1 +VER = 2.0.0
THISAPP = daq-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bc204ea09165b4ecbb1bb49c7c1a2ad4 +$(DL_FILE)_MD5 = a00855a153647df76d47f1ea454f74ae
install : $(TARGET)
diff --git a/lfs/snort b/lfs/snort index 98c232d..950b319 100644 --- a/lfs/snort +++ b/lfs/snort @@ -24,7 +24,7 @@
include Config
-VER = 2.9.3.1 +VER = 2.9.4
THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b2102605a7ca023ad6a2429821061c29 +$(DL_FILE)_MD5 = e79ee6b4fbb32edc5dfed2d7dfcc6813
install : $(TARGET)
diff --git a/lfs/strongswan b/lfs/strongswan index 39459c8..8e75329 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # +# 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 = 5.0.1 +VER = 5.0.2
THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 58fdeb49f133139a58f4d8adafc69a16 +$(DL_FILE)_MD5 = 77dc16443fd141f46183d3a4f60986ef
install : $(TARGET)
diff --git a/src/initscripts/init.d/setclock b/src/initscripts/init.d/setclock index 86c1614..661e944 100644 --- a/src/initscripts/init.d/setclock +++ b/src/initscripts/init.d/setclock @@ -31,7 +31,7 @@ case ${1} in
hwclock --hctosys ${CLOCKPARAMS} &>/dev/null if [ ! ${?} == 0 ]; then - if [ ! -z /var/log/messages ]; then + if [ -s /var/log/messages ]; then boot_mesg -n "No RTC found, set time to last log accesstime ... " DATE=`stat --format "%y" /var/log/messages | cut -d" " -f1` TIME=`stat --format "%y" /var/log/messages | sed -e "s|..*||g" | cut -d" " -f2`
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org