- The Modules/_ctypes/malloc_closure.c misuses a mmap() call trying to set a mem segment to rwx when it does not need it. Bug 329499

Package-Manager: portage-2.1.7.17/cvs/Linux i686

8 files changed, 36 insertions, 24 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 240b14f0580f..437115557650 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
 # 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.482 2010/07/22 16:34:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.483 2010/07/25 17:16:24 solar Exp $
+
+  25 Jul 2010; <solar@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:
+  - The Modules/_ctypes/malloc_closure.c misuses a mmap() call trying to set
+  a mem segment to rwx when it does not need it. Bug 329499
 
   22 Jul 2010; Markus Meier <maekke@gentoo.org> python-2.6.5-r2.ebuild:
   arm stable, bug #319723
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 58cb52721048..cf7e7cc4172d 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pydoc.conf 330 RMD160 0cd619ec251597e0fcadc05bfd249915e73baa17 SHA1 a56100d45378c554b9822f6ed512a6cb7841ef50 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1
 AUX pydoc.init 666 RMD160 11caf3a78bce4cdaebacaf21eaf26cc1ce30282e SHA1 88c5cb6d5bf737c74e1be93118cf157630af9ad7 SHA256 0d25c71232b74adb87dc709cc7cd8f8b13c452c0fe82fa33808f907f7a96d628
 AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6
@@ -24,18 +21,11 @@ DIST python-gentoo-patches-3.1.2-r5.tar.bz2 67359 RMD160 0ee5576b7de728a0840c602
 DIST python-gentoo-patches-3.1.2-r6.tar.bz2 1285912 RMD160 a525679255b2dcb0a65d00792a8c247742e94923 SHA1 7ab91a40074f33b08b805b2cce54dc32c1f596b1 SHA256 45a4368f537b2d92ead296dd600207313a20a8027dcaeaa2a0c71dcf8ecb9899
 EBUILD python-2.4.6.ebuild 9295 RMD160 ceafad3166524ebb3bb89c58efb8aff255053dd1 SHA1 8545e8b5671180216a863170213bd3f95666518c SHA256 03b17693ea85c22aeb13c3105330cf0aebaf9f9e241b0cc81a03c39cf5c959e0
 EBUILD python-2.5.4-r4.ebuild 9645 RMD160 21881a4d1f0e8245b1821109ab26e775d55e94c6 SHA1 2c1b8b54b5ec5902521d9e9017d669c67ae15160 SHA256 c6dc2f20bf1edbbdee06ab87ed5618d0f5e07172c212a51cb44a86df706591c1
-EBUILD python-2.6.4-r1.ebuild 9579 RMD160 63713df2187e8f3adc35038b26e58fc8e4cf8e4f SHA1 05640ba05170caff47cf8998d6ac1ad127a682a2 SHA256 5fb3de2f4f6b9b13c16c8f0b452bde4057a8a889a828920762b4c4c02e2aad98
-EBUILD python-2.6.5-r2.ebuild 9454 RMD160 20ea367f1228acaf8af463ddc6ed23306d5848c3 SHA1 2d693f16b26d33ef28a1b035501f07d0ddf1718b SHA256 b47fc9ce37c13f5b7ba9f1649b0807cf5d9cb6381cb7991bcf9feeebc65ef319
-EBUILD python-2.6.5-r3.ebuild 9452 RMD160 992d239730bbb901eb186b996f2cdeb0b7bc2b3d SHA1 aeb39e95a7b8ac219ce1d99eddeef3e7ec556564 SHA256 6564b86e7de3374a976f127343ee62c9cd4abbd2bcc7d0de32685520c6d48404
-EBUILD python-2.7.ebuild 9743 RMD160 43381e34f2e2494b348c4e26365e8579642deac8 SHA1 5061119a80c0992bd83805210029c5dad88cdfbb SHA256 92bc8e51588d143647f42b52cf867efdcc57a044c1b06f285ee6b7fe3f414af3
-EBUILD python-3.1.2-r3.ebuild 9253 RMD160 a49a52efde417a3c93c5b610dbb60de4ddbf11b8 SHA1 dfdfe9e35dd5ff0d71ef2e66330a34b08ac21299 SHA256 a549d8dc8d10e9a8673946909c5a3f2ac4c85a1d2ccfdf9cdb4f8d8308b6efff
-EBUILD python-3.1.2-r4.ebuild 9536 RMD160 dfc70f977eebdc524743cc8557528ffb32955a78 SHA1 7bcdfef9fcf3383c75d357b94f2ea9957ad05665 SHA256 382cd63966012d18beec23b3a0a1de27b095ae0a3bb1869bb3f6964b3ab6b9cb
-MISC ChangeLog 85818 RMD160 72ad527c965842efef4399d9ba0ea735ff60dff9 SHA1 04c1a12fbbd6de1834838a91b9a2b53e09c93311 SHA256 3f3265fcd42b6369aa924709fef405f2d404de651206a8aaf77620170f72741b
+EBUILD python-2.6.4-r1.ebuild 9750 RMD160 3109f3694676cfd4c39638911f84025de4b56b9d SHA1 f6f5bd644093559b6445ecd21ef5f04283177e07 SHA256 376c76908cd8225459ee07bff646cb96df7dfc3c0c11ad83ff9b56432441c6ac
+EBUILD python-2.6.5-r2.ebuild 9627 RMD160 0c86ee59113a92df8c62098aa0842a54065fd10e SHA1 faf5731af331bce5929294857e66482fb34c46c1 SHA256 05b2f58ace6dd23af73f3d8df8ed4b638e23f4693c8f19aa27a64d63ff9629c4
+EBUILD python-2.6.5-r3.ebuild 9623 RMD160 05b1ccc66b7f7743ce8cccba2901c3fc906a391c SHA1 303b00ef71cfbed70e50d019273db614ba67ba95 SHA256 013f9d1294e6df015294ae1d0790905cb52ae25868bf524357281c42333af8cb
+EBUILD python-2.7.ebuild 9914 RMD160 c806852048157263f148e57d12a9954174042b54 SHA1 b8f9a3dd38817b19476351cdbcfb0ae3433528fd SHA256 ade0441a81695ea9009e5057533ba287856258c380104780ab4c0279834eed4e
+EBUILD python-3.1.2-r3.ebuild 9425 RMD160 33a437e2ec3f0d6a4785b63682d6cdc7e0fdf02b SHA1 bd998f499ed1bbefa432377292788231114ad7f9 SHA256 0c61ad0c31fde43ef49cf3359177f743eeaa9891d68f555936b2c59dbb6839e6
+EBUILD python-3.1.2-r4.ebuild 9706 RMD160 1c6d2cb52902eeb8d2db9a1e4fcd35cac6c7f782 SHA1 5b46adf0b4e92a748d3ed089f383b1f2868b4f51 SHA256 49aebadaf9b1d4b1b65cab94e46ebc5daa57e730fd310862909bfa9a6b26c6b3
+MISC ChangeLog 86132 RMD160 5c1087a90802b1f18f727669ac818c4b38242dd9 SHA1 97b30440a63d517b48d6b5316f51cc34d36f24fe SHA256 b70f7934e20a00313b281ce228933cb84ec7ecfd58f787521abe7fc8999df0d9
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxIc0wACgkQkKaRLQcq0GKQUgCdG7fCpZyiBaosPW+J5e+RAzCl
-61sAoKSSI7bETlJON5aABVTmpKNJ4AJt
-=A5Fh
------END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.6.4-r1.ebuild b/dev-lang/python/python-2.6.4-r1.ebuild
index 41d50d9f0cd9..39d69d0dc48d 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.12 2010/05/25 17:09:38 arfrever Exp $
+# $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 $
 
 EAPI="2"
 
@@ -104,6 +104,9 @@ 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 fa326a40dc3c..dec718b6d6d5 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.15 2010/07/22 16:34:47 maekke Exp $
+# $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 $
 
 EAPI="2"
 
@@ -102,6 +102,9 @@ 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 2d407ff49a85..598a6455610f 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.1 2010/07/12 19:11:19 arfrever Exp $
+# $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 $
 
 EAPI="2"
 
@@ -102,6 +102,9 @@ 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 dc4096ce9648..27f30f2e6773 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.2 2010/07/10 13:06:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.ebuild,v 1.3 2010/07/25 17:16:24 solar Exp $
 
 EAPI="2"
 
@@ -107,6 +107,9 @@ 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 5882103fd5c2..d4ee894f626c 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.14 2010/07/18 12:42:52 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild,v 1.15 2010/07/25 17:16:24 solar Exp $
 
 EAPI="3"
 
@@ -89,6 +89,8 @@ 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 192922b9abad..a8e372e93fb4 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.3 2010/07/17 22:56:34 arfrever Exp $
+# $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 $
 
 EAPI="3"
 
@@ -95,6 +95,8 @@ 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
 }