Fix building on x32 ABIs #542618 by Bertrand Jacquin.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 65 insertions, 18 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 656dd0efbeb7..d3eee736b3e9 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.643 2015/03/21 11:01:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.644 2015/03/21 11:02:41 vapier Exp $
+
+  21 Mar 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/openssl-1.0.2a-x32-asm.patch, openssl-1.0.2a.ebuild:
+  Fix building on x32 ABIs #542618 by Bertrand Jacquin.
 
   21 Mar 2015; Mike Frysinger <vapier@gentoo.org> openssl-1.0.2a.ebuild,
   metadata.xml:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index b2b27cb5eb09..d9f3ec4d6b69 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -31,6 +31,7 @@ AUX openssl-1.0.2-parallel-build.patch 10661 SHA256 bc5622150a964dc2d9909f415571
 AUX openssl-1.0.2-s_client-verify.patch 648 SHA256 b6ca2278dd9833f87a1d0037cb3cac8aee0f8326ff13ece1f08a536b8545eb77 SHA512 78b09ae700096205582785584a268776af46fc5bc94a0faa1ce6087ffcc945649e69269ff7fa88dedd5df1a5cdecc53e885de1e39506470f23b02028ca962104 WHIRLPOOL 8e7c90d37c1736b4b2f2c38d1c12dcfee4996a50a2a7dd07645a0c0b6616006d11232dd0f88ab735833e1c46aa171ceb5e1288c3d57296010bdda59295de7599
 AUX openssl-1.0.2a-malloc-typo.patch 1388 SHA256 0e1fb553295c90082f7ca8410f4bf5d879b73fb194b7ca2c42ad2c070f575110 SHA512 03d7d3d200a8e5ab72388370d6124769fa20e7d6c014f6078f5d690aa4616909c1ba2e1c5b5c873177a71794b00cab201142a5b22683ff6b943b84dbf13737b0 WHIRLPOOL a6919aa7b832192f40288d18cc42079629829fa8eb5a90c6232d52fe6b7433e9b44a36f2c63288aac9ff66886b5129d178d5303e65dc7194d858c3eea5730fd8
 AUX openssl-1.0.2a-parallel-build.patch 11315 SHA256 eb5bd4e1eefb386b2fa60f39d08d9190a645bf09131140499db5bfc07e1ae539 SHA512 62fcde74c57b45047d43d8b24bfeae131bbca61c927eb7450811e9672ba2409575fe0e39ae25963609e38c5cd6a823eb11e2cec329a9a78b6a906209cf39ccd4 WHIRLPOOL 992a5b209415459084312019ee65bc22352592eeda4e5419abc64d5bbb07cd7eef49e3135bfaa38595133c5b5e4574ae87104b422c0fabe8507486289153fee0
+AUX openssl-1.0.2a-x32-asm.patch 1487 SHA256 9f25af447f6acd835254ef42a04aa64ca7c70be82190093ce0cbc302df65bda4 SHA512 65462611b5ed58d1c295b63f59ede54f097aa67994fa00d0205148fd9b2da682c7de317ebd3c31b38317e587de9097bd928be7fd265d49b8e6d8743f57021255 WHIRLPOOL 1f7e13282adf4cd9d6239720675e91efd784ca9e44cfc6e5ad453bb56e2ab05f4021c56347a4879444ef4be136fe334e3600186889b8a585b0b95fc8af36ed4a
 DIST openssl-0.9.8ze.tar.gz 3734873 SHA256 ee3da602826e975b47e4d7af8a27be8258c160876194898c58881eab814b55b8 SHA512 6ab08065ab2cdf6699e462e2a082e6d4c21f027383e12d4dd1d0dce2a4073ae52230494215b3fe24b8a8d73f5f5dd3a1fe53c66acd8db6e162e4bf3636e229c3 WHIRLPOOL 8a5de0aed7b48007b3b8092726c9c8eb6771c49d388baaff4d7ba3591be0b1856cb17842db5bc608994b38f5d87a8b07a441c874523e577b786a4612bba7789f
 DIST openssl-0.9.8zf.tar.gz 3822386 SHA256 d5245a29128984192acc5b1fc01e37429b7a01c53cadcb2645e546718b300edb SHA512 8a68f024c31b7de25e19732ad556a27d69cface8e7a546ca4221873053a270e5e36336626f7fe857bbbec5427204bddbb5fc9dea8d7a187a8db6719d970431ab WHIRLPOOL 842e5bc71a12bf363fe797e95faf988ae949aa15f8faee935ee8861e4093e9d4e0b766b24dda8d415f29d2ee2821050cfc3ce095d265d59574e7fe0af4024c66
 DIST openssl-1.0.0r.tar.gz 4095201 SHA256 6538b33a1b95681c86ac8c5cc54d22835f0f0a5bf42ee6df4138c672d7e75f17 SHA512 a65292a7b43f7d0637952476356a95908b5843ca17f717158dd4d2171113192f04c92f4f9133bb4750172f06367dae64733aa239b90c52d4d9323f467012428f WHIRLPOOL 71c7d726a3a5d70735d4b34c3e00c15fa2ef8640801f8a265e4e92cf01db4a517630084dd7632850f3df6f4dbd848a3a7ec908a71db996a45c29f1ac53ac7877
@@ -45,23 +46,23 @@ EBUILD openssl-1.0.0r.ebuild 7105 SHA256 9a73119cf74c7e219a4a25edfb3b8510f46a97b
 EBUILD openssl-1.0.1l-r1.ebuild 8880 SHA256 eed2ddde72a8e8d33027839ea595c1cac8ce93168db7aaa11ec909de1c89f6a4 SHA512 95983b1fbc937baa686b4265abf80b41c804946a8db15b1b1e7e282b408d61ab0d7c69c1970763b34a45876a4c822a662fafa47e976df797930d75ac458f7330 WHIRLPOOL 11d26c49e525bc162cadf7ab7ea068f480b21e9fe7e5b61eb8552c050d34371f5d4cf23257cf07c42b152dfdca0efbf78441f9942480bedf4b2ba032ac074903
 EBUILD openssl-1.0.1m.ebuild 8825 SHA256 84b6db3267866e27dd0e20a446aa48b1ed153d9d863ee2ac40abb581a66781c5 SHA512 9a91a519fb3d3e7b1587b9ba79e0cadfc4a8ffd6d4dd0727131e880f15cef63a886284a3bfa22b7194229aefbc40750205ba65d011246b4c03112cc8ee2692f4 WHIRLPOOL 819642d7f8e8a13aabd816a680b475de737d259d7a260c5d621454bae3425034820c916f0d61ef023fa71ab723badb64fef2f508bd1383d6fafe9d953bbcbd7b
 EBUILD openssl-1.0.2-r3.ebuild 8925 SHA256 16b32e6b3a83e270e067558d29a80578576e23adca0f35a5a4176492c32170cf SHA512 25ca31b089457de899b1c2ba409041f4b1b866830aa27ac5b62e344f6141e4587d54d5c1d7e5530c3df36e6093613c8d34a0d7e96553f3427f5c374e498621dd WHIRLPOOL 38cf25a45265d8f01973f982c5c7bb16df6bd5e7ac4721f5aa84e8c95a066284ed538c688489bb06af7067b07bb1590ddcfee5be31a82aeca82f46bd25c04219
-EBUILD openssl-1.0.2a.ebuild 8821 SHA256 de71117490d54634b6bcaa076d3bdf9098ee7785251e8f90bfa65b0d96e1a1ed SHA512 052449f0394ddfd5032b80da8e546f071fe083c2a61acfda8aa9bb6b2785ea48b889fec128aa388faa44a9afb6e1b458bb8cfeedfbb6af3a7749f409c296a7f8 WHIRLPOOL 2ff07e8a643fb831146fc21933733c048eead9cadc183c65b5bc8ddd17a976f2be6a7c2366c3364a8bcf5bf40977cc1b93813110d1b9036b6179e4c32c2ea4cb
-MISC ChangeLog 99257 SHA256 3f89460b31b0ca5d39a67b617ffaf7badd00bb37b65decdb194678fb35bcd1b1 SHA512 564e6dac35930cbca92c61ddfd597a66c4ea864d553c7adbf5619a14d7a58b978d4edd79741eb688eb7ac82f0b0c134c61e4faa89a2960b093e603cee13aba48 WHIRLPOOL d312ac203b7937e9296c6c0eef2b3ab09d54472ba00268affd7fd4393eb79519a7486cdaffde57b062a635042f3035632f95172e4bcc6d37cb669aba3ef180ed
-MISC metadata.xml 637 SHA256 7b96f0e49fc5ab28bf914be847a89300bf3c7e65f652d748a48721a40c444b8d SHA512 a92ca59f6fc42237f7d30c4b0cd7339a7e82455ef31e155fb09d61012b3e3892d235d09a8c535f1db73b1468d483bb697575167cfe0d1ab45ef184bb95dc37db WHIRLPOOL f6fe48fc5b7a3a94eff327c5a8d6930efe2a7c92e7fb8a3366d8af0133b466420e68e168883742f993e89e45db12dab8c5a11e665242e368f012b0dc26d3c9ef
+EBUILD openssl-1.0.2a.ebuild 8892 SHA256 2fa0a89a32176ac0d385e869c709d7ea2e90a80f05af7c4c010d81fcbc37871b SHA512 955ba1256ee1136bd97d1075b31d6dcae8e0db163cd9603b0b99afff3bb7ff816833d30e69766b09efa648463129124f863408a4c7937eef44857d41980a0c62 WHIRLPOOL 30c6c6d9a955fc4be9066a5aada55ea074b151a9f8652fde27b88ddf49bfd29094acaadf320c5bdbde6c7c1bbea4bee7937c2dbadcec17a570f5a9b855f44da4
+MISC ChangeLog 99746 SHA256 07dbb2e005d3063619c80a41449a3d3bc7c1c80c1926e80021ddf734a6d1c677 SHA512 80b9712f357692b5c9972c592ecabfc4be4327e3174c57d1fb40cf8ac88e0d733cfd1dc44b5a8bdc7e6a3d4bc8c112fdb5f2ea7c6577af92d97c38a5e1ba3052 WHIRLPOOL e5ef6bc2d0335596959d84f9ea5ba7ed5fce5788f4016623a5e0bf1e7f074084a470ff60c70b7e9f2a5a69bed024eacfba89875e3cba0f136eff7f0a4eb91693
+MISC metadata.xml 730 SHA256 229ceddc7f42d44d7cee107774dc210810cfcf866040306eb95e1c09da0279fc SHA512 31e307f60d08e38d39892f13f8d7bff9b530bf99d489983d224c9a0d061593448732f2a60beb70abc560672b49347567e20ea5692892274882bf4e955cbd52cd WHIRLPOOL edbcd6c8010d6282a798faf68279bb5a74420588f339ee2c59d110546a61d2911b30071bac8f7e2b60b33711d4d13b5226c6b5a195aa458ab8502fa1fe520c90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVDTZ6AAoJEPGu1DbS6WIAPpMP/2mE9F/WciJ+kteEz+yUNWHw
-bNceOUynWprE83mZux4Ka85y35DTp0UowOP++R7gxe6jUjtiVShNFA8R7HgahMYk
-Ilw18kLHJLogZSDxedS3X44HpiXHcHC8kk+DPpQqCmZxq8xlasHqh3QlXobcrsiR
-tfJd+iW+ZJTsLdAphW1R0eT1/zhnaxML2cQgWgMX+k2b8lI9SWdK/z4C33mPpDT3
-J+8BS1zdOeuh78/kms+hlhZMYvS0Yy72Xg//xB5CXeylgH2oPJYRBpbHwOLaS7tP
-51q8z+yvKaCLKbtzTRne87nNF3EltHxf29Ji7i/yrfyKLiAtSFBF5pfrs0MtAtz/
-b4xBA2OTyEldh3/+RkqJFq/K0rcGkLF/txqf2Vy+TyUGyUONX1ka/k23Vh1XNCMv
-av7Nv3ZTKSjGPknKFanzo8CbtT+v/L3Nwuf1rwljQIExQTo/CYW9n+BZJIzY+ldf
-tmt/dZeC2wm50DXQ7EeAMEGvurFhaFnsJ3BvAh008TANowQndNgE5zxDrEkYwEPh
-BqF4W3Q1jOc+vragGgnw+KqVwkimlQdhsSMheYAOiACqRk0VYYhEFV4D7EukeiKz
-MnYJs6lc4GhbmJBLNiLnkiYeSezaaFCFXQ8cRKWaDgDc+cILXarfzEtm4j08MDxQ
-C4fyHoDnRWy3i6BIIDsp
-=YHRB
+iQIcBAEBCAAGBQJVDU/SAAoJEPGu1DbS6WIAbaQQAJmv3776CVOP3AL1csnX7ZPl
+FQ1NAAFXn6YFmiPdPVXbDMymNGGU3UrpyANBwKcoQZFx3n2Gs9nhbl3O6Mth0Zfj
+tjFY5sZv7sbp07WQ3itPMUteogkpegGHGRc8DzlNH7cHI964qlIy/2f0ifYuLh9+
+fMBY3PZC3sytM8k9baltXbw6fabfpHZtPrPSMwxFs/5tzTs6KQ4XVRGLxAbe5c71
+TGQI3K93O39Wvuy3llcShWCurSQUnHOcUEqJ7YKyo/8WLQMNbTpqUQoA1h7nfdwT
+iiUR98MbyV0Uy0U8QRCSDBa5uqBnJSG5SCmvg4Z2s9atMzjZeDE3V5Xqt63WNW9p
+Cf9Zw1W9u8vKO2UDjeynn1zLDqgFrzZKCERUm1lS3cKDFqtLliuLgXOPzZp+LwAc
+tQ8oaNiHSoqT6WO9jbeyvkmNsfRVJXkyDQZX3/4jXOr4nVsq0bwSYG2lJu01kbyc
+Fuu7g0dNKnCOXQOFo8SPxCEgundsG/Y/YMpIS/9M0LgLTq8zVCsAQ+CqV49pftjt
+holCYswUUOiDvGnKrskRNvb1gR4jzDiKFtunLezCK04r13v5UQL8m8X+JGoQS6XT
+Bh11ZDASl8HMMoUhloeDWQZFsClMrEwbKq6Oz3yB335aTMshdaph2eKhGpxeggFz
+FXE3xz9s42BL2UY8BR6D
+=MhMh
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch b/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch
new file mode 100644
index 000000000000..c2c3a8eff5af
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch
@@ -0,0 +1,41 @@
+From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 21 Mar 2015 06:01:25 -0400
+Subject: [PATCH] crypto: use bigint in x86-64 perl
+
+When building on x32 systems where the default type is 32bit, make sure
+we can transparently represent 64bit integers.  Otherwise we end up with
+build errors like:
+/usr/bin/perl asm/ghash-x86_64.pl elf > ghash-x86_64.s
+Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, <> line 890.
+...
+ghash-x86_64.s: Assembler messages:
+ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression
+
+We don't enable this globally as there are some cases where we'd get
+32bit values interpreted as unsigned when we need them as signed.
+
+Reported-by: Bertrand Jacquin <bertrand@jacquin.bzh>
+URL: https://bugs.gentoo.org/542618
+---
+ crypto/perlasm/x86_64-xlate.pl | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
+index aae8288..0bf9774 100755
+--- a/crypto/perlasm/x86_64-xlate.pl
++++ b/crypto/perlasm/x86_64-xlate.pl
+@@ -195,6 +195,10 @@ my %globals;
+     sub out {
+     	my $self = shift;
+ 
++	# When building on x32 ABIs, the expanded hex value might be too
++	# big to fit into 32bits.  Enable transparent 64bit support here
++	# so we can safely print it out.
++	use bigint;
+ 	if ($gas) {
+ 	    # Solaris /usr/ccs/bin/as can't handle multiplications
+ 	    # in $self->{value}
+-- 
+2.3.3
+
diff --git a/dev-libs/openssl/openssl-1.0.2a.ebuild b/dev-libs/openssl/openssl-1.0.2a.ebuild
index 1d2f4de5660f..92ccfc149b5d 100644
--- a/dev-libs/openssl/openssl-1.0.2a.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2a.ebuild,v 1.5 2015/03/21 11:01:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2a.ebuild,v 1.6 2015/03/21 11:02:41 vapier Exp $
 
 EAPI="4"
 
@@ -63,6 +63,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
 		epatch "${FILESDIR}"/${PN}-1.0.2-s_client-verify.patch #472584
 		epatch "${FILESDIR}"/${PN}-1.0.2a-malloc-typo.patch #543828
+		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
 
 		epatch_user #332661
 	fi