Detect presence of rpm-sign when checking for rhel-ness

Resolves: #2044886
Signed-off-by: Robbie Harwood <rharwood@redhat.com>

0005-Detect-the-presence-of-rpm-sign-when-checking-for-rh.patch

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 4 Apr 2022 14:45:29 -0400
+Subject: [PATCH] Detect the presence of rpm-sign when checking for "rhel"-ness
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+[rharwood: manually reapply to main]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+(cherry picked from commit 17e5878cb087e0a766722d3c487f87c41b318f9a)
+(cherry picked from commit a1cfd0b6ddb423571d430f3df46af7761c0797e3)
+---
+ src/pesign-rpmbuild-helper.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pesign-rpmbuild-helper.in b/src/pesign-rpmbuild-helper.in
+index 0a845d2..239605a 100644
+--- a/src/pesign-rpmbuild-helper.in
++++ b/src/pesign-rpmbuild-helper.in
+@@ -192,7 +192,7 @@ main() {
+ 	fi
+     fi
+ 
+-    if [[ "${rhelver}" -ge 7 ]] ; then
++    if [[ "${rhelver}" -ge 7 ]] && which rpm-sign >&/dev/null ; then
+ 	nssdir="$(mktemp -p "${PWD}" -d)"
+ 	echo > "${nssdir}/pwfile"
+ 	certutil -N -d "${nssdir}" -f "${nssdir}/pwfile"

pesign.patches

@@ -2,3 +2,4 @@ Patch0001: 0001-daemon-remove-always-true-comparison.patch
 Patch0002: 0002-Disable-pragmas-for-warnings-that-are-too-old.patch
 Patch0003: 0003-Add-D_GLIBCXX_ASSERTIONS-to-CPPFLAGS.patch
 Patch0004: 0004-macros.pesign-handle-centos-like-rhel-with-rhelver.patch
+Patch0005: 0005-Detect-the-presence-of-rpm-sign-when-checking-for-rh.patch

pesign.spec

@@ -3,7 +3,7 @@
 Name:    pesign
 Summary: Signing utility for UEFI binaries
 Version: 115
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL-2.0-only
 URL:     https://github.com/rhboot/pesign
 
@@ -162,6 +162,10 @@ certutil -d %{_sysconfdir}/pki/pesign/ -X -L > /dev/null
 %{python3_sitelib}/mockbuild/plugins/pesign.*
 
 %changelog
+* Mon Apr 04 2022 Robbie Harwood <rharwood@redhat.com>
+- Detect presence of rpm-sign when checking for rhel-ness
+- Resolves: #2044886
+
 * Fri Apr 01 2022 Robbie Harwood <rharwood@redhat.com> - 115-3
 - Correct handling of rhel and centos macros
 - Resolves: #2044886