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 852891382C5 for ; Wed, 20 May 2020 23:13:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EB6FE0A90; Wed, 20 May 2020 23:13:54 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 67004E0A90 for ; Wed, 20 May 2020 23:13:54 +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 14EC034F1C2 for ; Wed, 20 May 2020 23:13:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA904238 for ; Wed, 20 May 2020 23:13:50 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1590016207.dee616e55bf3f2ced4f2f4688df60626ed2f6a29.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:5.6 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 2920_sign-file-patch-for-libressl.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: dee616e55bf3f2ced4f2f4688df60626ed2f6a29 X-VCS-Branch: 5.6 Date: Wed, 20 May 2020 23:13:50 +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: 1a407a98-4de0-436f-8fab-0c74c573531e X-Archives-Hash: 778af7a2c6223715429935d49c897212 commit: dee616e55bf3f2ced4f2f4688df60626ed2f6a29 Author: Mike Pagano gentoo org> AuthorDate: Wed May 20 23:10:07 2020 +0000 Commit: Mike Pagano gentoo org> CommitDate: Wed May 20 23:10:07 2020 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=dee616e5 sign-file: full functionality with modern LibreSSL Bug: https://bugs.gentoo.org/717166 Signed-off-by: Mike Pagano gentoo.org> 0000_README | 4 ++++ 2920_sign-file-patch-for-libressl.patch | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/0000_README b/0000_README index 3a37e9d..50aaa31 100644 --- a/0000_README +++ b/0000_README @@ -127,6 +127,10 @@ Patch: 2910_TVP5150-Fix-build-issue-by-selecting-REGMAP-I2C.patch From: https://bugs.gentoo.org/721096 Desc: VIDEO_TVP515 requies REGMAP_I2C to build. Select it by default in Kconfig. See bug #721096. Thanks to Max Steel +Patch: 2920_sign-file-patch-for-libressl.patch +From: https://bugs.gentoo.org/717166 +Desc: sign-file: full functionality with modern LibreSSL + Patch: 4567_distro-Gentoo-Kconfig.patch From: Tom Wijsman Desc: Add Gentoo Linux support config settings and defaults. diff --git a/2920_sign-file-patch-for-libressl.patch b/2920_sign-file-patch-for-libressl.patch new file mode 100644 index 0000000..e6ec017 --- /dev/null +++ b/2920_sign-file-patch-for-libressl.patch @@ -0,0 +1,16 @@ +--- a/scripts/sign-file.c 2020-05-20 18:47:21.282820662 -0400 ++++ b/scripts/sign-file.c 2020-05-20 18:48:37.991081899 -0400 +@@ -41,9 +41,10 @@ + * signing with anything other than SHA1 - so we're stuck with that if such is + * the case. + */ +-#if defined(LIBRESSL_VERSION_NUMBER) || \ +- OPENSSL_VERSION_NUMBER < 0x10000000L || \ +- defined(OPENSSL_NO_CMS) ++#if defined(OPENSSL_NO_CMS) || \ ++ ( defined(LIBRESSL_VERSION_NUMBER) \ ++ && (LIBRESSL_VERSION_NUMBER < 0x3010000fL) ) || \ ++ OPENSSL_VERSION_NUMBER < 0x10000000L + #define USE_PKCS7 + #endif + #ifndef USE_PKCS7