add patches to fix CVE-2010-4005. Bump PKGREVISION.

4 files changed, 43 insertions, 3 deletions

diff --git a/editors/tomboy/Makefile b/editors/tomboy/Makefile
index 3b2e6efec4e..7fbb0e79a2c 100644
--- a/editors/tomboy/Makefile
+++ b/editors/tomboy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2011/06/10 09:39:54 obache Exp $
+# $NetBSD: Makefile,v 1.28 2011/07/03 07:39:27 obache Exp $
 #
 
 DISTNAME=		tomboy-1.2.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		editors misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/tomboy/1.2/}
 
diff --git a/editors/tomboy/distinfo b/editors/tomboy/distinfo
index 5a3128c92bd..d9aa9617b7e 100644
--- a/editors/tomboy/distinfo
+++ b/editors/tomboy/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2010/11/30 03:44:36 obache Exp $
+$NetBSD: distinfo,v 1.8 2011/07/03 07:39:27 obache Exp $
 
 SHA1 (tomboy-1.2.1.tar.gz) = 98e01ad670a3aa2c264319a5e36daa0ea4036891
 RMD160 (tomboy-1.2.1.tar.gz) = fa2e16b6e3e175e98756005853de8b6cc0ffcf25
 Size (tomboy-1.2.1.tar.gz) = 7695607 bytes
+SHA1 (patch-Tomboy_tomboy-panel.in) = b8ba00735d939da3029a6aa1046d74ccf4fc20d2
+SHA1 (patch-Tomboy_tomboy.in) = f9b7caa4725133ca78111b9efaa16d7b1276c5b6
diff --git a/editors/tomboy/patches/patch-Tomboy_tomboy-panel.in b/editors/tomboy/patches/patch-Tomboy_tomboy-panel.in
new file mode 100644
index 00000000000..ac3b5c1f25c
--- /dev/null
+++ b/editors/tomboy/patches/patch-Tomboy_tomboy-panel.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Tomboy_tomboy-panel.in,v 1.1 2011/07/03 07:39:27 obache Exp $
+
+* Fix CVE-2010-4005
+  https://bugzilla.gnome.org/show_bug.cgi?id=635614
+
+--- Tomboy/tomboy-panel.in.orig	2010-02-06 20:59:53.000000000 +0000
++++ Tomboy/tomboy-panel.in
+@@ -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"
diff --git a/editors/tomboy/patches/patch-Tomboy_tomboy.in b/editors/tomboy/patches/patch-Tomboy_tomboy.in
new file mode 100644
index 00000000000..154acef6ac4
--- /dev/null
+++ b/editors/tomboy/patches/patch-Tomboy_tomboy.in
@@ -0,0 +1,23 @@
+$NetBSD: patch-Tomboy_tomboy.in,v 1.1 2011/07/03 07:39:27 obache Exp $
+
+* Fix CVE-2010-4005.
+  https://bugzilla.gnome.org/show_bug.cgi?id=635614
+
+--- Tomboy/tomboy.in.orig	2010-04-01 16:47:37.000000000 +0000
++++ Tomboy/tomboy.in
+@@ -3,13 +3,13 @@
+ if [ "x$PWD" = "x@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@"
+