Add another fix from upstream for alpha so it actually (seems) to work #330915 by Kazuyoshi Furutaka.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 36 insertions, 16 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 7a3e51f9172d..c31efeffd26e 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.350 2010/09/12 05:18:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.351 2010/09/14 00:30:14 vapier Exp $
+
+  14 Sep 2010; Mike Frysinger <vapier@gentoo.org> openssl-1.0.0a-r3.ebuild,
+  files/openssl-1.0.0a-alpha-mont.patch:
+  Add another fix from upstream for alpha so it actually (seems) to work
+  #330915 by Kazuyoshi Furutaka.
 
   12 Sep 2010; Mike Frysinger <vapier@gentoo.org> openssl-1.0.0a-r3.ebuild,
   +files/openssl-1.0.0a-alpha-mont.patch:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index fd82bb3abb3d..7618026df423 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -9,7 +9,7 @@ AUX openssl-0.9.8e-bsd-sparc64.patch 1484 RMD160 dd3d18caccd8167673a438cc83fa44f
 AUX openssl-0.9.8h-ldflags.patch 1000 RMD160 1e87b16d841360d790f06d714ea5f0111e83ca97 SHA1 72e7ccca848425d7cfc3f58f4476fb8fda4ec2d1 SHA256 00179ad3dc3fecc9193658202d7bb5c81169bbb2be59e8a90201ed43eacec805
 AUX openssl-0.9.8l-binutils.patch 2655 RMD160 d801d719b4fc4a6818313c27def8e7a184f40b99 SHA1 f7aaae0d3a0163105d495661c3a48673655a3b82 SHA256 c81d8b70e7ccbe3e7ee2fc81a4658d058301d0129adcc380c24066aa42cb390c
 AUX openssl-0.9.8m-binutils.patch 684 RMD160 78ee10d906423a77aff91aac2166bb5f58c386e6 SHA1 b7514556196a730541b0c99754b4ef79484e27fe SHA256 1e4475f7183ec237d129b686d4ca5265bf7eb34642e7d9e77cbe8ad9a97b4876
-AUX openssl-1.0.0a-alpha-mont.patch 2074 RMD160 237f0ea74b376eb4f075bd58f5e7dd3484d2faed SHA1 de894449914c557e0eb0fc865e9e949250c28e9d SHA256 7f0eeea560578e839b1cba539d4c33375c4af3ee6777a94ea75a72e467931a80
+AUX openssl-1.0.0a-alpha-mont.patch 2635 RMD160 6559e94693f62cf3c65c4318936566d868eff4ae SHA1 ab6a861445254486aad65368f4fcc4ce3137c8da SHA256 8c2077ee8c6eb98c6d7839cb0e6ff8035035fb43a4d757690f07d5432a7c20a6
 AUX openssl-1.0.0a-alphacpuid.patch 342 RMD160 98c6ad7e6b643c4adb13dc566a54faa3d0235807 SHA1 0f093ab2015727fe675d971a4ff2a3cdea633590 SHA256 6f9bf3284204c363295e735a8b23752274e5de90229ece8df2595f6651aa6fa1
 AUX openssl-1.0.0a-fix-double-free.patch 252 RMD160 4cf11701c503eb28ce2cea834523b9ec3e38bd4a SHA1 4006be947a41f77c471504d4770dbf8b36b315b8 SHA256 a179daada4021897dc2759e9555b22f5dcb511c1d011bbab8106b35fd2332b96
 AUX openssl-1.0.0a-ldflags.patch 914 RMD160 1e057330b3fc84d7f799976c0ba5cce02f505f57 SHA1 9bada0fb576b4f78b046b77b77248b352e1953a6 SHA256 33f5d39e2b6464ed33654214a0148a6f6546fe319793ae04f54d2106422ddba1
@@ -20,13 +20,13 @@ EBUILD openssl-0.9.8o-r1.ebuild 4251 RMD160 ba06206d1d8a6d0109fe2b53f05f2a363fac
 EBUILD openssl-0.9.8o-r2.ebuild 4313 RMD160 a1aa2220bdbd73216434afd5215bcbda2fa76540 SHA1 ecd3225826defc1f052df8730313f5ec941fd194 SHA256 2d54dc83c0bffb53d8a6142b97e574ca7560c2ca1224e4d3f6a3fe3571efb952
 EBUILD openssl-0.9.8o.ebuild 5355 RMD160 944bcef12c47a34a29f9d41c071e084daec2e715 SHA1 8984a9f092d75365e9506999edab77a042dbd1d9 SHA256 aafeacde45a423a2ef7a43fff95dcc22776371ca9a5dd475ebf8fdf992d96786
 EBUILD openssl-1.0.0a-r1.ebuild 5608 RMD160 73338932e4f1b8447957a9b4b58351775f2d9c7f SHA1 03cb9241ca0b452f653a0b6922dfb0c05f99ae83 SHA256 798a8e68b20b305967eeb143a0310866b43b24f6eb11fbacdea402d752168d9c
-EBUILD openssl-1.0.0a-r3.ebuild 6015 RMD160 aa567f5341029eded57b708e60c9248f191f0628 SHA1 5aeff98290db35330fcd2483fb48584c6d1cfc42 SHA256 c8b84db4f146de573c73827f9f1f79257ed59030dd8ad3302fced0505763f3ef
-MISC ChangeLog 52782 RMD160 afb157e25d510e9aac255f17b92eb4d57c9ebf56 SHA1 810540ae4a780b915ec70f68b8b1dc50b8814fca SHA256 ff7e97bef6c37c6cca46abd1f8007aba895e46ee6ac277a76948ca118150d52d
+EBUILD openssl-1.0.0a-r3.ebuild 6015 RMD160 96c34c8ea3915733f64ad0f2647fefaecc941ea7 SHA1 eb483ec58f29beceacbfeca1c77cef5c99d1b94e SHA256 1832691abe77ff4976349cb4564043535d1969409e507a5b61cfc07e3a7c002a
+MISC ChangeLog 53006 RMD160 28eff979e526d3cbe04d4108153add66c31ae294 SHA1 7674727ed9c38ef3cdbadbe7224bc551a40bb35d SHA256 25901e54d7b7ce55e278028c62df1bd4b741bba0f5116c2145cca5a49d186014
 MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkyMYwcACgkQTwhj9JtAlp54aAD/UOXjTYSAlJ+xt5qVd7tmcWX2
-rUCzw1jZaZVpZstNnzQA/0etp6R2TN8qoK/Q5dtmKFJjDAs4+S4jA4OrqOPBGIly
-=SdSU
+iF4EAREIAAYFAkyOwpMACgkQTwhj9JtAlp6tgAEAtQBUxugXMcJpiiPPWernr2ha
+NK/dXHPvRsh1f91zqh0A/248Oho84BVoZEK0FViDgPV6Hd63k9z9Dmc4JzZAnYI+
+=vTJo
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/openssl-1.0.0a-alpha-mont.patch b/dev-libs/openssl/files/openssl-1.0.0a-alpha-mont.patch
index 3beea07557a9..cb7d5655aa66 100644
--- a/dev-libs/openssl/files/openssl-1.0.0a-alpha-mont.patch
+++ b/dev-libs/openssl/files/openssl-1.0.0a-alpha-mont.patch
@@ -2,8 +2,14 @@ get the new alpha-mont code building with GNU toolchains
 
 https://bugs.gentoo.org/330915
 
---- a/crypto/bn/asm/alpha-mont.pl
-+++ b/crypto/bn/asm/alpha-mont.pl
+Index: crypto/bn/asm/alpha-mont.pl
+===================================================================
+RCS file: /usr/local/src/openssl/CVSROOT/openssl/crypto/bn/asm/alpha-mont.pl,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -p -r1.6 -r1.7
+--- crypto/bn/asm/alpha-mont.pl	10 Apr 2010 13:33:04 -0000	1.6
++++ crypto/bn/asm/alpha-mont.pl	13 Sep 2010 13:28:51 -0000	1.7
 @@ -41,8 +41,12 @@ $j="s4";
  $m1="s5";
  
@@ -17,6 +23,15 @@ https://bugs.gentoo.org/330915
  
  .text
  
+@@ -76,7 +80,7 @@ bn_mul_mont:
+ 	ldq	$aj,8($ap)
+ 	subq	sp,AT,sp
+ 	ldq	$bi,0($bp)	# bp[0]
+-	mov	-4096,AT
++	lda	AT,-4096(zero)	# mov	-4096,AT
+ 	ldq	$n0,0($n0)
+ 	and	sp,AT,sp
+ 
 @@ -106,9 +110,9 @@ bn_mul_mont:
  .align	4
  .L1st:
@@ -97,14 +112,14 @@ https://bugs.gentoo.org/330915
  	lda	$tp,8($tp)
  	lda	$rp,8($rp)
  	lda	$ap,8($ap)
-@@ -309,8 +313,10 @@ bn_mul_mont:
+@@ -309,8 +313,8 @@ bn_mul_mont:
  	lda	sp,48(sp)
  	ret	(ra)
  .end	bn_mul_mont
-+#if 0
- .rdata
- .asciiz	"Montgomery Multiplication for Alpha, CRYPTOGAMS by <appro\@openssl.org>"
-+#endif
+-.rdata
+-.asciiz	"Montgomery Multiplication for Alpha, CRYPTOGAMS by <appro\@openssl.org>"
++.ascii	"Montgomery Multiplication for Alpha, CRYPTOGAMS by <appro\@openssl.org>"
++.align	2
  ___
  
  print $code;
diff --git a/dev-libs/openssl/openssl-1.0.0a-r3.ebuild b/dev-libs/openssl/openssl-1.0.0a-r3.ebuild
index b165aa144060..042d2ef57be3 100644
--- a/dev-libs/openssl/openssl-1.0.0a-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.0.0a-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-libs/openssl/openssl-1.0.0a-r3.ebuild,v 1.4 2010/09/12 05:18:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r3.ebuild,v 1.5 2010/09/14 00:30:14 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist gmp kerberos rfc3779 sse2 test zlib"
 
 RDEPEND="gmp? ( dev-libs/gmp )