From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 417FE138334 for ; Mon, 16 Sep 2019 08:24:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DD82E0977; Mon, 16 Sep 2019 08:24:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 36032E0977 for ; Mon, 16 Sep 2019 08:24:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F78934B20B for ; Mon, 16 Sep 2019 08:24:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A64417E9 for ; Mon, 16 Sep 2019 08:24:07 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1568622242.28e9a37f7b5617f82c30c3a7780f4e55cea2128d.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/, dev-libs/openssl/files/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: dev-libs/openssl/Manifest dev-libs/openssl/files/openssl-1.0.2-gethostbyname2-solaris.patch dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch dev-libs/openssl/openssl-1.0.2t-r1.ebuild dev-libs/openssl/openssl-1.0.2t.ebuild dev-libs/openssl/openssl-1.1.0l.ebuild X-VCS-Directories: dev-libs/openssl/files/ dev-libs/openssl/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 28e9a37f7b5617f82c30c3a7780f4e55cea2128d X-VCS-Branch: master Date: Mon, 16 Sep 2019 08:24:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 575c7f6e-308c-4fcc-a966-b4096f4662d7 X-Archives-Hash: 1422d2014826eb274033400b66854561 commit: 28e9a37f7b5617f82c30c3a7780f4e55cea2128d Author: Fabian Groffen gentoo org> AuthorDate: Mon Sep 16 08:24:02 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Sep 16 08:24:02 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=28e9a37f dev-libs/openssl: sync for latest patch fixes Package-Manager: Portage-2.3.68-prefix, Repoman-2.3.17 Signed-off-by: Fabian Groffen gentoo.org> dev-libs/openssl/Manifest | 2 +- .../openssl-1.0.2-gethostbyname2-solaris.patch | 6 +++-- .../files/openssl-1.1.0k-fix-test_fuzz.patch | 19 ++++++++++++++ .../openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch | 30 ++++++++++++++++++++++ ...nssl-1.0.2t.ebuild => openssl-1.0.2t-r1.ebuild} | 8 +++--- dev-libs/openssl/openssl-1.1.0l.ebuild | 5 ++-- 6 files changed, 60 insertions(+), 10 deletions(-) diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 5442ba3658..f8fd70d980 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -11,7 +11,7 @@ DIST openssl-1.1.0j.tar.gz 5411919 BLAKE2B 0fbd936f38d30b64bea717a67cd59704c5ce4 DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457 DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 -DIST openssl-1.1.0k-bindist-1.0.tar.xz 11716 BLAKE2B c491ba0899c44dbcc63f85b255548c439c965a20a04ac2a6324a4122c4691b7c95ec18e62be6d708a7ea62ea197d32e5091987cb5043969878f89e5bc26243d4 SHA512 1d5bc9d7b24cf55d32d996e2421d43a1218b605720293f00d07814afb481387856f0dc000ad3c3e4cba2361055668cfe79a945be44ab85a249555f37e683a909 +DIST openssl-1.1.0l-bindist-1.0.tar.xz 13184 BLAKE2B c09e023458faff17b10d6f20c28462c0851757a20d59b4b751220ab307324d5778252df112ad74fd319407cc75fdd1cd507d48058dd0234dc8c03020c882ed42 SHA512 39720ecee3ec6080c1416f2fb7c9246b89ee55b21be2baabad51eb6823dbe1559450b1ae92fa61ac1cf5ba04ac8c02438aa469bc65eae6905cf1ea486f270793 DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e962487fbe72967f0392ace959955429192541881a98d097d7bb75ed7238b1817b0c3c2c4da04421512bd538f2b07cdd7 SHA512 81b74149f40ea7d9f7e235820a4f977844653ad1e2b302e65e712c12193f47542fe7e3385fd1e25e3dd074e4e6d04199836cbc492656f5a7692edab5e234f4ad DIST openssl-1.1.1-ec-curves.patch 7265 BLAKE2B 04725d226c430132cf54afbfaa30a82f8f8bbfd3608823d1d0cd42c3c13f417e90762759da3134d7b0c4373e531925db337b681340f2f284cb2f16a4caef22e3 SHA512 de4d0f1635740c57217836a476c420141c0d34a5f90cbf7957aed7a80e7ac9ca036de2d8448e6bf4c122999e308730575899f61cea6e51ab6825dd04890d75a1 DIST openssl-1.1.1b.tar.gz 8213737 BLAKE2B 7ad9da9548052e2a033a684038f97c420cfffd57994604bcb3fa12640796c8c0aea3d24fb05648ee4940fbec40b81462e81c353da5a41a2575c0585d9718eae8 SHA512 b54025fbb4fe264466f3b0d762aad4be45bd23cd48bdb26d901d4c41a40bfd776177e02230995ab181a695435039dbad313f4b9a563239a70807a2e19ecf045d diff --git a/dev-libs/openssl/files/openssl-1.0.2-gethostbyname2-solaris.patch b/dev-libs/openssl/files/openssl-1.0.2-gethostbyname2-solaris.patch index 7a5aee30b1..3474281ae8 100644 --- a/dev-libs/openssl/files/openssl-1.0.2-gethostbyname2-solaris.patch +++ b/dev-libs/openssl/files/openssl-1.0.2-gethostbyname2-solaris.patch @@ -1,5 +1,7 @@ ---- apps/s_socket.c -+++ apps/s_socket.c +introduced by Gentoo's own patches, not present upstream + +--- a/apps/s_socket.c ++++ b/apps/s_socket.c @@ -718,8 +718,13 @@ if (domain == AF_INET) ret = gethostbyname(name); diff --git a/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch b/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch new file mode 100644 index 0000000000..2c4cc31257 --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch @@ -0,0 +1,19 @@ +Test fuzz was forgotten when + + Perl: Use our own globbing wrapper rather than File::Glob::glob + +was backported to openssl-1.1.0 branch. + +Link: https://github.com/openssl/openssl/commit/b81cfa07ada850fd287d0a0c82ba280907f18ce7 + +--- a/test/recipes/90-test_fuzz.t ++++ b/test/recipes/90-test_fuzz.t +@@ -9,7 +9,7 @@ + use strict; + use warnings; + +-use if $^O ne "VMS", 'File::Glob' => qw/glob/; ++use OpenSSL::Glob; + use OpenSSL::Test qw/:DEFAULT srctop_file/; + use OpenSSL::Test::Utils; + diff --git a/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch b/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch new file mode 100644 index 0000000000..35a435df28 --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch @@ -0,0 +1,30 @@ +From bcf6a94c4bc912ad313ea21abdf7e83bbae450e5 Mon Sep 17 00:00:00 2001 +From: Nicola Tuveri +Date: Thu, 12 Sep 2019 01:57:47 +0300 +Subject: [PATCH] Fix no-ec2m in ec_curve.c (1.1.0) + +I made a mistake in d4a5dac9f9242c580fb9d0a4389440eccd3494a7 and +inverted the GF2m and GFp calls in ec_point_get_affine_coordinates, this +fixes it. +--- + crypto/ec/ec_curve.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c +index 2d28d7f70bb..6a58b3a23e0 100644 +--- a/crypto/ec/ec_curve.c ++++ b/crypto/ec/ec_curve.c +@@ -3200,11 +3200,11 @@ int ec_point_get_affine_coordinates(const EC_GROUP *group, + + #ifndef OPENSSL_NO_EC2M + if (field_nid == NID_X9_62_characteristic_two_field) { +- return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); ++ return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); + } else + #endif /* !def(OPENSSL_NO_EC2M) */ + if (field_nid == NID_X9_62_prime_field) { +- return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); ++ return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); + } else { + /* this should never happen */ + return 0; diff --git a/dev-libs/openssl/openssl-1.0.2t.ebuild b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild similarity index 98% rename from dev-libs/openssl/openssl-1.0.2t.ebuild rename to dev-libs/openssl/openssl-1.0.2t-r1.ebuild index 324a0685df..41dd63e4b0 100644 --- a/dev-libs/openssl/openssl-1.0.2t.ebuild +++ b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild @@ -47,7 +47,8 @@ RDEPEND="!prefix-stack? ( ${MY_PKGINSTDEPS} ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - prefix-stack? ( ${MY_PKGINSTDEPS} ) + prefix-stack? ( ${MY_PKGINSTDEPS} )" +BDEPEND=" >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( @@ -86,9 +87,7 @@ src_prepare() { rm -f Makefile if ! use vanilla ; then - if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then - [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" - fi + eapply "${WORKDIR}"/patch/*.patch fi eapply_user @@ -114,6 +113,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-1.0.2a-aix-soname.patch # like libtool eapply "${FILESDIR}"/${PN}-0.9.8g-engines-installnames.patch eapply "${FILESDIR}"/${PN}-1.0.0b-darwin-bundle-compile-fix.patch + eapply "${FILESDIR}"/${PN}-1.0.2-gethostbyname2-solaris.patch eapply "${FILESDIR}"/${PN}-1.0.2l-winnt.patch # parity # remove -arch for Darwin diff --git a/dev-libs/openssl/openssl-1.1.0l.ebuild b/dev-libs/openssl/openssl-1.1.0l.ebuild index f9d64c8261..38562bc38f 100644 --- a/dev-libs/openssl/openssl-1.1.0l.ebuild +++ b/dev-libs/openssl/openssl-1.1.0l.ebuild @@ -14,8 +14,7 @@ MY_P=${P/_/-} # - ec_curve.c (SOURCE12) -- MODIFIED # - ectest.c (SOURCE13) # - openssl-1.1.0-ec-curves.patch (PATCH37) -- MODIFIED -############# MISSING: FIX WHEN #694516 gets fixed: see KEYWORDS ############# -BINDIST_PATCH_SET="openssl-1.1.0k-bindist-1.0.tar.xz" +BINDIST_PATCH_SET="openssl-1.1.0l-bindist-1.0.tar.xz" DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" HOMEPAGE="https://www.openssl.org/" @@ -27,7 +26,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz LICENSE="openssl" SLOT="0/1.1" # .so version of libssl/libcrypto -#KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib" RESTRICT="!bindist? ( bindist )"