summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-04-30 07:06:47 +0000
committerMike Frysinger <vapier@gentoo.org>2011-04-30 07:06:47 +0000
commitd75156540e43817065b19e4600b551cb582fa291 (patch)
tree1ce2d9696becb432ae10580a4d4c4f17d0b0c549 /dev-libs
parentVersion bump. (diff)
downloadgentoo-2-d75156540e43817065b19e4600b551cb582fa291.tar.gz
gentoo-2-d75156540e43817065b19e4600b551cb582fa291.tar.bz2
gentoo-2-d75156540e43817065b19e4600b551cb582fa291.zip
Fix typo in alpha asm code #364699 by Raúl Porcel.
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/openssl/ChangeLog6
-rw-r--r--dev-libs/openssl/files/openssl-1.0.0d-alpha-typo.patch13
-rw-r--r--dev-libs/openssl/openssl-1.0.0d.ebuild3
3 files changed, 20 insertions, 2 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/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