From 82d11c745fa6cfb2a55e1e81ea4d23372d47caea Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Mon, 5 Aug 2013 08:18:48 +0000 Subject: Backport patch fixing python-exec overwrite, bug #468378. (Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!) --- dev-python/setuptools/ChangeLog | 9 ++++- ...etuptools-0.9.8-install_scripts-overwrite.patch | 24 +++++++++++++ dev-python/setuptools/setuptools-0.9.8-r1.ebuild | 42 ++++++++++++++++++++++ dev-python/setuptools/setuptools-0.9.8.ebuild | 38 -------------------- 4 files changed, 74 insertions(+), 39 deletions(-) create mode 100644 dev-python/setuptools/files/setuptools-0.9.8-install_scripts-overwrite.patch create mode 100644 dev-python/setuptools/setuptools-0.9.8-r1.ebuild delete mode 100644 dev-python/setuptools/setuptools-0.9.8.ebuild (limited to 'dev-python') diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog index 8fd3bd43bf06..ac0cc8ce1bd3 100644 --- a/dev-python/setuptools/ChangeLog +++ b/dev-python/setuptools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/setuptools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.197 2013/07/26 00:45:11 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.198 2013/08/05 08:18:48 mgorny Exp $ + +*setuptools-0.9.8-r1 (05 Aug 2013) + + 05 Aug 2013; Michał Górny + +files/setuptools-0.9.8-install_scripts-overwrite.patch, + +setuptools-0.9.8-r1.ebuild, -setuptools-0.9.8.ebuild: + Backport patch fixing python-exec overwrite, bug #468378. *setuptools-0.9.8 (26 Jul 2013) diff --git a/dev-python/setuptools/files/setuptools-0.9.8-install_scripts-overwrite.patch b/dev-python/setuptools/files/setuptools-0.9.8-install_scripts-overwrite.patch new file mode 100644 index 000000000000..a1cc30ad5ff5 --- /dev/null +++ b/dev-python/setuptools/files/setuptools-0.9.8-install_scripts-overwrite.patch @@ -0,0 +1,24 @@ +# HG changeset patch +# User Arfrever Frehtes Taifersar Arahesis +# Date 1375688645 -7200 +# Mon Aug 05 09:44:05 2013 +0200 +# Node ID af6c2bd582e4ed09d30319c9742144c0491562af +# Parent 648bb1e6fcb9132483680998858f4b9e083e9c44 +# Parent 13f77d26065af56983aeecc37021fbcbbad3fa99 +Merged in mgorny/setuptools-overwrite-fix (pull request #10) + +Unlink destination file before writing scripts. + +diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py +--- a/setuptools/command/easy_install.py ++++ b/setuptools/command/easy_install.py +@@ -799,6 +799,8 @@ + mask = current_umask() + if not self.dry_run: + ensure_directory(target) ++ if os.path.exists(target): ++ os.unlink(target) + f = open(target,"w"+mode) + f.write(contents) + f.close() + diff --git a/dev-python/setuptools/setuptools-0.9.8-r1.ebuild b/dev-python/setuptools/setuptools-0.9.8-r1.ebuild new file mode 100644 index 000000000000..a0b6eb337b0c --- /dev/null +++ b/dev-python/setuptools/setuptools-0.9.8-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.9.8-r1.ebuild,v 1.1 2013/08/05 08:18:48 mgorny Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} ) + +inherit distutils-r1 + +DESCRIPTION="a collection of extensions to Distutils" +HOMEPAGE="http://pypi.python.org/pypi/setuptools" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# Force in-source build because build system modifies sources. +DISTUTILS_IN_SOURCE_BUILD=1 + +DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}"/${PN}-0.9.8-install_scripts-overwrite.patch + ) + + # Disable tests requiring network connection. + rm -f setuptools/tests/test_packageindex.py + + distutils-r1_python_prepare_all +} + +python_test() { + # Fails test_setup_requires under python2.5; probably a distutils bug + esetup.py test +} + +python_install() { + export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 + distutils-r1_python_install +} diff --git a/dev-python/setuptools/setuptools-0.9.8.ebuild b/dev-python/setuptools/setuptools-0.9.8.ebuild deleted file mode 100644 index f8947effddf5..000000000000 --- a/dev-python/setuptools/setuptools-0.9.8.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.9.8.ebuild,v 1.1 2013/07/26 00:45:11 radhermit Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} ) - -inherit distutils-r1 - -DESCRIPTION="a collection of extensions to Distutils" -HOMEPAGE="http://pypi.python.org/pypi/setuptools" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="PSF-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) - -python_prepare_all() { - # Disable tests requiring network connection. - rm -f setuptools/tests/test_packageindex.py - - distutils-r1_python_prepare_all -} - -python_test() { - # Fails test_setup_requires under python2.5; probably a distutils bug - esetup.py test -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} -- cgit v1.2.3-65-gdbad