Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:5.4 commit in: /
Date: Tue, 02 Jun 2020 11:37:08
Message-Id: 1591097806.fc41eb3ddc9a0920c23174ef59d9a20cd6415e09.mpagano@gentoo
1 commit: fc41eb3ddc9a0920c23174ef59d9a20cd6415e09
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 2 11:36:46 2020 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 2 11:36:46 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=fc41eb3d
7
8 sign-file: full functionality with modern LibreSSL
9
10 Bug: https://bugs.gentoo.org/717166
11
12 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
13
14 0000_README | 4 ++++
15 2920_sign-file-patch-for-libressl.patch | 16 ++++++++++++++++
16 2 files changed, 20 insertions(+)
17
18 diff --git a/0000_README b/0000_README
19 index e6e9d24..750ca68 100644
20 --- a/0000_README
21 +++ b/0000_README
22 @@ -231,6 +231,10 @@ Patch: 2600_enable-key-swapping-for-apple-mac.patch
23 From: https://github.com/free5lot/hid-apple-patched
24 Desc: This hid-apple patch enables swapping of the FN and left Control keys and some additional on some apple keyboards. See bug #622902
25
26 +Patch: 2920_sign-file-patch-for-libressl.patch
27 +From: https://bugs.gentoo.org/717166
28 +Desc: sign-file: full functionality with modern LibreSSL
29 +
30 Patch: 4567_distro-Gentoo-Kconfig.patch
31 From: Tom Wijsman <TomWij@g.o>
32 Desc: Add Gentoo Linux support config settings and defaults.
33
34 diff --git a/2920_sign-file-patch-for-libressl.patch b/2920_sign-file-patch-for-libressl.patch
35 new file mode 100644
36 index 0000000..e6ec017
37 --- /dev/null
38 +++ b/2920_sign-file-patch-for-libressl.patch
39 @@ -0,0 +1,16 @@
40 +--- a/scripts/sign-file.c 2020-05-20 18:47:21.282820662 -0400
41 ++++ b/scripts/sign-file.c 2020-05-20 18:48:37.991081899 -0400
42 +@@ -41,9 +41,10 @@
43 + * signing with anything other than SHA1 - so we're stuck with that if such is
44 + * the case.
45 + */
46 +-#if defined(LIBRESSL_VERSION_NUMBER) || \
47 +- OPENSSL_VERSION_NUMBER < 0x10000000L || \
48 +- defined(OPENSSL_NO_CMS)
49 ++#if defined(OPENSSL_NO_CMS) || \
50 ++ ( defined(LIBRESSL_VERSION_NUMBER) \
51 ++ && (LIBRESSL_VERSION_NUMBER < 0x3010000fL) ) || \
52 ++ OPENSSL_VERSION_NUMBER < 0x10000000L
53 + #define USE_PKCS7
54 + #endif
55 + #ifndef USE_PKCS7