dev-lang/python-2.7.6-r2: revbump/merge (also best->native migration)

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 32 insertions, 11 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 58ad63c..291bb1f 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -10,12 +10,13 @@ AUX python-2.7.5-library-path.patch 991 SHA256 ff7a4a1846ebcadc2dbf979ea619072ca
 AUX python-2.7.5-nonfatal-compileall.patch 750 SHA256 3f5a137602f1b3f0522f561c168a740f0080b29c2c888cb3a8dbbcc4407c2d9e SHA512 d2e93e2a6fcd55d516df0ddaca31af97faed677ea6b4be282eb99e7864f8a7399b5ca11139844a4b3c264832183483b0f4c8c9865c05de0e8520e6d2c8f1dbc6 WHIRLPOOL ab576e3a4e67f881d6d5c705503230ace125fe94d907d7f69bb573dd492070b8b34078a2b1205f315eb45244fbae8855c0f15ce35158f1d356f1bd4acf83b3c2
 AUX python-2.7.5-re_unsigned_ptrdiff.patch 941 SHA256 5b0c0465a23d27e1c8f0961a8d88b3af75fbc9933ab60c2a71091720a3681079 SHA512 d46fbbc8411fae78cdfca2564faca42f32bb95ee348b9aa3fd1ca90b346cc52cd468945cee07e6df4dff46c10cee6856a58004f8e453960f6dca2751c077802b WHIRLPOOL 10bb08242dd9a055f6bdaf3eb1546786b58f180667c6355ea7276114cbac0ffba6c34822add7965fe3b5d41cc92ce8ec45e2d1d56377d8a6aa2755ef4267d101
 AUX python-2.7.6-includeflags.patch 1495 SHA256 f04b18b09c8e8bddfb9d92186a5457735a036fe541c1510c4b44a1c4005b3d79 SHA512 6b656ab8612798eac4aa09c4bc856d9f71f4df73b0aabbabec5952fbbe71bb2774c7f633f5cbc80e4e9802aba97ba698fdbc9795f3353c591fe888c8ef592fbb WHIRLPOOL e1de6155105c4b87d0b0e649570c60c3ddd7a024e8fb82d4443de3b4a9b5777bf9b9f78fe0236c2f9455d9339df2139002388432560d1be1fa99c9894c6c5a61
+AUX python-2.7.6-recvfrom_into_buffer_overflow.patch 563 SHA256 bdf280058fe31b6e9d08a32e4ce16e958e3dddeed515417a03b25e5ec62d41b4 SHA512 21b534e41ce1cd1bf954849f4246ef0ae907ba7335b42ccfc914cc33068db91140dc1fea0f1b8a83818609e7f5a5f5df6623f029c2c86004f2126eb3f2699c06 WHIRLPOOL 2ffe173be651aae7d43ad8ee75600133ea96952431140c7c00e0ca6ad431d3faa230207f93f1191bfd3bcdf7b0c9af61948871b06158e6953106d7f2d0c7e9f5
 AUX python-3.2-CVE-2013-2099.patch 2102 SHA256 76a89951e7efcf14d37e30e0104446429ca121c68cbb1753ec362a177c1b5a54 SHA512 03d2a09fe730bf8c94df1eb10f8bac37a31a28dfb45b7d49abe1c3ffe26ca948f8d00eb58319d34102f8a747a038d447d3507b11c051c778c42ae21ac1066c8e WHIRLPOOL 3cd701c606ef1f4f557d1d250af41a860a6a5c4b6d9ff9a9f469ab6974f13e1205d2c4c791e9bd353fd4ff726f6cbf979f9a3927b83b04af5128c1aea7070496
 AUX python-3.2-issue16248.patch 738 SHA256 b5e94ead2622f355d733232dcfdac4dab53889aab12980fa1e4496c296191e77 SHA512 6fcf3d4cf05e41758a6d51ad9cc25ce9fcd1d33854f096b599811a07ef6b7f0cc4f178c4db6b15c5c9ee86eb53fcc736fede0dfb4eae81ca429d0fad62d84db9 WHIRLPOOL dd620bdce394a74910f4deed50b8bcd2b5d6b61af1e2e225a7c36fe4f293560fe1237a2111a4a4a334dfd1272fa4b7faf6289b2a018864c4f154c8a8a8b85c5c
 AUX python-3.3-CVE-2013-2099.patch 2102 SHA256 d5ccc8de43a176d9d16c3a7be58d32dcf3c952147d8866f84dffcd8fa66f6396 SHA512 a8e2c8fd3d3c3924acb856e89b6dc6965c887688e4c7d078c27abacfaf6b33b12484d86942b75643f28e4a14a465e2ec6a30fe53acf2ab036ae667fb7f76d737 WHIRLPOOL c02bd815d5143b6a916a91f40bb7971f1be188e836ab6095a5befd6410545acba0d44b4b0a75a5f7e7d84105018c0ef27887eefdcd883c73e68f872bb4138e35
 AUX python-config-2.4-r1 1624 SHA256 923a9e896f99cca5aa4ccbb02f981c6e26a2b1aa42326de2359d3c884bde2a9f SHA512 f8a0e12bed93385b3dddfa64a416ff4a560ec1b12c6c4a0dd715a2c804a43b6a292f0fe13e28d7828d4c4d620cde9dd7eab6a3423216786917ea6f51856ff53c WHIRLPOOL f2fe759b05ac0eb3b8dd196b0c68b8b8e0145ab79659eb4a45adee1bf7ae7260f457ae6192b9792990babd59cb98cceec05a8d93a50a3203517fe49ec30f5e0e
 DIST Python-2.7.6.tar.xz 10431288 SHA256 1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 SHA512 e56e6cdd96ff7bcb680d11ad606c00f4264e413fc43ba7605b2d2e4a743fd6e464cbedabf18b461f742102e936f45d840302a99665b5f988b1df08b25285c238 WHIRLPOOL 3b83106e89c96d2227573595bd96c868e6ece7fb04fda0aa22c8d3249af99cedebcd224ec8ae788eabe8a091a55d12af9ed093ee1eedb7c72b66732c62d5e1b3
 DIST python-gentoo-patches-2.7.6-1.tar.xz 14572 SHA256 cb0fca8f006ee7b8501cfbed063c987ad6793f61072144ded2122bca6dc608ed SHA512 e6bc3de2053b1dbc5845effe86cc7d19acbcf10b52b2a1ce3d45988492a2430dd8f6ea3e547beaf57bdf176b06a07f267aa6afac82cde61ed730fe3f4b2ab238 WHIRLPOOL ecf800bc895609bbdf5ec5c53031142b56002b20930d9dd1c34610fb6628d0d5fa6874a1111fa691474bde6ae1e18a03da795bb298cde4a6f649e45637ea4da0
-EBUILD python-2.7.6-r1.ebuild 13917 SHA256 783c2e87f4dc79387e0588408c7e942ec4c952b46271e5445681ad701ccc41fb SHA512 c99586cce31cec9fab20d09aa2f715a6dd403316a92b7a0934048b81feca29c26d68105da76b102dd7bf8c77604afbe1c7243e40df406900aa8b4030056cddd2 WHIRLPOOL 35df6c547100889d5742b12513aee8662de3a2b72e95cdb14f24be6cbc8832ff5010a46a37a8b8f7c5c31cfbe126195446e2169dd5e6017d99a423279261c301
+EBUILD python-2.7.6-r2.ebuild 14003 SHA256 e8d0847771fbf374d75965bcd5dec8b4d2db262b3b4d94bddd00e125caa8a70a SHA512 3f2eb0b2132eb2377342171eeee847d8c590e2ed652a68a0e8716d833fc643ea217d7ac88ad7ee047c702c655a97fbe148a7df4ea5046379ba2fd57aa724ba62 WHIRLPOOL d8bc363645399cb080ca8c81bc54b77bc53bb50edc4aabc590137abe1ef9f50699d8dcd717fd6a1a3a2d19be3b62b59e8169177ee7b4d582d1e675ffe6b349c2
 MISC ChangeLog 27576 SHA256 d9b6928b2234df665a3ce1868f4452b24d2cc7e012e6ac08c116d8b786ab4859 SHA512 c54030c7f02a0663eea1c2a0fb5b9d0377b9245bb1de7330e85d341a05c7c3c6db117df20ac121fa1e549da3e76470714c9e4b723499716f00ee8ae6d4a64d50 WHIRLPOOL 8a878d2be539d36d6fd4102df9d493c63b528cd46a7ee3b0c89429a2370bdab90c50925e73adaf4c5920cef23efd54993d5b0e0d2cd5d946648a97b2bbbb7405
 MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e
diff --git a/dev-lang/python/files/python-2.7.6-recvfrom_into_buffer_overflow.patch b/dev-lang/python/files/python-2.7.6-recvfrom_into_buffer_overflow.patch
new file mode 100644
index 0000000..37e786b
--- /dev/null
+++ b/dev-lang/python/files/python-2.7.6-recvfrom_into_buffer_overflow.patch
@@ -0,0 +1,17 @@
+diff -r 40fb60df4755 Modules/socketmodule.c
+--- a/Modules/socketmodule.c	Sun Jan 12 12:11:47 2014 +0200
++++ b/Modules/socketmodule.c	Mon Jan 13 16:36:35 2014 -0800
+@@ -2744,6 +2744,13 @@
+         recvlen = buflen;
+     }
+ 
++    /* Check if the buffer is large enough */
++    if (buflen < recvlen) {
++        PyErr_SetString(PyExc_ValueError,
++                        "buffer too small for requested bytes");
++        goto error;
++    }
++
+     readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
+     if (readlen < 0) {
+         /* Return an error */
diff --git a/dev-lang/python/python-2.7.6-r1.ebuild b/dev-lang/python/python-2.7.6-r2.ebuild
index 20506d4..0626b0a 100644
--- a/dev-lang/python/python-2.7.6-r1.ebuild
+++ b/dev-lang/python/python-2.7.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -55,6 +55,7 @@ RDEPEND="app-arch/bzip2[${MULTILIB_USEDEP}]
 		tk? (
 			>=dev-lang/tk-8.0[${MULTILIB_USEDEP}]
 			dev-tcltk/blt[${MULTILIB_USEDEP}]
+			dev-tcltk/tix[${MULTILIB_USEDEP}]
 		)
 		xml? ( >=dev-libs/expat-2.1[${MULTILIB_USEDEP}] )
 	)
@@ -64,7 +65,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.65
 	!sys-devel/gcc[libffi]
 	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r8
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r8
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
  	)"
 RDEPEND+=" !build? ( app-misc/mime-types )
@@ -85,7 +86,7 @@ MULTILIB_WRAPPED_EXECUTABLES=(
 	/usr/bin/pydoc${SLOT}
 	/usr/bin/idle${SLOT}
 )
-MULTILIB_PARALLEL_PHASES=( src_configure src_compile src_test )
+MULTILIB_PARALLEL_PHASES=( src_configure src_test )
 
 pkg_setup() {
 	if use berkdb; then
@@ -117,6 +118,9 @@ src_prepare() {
 	# Fix for cross-compiling.
 	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
 
+	# fix for CVE-2014-1912 (bug #500518)
+	epatch "${FILESDIR}"/${P}-recvfrom_into_buffer_overflow.patch
+
 	# multilib header includes
 	local abis=( $(multilib_get_enabled_abis) )
 	[[ ${#abis[@]} -gt 1 ]] && \
@@ -275,17 +279,17 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	local S="${BUILD_DIR}"
-	local ABI="${ABI:-default}"
-	local BUILD_DIR="${WORKDIR}/${CHOST}-${ABI}"
-	pushd "${BUILD_DIR}" > /dev/null || die
-
 	# Tests will not work when cross compiling.
 	if tc-is-cross-compiler; then
 		elog "Disabling tests due to crosscompiling."
 		return
 	fi
 
+	local S="${BUILD_DIR}"
+	local ABI="${ABI:-default}"
+	local BUILD_DIR="${WORKDIR}/${CHOST}-${ABI}"
+	pushd "${BUILD_DIR}" > /dev/null || die
+
 	# Skip failing tests.
 	local skipped_tests="distutils gdb"
 
@@ -374,7 +378,6 @@ multilib_src_install_all() {
 	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
 
 	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
 		insinto /usr/share/doc/${PF}/examples
 		doins -r "${S}"/Tools
 	fi
@@ -411,7 +414,7 @@ multilib_src_install_all() {
 				fi
 			done
 
-			# Skip the remaining steps for the best abi.  For non-best abis, ...
+			# Skip the remaining steps for the native abi.  For non-native abis, ...
 			[[ ${abi} == ${bestabi} ]] && continue
 
 			# ... install initscript templates, ...