Merge remote-tracking branch 'origin/master' into install-raid

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 8ed87fc80e58d5b40f3a5cc108d2d3e36fb767c8..35ae7c0930e8fd91cae3d60e0558d6a5e06299cd 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -286,7 +286,7 @@ sub validip
 sub validmask {
        my $mask = shift;
 
-       return &Network::check_netmask($mask) or &Network::check_prefix($mask);
+       return &Network::check_netmask($mask) || &Network::check_prefix($mask);
 }
 
 sub validipormask
@@ -388,7 +388,9 @@ sub iporsubtocidr
 }
 
 sub getnetworkip {
-       return &Network::get_netaddress(shift);
+       my $arg = join("/", @_);
+
+       return &Network::get_netaddress($arg);
 }
 
 sub getccdbc

diff --git a/config/xen-image/README b/config/xen-image/README
index 574812166f72a9a01654d5b066891e5a99a2bbcf..5318673117e43f46bca63dd1d78ee9db7ec4e6fd 100644 (file)
--- a/config/xen-image/README
+++ b/config/xen-image/README
@@ -19,6 +19,7 @@ other usefull commands from the Dom0:
 - reset the fire: "xm destroy ipfire-xen"
 - look what is going on: "xm top" or "xm list"
 
-This script can also build a Citrix XenCenter xva image.
+This script can also build a Citrix XenCenter xva image. (Need xz-aware
+xen version. Tested with Citrix Xen Server 6.2.5 beta)
 - run "XEN_IMG_TYPE=xva sh xen-image-maker.sh" to build an xva image.
 - import the vm with "xe vm-import file=ipfire.xfa"

diff --git a/lfs/rsync b/lfs/rsync
index 57c822cc2bc8e72b2f862a37e479224e2282b3c8..8899ec0ed47783d7437749687625b19d66b80d74 100644 (file)
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.0
+VER        = 3.1.1
 
 THISAPP    = rsync-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3be148772a33224771a8d4d2a028b132
+$(DL_FILE)_MD5 = 43bd6676f0b404326eee2d63be3cdcfe
 
 install : $(TARGET)
 

diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl
index f0081b7ef9551049e8ef027dc63e879a6aa496a8..a19140d04cd055714d8dae3dd556b73222488d85 100644 (file)
--- a/src/squid-accounting/acct-lib.pl
+++ b/src/squid-accounting/acct-lib.pl
@@ -460,7 +460,6 @@ sub pdf2 {
        $lines->linewidth('0.5');
 
        #Fill BILL DATA into PDF
-       setlocale(LC_ALL, "$mainsettings{'LANGUAGE'}_$uplang");
        foreach (@billar) {
                my ($a1,$a2) = split( /\,/, $_ );
                $a2=sprintf"%.2f",($a2/1024/1024);