IPFire-SCM February 2013

ipfire-scm@lists.ipfire.org

1 participants
68 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ea31a62aadf428e37a686568e5b95caf0fbc07b6
by git＠ipfire.org 05 Feb '13

05 Feb '13

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 ea31a62aadf428e37a686568e5b95caf0fbc07b6 (commit) via 20d78d9e76d15992ebd9d4f0db783b7a83fb8f23 (commit) via d50fe89686deaa8527c81a7292e5eba0efa32a82 (commit) from d0abcb92d28020f2d786cba29fef69fc2fecccb7 (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 ea31a62aadf428e37a686568e5b95caf0fbc07b6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 5 02:07:42 2013 +0100 graphs: add mmcblk to media graphs. commit 20d78d9e76d15992ebd9d4f0db783b7a83fb8f23 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 5 01:48:27 2013 +0100 hostapd: update to 2.0. commit d50fe89686deaa8527c81a7292e5eba0efa32a82 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 5 01:47:58 2013 +0100 wpa_supplicant: update to 2.0. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/66/filelists/files | 2 ++ html/cgi-bin/media.cgi | 6 +++--- lfs/hostapd | 8 ++++---- lfs/wpa_supplicant | 6 +++--- src/scripts/makegraphs | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files index 7740615..5e38af7 100644 --- a/config/rootfiles/core/66/filelists/files +++ b/config/rootfiles/core/66/filelists/files @@ -27,6 +27,7 @@ opt/pakfire/lib/functions.sh srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat +srv/web/ipfire/cgi-bin/media.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/qos.cgi @@ -34,6 +35,7 @@ srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/updatexlrator.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/bin/watch +usr/local/bin/makegraphs usr/local/bin/readhash usr/local/bin/scanhd usr/sbin/ovpn-ccd-convert diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index f67c178..52d9337 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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 # @@ -45,9 +45,9 @@ my @querry = split(/\?/,$ENV{'QUERY_STRING'}); $querry[0] = '' unless defined $querry[0]; $querry[1] = 'hour' unless defined $querry[1]; -my @devices = `ls -1 /sys/block | grep -E '^sd|^xvd|^vd|^md' | sort | uniq`; +my @devices = `ls -1 /sys/block | grep -E '^sd|^mmcblk|^xvd|^vd|^md' | sort | uniq`; -if ( $querry[0] =~ "sd?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){ +if ( $querry[0] =~ "sd?" || $querry[0] =~ "mmcblk?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){ print "Content-type: image/png\n\n"; binmode(STDOUT); diff --git a/lfs/hostapd b/lfs/hostapd index f29712a..2ce9c21 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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 = 1.1 +VER = 2.0 THISAPP = hostapd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 23 +PAK_VER = 24 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e3ace8306d066ab2d24b4c9f668e2dd7 +$(DL_FILE)_MD5 = ba22e639bc57aa4035d2ea8ffa9bbbee install : $(TARGET) diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant index e8a67e0..1172e60 100644 --- a/lfs/wpa_supplicant +++ b/lfs/wpa_supplicant @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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 = 1.1 +VER = 2.0 THISAPP = wpa_supplicant-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b29b9af02d7e092db8c5c8508de0e45c +$(DL_FILE)_MD5 = 3be2ebfdcced52e00eda0afe2889839d install : $(TARGET) diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index 7cdd2f9..0b56b93 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -3,7 +3,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2008-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2008-2013 IPFire Team <info(a)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 # @@ -102,7 +102,7 @@ sub updatehdddata{ ## Update vnstat system ('/usr/bin/vnstat -u'); -my @disks = `ls -1 /sys/block | grep -E '^sd|^xvd|^vd|^md' | sort | uniq`; +my @disks = `ls -1 /sys/block | grep -E '^sd|^mmcblk|^xvd|^vd|^md' | sort | uniq`; system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus"); foreach (@disks){ my $disk = $_; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 02a43f996a257b62d81d344f4fb3f07bd61bd854
by git＠ipfire.org 03 Feb '13

03 Feb '13

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6ef17b234987286eec1f077f8fecf78a5a926a19
by git＠ipfire.org 03 Feb '13

03 Feb '13

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 3.x development tree". The branch, master has been updated via 6ef17b234987286eec1f077f8fecf78a5a926a19 (commit) from 79357a423c8d33e70c0374ff45230bb5ee8e503d (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 6ef17b234987286eec1f077f8fecf78a5a926a19 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 3 21:52:14 2013 +0100 pakfire: Import latest patches from upstream. ----------------------------------------------------------------------- Summary of changes: pakfire/pakfire.nm | 2 +- ...A-new-try-to-get-the-parallelism-straight.patch | 34 +++++++++++++++++ ...ove-pids-from-list-of-running-jobs-when-j.patch | 43 ++++++++++++++++++++++ ...A-new-try-to-get-the-parallelism-straight.patch | 35 ++++++++++++++++++ ...ld-parallelism-New-way-to-figure-that-out.patch | 40 ++++++++++++++++++++ 5 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 pakfire/patches/0001-A-new-try-to-get-the-parallelism-straight.patch create mode 100644 pakfire/patches/0002-builder-Remove-pids-from-list-of-running-jobs-when-j.patch create mode 100644 pakfire/patches/0003-Revert-A-new-try-to-get-the-parallelism-straight.patch create mode 100644 pakfire/patches/0004-build-parallelism-New-way-to-figure-that-out.patch Difference in files: diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index 5b9f84d..9eebd23 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -5,7 +5,7 @@ name = pakfire version = 0.9.24 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Packaging diff --git a/pakfire/patches/0001-A-new-try-to-get-the-parallelism-straight.patch b/pakfire/patches/0001-A-new-try-to-get-the-parallelism-straight.patch new file mode 100644 index 0000000..cae4b75 --- /dev/null +++ b/pakfire/patches/0001-A-new-try-to-get-the-parallelism-straight.patch @@ -0,0 +1,34 @@ +From 369ac3b365091ba1a26fb266a94d97adb3719cbc Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Thu, 24 Jan 2013 01:51:29 +0100 +Subject: [PATCH 1/4] A new try to get the parallelism straight. + +Getting back to CPU cores * 2. +--- + python/pakfire/system.py | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/python/pakfire/system.py b/python/pakfire/system.py +index a9154de..6f67d31 100644 +--- a/python/pakfire/system.py ++++ b/python/pakfire/system.py +@@ -156,15 +156,10 @@ class System(object): + Calculates how many processes should be run + simulatneously when compiling. + """ +- # Check how many processes would fit into the +- # memory when each process takes up to 500MB. +- multiplicator = self.memory / (500 * 1024 * 1024) +- multiplicator = round(multiplicator) +- + # Count the number of online CPU cores. + cpucount = os.sysconf("SC_NPROCESSORS_CONF") + +- return min(multiplicator, cpucount * 2) ++ return cpucount * 2 + + + # Create an instance of this class to only keep it once in memory. +-- +1.7.11.7 + diff --git a/pakfire/patches/0002-builder-Remove-pids-from-list-of-running-jobs-when-j.patch b/pakfire/patches/0002-builder-Remove-pids-from-list-of-running-jobs-when-j.patch new file mode 100644 index 0000000..53ca008 --- /dev/null +++ b/pakfire/patches/0002-builder-Remove-pids-from-list-of-running-jobs-when-j.patch @@ -0,0 +1,43 @@ +From c3319c905d03176308e01175f344cf33bd926113 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Sun, 3 Feb 2013 21:36:00 +0100 +Subject: [PATCH 2/4] builder: Remove pids from list of running jobs when job + has finished. + +--- + python/pakfire/client/builder.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/python/pakfire/client/builder.py b/python/pakfire/client/builder.py +index 9798cc4..2d6280c 100644 +--- a/python/pakfire/client/builder.py ++++ b/python/pakfire/client/builder.py +@@ -251,6 +251,8 @@ class PakfireDaemon(object): + + # Finally, remove the process from the process list. + self.processes.remove(process) ++ if self.pid2jobid.has_key(process.id): ++ del self.pid2jobid[process.id] + + return ret + +@@ -274,7 +276,6 @@ class PakfireDaemon(object): + for process in self.processes[:]: + job_id = self.pid2jobid.get(process.pid, None) + if job_id and job_id in aborted_jobs: +- + # Kill the process. + log.info("Killing process %s which was aborted by the user." \ + % process.pid) +@@ -283,6 +284,8 @@ class PakfireDaemon(object): + # Remove the process from the process list to avoid + # that is will be cleaned up in the normal way. + self.processes.remove(process) ++ if self.pid2jobid.has_key(process.id): ++ del self.pid2jobid[process.id] + + return True + +-- +1.7.11.7 + diff --git a/pakfire/patches/0003-Revert-A-new-try-to-get-the-parallelism-straight.patch b/pakfire/patches/0003-Revert-A-new-try-to-get-the-parallelism-straight.patch new file mode 100644 index 0000000..7db604a --- /dev/null +++ b/pakfire/patches/0003-Revert-A-new-try-to-get-the-parallelism-straight.patch @@ -0,0 +1,35 @@ +From 879abfa1d86f820326bd8edab5e7d5c8991cc9f0 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Sun, 3 Feb 2013 21:36:30 +0100 +Subject: [PATCH 3/4] Revert "A new try to get the parallelism straight." + +This reverts commit 369ac3b365091ba1a26fb266a94d97adb3719cbc +and obviously this is not a solution either. +--- + python/pakfire/system.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/python/pakfire/system.py b/python/pakfire/system.py +index 6f67d31..a9154de 100644 +--- a/python/pakfire/system.py ++++ b/python/pakfire/system.py +@@ -156,10 +156,15 @@ class System(object): + Calculates how many processes should be run + simulatneously when compiling. + """ ++ # Check how many processes would fit into the ++ # memory when each process takes up to 500MB. ++ multiplicator = self.memory / (500 * 1024 * 1024) ++ multiplicator = round(multiplicator) ++ + # Count the number of online CPU cores. + cpucount = os.sysconf("SC_NPROCESSORS_CONF") + +- return cpucount * 2 ++ return min(multiplicator, cpucount * 2) + + + # Create an instance of this class to only keep it once in memory. +-- +1.7.11.7 + diff --git a/pakfire/patches/0004-build-parallelism-New-way-to-figure-that-out.patch b/pakfire/patches/0004-build-parallelism-New-way-to-figure-that-out.patch new file mode 100644 index 0000000..f4621fc --- /dev/null +++ b/pakfire/patches/0004-build-parallelism-New-way-to-figure-that-out.patch @@ -0,0 +1,40 @@ +From f7a632ab069e3439f312023fc599dc659c197568 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Sun, 3 Feb 2013 21:40:16 +0100 +Subject: [PATCH 4/4] build parallelism: New way to figure that out. + +The system will now use either the old formula, +CPU cores * 2 + 1 or the amount of memory in megabytes devided +by 128 (i.e. each compiler process can have 128M RAM) which ever +is less. +--- + python/pakfire/system.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/python/pakfire/system.py b/python/pakfire/system.py +index a9154de..6d54d5f 100644 +--- a/python/pakfire/system.py ++++ b/python/pakfire/system.py +@@ -157,14 +157,15 @@ class System(object): + simulatneously when compiling. + """ + # Check how many processes would fit into the +- # memory when each process takes up to 500MB. +- multiplicator = self.memory / (500 * 1024 * 1024) ++ # memory when each process takes up to 128MB. ++ multiplicator = self.memory / (128 * 1024 * 1024) + multiplicator = round(multiplicator) + + # Count the number of online CPU cores. +- cpucount = os.sysconf("SC_NPROCESSORS_CONF") ++ cpucount = os.sysconf("SC_NPROCESSORS_CONF") * 2 ++ cpucount += 1 + +- return min(multiplicator, cpucount * 2) ++ return min(multiplicator, cpucount) + + + # Create an instance of this class to only keep it once in memory. +-- +1.7.11.7 + hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d0abcb92d28020f2d786cba29fef69fc2fecccb7
by git＠ipfire.org 02 Feb '13

02 Feb '13

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(a)ipfire.org> Date: Sat Feb 2 11:56:41 2013 +0100 strongswan: rootfile update. commit 3e30714aa7ce83cc6717baae415f8618b0000b73 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Sat Feb 2 09:57:14 2013 +0100 snort: fix sourcefire rules downloads. commit ce22214b4c1d108b0c219a5751fbd07ddcf0d08d Author: Arne Fitzenreiter <Arne_F(a)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(a)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(a)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(a)ipfire.org> Date: Sat Feb 2 09:42:05 2013 +0100 setclock: fix empty logfile check. commit 4a29f8541b6233a119ebb357b04c2e3c4dab7156 Author: Arne Fitzenreiter <Arne_F(a)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(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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/$snortsett…'OINKCODE'}"; + $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2940.tar.gz/$snortsettin…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931.tar.gz/$snortsettin…'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2940.tar.gz/$snortsettin…'OINKCODE'}"; } 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(a)ipfire.org # +# Copyright (C) 2007-2013 IPFire Team info(a)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(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.13-rc1, created. d0abcb92d28020f2d786cba29fef69fc2fecccb7
by git＠ipfire.org 02 Feb '13

02 Feb '13

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 tag, v2.13-rc1 has been created at d0abcb92d28020f2d786cba29fef69fc2fecccb7 (commit) - Log ----------------------------------------------------------------- commit d0abcb92d28020f2d786cba29fef69fc2fecccb7 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Sat Feb 2 11:56:41 2013 +0100 strongswan: rootfile update. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, rc1, updated. d0abcb92d28020f2d786cba29fef69fc2fecccb7
by git＠ipfire.org 02 Feb '13

02 Feb '13

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.13-rc1, created. 3e30714aa7ce83cc6717baae415f8618b0000b73
by git＠ipfire.org 02 Feb '13

02 Feb '13

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 tag, v2.13-rc1 has been created at 3e30714aa7ce83cc6717baae415f8618b0000b73 (commit) - Log ----------------------------------------------------------------- commit 3e30714aa7ce83cc6717baae415f8618b0000b73 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Sat Feb 2 09:57:14 2013 +0100 snort: fix sourcefire rules downloads. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, rc1, updated. 3e30714aa7ce83cc6717baae415f8618b0000b73
by git＠ipfire.org 02 Feb '13

02 Feb '13

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, rc1 has been updated 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 3e30714aa7ce83cc6717baae415f8618b0000b73 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Sat Feb 2 09:57:14 2013 +0100 snort: fix sourcefire rules downloads. commit ce22214b4c1d108b0c219a5751fbd07ddcf0d08d Author: Arne Fitzenreiter <Arne_F(a)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(a)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(a)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(a)ipfire.org> Date: Sat Feb 2 09:42:05 2013 +0100 setclock: fix empty logfile check. commit 4a29f8541b6233a119ebb357b04c2e3c4dab7156 Author: Arne Fitzenreiter <Arne_F(a)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 +++- 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 +- 9 files changed, 29 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(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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/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(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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/$snortsett…'OINKCODE'}"; + $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2940.tar.gz/$snortsettin…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931.tar.gz/$snortsettin…'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2940.tar.gz/$snortsettin…'OINKCODE'}"; } 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(a)ipfire.org # +# Copyright (C) 2007-2013 IPFire Team info(a)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(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)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

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2013