[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master, updated. debian/1.5.2-1-19-g565a705

[Iain Lane]

The following commit has been merged in the master branch:
commit 565a705743d8edb07d195193625207e321c82cab
Author: Iain Lane <laney at ubuntu.com>
Date:   Sat Apr 9 21:25:36 2011 +0100

    Remove no longer needed patch 00_LD_LIBRARY_PATH_CVE_2010-4005
    
    Patch is merged upstream
    
    Git-Dch: Ignore

diff --git a/debian/patches/00_LD_LIBRARY_PATH_CVE-2010-4005 b/debian/patches/00_LD_LIBRARY_PATH_CVE-2010-4005
deleted file mode 100644
index 546ee84..0000000
--- a/debian/patches/00_LD_LIBRARY_PATH_CVE-2010-4005
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Fix unsafe LD_LIBRARY_PATH setting (CVE-2010-4005)
-Author: Luis Medinas <lmedinas at gnome.org>
-Origin: https://bugzilla.gnome.org/show_bug.cgi?id=635614
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605096
-Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=635614
-Forwarded: not-needed
-
-Index: tomboy.git/Tomboy/tomboy.in
-===================================================================
---- tomboy.git.orig/Tomboy/tomboy.in	2010-11-29 01:10:11.170557627 +0000
-+++ tomboy.git/Tomboy/tomboy.in	2010-11-29 01:09:46.128629088 +0000
-@@ -3,13 +3,13 @@
- if [ "x$PWD" = "x at srcdir@" ] ; then
-     echo "*** Running uninstalled @target@ ***"
- 
--    export LD_LIBRARY_PATH="../libtomboy/.libs${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}:./Addins/PrintNotes/.libs"
-+    export LD_LIBRARY_PATH="../libtomboy/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}:./Addins/PrintNotes/.libs"
-     export TOMBOY_WRAPPER_PATH="$PWD/@wrapper@"
-     export MONO_PATH=$MONO_PATH:./Addins:../Mono.Addins/Mono.Addins:../Mono.Addins/Mono.Addins.Setup:../Mono.Addins/Mono.Addins.Gui
- 
-     THIS_EXE="--debug ./@target@"
- else
--    export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
-+    export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-     export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
-     export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
- 
-Index: tomboy.git/Tomboy/tomboy-panel.in
-===================================================================
---- tomboy.git.orig/Tomboy/tomboy-panel.in	2010-11-29 01:10:10.770526817 +0000
-+++ tomboy.git/Tomboy/tomboy-panel.in	2010-11-29 01:10:00.929768958 +0000
-@@ -1,6 +1,6 @@
- #!/usr/bin/env bash
- 
--export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
-+export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
- export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
- export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
- TOMBOY_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/tomboy"

-- 
Tomboy - desktop note taking program using Wiki style links