[SCM] ardour/master: Backport LDPATH fix from upstream.

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6fb790ec966842d07306e9be38f9e02accada96c
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed Sep 29 10:38:07 2010 +0200

    Backport LDPATH fix from upstream.
    
    Upstream also addresses potential issues with GTK_PATH, just to be sure.
    The ardev part isn't relevant for Debian, but it won't do any harm to
    patch it, just in case a user ever wants to rebuild the package and
    intends to run the debugger-friendly version.

diff --git a/debian/patches/130_ldpath.patch b/debian/patches/130_ldpath.patch
index 51d0e8d..0f4df44 100644
--- a/debian/patches/130_ldpath.patch
+++ b/debian/patches/130_ldpath.patch
@@ -1,17 +1,33 @@
-From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
+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: yes
---- a/gtk2_ardour/ardour.sh.in
-+++ b/gtk2_ardour/ardour.sh.in
-@@ -2,7 +2,7 @@
+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 GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$GTK_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}"
++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
  

-- 
ardour Debian packaging