diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-10 21:04:59 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-10 21:04:59 +0000 |
| commit | c7068476ae8f10b04732432cc4c7631123faf3bf (patch) | |
| tree | 6ecd6733901f6c397d228397ab43ec3c2158cffd /dev-libs/openssl/files | |
| parent | Stable on amd64 wrt bug #331969 (diff) | |
| download | gentoo-2-c7068476ae8f10b04732432cc4c7631123faf3bf.tar.gz gentoo-2-c7068476ae8f10b04732432cc4c7631123faf3bf.tar.bz2 gentoo-2-c7068476ae8f10b04732432cc4c7631123faf3bf.zip | |
Use environment LDFLAGS wrt #327421 by Olivier Huber. Fix double free wrt #332027 by Hanno Boeck.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/openssl/files')
| -rw-r--r-- | dev-libs/openssl/files/openssl-1.0.0a-fix-double-free.patch | 12 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch | 23 |
2 files changed, 35 insertions, 0 deletions
diff --git a/dev-libs/openssl/files/openssl-1.0.0a-fix-double-free.patch b/dev-libs/openssl/files/openssl-1.0.0a-fix-double-free.patch new file mode 100644 index 000000000000..a5aaf1eac0aa --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.0.0a-fix-double-free.patch @@ -0,0 +1,12 @@ +http://bugs.gentoo.org/332027 + +--- ssl/s3_clnt.c ++++ ssl/s3_clnt.c +@@ -1508,6 +1508,7 @@ + s->session->sess_cert->peer_ecdh_tmp=ecdh; + ecdh=NULL; + BN_CTX_free(bn_ctx); ++ bn_ctx = NULL; + EC_POINT_free(srvr_ecpoint); + srvr_ecpoint = NULL; + } diff --git a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch new file mode 100644 index 000000000000..290cdf92e8c0 --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch @@ -0,0 +1,23 @@ +http://bugs.gentoo.org/327421 + +--- Makefile.org ++++ Makefile.org +@@ -189,6 +189,7 @@ + MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \ + DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)' \ + MAKEDEPPROG='$(MAKEDEPPROG)' \ ++ LDFLAGS='${LDFLAGS}' \ + SHARED_LDFLAGS='$(SHARED_LDFLAGS)' \ + KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)' \ + ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \ +--- Makefile.shared ++++ Makefile.shared +@@ -153,7 +153,7 @@ + NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" + +-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" ++DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)" + + #This is rather special. It's a special target with which one can link + #applications without bothering with any features that have anything to |