[SCM] bristol/master.stable: Exporting unmodified PATH is unnecessary. Drop /usr/share/bristol/lib from the LD_LIBRARY_PATH.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master.stable branch:
commit 6b3a6405c2b54c0ff93a39e53614e9ae704573fd
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Oct 14 12:55:25 2010 +0200

    Exporting unmodified PATH is unnecessary. Drop /usr/share/bristol/lib from the LD_LIBRARY_PATH.

diff --git a/debian/patches/90-CVE_insecure_library_loading.patch b/debian/patches/90-CVE_insecure_library_loading.patch
index a6fc40e..7fc156d 100644
--- a/debian/patches/90-CVE_insecure_library_loading.patch
+++ b/debian/patches/90-CVE_insecure_library_loading.patch
@@ -2,17 +2,19 @@ Subject: Fix insecure library loading - CVE-2010-3351.
 Origin: upstream, https://sourceforge.net/support/tracker.php?aid=3077160
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598285
 ---
- bin/startBristol.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ bin/startBristol.in |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 --- bristol.orig/bin/startBristol.in
 +++ bristol/bin/startBristol.in
-@@ -347,7 +347,7 @@ fi
+@@ -347,9 +347,7 @@ fi
  export SLAB_HOME=$BRISTOL
  export BRIGHTON=$BRISTOL
  
 -export LD_LIBRARY_PATH=/usr/local/lib:usr/lib:${LD_LIBRARY_PATH}:${BRISTOL}/lib
-+export LD_LIBRARY_PATH=@BRISTOL_DIR@/lib:/usr/local/lib:/usr/lib:/lib
- 
- export PATH=${PATH}:$BRISTOL/bin:/usr/local/bin
+-
+-export PATH=${PATH}:$BRISTOL/bin:/usr/local/bin
++export LD_LIBRARY_PATH=/usr/local/lib:/usr/lib:/lib
  
+ if [ $jack -eq 1 ]; then
+ 	ldd `which bristol` | grep jack > /dev/null 2>&1

-- 
bristol packaging