Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:5.7 commit in: /
Date: Tue, 26 May 2020 17:59:20
Message-Id: 1590515916.ec9ddda7922e72d5f53c5b45262d3b24f67d1b18.mpagano@gentoo
1 commit: ec9ddda7922e72d5f53c5b45262d3b24f67d1b18
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 26 17:58:36 2020 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Tue May 26 17:58:36 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=ec9ddda7
7
8 Added two fixes to genpatches
9
10 VIDEO_TVP5150 requies REGMAP_I2C to build. Select it by default in Kconfig.
11 See bug #721096. Thanks to Max Steel
12 sign-file: full functionality with modern LibreSSL
13
14 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
15
16 0000_README | 8 ++++++++
17 ...TVP5150-Fix-build-issue-by-selecting-REGMAP-I2C.patch | 10 ++++++++++
18 2920_sign-file-patch-for-libressl.patch | 16 ++++++++++++++++
19 3 files changed, 34 insertions(+)
20
21 diff --git a/0000_README b/0000_README
22 index 639ad9e..b0aed76 100644
23 --- a/0000_README
24 +++ b/0000_README
25 @@ -63,6 +63,14 @@ Patch: 2900_tmp513-Fix-build-issue-by-selecting-CONFIG_REG.patch
26 From: https://bugs.gentoo.org/710790
27 Desc: tmp513 requies REGMAP_I2C to build. Select it by default in Kconfig. See bug #710790. Thanks to Phil Stracchino
28
29 +Patch: 2910_TVP5150-Fix-build-issue-by-selecting-REGMAP-I2C.patch
30 +From: https://bugs.gentoo.org/721096
31 +Desc: VIDEO_TVP5150 requies REGMAP_I2C to build. Select it by default in Kconfig. See bug #721096. Thanks to Max Steel
32 +
33 +Patch: 2920_sign-file-patch-for-libressl.patch
34 +From: https://bugs.gentoo.org/717166
35 +Desc: sign-file: full functionality with modern LibreSSL
36 +
37 Patch: 4567_distro-Gentoo-Kconfig.patch
38 From: Tom Wijsman <TomWij@g.o>
39 Desc: Add Gentoo Linux support config settings and defaults.
40
41 diff --git a/2910_TVP5150-Fix-build-issue-by-selecting-REGMAP-I2C.patch b/2910_TVP5150-Fix-build-issue-by-selecting-REGMAP-I2C.patch
42 new file mode 100644
43 index 0000000..1bc058e
44 --- /dev/null
45 +++ b/2910_TVP5150-Fix-build-issue-by-selecting-REGMAP-I2C.patch
46 @@ -0,0 +1,10 @@
47 +--- a/drivers/media/i2c/Kconfig 2020-05-13 12:38:05.102903309 -0400
48 ++++ b/drivers/media/i2c/Kconfig 2020-05-13 12:38:51.283171977 -0400
49 +@@ -378,6 +378,7 @@ config VIDEO_TVP514X
50 + config VIDEO_TVP5150
51 + tristate "Texas Instruments TVP5150 video decoder"
52 + depends on VIDEO_V4L2 && I2C
53 ++ select REGMAP_I2C
54 + select V4L2_FWNODE
55 + help
56 + Support for the Texas Instruments TVP5150 video decoder.
57
58 diff --git a/2920_sign-file-patch-for-libressl.patch b/2920_sign-file-patch-for-libressl.patch
59 new file mode 100644
60 index 0000000..e6ec017
61 --- /dev/null
62 +++ b/2920_sign-file-patch-for-libressl.patch
63 @@ -0,0 +1,16 @@
64 +--- a/scripts/sign-file.c 2020-05-20 18:47:21.282820662 -0400
65 ++++ b/scripts/sign-file.c 2020-05-20 18:48:37.991081899 -0400
66 +@@ -41,9 +41,10 @@
67 + * signing with anything other than SHA1 - so we're stuck with that if such is
68 + * the case.
69 + */
70 +-#if defined(LIBRESSL_VERSION_NUMBER) || \
71 +- OPENSSL_VERSION_NUMBER < 0x10000000L || \
72 +- defined(OPENSSL_NO_CMS)
73 ++#if defined(OPENSSL_NO_CMS) || \
74 ++ ( defined(LIBRESSL_VERSION_NUMBER) \
75 ++ && (LIBRESSL_VERSION_NUMBER < 0x3010000fL) ) || \
76 ++ OPENSSL_VERSION_NUMBER < 0x10000000L
77 + #define USE_PKCS7
78 + #endif
79 + #ifndef USE_PKCS7