Origin: http://subversion.ardour.org/svn/ardour2/branches/2.0-ongoing/
Description: Fix unsecure loading of libraries
 When LD_LIBRARY_PATH is unset, the ardour executable would
 load malicious libraries from CWD/$PWD.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598282
Forwarded: Not-Needed
--- a/gtk2_ardour/ardev_common.sh.in	(revision 7856)
+++ b/gtk2_ardour/ardev_common.sh.in	(revision 7858)
@@ -11,9 +11,9 @@
     echo USING OLD CLEARLOOKS
     export GTK_PATH=~/.ardour2:libs/clearlooks-older
 fi
-export VAMP_PATH=libs/vamp-plugins:$VAMP_PATH
+export VAMP_PATH=libs/vamp-plugins${VAMP_PATH:+:$VAMP_PATH}
 
-export LD_LIBRARY_PATH=libs/vamp-sdk:libs/surfaces/control_protocol:libs/ardour:libs/midi++2:libs/pbd:libs/rubberband:libs/soundtouch:libs/gtkmm2ext:libs/sigc++2:libs/glibmm2:libs/gtkmm2/atk:libs/gtkmm2/pango:libs/gtkmm2/gdk:libs/gtkmm2/gtk:libs/libgnomecanvasmm:libs/libsndfile:libs/appleutility:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=libs/vamp-sdk:libs/surfaces/control_protocol:libs/ardour:libs/midi++2:libs/pbd:libs/rubberband:libs/soundtouch:libs/gtkmm2ext:libs/sigc++2:libs/glibmm2:libs/gtkmm2/atk:libs/gtkmm2/pango:libs/gtkmm2/gdk:libs/gtkmm2/gtk:libs/libgnomecanvasmm:libs/libsndfile:libs/appleutility${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 # DYLD_LIBRARY_PATH is for darwin.
 export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
--- a/gtk2_ardour/ardour.sh.in	(revision 7856)
+++ b/gtk2_ardour/ardour.sh.in	(revision 7858)
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$GTK_PATH
+export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${GTK_PATH:+:$GTK_PATH}
 
-export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$LD_LIBRARY_PATH 
+export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 # DYLD_LIBRARY_PATH is for Darwin
 export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH