Merge branch 'master' into perl_5.12.2

diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files
index d3c27e8a1cfebe2dee8e8c67ed68185b59e305a1..f6d15ca787a8518bfb95c0cc1181f32b299d80c4 100644 (file)
--- a/config/rootfiles/core/45/filelists/files
+++ b/config/rootfiles/core/45/filelists/files
@@ -1,3 +1,8 @@
 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
+usr/sbin/updxlrator

diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh
index 40d08d4381853b09e813c5734780ac0212754715..1197905cd362845ff3b318e7d883e0a3999e754b 100644 (file)
--- 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/rootfiles/packages/parted b/config/rootfiles/packages/parted
new file mode 100644 (file)
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/config/updxlrator/updxlrator b/config/updxlrator/updxlrator
index 7f44ff76df2d2a5f226cf92a232734c67260e265..4aaa38938c5473a40ce481822e9c46229a1c3cd7 100644 (file)
--- 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);
        }

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 7b53c009ec7e189161969a2b9a3bed24e5cc86e2..14ee20910509b0e9633e6b5d586039d7cda7d12e 100644 (file)
--- 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@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 6a93b68375ea47d99206054bbd22975b2e335a4b..8e623c96afba617949e4ba5753c76a678a3c6fb8 100644 (file)
--- 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@ipfire.org>                          #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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 0bfeabd1b21de84db6dfaf8a5b883fe61bbf7593..e2af0a08870aa529bea4c12cb849ecef5bd5752d 100644 (file)
--- 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@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 f732c5b68c96add3abd9b0b2d9cadc7c2fa969f9..476de52cc3b4ee7e1b829c829a34d8afb7568b34 100644 (file)
--- 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@ipfire.org>                          #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index f336ec610aaa8f9f01d3a55c511fcba5840ef485..55582952b5e0b523b8860f4fdf4c885d91459045 100644 (file)
--- 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@ipfire.org                       #
+# Copyright (C) 2007-2011  IPFire Team  info@ipfire.org                       #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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") {

diff --git a/lfs/fireinfo b/lfs/fireinfo
index 97b5a87056ba33301eae841166be42cb2c0b98da..0c55e007cd9bdd05f12bd49f5313933830fa8203 100644 (file)
--- 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/lfs/parted b/lfs/parted
new file mode 100644 (file)
index 0000000..25db9e5
--- /dev/null
+++ b/lfs/parted
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# 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)
+
+PROG       = parted
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# 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))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# 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 fe473aeec4e7a9d0a5e14da159c582f6ed4b9868..13d79e08845fe452cf106f7ef9d2e3edd0127edb 100755 (executable)
--- 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

diff --git a/src/patches/fireinfo-invalid-id.patch b/src/patches/fireinfo-invalid-id.patch
deleted file mode 100644 (file)
index 669deb6..0000000
--- a/src/patches/fireinfo-invalid-id.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit ac68f90a0229083d755e7e2e8980822405ac2da8
-Author: Michael Tremer <michael.tremer@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):

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index c2baee7ccaf4cad0dbbc94a7af1577903711ca9f..97d086a1057ba05b23599dc716abc30f2ccef21b 100644 (file)
--- 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@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";}