Revert wrong change in _ctypes module (bug #329499).

(Portage version: HEAD/cvs/Linux x86_64)

7 files changed, 12 insertions, 23 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 653cdf80ac08..00c062025a90 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.484 2010/07/30 16:58:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.485 2010/07/31 19:14:08 arfrever Exp $
+
+  31 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  python-2.6.4-r1.ebuild, python-2.6.5-r2.ebuild, python-2.6.5-r3.ebuild,
+  python-2.7.ebuild, python-3.1.2-r3.ebuild, python-3.1.2-r4.ebuild:
+  Revert wrong change in _ctypes module (bug #329499).
 
   30 Jul 2010; Jeroen Roovers <jer@gentoo.org> python-3.1.2-r3.ebuild:
   Stable for HPPA (bug #320043).
diff --git a/dev-lang/python/python-2.6.4-r1.ebuild b/dev-lang/python/python-2.6.4-r1.ebuild
index 39d69d0dc48d..a371e9c75699 100644
--- a/dev-lang/python/python-2.6.4-r1.ebuild
+++ b/dev-lang/python/python-2.6.4-r1.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/dev-lang/python/python-2.6.4-r1.ebuild,v 1.13 2010/07/25 17:16:24 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.4-r1.ebuild,v 1.14 2010/07/31 19:14:08 arfrever Exp $
 
 EAPI="2"
 
@@ -104,9 +104,6 @@ src_prepare() {
 	# that stdin is a tty for bug #248081.
 	sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed"
 
-	# python ctypes abuse mmap perms incorrectly. This breaks PaX
-	sed -i -e s/'PROT_READ | PROT_WRITE | PROT_EXEC'/'PROT_READ | PROT_WRITE'/g Modules/_ctypes/malloc_closure.c
-
 	eautoreconf
 }
 
diff --git a/dev-lang/python/python-2.6.5-r2.ebuild b/dev-lang/python/python-2.6.5-r2.ebuild
index dec718b6d6d5..54604077c816 100644
--- a/dev-lang/python/python-2.6.5-r2.ebuild
+++ b/dev-lang/python/python-2.6.5-r2.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/dev-lang/python/python-2.6.5-r2.ebuild,v 1.16 2010/07/25 17:16:23 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.17 2010/07/31 19:14:08 arfrever Exp $
 
 EAPI="2"
 
@@ -102,9 +102,6 @@ src_prepare() {
 	# that stdin is a tty for bug #248081.
 	sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed"
 
-	# python ctypes abuse mmap perms incorrectly. This breaks PaX
-	sed -i -e s/'PROT_READ | PROT_WRITE | PROT_EXEC'/'PROT_READ | PROT_WRITE'/g Modules/_ctypes/malloc_closure.c
-
 	eautoreconf
 }
 
diff --git a/dev-lang/python/python-2.6.5-r3.ebuild b/dev-lang/python/python-2.6.5-r3.ebuild
index 598a6455610f..985a702c41eb 100644
--- a/dev-lang/python/python-2.6.5-r3.ebuild
+++ b/dev-lang/python/python-2.6.5-r3.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/dev-lang/python/python-2.6.5-r3.ebuild,v 1.2 2010/07/25 17:16:24 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r3.ebuild,v 1.3 2010/07/31 19:14:08 arfrever Exp $
 
 EAPI="2"
 
@@ -102,9 +102,6 @@ src_prepare() {
 	# that stdin is a tty for bug #248081.
 	sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed"
 
-	# python ctypes abuse mmap perms incorrectly. This breaks PaX
-	sed -i -e s/'PROT_READ | PROT_WRITE | PROT_EXEC'/'PROT_READ | PROT_WRITE'/g Modules/_ctypes/malloc_closure.c
-
 	eautoreconf
 }
 
diff --git a/dev-lang/python/python-2.7.ebuild b/dev-lang/python/python-2.7.ebuild
index 27f30f2e6773..ee22e3c28670 100644
--- a/dev-lang/python/python-2.7.ebuild
+++ b/dev-lang/python/python-2.7.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/dev-lang/python/python-2.7.ebuild,v 1.3 2010/07/25 17:16:24 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.ebuild,v 1.4 2010/07/31 19:14:08 arfrever Exp $
 
 EAPI="2"
 
@@ -107,9 +107,6 @@ src_prepare() {
 
 	# Support versions of Autoconf other than 2.65.
 	sed -e "/version_required(2\.65)/d" -i configure.in || die "sed failed"
-
-	# python ctypes abuse mmap perms incorrectly. This breaks PaX
-	sed -i -e s/'PROT_READ | PROT_WRITE | PROT_EXEC'/'PROT_READ | PROT_WRITE'/g Modules/_ctypes/malloc_closure.c
 }
 
 src_configure() {
diff --git a/dev-lang/python/python-3.1.2-r3.ebuild b/dev-lang/python/python-3.1.2-r3.ebuild
index 6bec01837dcf..3b9d02f50d93 100644
--- a/dev-lang/python/python-3.1.2-r3.ebuild
+++ b/dev-lang/python/python-3.1.2-r3.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/dev-lang/python/python-3.1.2-r3.ebuild,v 1.16 2010/07/30 16:58:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild,v 1.17 2010/07/31 19:14:08 arfrever Exp $
 
 EAPI="3"
 
@@ -89,8 +89,6 @@ src_prepare() {
 	# that stdin is a tty for bug #248081.
 	sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed"
 
-	# python ctypes abuse mmap perms incorrectly. This breaks PaX
-	sed -i -e s/'PROT_READ | PROT_WRITE | PROT_EXEC'/'PROT_READ | PROT_WRITE'/g Modules/_ctypes/malloc_closure.c
 	eautoreconf
 }
 
diff --git a/dev-lang/python/python-3.1.2-r4.ebuild b/dev-lang/python/python-3.1.2-r4.ebuild
index a8e372e93fb4..9230e18e78e9 100644
--- a/dev-lang/python/python-3.1.2-r4.ebuild
+++ b/dev-lang/python/python-3.1.2-r4.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/dev-lang/python/python-3.1.2-r4.ebuild,v 1.4 2010/07/25 17:16:23 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r4.ebuild,v 1.5 2010/07/31 19:14:08 arfrever Exp $
 
 EAPI="3"
 
@@ -95,8 +95,6 @@ src_prepare() {
 	# Fix parallel installation (bug #328009).
 	sed -e "s/^sharedinstall:/& sharedmods/" -i Makefile.pre.in || die "sed failed"
 
-	# python ctypes abuse mmap perms incorrectly. This breaks PaX
-	sed -i -e s/'PROT_READ | PROT_WRITE | PROT_EXEC'/'PROT_READ | PROT_WRITE'/g Modules/_ctypes/malloc_closure.c
 	eautoreconf
 }