[SCM] bristol/master: 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 branch:
commit f9f8c57ac3bc60c677870feddc1dcfff73472a8f
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Oct 14 12:48:44 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 d08289f..933f9c6 100644
--- a/debian/patches/90-CVE_insecure_library_loading.patch
+++ b/debian/patches/90-CVE_insecure_library_loading.patch
@@ -2,8 +2,8 @@ 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 |   54 ++++++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 50 insertions(+), 4 deletions(-)
+ bin/startBristol.in |   56 ++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 50 insertions(+), 6 deletions(-)
 
 --- bristol.orig/bin/startBristol.in
 +++ bristol/bin/startBristol.in
@@ -85,16 +85,18 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598285
  
  # Nokey: Does the BRISTOL directory actually exist?
  if [ ! -d $BRISTOL ]; then
-@@ -360,7 +398,7 @@ fi
+@@ -360,9 +398,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 LD_LIBRARY_PATH=/usr/local/lib:/usr/lib:/lib
  
- export PATH=${PATH}:$BRISTOL/bin:/usr/local/bin
- 
-@@ -408,7 +446,7 @@ if [ $engine = 1 ]; then
+ if [ $jack -eq 1 ]; then
+ 	ldd `which bristol` | grep jack > /dev/null 2>&1
+@@ -408,7 +444,7 @@ if [ $engine = 1 ]; then
  		ls /tmp/br.$localport >/dev/null 2>&1
  		if [ $? -eq 0 ]; then
  			echo "host port looked busy, unlinking"
@@ -103,7 +105,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598285
  		fi
  	else
  		echo checking availability of TCP port $PORT
-@@ -506,5 +544,13 @@ fi
+@@ -506,5 +542,13 @@ fi
  
  sleep 1
  

-- 
bristol packaging