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 f9f13c135b2c8d86a1861aec8f80985483843f52 (commit) via 7c8301fb8a501d03e47923bf7eb321330b663736 (commit) via ff1ed674e01b7db0acd4a565dc74cca01b825f6b (commit) from 1d0fcb09edd3929dda72d23afd3a8d16f7713794 (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 f9f13c135b2c8d86a1861aec8f80985483843f52 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 11 13:16:34 2012 +0100
etherwake: Also send broadcast packet.
Fixes #10191.
commit 7c8301fb8a501d03e47923bf7eb321330b663736 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 11 12:32:34 2012 +0100
snort: Update to 2.9.4.
Comes with a bunch of bugfixes. Nothing too exciting for us.
commit ff1ed674e01b7db0acd4a565dc74cca01b825f6b Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 11 12:16:54 2012 +0100
routing.cgi: Allow adding static routes with subnet masks.
It was not possible to enter networks in the subnet mask notation, which is fixed by this patch.
Fixes #10219.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/daq | 6 +++--- config/rootfiles/common/snort | 4 +++- config/rootfiles/core/65/filelists/files | 2 ++ config/rootfiles/core/{64 => 65}/filelists/snort | 0 html/cgi-bin/ids.cgi | 4 ++-- html/cgi-bin/routing.cgi | 4 +++- lfs/daq | 4 ++-- lfs/snort | 4 ++-- src/misc-progs/launch-ether-wake.c | 4 ++++ 9 files changed, 21 insertions(+), 11 deletions(-) copy config/rootfiles/core/{64 => 65}/filelists/snort (100%)
Difference in files: 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/core/65/filelists/files b/config/rootfiles/core/65/filelists/files index 67bd0b3..13788f1 100644 --- a/config/rootfiles/core/65/filelists/files +++ b/config/rootfiles/core/65/filelists/files @@ -3,7 +3,9 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/local/bin/launch-ether-wake usr/sbin/ovpn-ccd-convert var/ipfire/general-functions.pl var/ipfire/langs diff --git a/config/rootfiles/core/65/filelists/snort b/config/rootfiles/core/65/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/65/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index efbc3de..c5fb4c6 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -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/reg-rules/snortrules-snapshot-294_s.tar.gz/$snortsettin..."; } 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-294.tar.gz/$snortsettings..."; } else { $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; } diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index 86e0429..afcd388 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -118,6 +118,8 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { }
if ($settings{'ACTION'} eq $Lang::tr{'add'}) { + # Convert subnet masks to CIDR notation. + $settings{'IP'} = &General::iporsubtocidr($settings{'IP'});
# Validate inputs if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){ @@ -443,4 +445,4 @@ sub SortDataFile # sub BuildConfiguration { system '/usr/local/bin/rebuildroutes'; -} \ No newline at end of file +} 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/src/misc-progs/launch-ether-wake.c b/src/misc-progs/launch-ether-wake.c index f487041..cac4d3c 100644 --- a/src/misc-progs/launch-ether-wake.c +++ b/src/misc-progs/launch-ether-wake.c @@ -29,5 +29,9 @@ int main(int argc, char *argv[]) snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s %s", argv[2], argv[1]); safe_system(command);
+ /* Send magic packet with broadcast flag set. */ + snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s -b %s", argv[2], argv[1]); + safe_system(command); + return(0); }
hooks/post-receive -- IPFire 2.x development tree