IPFire-SCM January 2011

ipfire-scm@lists.ipfire.org

1 participants
93 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d949f3369aa6ef63ea92c07ecfc657d11614624f
by git＠ipfire.org 25 Jan '11

25 Jan '11

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 d949f3369aa6ef63ea92c07ecfc657d11614624f (commit) from caa3ddcc83196adabdcf04a4728baeb1ccbcb18d (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 d949f3369aa6ef63ea92c07ecfc657d11614624f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 25 11:18:04 2011 +0100 memtest86+: Update to 4.20. Closes #131. ----------------------------------------------------------------------- Summary of changes: pkgs/core/memtest86+/memtest86+.nm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/core/memtest86+/memtest86+.nm b/pkgs/core/memtest86+/memtest86+.nm index 1f9eb0d..a8e2958 100644 --- a/pkgs/core/memtest86+/memtest86+.nm +++ b/pkgs/core/memtest86+/memtest86+.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = memtest86+ -PKG_VER = 4.10 +PKG_VER = 4.20 PKG_REL = 0 PKG_MAINTAINER = hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. caa3ddcc83196adabdcf04a4728baeb1ccbcb18d
by git＠ipfire.org 24 Jan '11

24 Jan '11

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 caa3ddcc83196adabdcf04a4728baeb1ccbcb18d (commit) from 00694ef29011229f30d1bd5acc33b61e3594222c (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 caa3ddcc83196adabdcf04a4728baeb1ccbcb18d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 24 14:00:28 2011 +0100 quagga: Update to 0.99.17. ----------------------------------------------------------------------- Summary of changes: pkgs/core/quagga/quagga.nm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/core/quagga/quagga.nm b/pkgs/core/quagga/quagga.nm index ef4c362..664af87 100644 --- a/pkgs/core/quagga/quagga.nm +++ b/pkgs/core/quagga/quagga.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = quagga -PKG_VER = 0.99.11 +PKG_VER = 0.99.17 PKG_REL = 0 PKG_MAINTAINER = hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 00694ef29011229f30d1bd5acc33b61e3594222c
by git＠ipfire.org 24 Jan '11

24 Jan '11

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 00694ef29011229f30d1bd5acc33b61e3594222c (commit) via fb4aa220d613a529be5cc864618780e4b2f308d2 (commit) from 3cbe338bbc89751fddf587c9057ac47708bc2627 (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 00694ef29011229f30d1bd5acc33b61e3594222c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 24 13:18:29 2011 +0100 gnupg2: Update to 2.0.17. Closes #127. commit fb4aa220d613a529be5cc864618780e4b2f308d2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 24 13:00:47 2011 +0100 bind: Update to 9.7.2-P3. Closes #128. ----------------------------------------------------------------------- Summary of changes: pkgs/core/bind/bind.nm | 2 +- pkgs/core/gnupg2/gnupg2.nm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/pkgs/core/bind/bind.nm b/pkgs/core/bind/bind.nm index 9041e9e..0040f28 100644 --- a/pkgs/core/bind/bind.nm +++ b/pkgs/core/bind/bind.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = bind -PKG_VER = 9.4.1-P1 +PKG_VER = 9.7.2-P3 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/gnupg2/gnupg2.nm b/pkgs/core/gnupg2/gnupg2.nm index 8ccb5e2..94a7762 100644 --- a/pkgs/core/gnupg2/gnupg2.nm +++ b/pkgs/core/gnupg2/gnupg2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = gnupg -PKG_VER = 2.0.16 +PKG_VER = 2.0.17 PKG_REL = 0 PKG_MAINTAINER = @@ -35,7 +35,7 @@ PKG_LICENSE = GPLv3+ PKG_SUMMARY = Utility for secure communication and data storage. PKG_BUILD_DEPS+= libassuan-devel libcurl-devel libgcrypt-devel libksba-devel \ - pinentry pth-devel + pinentry pth-devel zlib-devel define PKG_DESCRIPTION The GnuPG 2 package is GNU's tool for secure communication and data \ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3cbe338bbc89751fddf587c9057ac47708bc2627
by git＠ipfire.org 24 Jan '11

24 Jan '11

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 3cbe338bbc89751fddf587c9057ac47708bc2627 (commit) via 5edfce169c79a24384cfe799d4b2c5789c242351 (commit) from e8bdc8544c541646f128d46fb6044ba392916a34 (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 3cbe338bbc89751fddf587c9057ac47708bc2627 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 24 12:13:00 2011 +0100 file: Update to 5.05. commit 5edfce169c79a24384cfe799d4b2c5789c242351 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 24 12:04:06 2011 +0100 iproute2: Update to 2.6.37. ----------------------------------------------------------------------- Summary of changes: pkgs/core/file/file.nm | 2 +- pkgs/core/iproute2/iproute2.nm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/pkgs/core/file/file.nm b/pkgs/core/file/file.nm index 159eb21..d434e8e 100644 --- a/pkgs/core/file/file.nm +++ b/pkgs/core/file/file.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = file -PKG_VER = 5.04 +PKG_VER = 5.05 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/iproute2/iproute2.nm b/pkgs/core/iproute2/iproute2.nm index 9419ba5..cc167e1 100644 --- a/pkgs/core/iproute2/iproute2.nm +++ b/pkgs/core/iproute2/iproute2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = iproute2 -PKG_VER = 2.6.34 +PKG_VER = 2.6.37 PKG_REL = 0 PKG_MAINTAINER = hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. e7d2f07094a3cd74293a10123184489b1c916c57
by git＠ipfire.org 23 Jan '11

23 Jan '11

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 e7d2f07094a3cd74293a10123184489b1c916c57 (commit) from aaf12a485ec085c805f153b574059dc0600736c5 (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 e7d2f07094a3cd74293a10123184489b1c916c57 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Jan 23 09:59:37 2011 +0100 There are more than 20 and 27 parsings for local interface in the firwall log. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/logs.cgi/firewalllog.dat | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 2c4fb14..c2888c3 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -333,7 +333,7 @@ foreach $_ (@log) my $comment = $3; my $packet = $4; - $packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 eq "27" || $1 eq "20"){ $iface="";} + $packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 $1 =~ /2./ ){ $iface="";} $packet =~ /SRC=([\d\.]+)/; my $srcaddr=$1; $packet =~ /DST=([\d\.]+)/; my $dstaddr=$1; $packet =~ /MAC=([\w+\:]+)/; my $macaddr=$1; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. aaf12a485ec085c805f153b574059dc0600736c5
by git＠ipfire.org 22 Jan '11

22 Jan '11

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 aaf12a485ec085c805f153b574059dc0600736c5 (commit) from bd3c8b59949509e6bc8a77104deb15854ad187bb (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 aaf12a485ec085c805f153b574059dc0600736c5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 23 00:31:04 2011 +0100 core45: start vpn-watch only if ipsec is enabled. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/45/update.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 69b61e3..3229f74 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -54,8 +54,10 @@ echo Starting Proxy /etc/init.d/squid start 2>/dev/null echo Rewriting Outgoing FW Rules /var/ipfire/outgoing/bin/outgoingfw.pl -echo Starting vpn-watch -/usr/local/bin/vpn-watch & +if [ `grep "ENABLED=on" /var/ipfire/vpn/setting` ]; then + echo Starting vpn-watch + /usr/local/bin/vpn-watch & +fi # #Update Language cache hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. bd3c8b59949509e6bc8a77104deb15854ad187bb
by git＠ipfire.org 22 Jan '11

22 Jan '11

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 bd3c8b59949509e6bc8a77104deb15854ad187bb (commit) from fc7d153f062440dd637bf4722afb2848ea7ae35c (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 bd3c8b59949509e6bc8a77104deb15854ad187bb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 23 00:26:21 2011 +0100 core45: remove some addon cronjobs if the addons are not installed. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/45/update.sh | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 582bd82..69b61e3 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -26,7 +26,7 @@ # # Remove core updates from pakfire cache to save space... -rm -f /var/cache/pakfire core-upgrade-*.ipfire +rm -f /var/cache/pakfire/core-upgrade-*.ipfire # #Stop services echo Stopping Proxy @@ -38,6 +38,12 @@ killall vpn-watch #Extract files extract_files +# +# Remove some addon cronjobs if the addons are not installed +[ ! -e /opt/pakfire/db/installed/meta-cacti ] && rm -f /etc/fcron.cyclic/cacti.cron +[ ! -e /opt/pakfire/db/installed/meta-gnump3d ] && rm -f /etc/fcron.daily/gnump3d-index +[ ! -e /opt/pakfire/db/installed/meta-asterisk ] && rm -f /etc/fcron.minutely/wakeup.sh + # Remove disable cron mails... sed "s|MAILTO=root|MAILTO=|g" < /var/spool/cron/root.orig > /var/tmp/root.tmp fcrontab /var/tmp/root.tmp hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. fc7d153f062440dd637bf4722afb2848ea7ae35c
by git＠ipfire.org 22 Jan '11

22 Jan '11

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 fc7d153f062440dd637bf4722afb2848ea7ae35c (commit) via 0a478d33513c0c6edae9492f10b96820abe573d9 (commit) via dbd3392c8a15046ab0a5383bea5a63b04e9e9fcb (commit) from 841e825e7ba07fd704c2ccd1601a2a2237576884 (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 fc7d153f062440dd637bf4722afb2848ea7ae35c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 22 23:48:47 2011 +0100 Remove core-updates from pakfire cache. commit 0a478d33513c0c6edae9492f10b96820abe573d9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 22 23:48:21 2011 +0100 Fix outgoingfw.pl is not executable. commit dbd3392c8a15046ab0a5383bea5a63b04e9e9fcb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 22 23:47:41 2011 +0100 Remove some addon cronjobs from iso. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/fcron | 18 ++++++++++++------ config/rootfiles/core/45/update.sh | 3 +++ lfs/configroot | 3 +++ lfs/fcron | 9 +++++++++ 4 files changed, 27 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/common/fcron b/config/rootfiles/common/fcron index cf34afc..b3a1c49 100644 --- a/config/rootfiles/common/fcron +++ b/config/rootfiles/common/fcron @@ -1,12 +1,18 @@ etc/fcron.allow etc/fcron.conf -etc/fcron.cyclic -etc/fcron.daily +#etc/fcron.cyclic +etc/fcron.cyclic/info.txt +#etc/fcron.daily +etc/fcron.daily/info.txt etc/fcron.deny -etc/fcron.hourly -etc/fcron.minutely -etc/fcron.monthly -etc/fcron.weekly +#etc/fcron.hourly +etc/fcron.hourly/info.txt +#etc/fcron.minutely +etc/fcron.minutely/info.txt +#etc/fcron.monthly +etc/fcron.monthly/info.txt +#etc/fcron.weekly +etc/fcron.weekly/info.txt usr/bin/fcronsighup usr/bin/fcrontab usr/sbin/fcron diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 80201c5..582bd82 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -25,6 +25,9 @@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # +# Remove core updates from pakfire cache to save space... +rm -f /var/cache/pakfire core-upgrade-*.ipfire +# #Stop services echo Stopping Proxy /etc/init.d/squid stop 2>/dev/null diff --git a/lfs/configroot b/lfs/configroot index ff1a206..43c2d21 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -139,4 +139,7 @@ $(TARGET) : done chown root:nobody $(CONFIG_ROOT)/dhcpc + # Set outgoingfw.pl executable + chmod 755 $(CONFIG_ROOT)/outgoing/bin/outgoingfw.pl + @$(POSTBUILD) diff --git a/lfs/fcron b/lfs/fcron index 5cf9cc5..38343d4 100644 --- a/lfs/fcron +++ b/lfs/fcron @@ -93,6 +93,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod u-s /usr/bin/fcrontab /usr/bin/fcronsighup mkdir -p /etc/fcron.minutely /etc/fcron.cyclic /etc/fcron.hourly \ /etc/fcron.daily /etc/fcron.weekly /etc/fcron.monthly + + #Create Placeholder files + echo "Place scripts run minutely here ..." > /etc/fcron.minutely/info.txt + echo "Place scripts run cyclic here ..." > /etc/fcron.cyclic/info.txt + echo "Place scripts run hourly here ..." > /etc/fcron.hourly/info.txt + echo "Place scripts run daily here ..." > /etc/fcron.daily/info.txt + echo "Place scripts run weekly here ..." > /etc/fcron.weekly/info.txt + echo "Place scripts run monthly here ..." > /etc/fcron.monthly/info.txt + /usr/bin/fcrontab $(DIR_SRC)/config/cron/crontab @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 841e825e7ba07fd704c2ccd1601a2a2237576884
by git＠ipfire.org 22 Jan '11

22 Jan '11

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 841e825e7ba07fd704c2ccd1601a2a2237576884 (commit) from 76b59637b9b184cbae9e6db758ec19dedb995fa6 (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 841e825e7ba07fd704c2ccd1601a2a2237576884 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 22 19:07:34 2011 +0100 fcron: disable mails. ----------------------------------------------------------------------- Summary of changes: config/cron/crontab | 2 +- config/rootfiles/core/45/update.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/cron/crontab b/config/cron/crontab index 7fa37ea..5cca1fa 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -3,7 +3,7 @@ # SHELL=/bin/bash PATH=/sbin:/bin:/usr/sbin:/usr/bin -MAILTO=root +MAILTO= HOME=/ # Do all jobs in this directories diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index d227791..80201c5 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -35,6 +35,10 @@ killall vpn-watch #Extract files extract_files +# Remove disable cron mails... +sed "s|MAILTO=root|MAILTO=|g" < /var/spool/cron/root.orig > /var/tmp/root.tmp +fcrontab /var/tmp/root.tmp + # #Start services echo Starting Proxy hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 76b59637b9b184cbae9e6db758ec19dedb995fa6
by git＠ipfire.org 22 Jan '11

22 Jan '11

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 76b59637b9b184cbae9e6db758ec19dedb995fa6 (commit) via 324bb8881f2e21a483d0d8495564be240af33b66 (commit) from d89eab6d695b14607512de9896f9ab9e8c825c90 (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 76b59637b9b184cbae9e6db758ec19dedb995fa6 Merge: 324bb88 d89eab6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 22 18:55:28 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit 324bb8881f2e21a483d0d8495564be240af33b66 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 22 18:54:31 2011 +0100 remove more bogus logentries. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/45/filelists/files | 6 ++++++ html/cgi-bin/fireinfo.cgi | 2 +- html/cgi-bin/ids.cgi | 4 ++-- html/cgi-bin/pakfire.cgi | 10 ++-------- html/cgi-bin/wlanap.cgi | 6 +++--- src/initscripts/init.d/functions | 2 +- src/scripts/hddshutdown | 27 ++++++++++++++++++++------- 7 files changed, 35 insertions(+), 22 deletions(-) Difference in files: diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files index ae685d5..03e511f 100644 --- a/config/rootfiles/core/45/filelists/files +++ b/config/rootfiles/core/45/filelists/files @@ -1,11 +1,17 @@ etc/system-release etc/issue +etc/rc.d/init.d/functions srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/fireinfo.cgi +srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/sbin/updxlrator var/ipfire/outgoing/bin/outgoingfw.pl srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat +usr/local/bin/makegraphs +usr/local/bin/hddshutdown usr/local/bin/vpn-watch diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi index 1be0ebe..11c4637 100644 --- a/html/cgi-bin/fireinfo.cgi +++ b/html/cgi-bin/fireinfo.cgi @@ -152,7 +152,7 @@ print <<END; </tr> <tr>  - <td colspan="2"> </td> + <td colspan="2"> </td> </tr> <tr> <td colspan='2'> diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 7567fd0..734e7dc 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-2010 IPFire Team # +# Copyright (C) 2005-2011 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 # @@ -97,7 +97,7 @@ if (-e "/etc/snort/snort.conf") { close(FILE); open(FILE, ">/etc/snort/snort.conf") or die 'Unable to write snort config file.'; - my @rules = `cd /etc/snort/rules/ && ls *.rules`; # With this loop the rule might be display with correct rulepath set + my @rules = `cd /etc/snort/rules/ && ls *.rules 2>/dev/null`; # With this loop the rule might be display with correct rulepath set foreach (@rules) { chomp $_; my $temp = join(";",@snortconfig); diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index da761f0..124f912 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 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 # @@ -57,12 +57,6 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont &Header::openpage($Lang::tr{'pakfire configuration'}, 1); &Header::openbigbox('100%', 'left', '', $errormessage); -# check if reboot is necessary -my $reboot = 0; -if (`find /var/run/need_reboot 2>/dev/null`) { - $reboot = 1; -} - if ($pakfiresettings{'ACTION'} eq 'install'){ $pakfiresettings{'INSPAKS'} =~ s/\|/\ /g; if ("$pakfiresettings{'FORCE'}" eq "on") { @@ -236,7 +230,7 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db" print <<END; <table width='95%' cellpadding='5' > END -if ($reboot == 1) { +if ( -e "/var/run/need_reboot") { print "<tr><td align='center' colspan='2'>$Lang::tr{'needreboot'}!</td></tr>"; print "<tr><td colspan='2'> </td></tr>" } diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index cd5bda3..0bb42ae 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPTifre Team # +# Copyright (C) 2005-2011 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 # @@ -242,7 +242,7 @@ $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'"; $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'"; $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'"; -my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel`; +my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel 2>/dev/null`; # get available channels my @temp; @@ -253,7 +253,7 @@ if ( $channel =~ /\d+/ ){push(@temp,$channel);} } my @channellist = @temp; -my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower`; +my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower 2>/dev/null`; # get available channels my @temp; diff --git a/src/initscripts/init.d/functions b/src/initscripts/init.d/functions index 00cd6fa..e2e058d 100644 --- a/src/initscripts/init.d/functions +++ b/src/initscripts/init.d/functions @@ -27,7 +27,7 @@ KILLDELAY="10" ## Screen Dimensions # Find current screen size if [ -z "${COLUMNS}" ]; then - COLUMNS=$(stty size) + COLUMNS=$(stty size 2>/dev/null) COLUMNS=${COLUMNS##* } fi diff --git a/src/scripts/hddshutdown b/src/scripts/hddshutdown index 2899499..bb28f83 100644 --- a/src/scripts/hddshutdown +++ b/src/scripts/hddshutdown @@ -1,13 +1,26 @@ #!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 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 # +# 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/>. # +# # +############################################################################### # # IPFire HDD Shutdown state reader # -# This code is distributed under the terms of the GPL -# -# 18.09.2007 Maniacikarus - IPFire.org - maniacikarus(a)ipfire.org -# 22.09.2007 Arne_F - fitzenreiter.de - arne(a)fitzenreiter.de - -# begin my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; my $diskstats = ""; @@ -20,7 +33,7 @@ if ($debug){print "### Searching for available Disks ###\n";} foreach (@devices){ chomp $_; my @array = split(/\//,$_); - $diskstats = `cat /var/run/hddstats-$array[$#array]`; + $diskstats = `cat /var/run/hddstats-$array[$#array] 2>/dev/null`; chomp $diskstats; $newdiskstats = `iostat -d -t $_ | tail -2 | head -1 | awk '{ print \$5","\$6}'`; chomp $newdiskstats; hooks/post-receive -- IPFire 2.x development tree

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2011