New version, including patch to avoid sandbox violation (bug #60545)

6 files changed, 34 insertions, 8 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 96272b127c1c..bad1d897a614 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/glabels
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.2 2004/08/18 17:31:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.3 2004/09/03 09:07:13 leonardop Exp $
+
+*glabels-2.0.1 (03 Sep 2004)
+
+  03 Sep 2004; L. Boshell <leonardop@gentoo.org> glabels-2.0.1.ebuild,
+  files/glabels-2.0.1-sandbox_fix.patch:
+  New version. Added patch to fix a potential sandbox violation when
+  desktop-file-utils is installed. Resolves bug #60545.
 
   18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> glabels-1.93.3.ebuild:
   Stable on sparc
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index 088a79201320..ade353d19ebe 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,6 +1,9 @@
-MD5 78deb371c6ffce2cd588316f33658f06 ChangeLog 2054
-MD5 ab002f8bde4d44c83f613d09a152faef glabels-1.93.3.ebuild 964
-MD5 14539f5217d39d361b3aab0274f97005 glabels-2.0.0.ebuild 1036
+MD5 715b0e2080335f389f12d4586a5e5e3b ChangeLog 2277
 MD5 54b7f17aa1f3cf4e8cc03858fd99070c metadata.xml 554
-MD5 9e2ffe73924322314756d4f75f0f7298 files/digest-glabels-1.93.3 67
+MD5 ab002f8bde4d44c83f613d09a152faef glabels-1.93.3.ebuild 964
+MD5 c2f8827879b968b54c7c359466d27907 glabels-2.0.0.ebuild 1131
+MD5 c2f8827879b968b54c7c359466d27907 glabels-2.0.1.ebuild 1131
 MD5 beeadac937d901cb1fe5fb039672d3cc files/digest-glabels-2.0.0 66
+MD5 9e2ffe73924322314756d4f75f0f7298 files/digest-glabels-1.93.3 67
+MD5 81f9fc011c0c65da556b38f4eae30d5e files/glabels-2.0.0-sandbox_fix.patch 415
+MD5 42fee8564da4e38b5e06395d87648ee4 files/digest-glabels-2.0.1 66
diff --git a/app-office/glabels/files/digest-glabels-2.0.0 b/app-office/glabels/files/digest-glabels-2.0.0
deleted file mode 100644
index c8d8105c57b8..000000000000
--- a/app-office/glabels/files/digest-glabels-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 77a421ee35b64f01a0fbf5ada5944add glabels-2.0.0.tar.gz 1408734
diff --git a/app-office/glabels/files/digest-glabels-2.0.1 b/app-office/glabels/files/digest-glabels-2.0.1
new file mode 100644
index 000000000000..a0655e8e3a90
--- /dev/null
+++ b/app-office/glabels/files/digest-glabels-2.0.1
@@ -0,0 +1 @@
+MD5 d6658de86c76f9f333ed28ac11ca22f9 glabels-2.0.1.tar.gz 1415676
diff --git a/app-office/glabels/files/glabels-2.0.1-sandbox_fix.patch b/app-office/glabels/files/glabels-2.0.1-sandbox_fix.patch
new file mode 100644
index 000000000000..f35e695d3a28
--- /dev/null
+++ b/app-office/glabels/files/glabels-2.0.1-sandbox_fix.patch
@@ -0,0 +1,12 @@
+diff -NurdB glabels-2.0.1-orig/configure glabels-2.0.1/configure
+--- glabels-2.0.1-orig/configure	2004-09-03 03:38:05 -0500
++++ glabels-2.0.1/configure	2004-09-03 03:38:45 -0500
+@@ -9383,7 +9383,7 @@
+   ;;
+ esac
+ fi
+-UPDATE_DESKTOP_DATABASE=$ac_cv_path_UPDATE_DESKTOP_DATABASE
++UPDATE_DESKTOP_DATABASE=no
+ 
+ if test -n "$UPDATE_DESKTOP_DATABASE"; then
+   echo "$as_me:$LINENO: result: $UPDATE_DESKTOP_DATABASE" >&5
diff --git a/app-office/glabels/glabels-2.0.0.ebuild b/app-office/glabels/glabels-2.0.1.ebuild
index 582183432f12..94e17653a94d 100644
--- a/app-office/glabels/glabels-2.0.0.ebuild
+++ b/app-office/glabels/glabels-2.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.0.0.ebuild,v 1.1 2004/08/10 23:21:02 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.0.1.ebuild,v 1.1 2004/09/03 09:07:13 leonardop Exp $
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Program for creating labels and business cards"
 HOMEPAGE="http://glabels.sourceforge.net/"
@@ -32,6 +32,10 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 src_unpack() {
 	unpack ${A}
+
 	# Small syntax correction.
 	sed -i -e 's:;Office:;Office;:' ${S}/data/desktop/glabels.desktop.in
+
+	# Avoid sandbox violation. See bug #60545.
+	epatch ${FILESDIR}/${P}-sandbox_fix.patch
 }