Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/files/, dev-libs/openssl/
Date: Fri, 23 Aug 2019 18:10:50
Message-Id: 1566583818.2c20225928fed2fb4c7512f4655207478ada6caf.whissi@gentoo
1 commit: 2c20225928fed2fb4c7512f4655207478ada6caf
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 23 17:33:18 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 23 18:10:18 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c202259
7
8 dev-libs/openssl: fix fuzz test
9
10 Package-Manager: Portage-2.3.72, Repoman-2.3.17
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 .../openssl/files/openssl-1.1.0k-fix-test_fuzz.patch | 19 +++++++++++++++++++
14 dev-libs/openssl/openssl-1.1.0k-r1.ebuild | 1 +
15 2 files changed, 20 insertions(+)
16
17 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
18 new file mode 100644
19 index 00000000000..2c4cc31257c
20 --- /dev/null
21 +++ b/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch
22 @@ -0,0 +1,19 @@
23 +Test fuzz was forgotten when
24 +
25 + Perl: Use our own globbing wrapper rather than File::Glob::glob
26 +
27 +was backported to openssl-1.1.0 branch.
28 +
29 +Link: https://github.com/openssl/openssl/commit/b81cfa07ada850fd287d0a0c82ba280907f18ce7
30 +
31 +--- a/test/recipes/90-test_fuzz.t
32 ++++ b/test/recipes/90-test_fuzz.t
33 +@@ -9,7 +9,7 @@
34 + use strict;
35 + use warnings;
36 +
37 +-use if $^O ne "VMS", 'File::Glob' => qw/glob/;
38 ++use OpenSSL::Glob;
39 + use OpenSSL::Test qw/:DEFAULT srctop_file/;
40 + use OpenSSL::Test::Utils;
41 +
42
43 diff --git a/dev-libs/openssl/openssl-1.1.0k-r1.ebuild b/dev-libs/openssl/openssl-1.1.0k-r1.ebuild
44 index 5bc111be0f8..f8ee7f73587 100644
45 --- a/dev-libs/openssl/openssl-1.1.0k-r1.ebuild
46 +++ b/dev-libs/openssl/openssl-1.1.0k-r1.ebuild
47 @@ -53,6 +53,7 @@ SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
48 PATCHES=(
49 "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
50 "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
51 + "${FILESDIR}"/${PN}-1.1.0k-fix-test_fuzz.patch
52 )
53
54 S="${WORKDIR}/${MY_P}"