[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a4c895e569730bb73496907c748a18a17b6045be - IPFire-SCM

24 Sep 2014

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, next has been updated
       via  a4c895e569730bb73496907c748a18a17b6045be (commit)
       via  cce37f04afc89e327a9945d08bf447d5188d30a4 (commit)
       via  7b0afb50d3c5a65249f4866ba3eb52d50be4de30 (commit)
       via  51d8e3309363d9e576030024da74639261e14961 (commit)
       via  499e7fc33fe5b689476d8bdaf4452f5163b20f22 (commit)
       via  7bfaaa0d353ffefd50b2d4bbfa70a81363669d62 (commit)
       via  9f64c06d941709052d2ae7405a3770b018a6e192 (commit)
       via  35880220b07a87b57689e21ac2fd514c50fc81f4 (commit)
       via  67bda607ca7335f3655cfd663bcae42a296b1888 (commit)
       via  d18925c39a586328ffddf4bb92a13f29190aa29a (commit)
       via  38ffd2d6410fa26707b21a6870b89e45d745f666 (commit)
       via  d2ff1cc455f37bb806e10e27b31f0fe31b3de16e (commit)
       via  d49a04c939bcb5ebadba3138dd52c2852700806b (commit)
       via  48f989de1591ed83a614e7133649723a91d7e822 (commit)
      from  5aa856ce1cc1375e2a5a21c17411f7be20d57bfe (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 a4c895e569730bb73496907c748a18a17b6045be
Merge: 5aa856c cce37f0
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Sep 24 20:39:43 2014 +0200
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/core/82/filelists/iputils                        | 1 +
 config/rootfiles/{oldcore/77 => core/82}/filelists/openssl-compat | 0
 config/rootfiles/packages/perl-PDF-API2                           | 6 +++---
 config/xen-image/README                                           | 3 ++-
 lfs/openssl-compat                                                | 6 +++---
 lfs/rsync                                                         | 6 +++---
 lfs/samba                                                         | 2 +-
 lfs/sane                                                          | 4 ++--
 src/squid-accounting/acct-lib.pl                                  | 1 -
 9 files changed, 15 insertions(+), 14 deletions(-)
 create mode 120000 config/rootfiles/core/82/filelists/iputils
 copy config/rootfiles/{oldcore/77 => core/82}/filelists/openssl-compat (100%)
Difference in files:

diff --git a/config/rootfiles/core/82/filelists/iputils b/config/rootfiles/core/82/filelists/iputils
new file mode 120000
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
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 c594d82..642579a 100644
--- 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 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/openssl-compat b/lfs/openssl-compat
index d2ae6a0..604ac13 100644
--- 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 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/lfs/samba b/lfs/samba
index 4bd42cb..3772ad3 100644
--- 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 842b548..39b9603 100644
--- 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 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

    