IPFire-SCM January 2011

ipfire-scm@lists.ipfire.org

1 participants
93 discussions

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

20 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 d846fee0378b8c7e56229d69d47ec0008c45309c (commit) via 8955b5a74668565b31ffad1df13d2be1add87fb2 (commit) from 8845173bd6ebcd3ec82a6e2a674da509446d597b (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 d846fee0378b8c7e56229d69d47ec0008c45309c Merge: 8955b5a 8845173 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Thu Jan 20 20:11:04 2011 +0100 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x commit 8955b5a74668565b31ffad1df13d2be1add87fb2 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Thu Jan 20 20:10:23 2011 +0100 Fixed index.cgi nfs mount warning by using posix output. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/index.cgi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 8e623c9..0dcadb0 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -407,7 +407,7 @@ if ($used / $mem > 90) { # Diskspace usage warning my @temp=(); my $temp2=(); -my @df = `/bin/df -B M -x rootfs`; +my @df = `/bin/df -B M -P -x rootfs`; foreach my $line (@df) { next if $line =~ m/^Filesystem/; if ($line =~ m/root/ ) { hooks/post-receive -- IPFire 2.x development tree

1 0

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

19 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 8845173bd6ebcd3ec82a6e2a674da509446d597b (commit) via 3c43cafe14ff93fa92932d0895cb4ba7e3d25e83 (commit) from 1c32aae7e33a6287a7e4f90c69c930b107afc4f7 (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 8845173bd6ebcd3ec82a6e2a674da509446d597b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 20 00:15:54 2011 +0100 makegraphs: Remove some erroroutputs. commit 3c43cafe14ff93fa92932d0895cb4ba7e3d25e83 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 20 00:13:39 2011 +0100 Fix parted package build. ----------------------------------------------------------------------- Summary of changes: lfs/parted | 10 +++++++++- src/scripts/makegraphs | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) Difference in files: diff --git a/lfs/parted b/lfs/parted index 7a70d99..25db9e5 100644 --- a/lfs/parted +++ b/lfs/parted @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# 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 # @@ -32,6 +32,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = parted +PAK_VER = 1 + +DEPS = "" + ############################################################################### # Top-level Rules ############################################################################### @@ -50,6 +55,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) +dist: + @$(PAK) + ############################################################################### # Downloading, checking, md5sum ############################################################################### diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index c2baee7..97d086a 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -3,7 +3,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2008 Michael Tremer & Christian Schmidt # +# Copyright (C) 2008-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 # @@ -103,7 +103,7 @@ sub updatehdddata{ system ('/usr/bin/vnstat -u'); my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; -system("unlink /var/run/hddstatus && touch /var/run/hddstatus"); +system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus"); foreach (@disks){ my $disk = $_; chomp $disk; @@ -114,7 +114,7 @@ foreach (@disks){ my $newdiskstats = ""; my @array = split(/\//,$disk); - $diskstats = `cat /var/run/hddstats-$array[$#array]`; + $diskstats = `cat /var/run/hddstats-$array[$#array] 2>/dev/null`; chomp $diskstats; my $newdiskstats = `/usr/bin/iostat -d -t $disk | tail -2 | head -1 | awk '{ print \$5","\$6}'`; chomp $newdiskstats; @@ -122,7 +122,7 @@ foreach (@disks){ chomp $status; if ($status !~/standby/ || $diskstats ne $newdiskstats){ - if (-e "/var/run/hddshutdown-".$array[$#array]){system("unlink /var/run/hddshutdown-".$array[$#array]);} + if (-e "/var/run/hddshutdown-".$array[$#array]){system("unlink /var/run/hddshutdown-".$array[$#array]." 2>/dev/null");} } if (-e "/var/run/hddshutdown-".$array[$#array]){$status = " standby\n";} hooks/post-receive -- IPFire 2.x development tree

1 0

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

19 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 1c32aae7e33a6287a7e4f90c69c930b107afc4f7 (commit) via fdcfde0a2eb166558b1bf23b18a31e5d2c46fc7a (commit) via b7e680f2eb66cfdef715c07a442d8982eefd5550 (commit) via 5d547072c3e454549eb0ac0c36827ebcba8eba4a (commit) from 551bddaefe35e9b9d60ee2f7cfb0ca40c4af0a4e (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 1c32aae7e33a6287a7e4f90c69c930b107afc4f7 Merge: fdcfde0 551bdda Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 19 19:31:00 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit fdcfde0a2eb166558b1bf23b18a31e5d2c46fc7a Merge: b7e680f 8dbba0e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 19 19:27:22 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit b7e680f2eb66cfdef715c07a442d8982eefd5550 Merge: 73c7eff 5d54707 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 19 19:24:45 2011 +0100 Merge commit 'ms/parted' commit 5d547072c3e454549eb0ac0c36827ebcba8eba4a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 19 01:27:23 2011 +0100 parted: New package. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/parted | 48 ++++++++++++++++++++++++++++++++++++++ lfs/{GD-TextUtil => parted} | 8 +++--- make.sh | 1 + 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 config/rootfiles/packages/parted copy lfs/{GD-TextUtil => parted} (94%) Difference in files: diff --git a/config/rootfiles/packages/parted b/config/rootfiles/packages/parted new file mode 100644 index 0000000..74164e0 --- /dev/null +++ b/config/rootfiles/packages/parted @@ -0,0 +1,48 @@ +#usr/include/parted +#usr/include/parted/constraint.h +#usr/include/parted/debug.h +#usr/include/parted/device.h +#usr/include/parted/disk.h +#usr/include/parted/exception.h +#usr/include/parted/filesys.h +#usr/include/parted/geom.h +#usr/include/parted/natmath.h +#usr/include/parted/parted.h +#usr/include/parted/timer.h +#usr/include/parted/unit.h +#usr/lib/libparted.a +#usr/lib/libparted.la +#usr/lib/libparted.so +usr/lib/libparted.so.0 +usr/lib/libparted.so.0.0.1 +#usr/lib/pkgconfig/libparted.pc +usr/sbin/parted +usr/sbin/partprobe +#usr/share/info/parted.info +#usr/share/locale/ca/LC_MESSAGES/parted.mo +#usr/share/locale/cs/LC_MESSAGES/parted.mo +#usr/share/locale/da/LC_MESSAGES/parted.mo +#usr/share/locale/de/LC_MESSAGES/parted.mo +#usr/share/locale/es/LC_MESSAGES/parted.mo +#usr/share/locale/fr/LC_MESSAGES/parted.mo +#usr/share/locale/gl/LC_MESSAGES/parted.mo +#usr/share/locale/id/LC_MESSAGES/parted.mo +#usr/share/locale/it/LC_MESSAGES/parted.mo +#usr/share/locale/ja/LC_MESSAGES/parted.mo +#usr/share/locale/nl/LC_MESSAGES/parted.mo +#usr/share/locale/nn/LC_MESSAGES/parted.mo +#usr/share/locale/pl/LC_MESSAGES/parted.mo +#usr/share/locale/pt/LC_MESSAGES/parted.mo +#usr/share/locale/pt_BR/LC_MESSAGES/parted.mo +#usr/share/locale/ro/LC_MESSAGES/parted.mo +#usr/share/locale/ru/LC_MESSAGES/parted.mo +#usr/share/locale/rw/LC_MESSAGES/parted.mo +#usr/share/locale/sk/LC_MESSAGES/parted.mo +#usr/share/locale/sv/LC_MESSAGES/parted.mo +#usr/share/locale/tr/LC_MESSAGES/parted.mo +#usr/share/locale/uk/LC_MESSAGES/parted.mo +#usr/share/locale/vi/LC_MESSAGES/parted.mo +#usr/share/locale/zh_CN/LC_MESSAGES/parted.mo +#usr/share/locale/zh_TW/LC_MESSAGES/parted.mo +#usr/share/man/man8/parted.8 +#usr/share/man/man8/partprobe.8 diff --git a/lfs/parted b/lfs/parted new file mode 100644 index 0000000..7a70d99 --- /dev/null +++ b/lfs/parted @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 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 # +# 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/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.3 + +THISAPP = parted-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 30ceb6df7e8681891e865e2fe5a7903d + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --disable-device-mapper + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index fe473ae..13d79e0 100755 --- a/make.sh +++ b/make.sh @@ -685,6 +685,7 @@ buildipfire() { ipfiremake miniupnpd ipfiremake client175 ipfiremake powertop + ipfiremake parted echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild hooks/post-receive -- IPFire 2.x development tree

1 0

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

19 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 551bddaefe35e9b9d60ee2f7cfb0ca40c4af0a4e (commit) via ee7b74d483f8637f1c7a7ae08d45c75858519b1d (commit) via f2ab614b46212a977026117aba71968fc8bf361c (commit) from 8dbba0e4607ad83d26849e87b09ef52a5ec3f70f (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 551bddaefe35e9b9d60ee2f7cfb0ca40c4af0a4e Merge: ee7b74d 8dbba0e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 19 19:29:52 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x commit ee7b74d483f8637f1c7a7ae08d45c75858519b1d Merge: f2ab614 7bb2165 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 19 01:03:00 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x commit f2ab614b46212a977026117aba71968fc8bf361c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 18 19:59:44 2011 +0100 fireinfo: Update to 2.0.3. ----------------------------------------------------------------------- Summary of changes: lfs/fireinfo | 8 ++------ src/patches/fireinfo-invalid-id.patch | 18 ------------------ 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 src/patches/fireinfo-invalid-id.patch Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index 97b5a87..0c55e00 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@ include Config -VER = 2.0.2 +VER = 2.0.3 THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ed29f591ccfeeb6386a61eafcc5dc398 +$(DL_FILE)_MD5 = f9ce8b96350dd5af1e5c095806128cd0 install : $(TARGET) @@ -70,10 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - # Fix for braindead board vendors. - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-invalid-id.patch - cd $(DIR_APP) && python setup.py build cd $(DIR_APP) && python setup.py install diff --git a/src/patches/fireinfo-invalid-id.patch b/src/patches/fireinfo-invalid-id.patch deleted file mode 100644 index 669deb6..0000000 --- a/src/patches/fireinfo-invalid-id.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit ac68f90a0229083d755e7e2e8980822405ac2da8 -Author: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Tue Jan 18 19:11:06 2011 +0100 - - Add invalid ID: 00020003-0004-0005-0006-000700080009. - -diff --git a/fireinfo/system.py b/fireinfo/system.py -index 135c29b..690eae2 100644 ---- a/fireinfo/system.py -+++ b/fireinfo/system.py -@@ -41,6 +41,7 @@ INVALID_ID_STRINGS = ( - "N/A", "n/a", - "12345", "54321", "202020", - "Chassis", "chassis", -+ "00020003-0004-0005-0006-000700080009", - ) - - class Singleton(type): hooks/post-receive -- IPFire 2.x development tree

1 0

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

19 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 8dbba0e4607ad83d26849e87b09ef52a5ec3f70f (commit) from 73c7eff80ece6765c5c147514a3ce2153f7bf4c8 (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 8dbba0e4607ad83d26849e87b09ef52a5ec3f70f Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Jan 19 18:43:16 2011 +0100 Fixed Avira Update Caching and improved Gentoo Caching. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/45/filelists/files | 1 + config/rootfiles/core/45/update.sh | 4 ++++ config/updxlrator/updxlrator | 11 +++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files index afefcad..f6d15ca 100644 --- a/config/rootfiles/core/45/filelists/files +++ b/config/rootfiles/core/45/filelists/files @@ -5,3 +5,4 @@ srv/web/ipfire/cgi-bin/index.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 diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 40d08d4..1197905 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -26,6 +26,8 @@ # #Stop services +echo Stopping Proxy +/etc/init.d/squid stop 2>/dev/null # #Extract files @@ -33,6 +35,8 @@ extract_files # #Start services +echo Starting Proxy +/etc/init.d/squid start 2>/dev/null # #Update Language cache diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator index 7f44ff7..4aaa389 100644 --- a/config/updxlrator/updxlrator +++ b/config/updxlrator/updxlrator @@ -101,7 +101,10 @@ while (<>) { # Section: Linux Downloads # ----------------------------------------------------------- - if ($source_url =~ m@^[h|f]t?tp://[^?]+\.(deb|rpm)$@i) + if ( + ($source_url =~ m@^[h|f]t?tp://[^?]+\.(deb|rpm)$@i) || + ($source_url =~ m@^[h|f]t?tp://[^?]+/distfiles/[^?]+\.(tar\.gz|tar\.bz2|tgz|zip|patch\.bz2|gz|docx|patch|pdf|exe)$@i) + ) { $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Linux",$mirror); } @@ -157,7 +160,11 @@ while (<>) { # Section: Avira Downloads # ----------------------------------------------------------- - if ($source_url =~ m@^http://dl[0-9]\.avgate\.net/.*\.(htm|html|gz)$@i) + if ( + ($source_url =~ m@^http://dl[0-9]\.avgate\.net/.*\.(htm|html|gz)$@i) || + ($source_url =~ m@^http://80.190.130.19[4-5]/update/.*\.(htm|html|gz)$@i) || + ($source_url =~ m@^http://62.146.64.14[6-7]/update/.*\.(htm|html|gz)$@i) + ) { $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Avira",$mirror); } hooks/post-receive -- IPFire 2.x development tree

1 0

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

19 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 73c7eff80ece6765c5c147514a3ce2153f7bf4c8 (commit) via e85d32bbb3eb5c5debf106737c4a4fe8c4729325 (commit) from 7bb21658735d8e84fac4721892ed7c81ddc2ac7a (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 73c7eff80ece6765c5c147514a3ce2153f7bf4c8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 19 17:47:56 2011 +0100 Remove some httpd errorlog entries. commit e85d32bbb3eb5c5debf106737c4a4fe8c4729325 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 19 17:35:18 2011 +0100 Fix index.cgi autorefresh. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/45/filelists/files | 4 ++++ html/cgi-bin/connections.cgi | 4 ++-- html/cgi-bin/index.cgi | 6 +++--- html/cgi-bin/pppsetup.cgi | 4 ++-- html/cgi-bin/proxy.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files index d3c27e8..afefcad 100644 --- a/config/rootfiles/core/45/filelists/files +++ b/config/rootfiles/core/45/filelists/files @@ -1,3 +1,7 @@ etc/system-release etc/issue +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 7b53c00..14ee209 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# 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 # @@ -57,7 +57,7 @@ if (open(IP, "${General::swroot}/red/local-ipaddress")) { push(@colour, ${Header::colourfw} ); } -my @vpn = `/usr/local/bin/ipsecctrl I|grep erouted|cut -d"]" -f3|cut -d"=" -f4|cut -d";" -f1| sed "s|/| |g"`; +my @vpn = `/usr/local/bin/ipsecctrl I 2>/dev/null|grep erouted|cut -d"]" -f3|cut -d"=" -f4|cut -d";" -f1| sed "s|/| |g"`; foreach my $route (@vpn) { chomp($route); my @temp = split(/[\t ]+/, $route); diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 6a93b68..8e623c9 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -58,7 +58,7 @@ my %mainsettings = (); my $connstate = &Header::connectionstatus(); - if ( -e "/var/ipfire/main/gpl-acceted" ) { + if ( -e "/var/ipfire/main/gpl-accepted" ) { if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) { $refresh = "<meta http-equiv='refresh' content='300;'>"; } elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ @@ -431,7 +431,7 @@ foreach my $line (@df) { } # S.M.A.R.T. health warning -my @files = `/bin/ls /var/run/smartctl_out_hddtemp-*`; +my @files = `/bin/ls /var/run/smartctl_out_hddtemp-* 2>/dev/null`; foreach my $file (@files) { chomp ($file); my $disk=`echo $file | cut -d"-" -f2`; diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 0bfeabd..e2af0a0 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# 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 # @@ -486,7 +486,7 @@ print <<END END ; -my $atmdev=`cat /proc/net/atm/devices | grep 0`; +my $atmdev=`cat /proc/net/atm/devices 2>/dev/null | grep 0`; chomp ($atmdev); if ($atmdev ne '') { print <<END diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index f732c5b..476de52 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# 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 # diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index f336ec6..5558295 100644 --- 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-2010 IPFire Team info(a)ipfire.org # +# 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 # @@ -2400,7 +2400,7 @@ EOF &General::readhasharray("${General::swroot}/vpn/config", \%confighash); $cgiparams{'CA_NAME'} = ''; - my @status = `/usr/local/bin/ipsecctrl I`; + my @status = `/usr/local/bin/ipsecctrl I 2>/dev/null`; # suggest a default name for this side if ($cgiparams{'VPN_IP'} eq '' && -e "${General::swroot}/red/active") { hooks/post-receive -- IPFire 2.x development tree

1 0

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

18 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 7bb21658735d8e84fac4721892ed7c81ddc2ac7a (commit) from 090e421172e56743af36a4f3e734b8b60e4e0b0c (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 7bb21658735d8e84fac4721892ed7c81ddc2ac7a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 18 21:30:58 2011 +0100 Add fireinfo update to core45. ----------------------------------------------------------------------- Summary of changes: .../rootfiles/core/{44 => 45}/filelists/fireinfo | 0 1 files changed, 0 insertions(+), 0 deletions(-) copy config/rootfiles/core/{44 => 45}/filelists/fireinfo (100%) Difference in files: diff --git a/config/rootfiles/core/45/filelists/fireinfo b/config/rootfiles/core/45/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/core/45/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

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

18 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 090e421172e56743af36a4f3e734b8b60e4e0b0c (commit) from 512d54a98f02dbed4bd67c73dad0c318d8831f8c (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 090e421172e56743af36a4f3e734b8b60e4e0b0c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 18 19:18:41 2011 +0100 fireinfo: Fix hash collision because of very weird UUID. ----------------------------------------------------------------------- Summary of changes: lfs/fireinfo | 4 ++++ src/patches/fireinfo-invalid-id.patch | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) create mode 100644 src/patches/fireinfo-invalid-id.patch Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index abc9d84..97b5a87 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -70,6 +70,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + # Fix for braindead board vendors. + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-invalid-id.patch + cd $(DIR_APP) && python setup.py build cd $(DIR_APP) && python setup.py install diff --git a/src/patches/fireinfo-invalid-id.patch b/src/patches/fireinfo-invalid-id.patch new file mode 100644 index 0000000..669deb6 --- /dev/null +++ b/src/patches/fireinfo-invalid-id.patch @@ -0,0 +1,18 @@ +commit ac68f90a0229083d755e7e2e8980822405ac2da8 +Author: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Tue Jan 18 19:11:06 2011 +0100 + + Add invalid ID: 00020003-0004-0005-0006-000700080009. + +diff --git a/fireinfo/system.py b/fireinfo/system.py +index 135c29b..690eae2 100644 +--- a/fireinfo/system.py ++++ b/fireinfo/system.py +@@ -41,6 +41,7 @@ INVALID_ID_STRINGS = ( + "N/A", "n/a", + "12345", "54321", "202020", + "Chassis", "chassis", ++ "00020003-0004-0005-0006-000700080009", + ) + + class Singleton(type): hooks/post-receive -- IPFire 2.x development tree

1 0

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

18 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 512d54a98f02dbed4bd67c73dad0c318d8831f8c (commit) from eff5c1d30c0a451991478f6732d66fa598c1a170 (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 512d54a98f02dbed4bd67c73dad0c318d8831f8c Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Jan 18 19:20:48 2011 +0100 Fixed Proxy unable to handle max download size correct. Added and started to core 45. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/24 => core/45}/exclude | 0 config/rootfiles/core/45/filelists/files | 3 +++ config/rootfiles/core/{44 => 45}/meta | 0 config/rootfiles/{oldcore/42 => core/45}/update.sh | 5 +++-- html/cgi-bin/proxy.cgi | 12 +++++------- 5 files changed, 11 insertions(+), 9 deletions(-) copy config/rootfiles/{oldcore/24 => core/45}/exclude (100%) create mode 100644 config/rootfiles/core/45/filelists/files copy config/rootfiles/core/{44 => 45}/meta (100%) copy config/rootfiles/{oldcore/42 => core/45}/update.sh (95%) Difference in files: diff --git a/config/rootfiles/core/45/exclude b/config/rootfiles/core/45/exclude new file mode 100644 index 0000000..e69de29 diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files new file mode 100644 index 0000000..d3c27e8 --- /dev/null +++ b/config/rootfiles/core/45/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/config/rootfiles/core/45/meta b/config/rootfiles/core/45/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/45/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh new file mode 100644 index 0000000..40d08d4 --- /dev/null +++ b/config/rootfiles/core/45/update.sh @@ -0,0 +1,49 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.28-ipfire +#depmod 2.6.32.28-ipfire-pae +#depmod 2.6.32.28-ipfire-xen + +# +#Finish +#Don't report the exitcode last command +exit 0 diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 2525b6e..f732c5b 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -82,7 +82,6 @@ my @templist=(); my $cachemem=0; my $proxy1=''; my $proxy2=''; -my $replybodymaxsize=0; my $browser_regexp=''; my $needhup = 0; my $errormessage=''; @@ -3870,19 +3869,18 @@ END request_body_max_size $proxysettings{'MAX_OUTGOING_SIZE'} KB END ; - $replybodymaxsize = 1024 * $proxysettings{'MAX_INCOMING_SIZE'}; if ($proxysettings{'MAX_INCOMING_SIZE'} > 0) { - if (!-z $acl_src_unrestricted_ip) { print FILE "reply_body_max_size 0 deny IPFire_unrestricted_ips\n"; } - if (!-z $acl_src_unrestricted_mac) { print FILE "reply_body_max_size 0 deny IPFire_unrestricted_mac\n"; } + if (!-z $acl_src_unrestricted_ip) { print FILE "reply_body_max_size none IPFire_unrestricted_ips\n"; } + if (!-z $acl_src_unrestricted_mac) { print FILE "reply_body_max_size none IPFire_unrestricted_mac\n"; } if ($proxysettings{'AUTH_METHOD'} eq 'ncsa') { - if (!-z $extgrp) { print FILE "reply_body_max_size 0 deny for_extended_users\n"; } + if (!-z $extgrp) { print FILE "reply_body_max_size none for_extended_users\n"; } } } - if ( $replybodymaxsize != '0' ) + if ( $proxysettings{'MAX_INCOMING_SIZE'} != '0' ) { - print FILE "reply_body_max_size $replybodymaxsize deny all\n\n"; + print FILE "reply_body_max_size $proxysettings{'MAX_INCOMING_SIZE'} KB all\n\n"; } print FILE "visible_hostname"; hooks/post-receive -- IPFire 2.x development tree

1 0

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

18 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 e8bdc8544c541646f128d46fb6044ba392916a34 (commit) from 2f102cbbe8dd66edee1b8260118990d918148c14 (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 e8bdc8544c541646f128d46fb6044ba392916a34 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 18 14:52:11 2011 +0100 pcre: Update to 8.12. Closes #124. ----------------------------------------------------------------------- Summary of changes: pkgs/core/pcre/pcre.nm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/pkgs/core/pcre/pcre.nm b/pkgs/core/pcre/pcre.nm index cfba51e..f020712 100644 --- a/pkgs/core/pcre/pcre.nm +++ b/pkgs/core/pcre/pcre.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = pcre -PKG_VER = 8.11 -PKG_REL = 0 +PKG_VER = 8.12 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Libraries hooks/post-receive -- IPFire 3.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