From 41c50b762dccf0b4a384a36ed68dd458dbca2f3a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 07 2021 18:31:09 +0000
Subject: import pesign-113-17.el9


---

diff --git a/SOURCES/0014-macros.pesign-handle-centos-like-rhel-with-rhelver.patch b/SOURCES/0014-macros.pesign-handle-centos-like-rhel-with-rhelver.patch
deleted file mode 100644
index f483ec6..0000000
--- a/SOURCES/0014-macros.pesign-handle-centos-like-rhel-with-rhelver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From efb69f149f256631a952e0a0db5b45ed5d391509 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 10 Aug 2021 12:39:08 -0400
-Subject: [PATCH] macros.pesign: handle centos like rhel with --rhelver
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/macros.pesign | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/macros.pesign b/src/macros.pesign
-index 34af57c5b3b..2ca1afb916e 100644
---- a/src/macros.pesign
-+++ b/src/macros.pesign
-@@ -35,6 +35,7 @@
-     %{?_buildhost:--hostname "%{_buildhost}"}				\\\
-     %{?vendor:--vendor "%{vendor}"}					\\\
--    %{?_rhel:--rhelver "%{_rhel}"}					\\\
-+    %{?rhel:--rhelver "%{rhel}"}					\\\
-+    %{?centos:--rhelver "%{centos}"}					\\\
-     %{?-n:--rhelcert %{-n*}}%{?!-n:--rhelcert %{__pesign_cert}}	\\\
-     %{?-a:--rhelcafile "%{-a*}"}					\\\
-     %{?-c:--rhelcertfile "%{-c*}"}					\\\
--- 
-2.31.1
-
diff --git a/SOURCES/0015-Detect-the-presence-of-rpm-sign-when-checking-for-rh.patch b/SOURCES/0015-Detect-the-presence-of-rpm-sign-when-checking-for-rh.patch
deleted file mode 100644
index 7a4fba6..0000000
--- a/SOURCES/0015-Detect-the-presence-of-rpm-sign-when-checking-for-rh.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3956d8a819541578b31c919270e915fbcc791e89 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Fri, 1 Oct 2021 17:58:20 -0400
-Subject: [PATCH] Detect the presence of rpm-sign when checking for
- "rhel"-ness.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- 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 27b8261bc17..d6ca29683b1 100644
---- a/src/pesign-rpmbuild-helper.in
-+++ b/src/pesign-rpmbuild-helper.in
-@@ -187,7 +187,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"
--- 
-2.31.1
-
diff --git a/SPECS/pesign.spec b/SPECS/pesign.spec
index 94d4666..57a8033 100644
--- a/SPECS/pesign.spec
+++ b/SPECS/pesign.spec
@@ -3,7 +3,7 @@
 Name:    pesign
 Summary: Signing utility for UEFI binaries
 Version: 113
-Release: 20%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 URL:     https://github.com/vathpela/pesign
 
@@ -56,8 +56,6 @@ Patch0010: 0010-pesign-authorize-don-t-setfacl-etc-pki-pesign-foo.patch
 Patch0011: 0011-kernel-building-hack.patch
 Patch0012: 0012-Use-run-not-var-run.patch
 Patch0013: 0013-Turn-off-free-nonheap-object.patch
-Patch0014: 0014-macros.pesign-handle-centos-like-rhel-with-rhelver.patch
-Patch0015: 0015-Detect-the-presence-of-rpm-sign-when-checking-for-rh.patch
 
 %description
 This package contains the pesign utility for signing UEFI binaries as
@@ -170,18 +168,6 @@ certutil -d %{_sysconfdir}/pki/pesign/ -X -L > /dev/null
 %{python3_sitelib}/mockbuild/plugins/pesign.*
 
 %changelog
-* Fri Oct 01 2021 Peter Jones <pjones@redhat.com> - 113-20
-- Also detect whether rpm-sign is present when detecting RHEL builds.
-  Related: rhbz#1951104
-
-* Wed Sep 29 2021 Peter Jones <pjones@redhat.com> - 113-19
-- Detect the RHEL version number correctly in the rpm pesign macro
-  Related: rhbz#1951104
-
-* Tue Aug 10 2021 Peter Jones <pjones@redhat.com> - 113-18
-- Detect the CentOS version number correctly in rpm pesign macro
-  Related: rhbz#1991688
-
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 113-17
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688