From 0313f2feb9d689f627133a0165c8ee8c5dab707b Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Wed, 15 Sep 2021 11:20:35 +0000 Subject: [PATCH] AlmaLinux changes --- .../0030-fix-the-build-with-nss-3.44.patch | 45 +++++++++++++++++++ SPECS/pesign.spec | 6 +++ 2 files changed, 51 insertions(+) create mode 100644 SOURCES/0030-fix-the-build-with-nss-3.44.patch diff --git a/SOURCES/0030-fix-the-build-with-nss-3.44.patch b/SOURCES/0030-fix-the-build-with-nss-3.44.patch new file mode 100644 index 0000000..da60669 --- /dev/null +++ b/SOURCES/0030-fix-the-build-with-nss-3.44.patch @@ -0,0 +1,45 @@ +From b535d1ac5cbcdf18a97d97a92581e38080d9e521 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 14 May 2019 11:28:38 -0400 +Subject: [PATCH] efikeygen: Fix the build with nss 3.44 + +NSS 3.44 adds some certificate types, which changes a type and makes +some encoding stuff weird. As a result, we get: + +gcc8 -I/wrkdirs/usr/ports/sysutils/pesign/work/pesign-0.110/include -O2 -pipe -fstack-protector-strong -Wl,-rpath=/usr/local/lib/gcc8 -isystem /usr/local/include -fno-strict-aliasing -g -O0 -g -O0 -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants --std=gnu99 -D_GNU_SOURCE -Wno-unused-result -Wno-unused-function -I../include/ -I/usr/local/include/nss -I/usr/local/include/nss/nss -I/usr/local/include/nspr -Werror -fPIC -isystem /usr/local/include -DCONFIG_amd64 -DCONFIG_amd64 -c efikeygen.c -o efikeygen.o +In file included from /usr/local/include/nss/nss/cert.h:22, + from efikeygen.c:39: +efikeygen.c: In function 'add_cert_type': +/usr/local/include/nss/nss/certt.h:445:5: error: unsigned conversion from 'int' to 'unsigned char' changes value from '496' to '240' [-Werror=overflow] + (NS_CERT_TYPE_SSL_CLIENT | NS_CERT_TYPE_SSL_SERVER | NS_CERT_TYPE_EMAIL | \ + ^ +efikeygen.c:208:23: note: in expansion of macro 'NS_CERT_TYPE_APP' + unsigned char type = NS_CERT_TYPE_APP; + ^~~~~~~~~~~~~~~~ +cc1: all warnings being treated as errors + +This is fixed by just making it an int. + +Fixes github issue #48. + +Signed-off-by: Peter Jones +--- + src/efikeygen.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/efikeygen.c b/src/efikeygen.c +index ede76ef..2cd953e 100644 +--- a/src/efikeygen.c ++++ b/src/efikeygen.c +@@ -208,7 +208,7 @@ static int + add_cert_type(cms_context *cms, void *extHandle, int is_ca) + { + SECItem bitStringValue; +- unsigned char type = NS_CERT_TYPE_APP; ++ int type = NS_CERT_TYPE_APP; + + if (is_ca) + type |= NS_CERT_TYPE_SSL_CA | +-- +2.21.0 + diff --git a/SPECS/pesign.spec b/SPECS/pesign.spec index 99ae141..61f8345 100644 --- a/SPECS/pesign.spec +++ b/SPECS/pesign.spec @@ -1,3 +1,4 @@ +%global dist %{?dist}.alma %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: pesign @@ -59,6 +60,7 @@ Patch0026: 0026-Clean-up-gcc-command-lines-a-little.patch Patch0027: 0027-Make-pesign-users-groups-static-in-the-repo.patch Patch0028: 0028-rpm-Make-the-client-signer-use-the-fedora-values-unl.patch Patch0029: 0029-Make-macros.pesign-error-in-kojibuilder-if-we-don-t-.patch +Patch0030: 0030-fix-the-build-with-nss-3.44.patch %description This package contains the pesign utility for signing UEFI binaries as @@ -163,6 +165,10 @@ exit 0 %{python3_sitelib}/mockbuild/plugins/pesign.* %changelog +* Sat Dec 21 2019 Eugene Zamriy - 0.112-25.cloudlinux +- Apply 0030-fix-the-build-with-nss-3.44.patch + Resolves: https://github.com/rhboot/pesign/issues/48 + * Mon Oct 01 2018 Peter Jones - 0.112-25 - Preserve .py timestamp during install so .pyc/.pyo files have the same timestamp on all arches, preventing rpmdiff from complaining.