diff options
| -rw-r--r-- | app-editors/editra/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/editra/editra-0.5.32.ebuild | 8 | ||||
| -rw-r--r-- | app-editors/editra/files/editra-0.5.32-sandbox.patch | 25 |
3 files changed, 37 insertions, 2 deletions
diff --git a/app-editors/editra/ChangeLog b/app-editors/editra/ChangeLog index ad7ea5f96b14..f195d4401757 100644 --- a/app-editors/editra/ChangeLog +++ b/app-editors/editra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/editra # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/ChangeLog,v 1.9 2010/01/23 00:15:12 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/ChangeLog,v 1.10 2010/02/19 00:21:13 dirtyepic Exp $ + + 19 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> editra-0.5.32.ebuild, + +files/editra-0.5.32-sandbox.patch: + Fix sandbox violations, bug #298752. *editra-0.5.32 (23 Jan 2010) diff --git a/app-editors/editra/editra-0.5.32.ebuild b/app-editors/editra/editra-0.5.32.ebuild index 90bac53a46e7..95f6da0a099a 100644 --- a/app-editors/editra/editra-0.5.32.ebuild +++ b/app-editors/editra/editra-0.5.32.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.5.32.ebuild,v 1.1 2010/01/23 00:15:12 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.5.32.ebuild,v 1.2 2010/02/19 00:21:13 dirtyepic Exp $ EAPI=2 @@ -26,6 +26,12 @@ RDEPEND="${DEPEND} S="${WORKDIR}"/${MY_PN}-${PV} +src_prepare() { + #http://code.google.com/p/editra/issues/detail?id=481 + epatch "${FILESDIR}"/${P}-sandbox.patch + # next version, use setup.py install --no-clean +} + src_install() { distutils_src_install insinto /usr/share/pixmaps diff --git a/app-editors/editra/files/editra-0.5.32-sandbox.patch b/app-editors/editra/files/editra-0.5.32-sandbox.patch new file mode 100644 index 000000000000..4b138291648c --- /dev/null +++ b/app-editors/editra/files/editra-0.5.32-sandbox.patch @@ -0,0 +1,25 @@ +diff --git a/setup.py b/setup.py +index 8db801c..80aa3bf 100755 +--- a/setup.py ++++ b/setup.py +@@ -482,20 +482,6 @@ def DoSourcePackage(): + else: + from distutils.core import setup + +- # Try to remove possibly conflicting files from an old install +- try: +- import Editra +- path = Editra.__file__ +- if '__init__' in path: +- path = os.path.dirname(path) +- path = os.path.join(path, 'src') +- del sys.modules['Editra'] +- shutil.rmtree(path) +- except (ImportError, OSError): +- pass +- except: +- sys.stderr.write("[ERROR] Failed to remove old source files") +- + # Make sure to delete any existing MANIFEST file beforehand to + # prevent stale file lists + if os.path.exists('MANIFEST'): |