diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-01-11 02:17:37 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-01-11 02:17:37 +0000 |
| commit | beeb481328b216c048c25d0df281bf68bf4d0a6b (patch) | |
| tree | a4316cd357213c94d6af3bbf6a74bdc610932433 | |
| parent | Marking qt-creator-1.2.1 ppc64 for bug 281662 (diff) | |
| download | gentoo-2-beeb481328b216c048c25d0df281bf68bf4d0a6b.tar.gz gentoo-2-beeb481328b216c048c25d0df281bf68bf4d0a6b.tar.bz2 gentoo-2-beeb481328b216c048c25d0df281bf68bf4d0a6b.zip | |
Respect LDFLAGS on openssl again #181438.
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch | 4 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.8l-r2.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index d954c360e099..30b714f8329b 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,10 @@ # 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.311 2010/01/11 00:46:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.312 2010/01/11 02:17:35 vapier Exp $ + + 11 Jan 2010; Mike Frysinger <vapier@gentoo.org> + files/openssl-0.9.8h-ldflags.patch, openssl-0.9.8l-r2.ebuild: + Respect LDFLAGS on openssl again #181438. 11 Jan 2010; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8l-r2.ebuild, files/openssl-0.9.8e-bsd-sparc64.patch: diff --git a/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch b/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch index 4658c85ebce1..462af70d7c36 100644 --- a/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch +++ b/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch @@ -2,8 +2,8 @@ http://bugs.gentoo.org/181438 make sure we respect LDFLAGS ---- openssl-0.9.8h/Makefile -+++ openssl-0.9.8h/Makefile +--- openssl-0.9.8h/Makefile.org ++++ openssl-0.9.8h/Makefile.org @@ -180,6 +181,7 @@ MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \ DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}' \ diff --git a/dev-libs/openssl/openssl-0.9.8l-r2.ebuild b/dev-libs/openssl/openssl-0.9.8l-r2.ebuild index de6b245e7b67..a185c747ba33 100644 --- a/dev-libs/openssl/openssl-0.9.8l-r2.ebuild +++ b/dev-libs/openssl/openssl-0.9.8l-r2.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-0.9.8l-r2.ebuild,v 1.3 2010/01/11 00:46:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8l-r2.ebuild,v 1.4 2010/01/11 02:17:35 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -35,7 +35,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-0.9.8e-make.patch #146316 epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch epatch "${FILESDIR}"/${PN}-0.9.8g-sslv3-no-tlsext.patch - #epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438 + epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438 epatch "${FILESDIR}"/${PN}-0.9.8l-CVE-2009-137{7,8,9}.patch #270305 epatch "${FILESDIR}"/${P}-CVE-2009-1387.patch #270305 epatch "${FILESDIR}"/${P}-CVE-2009-2409.patch #280591 |