Merge branch 'master' into next

diff --git a/config/rootfiles/core/82/filelists/iputils b/config/rootfiles/core/82/filelists/iputils
new file mode 120000 (symlink)
index 0000000..361c28f
--- /dev/null
+++ b/config/rootfiles/core/82/filelists/iputils
@@ -0,0 +1 @@
+../../../common/iputils
\ No newline at end of file

diff --git a/config/rootfiles/core/82/filelists/openssl-compat b/config/rootfiles/core/82/filelists/openssl-compat
new file mode 120000 (symlink)
index 0000000..c9fa421
--- /dev/null
+++ b/config/rootfiles/core/82/filelists/openssl-compat
@@ -0,0 +1 @@
+../../../common/openssl-compat
\ No newline at end of file

diff --git a/config/rootfiles/packages/perl-PDF-API2 b/config/rootfiles/packages/perl-PDF-API2
index c594d82429c82202cef77f1e5c8155e9b1dbe09b..642579a6e5c0ee6b5f8dad800abec7399f057106 100644 (file)
--- a/config/rootfiles/packages/perl-PDF-API2
+++ b/config/rootfiles/packages/perl-PDF-API2
@@ -129,9 +129,9 @@ usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/uniglyph.txt
 usr/lib/perl5/site_perl/5.12.3/PDF/API2/UniWrap.pm
 usr/lib/perl5/site_perl/5.12.3/PDF/API2/Util.pm
 usr/lib/perl5/site_perl/5.12.3/PDF/API2/Win32.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF/API2
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF/API2/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/PDF
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/PDF/API2
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/PDF/API2/.packlist
 #usr/share/man/man3/PDF::API2.3
 #usr/share/man/man3/PDF::API2::Annotation.3
 #usr/share/man/man3/PDF::API2::Basic::PDF::Array.3

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/openssl-compat b/lfs/openssl-compat
index d2ae6a0e909d412a639d1d38157e710502591a1b..604ac1324432847b2e0425af3dfde7cb3c39dcfc 100644 (file)
--- a/lfs/openssl-compat
+++ b/lfs/openssl-compat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2014  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.8y
+VER        = 0.9.8zb
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 47c7fb37f78c970f1d30aa2f9e9e26d8
+$(DL_FILE)_MD5 = 65c5f42734f8ecd58990b12a9afa6453
 
 install : $(TARGET)
 

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/lfs/samba b/lfs/samba
index 4bd42cbb276a3b28c6993d9e6df2e2ae688bcf92..3772ad3028085043be106f52ee19ea3184343d69 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 58
+PAK_VER    = 59
 
 DEPS       = "cups krb5"
 

diff --git a/lfs/sane b/lfs/sane
index 842b5484610ae9013a4275a0efd17a900084f9ce..39b9603b5ba51c59f12da06ba7a21b3a9de8530d 100644 (file)
--- a/lfs/sane
+++ b/lfs/sane
@@ -33,9 +33,9 @@ DIR_APP    = $(DIR_SRC)/sane-backends-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = sane
-PAK_VER    = 3
+PAK_VER    = 4
 
-DEPS       = "libtiff"
+DEPS       = "cups libtiff"
 
 ###############################################################################
 # Top-level Rules

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);