summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2014-07-07 21:10:08 +0200
committerMichael Haubenwallner <haubi@gentoo.org>2014-07-07 21:10:08 +0200
commitd43e4997e0813df2de993354a8fb42aef19bbf17 (patch)
tree2c11f376c9b5028a15cd45ccb5ae47d6bd0f4d39 /dev-lang
parentlibtool-2.4.2-r1: Fix local-libtool creation for multilib, bug#516598. (diff)
downloadprefix-d43e4997e0813df2de993354a8fb42aef19bbf17.tar.gz
prefix-d43e4997e0813df2de993354a8fb42aef19bbf17.tar.bz2
prefix-d43e4997e0813df2de993354a8fb42aef19bbf17.zip
python-3.3.3: fixorz upstream issues 13493, 14150, 15590, 16189 for AIX
(Portage version: 2.2.10.1-prefix/hg/AIX 00F773C04C00, signed Manifest commit with key A630CCB8)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/python/ChangeLog3
-rw-r--r--dev-lang/python/Manifest14
-rw-r--r--dev-lang/python/python-3.3.3.ebuild14
3 files changed, 19 insertions, 12 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index cdcb581979..f2c0f008a8 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.757 2014/04/25 18:33:36 chutzpah Exp $
+ 07 Jul 2014; Michael Haubenwallner <haubi@gentoo.org> python-3.3.3.ebuild:
+ fixorz upstream issues 13493, 14150, 15590, 16189 for AIX
+
23 Jun 2014; Michael Haubenwallner <haubi@gentoo.org> python-2.7.6-r1.ebuild:
fixorz upstream issues 13493, 14150, 15590, 16189 for AIX
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index f477c9d4b6..cbab2cdc81 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX CVE-2013-4238_py27.patch 11591 SHA256 050cc2d4b9d588f2587010a30819591e02130fde90594782993a39c945c1559b SHA512 f9b1d0573bc7175b8fe6bdd8b6777a376cd717a594a14a6ddb334e0107596b0fbfbfe8a0c1743a0da54ce8ac8905cb7385aa2ae26698272f679763542c13e7e2 WHIRLPOOL bbf89edb2e3620aae3f54e80feba98d75fa566594b2e71e88b75c22036201a2692a77daf56080f4413612edf159f4282f5494a0a5dd11b350bcde248ef51f139
AUX CVE-2013-4238_py33.patch 11437 SHA256 e4f78490fc247df9d1133dc9f2deec47b1c582c4af1c8e93bd503d889c9eb716 SHA512 d1f1b64c46056f178b89abfe61c7c653afc0ed67cf9a8ef8c981d1cf6a1c389cb20bd354cac3a30c1241e6fe24a49e165527571276c1f8afb55989f5f069ba00 WHIRLPOOL e5889b6be0a2db7ec45ff8cbe9fa8481c6c69b25091b62635d2ff595ef5d0b1136485f7adb04f4c0c97402edfd9d915d4fd05e2b6bf1942497d81de1b1cefdce
AUX pydoc.conf 513 SHA256 a2286629ff90ff441234e5651675aa4e3b2844916a1135e59b65bd6922cf4778 SHA512 1c0058f96b9634021d3bb370e44edaf31886a07f7c84f220679e1ad722b83180e4b73824395029f79ce7643a0ef63bc94b62a6569e32f81c158acbdcef2b32e5 WHIRLPOOL 3163671c44d671e82420e2daa022fd4e6b4f1329fbb9e89777247d022530063505e2e857be9f661e756e4ad2e7f23b317fd67b4d3d8a84d3389203c4e66ca7ac
@@ -40,13 +37,6 @@ DIST python-prefix-3.3.3-gentoo-patches-r2.tar.bz2 13776 SHA256 7e90671d26b60b87
EBUILD python-2.7.5-r4.ebuild 19500 SHA256 830e720b73b7a3ba9266afc5572e35558543acb0f4fa98c6bd7c33613af3ce5e SHA512 6eb7ae7c9910da1e61a375f4e415e936fc9131ac240f5bfc1ccec795edd54d7fd34bb7596c1c0042a458b323f799a1fe2867ffaeb72038b1cf73aa4c36a36e32 WHIRLPOOL cf7826dd40e1bf6c27b93af3f7fbcfc0c0a7fbea5fe5d23035c039f09f860b3a4449f7715302845b40ded9630987ddae8ea2acd12ef0cf2b0e877e989373ebf9
EBUILD python-2.7.6-r1.ebuild 20233 SHA256 0d56c96a587c423dfbe0cd443bbf9a124a1a9f9b6c3cca05b05755722cbe2671 SHA512 c11fc060d82d3610fc968b4bf5dae81dc1955fb3d595faa6514bb046f8e60f93865fbb334dbfb262051df2940fa47fdfd677b39371a29c2651365e8e14473a73 WHIRLPOOL 4c0c6cb44cc74a08f6e6253ee74de50d3b28e0cd9ec499d385d130398b3c619d2275675f8df2fb3e0fa32a2854d31ed08b1821505a35eb034012b9131f6753d9
EBUILD python-3.2.5-r3.ebuild 12225 SHA256 2adc6ed9cf4c8d75fc9e753aca2df6de0e0aa27b938367ea696da5f8d1dc9fb9 SHA512 6a76bcedbc0953e95e821b5831646c733b2e55e990043b3a4f5e06b60c48d5104b5db756fe283e80a034b62c23699b03e2227b3e3e9f974068db3c807d775141 WHIRLPOOL 70eb69939392a067873faab20192094e71209eca6582443d16798d44b3dc6896fb94b6e58f61dd7ce44ddb02c936a4f474b003275cc14c6fa780a68085331441
-EBUILD python-3.3.3.ebuild 12164 SHA256 4ea3edf4d0138a1254a202e1a2a57d1191c579c5820e44f0c328d3fb1f3bbb6f SHA512 292040897cad25d236d156e004bd7f05b27427586c38e6d517f997adc9f4d32226c05ca129a1cf4e4cc8c57f4339f4344d16a7cc9028e3cccd9938c9bfc2dbb3 WHIRLPOOL 1557da0819f9bda462f54fce52bf589e7dd024c6fc4f50d1ca5b7ff091293e67b2538224c0ea2fc2456552855e4aebd75d6d8e210fd55cfcd0c452b4b6fc4eb9
-MISC ChangeLog 136361 SHA256 55c46303f2ff663d41f3a28d76881cc311f6464073ff5d6d2eb41838f01ceb7d SHA512 377a24ac086866a9deda47024ec7abe7174d39d8f92ce979b9cf2d148671b2fbb6e090e98fd86100d6ce2364fd9180ff2b1607d6211faa016796821dd3497ef2 WHIRLPOOL 697724bb2e085f0691b1628245d28a5a9581b1d089da20fbd834b30ecc62775059cba30da01696a8b700e2b79d7c2baab8b6968547eb83b3f46b088779a4e270
+EBUILD python-3.3.3.ebuild 12878 SHA256 cfb101d73b57d9e666c13ea0c194b15aacdd4377f864eccd1f07fd1f4cfe25cd SHA512 b45989d26bf04c4d047cd6a11e201dd9cc3b46e0cdfb3f68ed6072873777d6545655c4383980d85ef3c3b0b908fff57c4cd9af82b1e61f07446b544734ea55d6 WHIRLPOOL 3392c278b681e15b5187ff7ee61a01921388fecb664772a7e452da2884c93b2a98b93252226ffcae03cd32ffe0f8ecda886ff15872a09bdfec82d8656e8ceeb7
+MISC ChangeLog 136499 SHA256 3fa61ee21dca30f2d58c6c62599eac2d5d987eb32906b8f9aabeea019b747836 SHA512 eae1f809a925d45b7f97d958c99c0ed6d0c1c9c157e382cff0fc23f3eabcbda167d7c532a9bcee241b91c7a904e214b35136f086bbbf9bbc211b6ef150fe8f75 WHIRLPOOL 3b8364a1ed1a8e71884f3519ebc863e94fa7b06b0d5622cfd09566035a7697829d0e46ccf9a16b4765d77a0631bf8d26d51a4f7e53dc62b151158a4a209fe070
MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlOn5TcACgkQLc0TWKYwzLgCGwCgguwkILjNAQAkV0F9ZryqDCpf
-rSUAnjUk5BUMAJYNbGRhSIv/zjsJKfd1
-=U6s+
------END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-3.3.3.ebuild b/dev-lang/python/python-3.3.3.ebuild
index 2cb223d4fa..21262661aa 100644
--- a/dev-lang/python/python-3.3.3.ebuild
+++ b/dev-lang/python/python-3.3.3.ebuild
@@ -301,6 +301,20 @@ src_install() {
-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-e "s/\(PY_LDFLAGS=\).*/\1/" \
-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
+ if [[ ${CHOST} == *-aix* ]]; then
+ # fix upstream bugs with quite large proposed diffs still to be sorted out:
+ # http://bugs.python.org/issue13493
+ # http://bugs.python.org/issue14150
+ # http://bugs.python.org/issue15590
+ # http://bugs.python.org/issue16189
+ sed -e "/Libs:/s|\$| -Wl,-bE:${EPREFIX}/${libdir#$ED}/config-${SLOT}/python.exp -lld|" \
+ -i "${ED}"usr/$(get_libdir)/pkgconfig/python-${SLOT}.pc || die "sed failed"
+ sed -e "s|:Modules/python.exp|:${EPREFIX}/${libdir#$ED}/config-${SLOT}/python.exp|" \
+ -e 's| -bI:| -Wl,-bI:|g' \
+ -e '/LINKFORSHARED/s|-bE:|-bI:|g' \
+ -e '/LINKFORSHARED/s| -lld||g' \
+ -i "${libdir}"/{_sysconfigdata.py,config-${SLOT}/Makefile} || die "sed failed"
+ fi
# Backwards compat with Gentoo divergence.
dosym python${SLOT}-config /usr/bin/python-config-${SLOT}