[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-6-gca8c62e

[Lifeng Sun]

The following commit has been merged in the master branch:
commit ca8c62e710b2bada6e52915d5527a2654110859c
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sun Jun 10 18:06:03 2012 +0800

    Fix CVE-2010-3376: insecure library loading. (Closes: #598419)

diff --git a/debian/changelog b/debian/changelog
index 1df78bf..d92b041 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+root-system (5.34.00~rc1-2) UNRELEASED; urgency=low
+
+  * Fix CVE-2010-3376: insecure library loading. (Closes: #598419)
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Sun, 10 Jun 2012 18:11:49 +0800
+
 root-system (5.34.00~rc1-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/skel/proofserv.in b/debian/skel/proofserv.in
index b9f76ce..859d65a 100755
--- a/debian/skel/proofserv.in
+++ b/debian/skel/proofserv.in
@@ -3,7 +3,7 @@
 rootplugins=@prefix@/lib/root/@libvers@
 rootbindir=@prefix@/bin
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$rootplugins
+export LD_LIBRARY_PATH=$rootplugins${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 exec $rootbindir/proofserv.bin "$@"
 

-- 
root-system: CERN's ROOT Data Analysis Framework