Fix typo in alpha asm code #364699 by Raúl Porcel.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 26 insertions, 7 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 9054817caae6..ed3c1efc9a6a 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.394 2011/03/16 03:39:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.395 2011/04/30 07:06:47 vapier Exp $
+
+  30 Apr 2011; Mike Frysinger <vapier@gentoo.org> openssl-1.0.0d.ebuild,
+  +files/openssl-1.0.0d-alpha-typo.patch:
+  Fix typo in alpha asm code #364699 by Raúl Porcel.
 
   16 Mar 2011; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8r.ebuild,
   openssl-1.0.0d.ebuild:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index f37dd45c3389..faa30edae3d2 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -9,17 +9,18 @@ AUX openssl-0.9.8h-ldflags.patch 1000 RMD160 1e87b16d841360d790f06d714ea5f0111e8
 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-ldflags.patch 914 RMD160 1e057330b3fc84d7f799976c0ba5cce02f505f57 SHA1 9bada0fb576b4f78b046b77b77248b352e1953a6 SHA256 33f5d39e2b6464ed33654214a0148a6f6546fe319793ae04f54d2106422ddba1
+AUX openssl-1.0.0d-alpha-typo.patch 235 RMD160 0cccd47a97bbcc9feddec767de61cba3fd7fdfd1 SHA1 03242d4019182608537a8b9019898a23949fbfcf SHA256 60d2cb4cae47b5d61aeca2b6e0ae45d82c3b2ba698df72d10ee26370abd354ab
 DIST openssl-0.9.8r.tar.gz 3773698 RMD160 9bc8024bf7af229c5024887d6f6a368cd8b93728 SHA1 a02411e5f4d463cac4a2a4a357a4a0b93bf65e72 SHA256 42b2368f786b05ed3be846838dce126b4e8e3dba8fb2e0ce83102df28c102fad
 DIST openssl-1.0.0d.tar.gz 4025484 RMD160 0c6cdf0659d88bf4dbc6d0394059a47a01fe6846 SHA1 32ca934f380a547061ddab7221b1a34e4e07e8d5 SHA256 92511d1f0caaa298dba250426f8e7d5d00b271847886d1adc62422778d6320db
 DIST openssl-c_rehash.sh.1.7 4167 RMD160 c87f12c5421593d160f0cc650921c2e3412869ab SHA1 54493c80be245f2da9b7d303e49d613d376d9609 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0
 EBUILD openssl-0.9.8r.ebuild 4265 RMD160 5417ab4f54edc79ecd341449e946bc12e1c1c9a4 SHA1 79904414102749ddeb47f66386f5959614937e07 SHA256 db71cea831fa3265ffaeafdcd9b56f7c25caa5e37edb09b9e618c7adf41268ea
-EBUILD openssl-1.0.0d.ebuild 5844 RMD160 f8ba2a401c2df287b725e1c276eac7e23f653767 SHA1 99128b8f95482443be4ce6379ce10a1f11678589 SHA256 685ae60fff2f9fe9a59a27ac3f1e79e3c5714bba7cfde8e9b5283f6e71f2a312
-MISC ChangeLog 58748 RMD160 26759f494ef9ef8414bc74c765e1a2dfe8b44587 SHA1 57ffcbe19c85015ce3cfb6d3d13e59245956eb16 SHA256 e79f30a27355aef17f416a1995c2e404308cfcf331f734950070deaba0856bf3
+EBUILD openssl-1.0.0d.ebuild 5905 RMD160 22eab74ad9deb288f5807d13fb342158c00ab561 SHA1 cfb0fc34c57fb1a17560b157d70ea00a9dadb66a SHA256 c8d16085bc119e0049d1836bf76762c2fbc9a680c328f0f581e82ac87992f19c
+MISC ChangeLog 58918 RMD160 8f79808ed276abfa0c7e475f6457bed530734578 SHA1 0b2c4f3f67e524c7dbb132157515a12309c6d08d SHA256 f6fbb6e8aa86d41bec67131328c94fb87a7b123b8a92a7e9551d860ae685a030
 MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2AMOIACgkQaC/OocHi7JYygQD6Aw4tMfAJxpRt17sYRsv5IsCC
-CwuLt9bh46yVxUvRxjMA/iNLRFTddOeLT5h4jw7612dHBbc2nmtwDIPasQCLtmJj
-=j70e
+iF4EAREIAAYFAk27tNMACgkQaC/OocHi7JYj7AD/SLyPbmuIpv4O6yTJUZ0NdeAn
+VEue1k86E/K/me9rk3YA/0u3t2WUE+g6TTZz7qyqTUeQ0+G3r5oKeZ4ojmx463/V
+=cmih
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/openssl-1.0.0d-alpha-typo.patch b/dev-libs/openssl/files/openssl-1.0.0d-alpha-typo.patch
new file mode 100644
index 000000000000..1d5496daed2f
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.0d-alpha-typo.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/364699
+
+--- crypto/bn/asm/alpha-mont.pl
++++ crypto/bn/asm/alpha-mont.pl
+@@ -41,7 +41,7 @@ $j="s4";
+ $m1="s5";
+ 
+ $code=<<___;
+-#indef __linux__
++#ifdef __linux__
+ #include <asm/regdef.h>
+ #else
+ #include <asm.h>
diff --git a/dev-libs/openssl/openssl-1.0.0d.ebuild b/dev-libs/openssl/openssl-1.0.0d.ebuild
index 421899d35aa6..5014dd94541e 100644
--- a/dev-libs/openssl/openssl-1.0.0d.ebuild
+++ b/dev-libs/openssl/openssl-1.0.0d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0d.ebuild,v 1.9 2011/03/16 03:39:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0d.ebuild,v 1.10 2011/04/30 07:06:47 vapier Exp $
 
 EAPI="2"
 
@@ -35,6 +35,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
 	epatch "${FILESDIR}"/${PN}-0.9.8l-binutils.patch #289130
 	epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
+	epatch "${FILESDIR}"/${PN}-1.0.0d-alpha-typo.patch #364699
 	epatch_user #332661
 
 	# disable fips in the build