diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-03-21 09:14:11 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-21 09:14:11 +0000 |
| commit | f9ecc306583e70783501d86c2c32900c5f00cc77 (patch) | |
| tree | acc4a34c8b38748fbd2d36f6301c98f0da0f072f /dev-libs | |
| parent | Stable for HPPA (bug #540290). (diff) | |
| download | gentoo-2-f9ecc306583e70783501d86c2c32900c5f00cc77.tar.gz gentoo-2-f9ecc306583e70783501d86c2c32900c5f00cc77.tar.bz2 gentoo-2-f9ecc306583e70783501d86c2c32900c5f00cc77.zip | |
Fix typo in malloc define #543828 by Conrad Kostecki.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch | 36 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-1.0.2a.ebuild | 3 |
3 files changed, 43 insertions, 2 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index f7ddd447a541..fa86954c4a8b 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.640 2015/03/19 23:07:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.641 2015/03/21 09:14:11 vapier Exp $ + + 21 Mar 2015; Mike Frysinger <vapier@gentoo.org> + +files/openssl-1.0.2a-malloc-typo.patch, openssl-1.0.2a.ebuild: + Fix typo in malloc define #543828 by Conrad Kostecki. 19 Mar 2015; Ulrich Müller <ulm@gentoo.org> openssl-0.9.8z_p6.ebuild, openssl-1.0.0r.ebuild, openssl-1.0.1m.ebuild: diff --git a/dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch b/dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch new file mode 100644 index 000000000000..e7995cc9d5bd --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch @@ -0,0 +1,36 @@ +From 7b4152089fe39c3495508076ab81ed4aca3d65ba Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 21 Mar 2015 05:08:41 -0400 +Subject: [PATCH] fix malloc define typo + +Reported-by: Conrad Kostecki <ck+gentoobugzilla@bl4ckb0x.de> +URL: https://bugs.gentoo.org/543828 +--- + crypto/bio/bss_dgram.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c +index aef8149..ed275d1 100644 +--- a/crypto/bio/bss_dgram.c ++++ b/crypto/bio/bss_dgram.c +@@ -1338,7 +1338,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl) + (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t)); + authchunks = OPENSSL_malloc(optlen); + if (!authchunks) { +- BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR); ++ BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_FAILURE); + return -1; + } + memset(authchunks, 0, optlen); +@@ -1410,7 +1410,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl) + char *tmp; + data->saved_message.bio = b; + if(!(tmp = OPENSSL_malloc(inl))) { +- BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR); ++ BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE); + return -1; + } + if (data->saved_message.data) +-- +2.3.3 + diff --git a/dev-libs/openssl/openssl-1.0.2a.ebuild b/dev-libs/openssl/openssl-1.0.2a.ebuild index 9999d82ed1c5..de4c244c3459 100644 --- a/dev-libs/openssl/openssl-1.0.2a.ebuild +++ b/dev-libs/openssl/openssl-1.0.2a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2a.ebuild,v 1.2 2015/03/19 21:14:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2a.ebuild,v 1.3 2015/03/21 09:14:11 vapier Exp $ EAPI="4" @@ -62,6 +62,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-build.patch epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch epatch "${FILESDIR}"/${PN}-1.0.2-s_client-verify.patch #472584 + epatch "${FILESDIR}"/${PN}-1.0.2a-malloc-typo.patch #543828 epatch_user #332661 fi |