diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-10-11 05:47:53 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-10-11 05:47:53 +0000 |
| commit | 19fe33288e6a04a96386dd718911f21c6cd65360 (patch) | |
| tree | baeb2fa01647f1f4ff9dd2ff90aa89004d19eeba /dev-libs/openssl | |
| parent | Version bump #195210. (diff) | |
| download | gentoo-2-19fe33288e6a04a96386dd718911f21c6cd65360.tar.gz gentoo-2-19fe33288e6a04a96386dd718911f21c6cd65360.tar.bz2 gentoo-2-19fe33288e6a04a96386dd718911f21c6cd65360.zip | |
Fix from upstream for building with -O0 #185104.
(Portage version: 2.1.3.12)
Diffstat (limited to 'dev-libs/openssl')
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-0.9.8e-padlock-O0.patch | 22 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.8e-r4.ebuild | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index 4765f76a620c..f0bd2698a4c9 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.235 2007/10/07 16:59:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.236 2007/10/11 05:47:52 vapier Exp $ + + 11 Oct 2007; Mike Frysinger <vapier@gentoo.org> + +files/openssl-0.9.8e-padlock-O0.patch, openssl-0.9.8e-r4.ebuild: + Fix from upstream for building with -O0 #185104. *openssl-0.9.8e-r4 (07 Oct 2007) diff --git a/dev-libs/openssl/files/openssl-0.9.8e-padlock-O0.patch b/dev-libs/openssl/files/openssl-0.9.8e-padlock-O0.patch new file mode 100644 index 000000000000..fb230e7c1747 --- /dev/null +++ b/dev-libs/openssl/files/openssl-0.9.8e-padlock-O0.patch @@ -0,0 +1,22 @@ +http://bugs.gentoo.org/185104 + +fix from upstream for: +Padlock engine fails to compile with -O0 -fPIC [from HEAD] + +Index: crypto/engine/eng_padlock.c +=================================================================== +RCS file: /usr/local/src/openssl/CVSROOT/openssl/crypto/engine/Attic/eng_padlock.c,v +retrieving revision 1.14.2.6 +retrieving revision 1.14.2.7 +diff -u -p -r1.14.2.6 -r1.14.2.7 +--- crypto/engine/eng_padlock.c 19 Oct 2006 20:56:31 -0000 1.14.2.6 ++++ crypto/engine/eng_padlock.c 20 May 2007 07:14:14 -0000 1.14.2.7 +@@ -436,7 +436,7 @@ static inline void *name(size_t cnt, \ + rep_xcrypt "\n" \ + " popl %%ebx" \ + : "=a"(iv), "=c"(cnt), "=D"(out), "=S"(inp) \ +- : "0"(cdata), "1"(cnt), "2"(out), "3"(inp), "m"(*cdata) \ ++ : "0"(cdata), "1"(cnt), "2"(out), "3"(inp) \ + : "edx", "cc", "memory"); \ + return iv; \ + } diff --git a/dev-libs/openssl/openssl-0.9.8e-r4.ebuild b/dev-libs/openssl/openssl-0.9.8e-r4.ebuild index 07b878572860..ae7b33d5b31d 100644 --- a/dev-libs/openssl/openssl-0.9.8e-r4.ebuild +++ b/dev-libs/openssl/openssl-0.9.8e-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8e-r4.ebuild,v 1.1 2007/10/07 16:59:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8e-r4.ebuild,v 1.2 2007/10/11 05:47:52 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -40,6 +40,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-0.9.8e-CVE-2007-5135.patch #194039 epatch "${FILESDIR}"/${PN}-0.9.8e-make.patch #146316 epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch + epatch "${FILESDIR}"/${PN}-0.9.8e-padlock-O0.patch #185104 [[ $(gcc-version) == "4.2" ]] && epatch "${FILESDIR}"/${PN}-0.9.8-gcc42.patch #158324 # allow openssl to be cross-compiled |