[git.ipfire.org] IPFire 2.x development tree branch, core82, updated. 7b0afb50d3c5a65249f4866ba3eb52d50be4de30

[git.ipfire.org] IPFire 2.x development tree branch, core82, updated. 7b0afb50d3c5a65249f4866ba3eb52d50be4de30

[git]

[-- Attachment #1: Type: text/plain, Size: 4008 bytes --]

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, core82 has been updated
       via  7b0afb50d3c5a65249f4866ba3eb52d50be4de30 (commit)
       via  51d8e3309363d9e576030024da74639261e14961 (commit)
       via  499e7fc33fe5b689476d8bdaf4452f5163b20f22 (commit)
       via  7bfaaa0d353ffefd50b2d4bbfa70a81363669d62 (commit)
       via  9f64c06d941709052d2ae7405a3770b018a6e192 (commit)
       via  35880220b07a87b57689e21ac2fd514c50fc81f4 (commit)
       via  67bda607ca7335f3655cfd663bcae42a296b1888 (commit)
      from  d18925c39a586328ffddf4bb92a13f29190aa29a (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 7b0afb50d3c5a65249f4866ba3eb52d50be4de30
Merge: d18925c 51d8e33
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Sep 9 17:57:27 2014 +0200

    Merge remote-tracking branch 'origin/master' into core82

-----------------------------------------------------------------------

Summary of changes:
 config/cfgroot/general-functions.pl | 6 ++++--
 config/xen-image/README             | 3 ++-
 lfs/rsync                           | 6 +++---
 src/squid-accounting/acct-lib.pl    | 1 -
 4 files changed, 9 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 8ed87fc..35ae7c0 100644
--- 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 5748121..5318673 100644
--- 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 57c822c..8899ec0 100644
--- 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 f0081b7..a19140d 100644
--- 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);


hooks/post-receive
--
IPFire 2.x development tree