27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
|
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)
|
||
|
|
---
|
||
|
|
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 c9d5570..9dee56e 100644
|
||
|
|
--- a/src/pesign-rpmbuild-helper.in
|
||
|
|
+++ b/src/pesign-rpmbuild-helper.in
|
||
|
|
@@ -190,7 +190,7 @@ main() {
|
||
|
|
getfacl -n /run/pesign /run/pesign/socket /var/run/pesign /var/run/pesign/socket 1>&2 ||:
|
||
|
|
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"
|