summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-03-21 09:14:35 +0000
committerMike Frysinger <vapier@gentoo.org>2015-03-21 09:14:35 +0000
commit84e91e16b5c27a95e077936563240491089acb62 (patch)
tree47211021427aa81f39195c6252e9278886b6efe8 /dev-libs/openssl
parentStable for HPPA (bug #540290). (diff)
downloadhistorical-84e91e16b5c27a95e077936563240491089acb62.tar.gz
historical-84e91e16b5c27a95e077936563240491089acb62.tar.bz2
historical-84e91e16b5c27a95e077936563240491089acb62.zip
Fix typo in malloc define #543828 by Conrad Kostecki.
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'dev-libs/openssl')
-rw-r--r--dev-libs/openssl/ChangeLog6
-rw-r--r--dev-libs/openssl/Manifest28
-rw-r--r--dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch36
-rw-r--r--dev-libs/openssl/openssl-1.0.2a.ebuild3
4 files changed, 59 insertions, 14 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/Manifest b/dev-libs/openssl/Manifest
index f871597ee724..b2b27cb5eb09 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -29,6 +29,7 @@ AUX openssl-1.0.2-CVE-2015-0291.patch 16069 SHA256 be4f9fa463a027e7c77396a8d3ddc
AUX openssl-1.0.2-ipv6.patch 18811 SHA256 9ff3150c75f3f3e6a9773ffe54d90994cbf68cc919134aea68e09e7ed921763d SHA512 58e293f8f19a3fad08729b842dd977b73fedb0c49208d87a056bfea857c0e2b79a310d7d098c04429b65564fce64defeda6d1dcc3068ad5a80ef276db6421e54 WHIRLPOOL 36a0fffc7238011b93077bed94c9507f2ffc1cf199e6c06e94d01589cdc84a6568b9122e1a120b8262bd0a1c43f25169a29796c92a78338dd9f03b4cc2cdf0b8
AUX openssl-1.0.2-parallel-build.patch 10661 SHA256 bc5622150a964dc2d9909f41557140b696ce1bdfa4e2b12cc3e0e51029ead32b SHA512 a4957304a4424016cd8a1c6552c422cd042d737e12f96235ec54d1e601ccbe8cb79d931ac8777d1a599bd4a70eac4e6700a24362f14fb04eb273df82f2de0d01 WHIRLPOOL 5b34e45dcb0db6649e26d275925ca008f5201afbc22184e15c5324513bc0ed40ee271a70686e10a20bb219b3c4bd2148323b317ead97cdc27a3c897c0a07d228
AUX openssl-1.0.2-s_client-verify.patch 648 SHA256 b6ca2278dd9833f87a1d0037cb3cac8aee0f8326ff13ece1f08a536b8545eb77 SHA512 78b09ae700096205582785584a268776af46fc5bc94a0faa1ce6087ffcc945649e69269ff7fa88dedd5df1a5cdecc53e885de1e39506470f23b02028ca962104 WHIRLPOOL 8e7c90d37c1736b4b2f2c38d1c12dcfee4996a50a2a7dd07645a0c0b6616006d11232dd0f88ab735833e1c46aa171ceb5e1288c3d57296010bdda59295de7599
+AUX openssl-1.0.2a-malloc-typo.patch 1388 SHA256 0e1fb553295c90082f7ca8410f4bf5d879b73fb194b7ca2c42ad2c070f575110 SHA512 03d7d3d200a8e5ab72388370d6124769fa20e7d6c014f6078f5d690aa4616909c1ba2e1c5b5c873177a71794b00cab201142a5b22683ff6b943b84dbf13737b0 WHIRLPOOL a6919aa7b832192f40288d18cc42079629829fa8eb5a90c6232d52fe6b7433e9b44a36f2c63288aac9ff66886b5129d178d5303e65dc7194d858c3eea5730fd8
AUX openssl-1.0.2a-parallel-build.patch 11315 SHA256 eb5bd4e1eefb386b2fa60f39d08d9190a645bf09131140499db5bfc07e1ae539 SHA512 62fcde74c57b45047d43d8b24bfeae131bbca61c927eb7450811e9672ba2409575fe0e39ae25963609e38c5cd6a823eb11e2cec329a9a78b6a906209cf39ccd4 WHIRLPOOL 992a5b209415459084312019ee65bc22352592eeda4e5419abc64d5bbb07cd7eef49e3135bfaa38595133c5b5e4574ae87104b422c0fabe8507486289153fee0
DIST openssl-0.9.8ze.tar.gz 3734873 SHA256 ee3da602826e975b47e4d7af8a27be8258c160876194898c58881eab814b55b8 SHA512 6ab08065ab2cdf6699e462e2a082e6d4c21f027383e12d4dd1d0dce2a4073ae52230494215b3fe24b8a8d73f5f5dd3a1fe53c66acd8db6e162e4bf3636e229c3 WHIRLPOOL 8a5de0aed7b48007b3b8092726c9c8eb6771c49d388baaff4d7ba3591be0b1856cb17842db5bc608994b38f5d87a8b07a441c874523e577b786a4612bba7789f
DIST openssl-0.9.8zf.tar.gz 3822386 SHA256 d5245a29128984192acc5b1fc01e37429b7a01c53cadcb2645e546718b300edb SHA512 8a68f024c31b7de25e19732ad556a27d69cface8e7a546ca4221873053a270e5e36336626f7fe857bbbec5427204bddbb5fc9dea8d7a187a8db6719d970431ab WHIRLPOOL 842e5bc71a12bf363fe797e95faf988ae949aa15f8faee935ee8861e4093e9d4e0b766b24dda8d415f29d2ee2821050cfc3ce095d265d59574e7fe0af4024c66
@@ -44,20 +45,23 @@ EBUILD openssl-1.0.0r.ebuild 7105 SHA256 9a73119cf74c7e219a4a25edfb3b8510f46a97b
EBUILD openssl-1.0.1l-r1.ebuild 8880 SHA256 eed2ddde72a8e8d33027839ea595c1cac8ce93168db7aaa11ec909de1c89f6a4 SHA512 95983b1fbc937baa686b4265abf80b41c804946a8db15b1b1e7e282b408d61ab0d7c69c1970763b34a45876a4c822a662fafa47e976df797930d75ac458f7330 WHIRLPOOL 11d26c49e525bc162cadf7ab7ea068f480b21e9fe7e5b61eb8552c050d34371f5d4cf23257cf07c42b152dfdca0efbf78441f9942480bedf4b2ba032ac074903
EBUILD openssl-1.0.1m.ebuild 8825 SHA256 84b6db3267866e27dd0e20a446aa48b1ed153d9d863ee2ac40abb581a66781c5 SHA512 9a91a519fb3d3e7b1587b9ba79e0cadfc4a8ffd6d4dd0727131e880f15cef63a886284a3bfa22b7194229aefbc40750205ba65d011246b4c03112cc8ee2692f4 WHIRLPOOL 819642d7f8e8a13aabd816a680b475de737d259d7a260c5d621454bae3425034820c916f0d61ef023fa71ab723badb64fef2f508bd1383d6fafe9d953bbcbd7b
EBUILD openssl-1.0.2-r3.ebuild 8925 SHA256 16b32e6b3a83e270e067558d29a80578576e23adca0f35a5a4176492c32170cf SHA512 25ca31b089457de899b1c2ba409041f4b1b866830aa27ac5b62e344f6141e4587d54d5c1d7e5530c3df36e6093613c8d34a0d7e96553f3427f5c374e498621dd WHIRLPOOL 38cf25a45265d8f01973f982c5c7bb16df6bd5e7ac4721f5aa84e8c95a066284ed538c688489bb06af7067b07bb1590ddcfee5be31a82aeca82f46bd25c04219
-EBUILD openssl-1.0.2a.ebuild 8759 SHA256 3d213056f89f268a4978bde42bdb627aeef5a8208d937ab1948d00af8cb645f4 SHA512 6472f86b6e7db9826ccc411280e3a89b7b2cbd161ecca1042f367bde819d83bba4b35cf7b440ee478ef743f3f8d8476540f88252eb91be2b0d75fadf32745343 WHIRLPOOL 9e08b94a83707e98680644302b8acfb981e13a8953ef2604b79d0278b416c1ba423863f599623a337685c73a53d5ee5cfb2cb5309cdbe076db301815fa0378a8
-MISC ChangeLog 99081 SHA256 285111815e9fc265b055419faad5508467b728d47ba36b3c6a99b72e9f27dcc5 SHA512 618b343e3f2a82e390a431f3ff2060e42c2c584870d75ff370667d5401732b4f6e9b97022acb1137cf7f77484e813ae2eddf6d53e0b20cb7beb3a43453b2aa6f WHIRLPOOL d7a9be89a4c33ff1ee94b9b1923869e564cf385fb69c3f7c089bd32dc57d0f6a5d8609903b55f28ef72a8a8780822467541982b24acaa8fed0028d3d85819fcf
+EBUILD openssl-1.0.2a.ebuild 8821 SHA256 de71117490d54634b6bcaa076d3bdf9098ee7785251e8f90bfa65b0d96e1a1ed SHA512 052449f0394ddfd5032b80da8e546f071fe083c2a61acfda8aa9bb6b2785ea48b889fec128aa388faa44a9afb6e1b458bb8cfeedfbb6af3a7749f409c296a7f8 WHIRLPOOL 2ff07e8a643fb831146fc21933733c048eead9cadc183c65b5bc8ddd17a976f2be6a7c2366c3364a8bcf5bf40977cc1b93813110d1b9036b6179e4c32c2ea4cb
+MISC ChangeLog 99257 SHA256 3f89460b31b0ca5d39a67b617ffaf7badd00bb37b65decdb194678fb35bcd1b1 SHA512 564e6dac35930cbca92c61ddfd597a66c4ea864d553c7adbf5619a14d7a58b978d4edd79741eb688eb7ac82f0b0c134c61e4faa89a2960b093e603cee13aba48 WHIRLPOOL d312ac203b7937e9296c6c0eef2b3ab09d54472ba00268affd7fd4393eb79519a7486cdaffde57b062a635042f3035632f95172e4bcc6d37cb669aba3ef180ed
MISC metadata.xml 637 SHA256 7b96f0e49fc5ab28bf914be847a89300bf3c7e65f652d748a48721a40c444b8d SHA512 a92ca59f6fc42237f7d30c4b0cd7339a7e82455ef31e155fb09d61012b3e3892d235d09a8c535f1db73b1468d483bb697575167cfe0d1ab45ef184bb95dc37db WHIRLPOOL f6fe48fc5b7a3a94eff327c5a8d6930efe2a7c92e7fb8a3366d8af0133b466420e68e168883742f993e89e45db12dab8c5a11e665242e368f012b0dc26d3c9ef
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQGcBAEBCAAGBQJVC1bNAAoJEJQzkH1pP7W4hAkL/3Aj02rtSGaKIfeFm7fUcoVj
-eQgDptbtREd2pS5AM6Vm1t9Ib4c9CUqravcUJia5Zk8Ew88kXC+4dsu9cnSfcr7X
-3bPBcrht3yJfuE6d6hXoo906pLmlph1MnHGWMVMtqyRloQhlRXJ7sKKpg2zckM8s
-0+Zovabkheoekv+fJYuAuNIIdgsdcj5ZerrPjBqxXw1+cHVlG/KMcDaWPU08F4p7
-T/T/M3rvDTha9zDnc2Crw5FtUOlRyD3zoTRYtz33MOTXdjxWo1baW6vAYK0gTXTC
-brOLWIKGi7goq8C1kG37E5eUfiMYkc5yCNuBiMJqhPErHBntYgHaWRIdwB7ach5m
-lBCkXSKrNsbKcx5+BcTvYOpiGFCL7fM2KtlmVbEQBgzgpleWqjwRekvRBL1Ip5uJ
-iNLi3ciaIxuZbdojeLLalEzngMfWdBvNL+zm5NYTZxQuDxWfMNMRGO6t074c7PKH
-Sa4oa2GI+kyRK+ec/OlCU3HwP6QH1c30TT8ysIoXtg==
-=i37y
+iQIcBAEBCAAGBQJVDTZ6AAoJEPGu1DbS6WIAPpMP/2mE9F/WciJ+kteEz+yUNWHw
+bNceOUynWprE83mZux4Ka85y35DTp0UowOP++R7gxe6jUjtiVShNFA8R7HgahMYk
+Ilw18kLHJLogZSDxedS3X44HpiXHcHC8kk+DPpQqCmZxq8xlasHqh3QlXobcrsiR
+tfJd+iW+ZJTsLdAphW1R0eT1/zhnaxML2cQgWgMX+k2b8lI9SWdK/z4C33mPpDT3
+J+8BS1zdOeuh78/kms+hlhZMYvS0Yy72Xg//xB5CXeylgH2oPJYRBpbHwOLaS7tP
+51q8z+yvKaCLKbtzTRne87nNF3EltHxf29Ji7i/yrfyKLiAtSFBF5pfrs0MtAtz/
+b4xBA2OTyEldh3/+RkqJFq/K0rcGkLF/txqf2Vy+TyUGyUONX1ka/k23Vh1XNCMv
+av7Nv3ZTKSjGPknKFanzo8CbtT+v/L3Nwuf1rwljQIExQTo/CYW9n+BZJIzY+ldf
+tmt/dZeC2wm50DXQ7EeAMEGvurFhaFnsJ3BvAh008TANowQndNgE5zxDrEkYwEPh
+BqF4W3Q1jOc+vragGgnw+KqVwkimlQdhsSMheYAOiACqRk0VYYhEFV4D7EukeiKz
+MnYJs6lc4GhbmJBLNiLnkiYeSezaaFCFXQ8cRKWaDgDc+cILXarfzEtm4j08MDxQ
+C4fyHoDnRWy3i6BIIDsp
+=YHRB
-----END PGP SIGNATURE-----
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