From 67bda607ca7335f3655cfd663bcae42a296b1888 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Mon, 1 Sep 2014 11:11:25 +0200 Subject: [PATCH 1/6] Squid-accounting: revert setlocale because thevalues are not correctly with this setting --- src/squid-accounting/acct-lib.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl index f0081b7ef..a19140d04 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); From 35880220b07a87b57689e21ac2fd514c50fc81f4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 5 Sep 2014 21:56:01 +0200 Subject: [PATCH 2/6] rsync: update to 3.1.1. --- lfs/rsync | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/rsync b/lfs/rsync index 57c822cc2..8899ec0ed 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) From 9f64c06d941709052d2ae7405a3770b018a6e192 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 3 Sep 2014 22:23:04 +0200 Subject: [PATCH 3/6] general-functions.pl: Subroutine getnetworkip() accepted multiple arguments --- config/cfgroot/general-functions.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 8ed87fc80..7c88cfc68 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -388,7 +388,9 @@ sub iporsubtocidr } sub getnetworkip { - return &Network::get_netaddress(shift); + my $arg = join("/", $@); + + return &Network::get_netaddress($arg); } sub getccdbc From 7bfaaa0d353ffefd50b2d4bbfa70a81363669d62 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 4 Sep 2014 11:13:41 +0200 Subject: [PATCH 4/6] general-functions.pl: Fix syntax error --- config/cfgroot/general-functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 7c88cfc68..4ed5a5520 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -388,7 +388,7 @@ sub iporsubtocidr } sub getnetworkip { - my $arg = join("/", $@); + my $arg = join("/", @_); return &Network::get_netaddress($arg); } From 499e7fc33fe5b689476d8bdaf4452f5163b20f22 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 6 Sep 2014 18:44:50 +0200 Subject: [PATCH 5/6] general-functions.pl: Fix perl coding error --- config/cfgroot/general-functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 4ed5a5520..35ae7c093 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 From 51d8e3309363d9e576030024da74639261e14961 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 9 Sep 2014 17:54:27 +0200 Subject: [PATCH 6/6] xen-image: add xz-aware xen version hint to README. --- config/xen-image/README | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/xen-image/README b/config/xen-image/README index 574812166..531867311 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"