From f0536d0bd90dcb17114fc9815cb437d26d75ef75 Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Thu, 24 Apr 2025 12:46:52 +0200 Subject: [PATCH] Add patch for prebuilt rpmsign(8) as well The original 4.19.x tarball ships prebuilt man pages so just updating the source .md file won't suffice, we need to either activate a rebuild (by enabling BuildRequires: pandoc) or just patch the resulting file. The latter seems easier and cleaner (Pandoc may not even be available on the build hosts) so do just that. Kudos to Jan Blazek for spotting! Related: RHEL-73173 --- ...bout-rpmsign-in-the-rpmsign-man-page.patch | 49 +++++++++++++++++++ rpm.spec | 5 +- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/0004-Talk-about-rpmsign-in-the-rpmsign-man-page.patch b/0004-Talk-about-rpmsign-in-the-rpmsign-man-page.patch index 6ab79a0..0e53c31 100644 --- a/0004-Talk-about-rpmsign-in-the-rpmsign-man-page.patch +++ b/0004-Talk-about-rpmsign-in-the-rpmsign-man-page.patch @@ -64,3 +64,52 @@ index 04d6855e7..339e28451 100644 -- 2.49.0 +diff -up rpm-4.19.1.1/docs/man/rpmsign.8.orig rpm-4.19.1.1/docs/man/rpmsign.8 +--- rpm-4.19.1.1/docs/man/rpmsign.8.orig 2025-04-24 12:35:05.722684233 +0200 ++++ rpm-4.19.1.1/docs/man/rpmsign.8 2025-04-24 12:42:46.963922808 +0200 +@@ -22,12 +22,12 @@ rpmsign - RPM Package Signing + .SH SYNOPSIS + .SS SIGNING PACKAGES: + .PP +-\f[B]rpm\f[R] \f[B]--addsign|--resign\f[R] [\f[B]rpmsign-options\f[R]] +-\f[I]PACKAGE_FILE ...\f[R] ++\f[B]rpmsign\f[R] \f[B]--addsign|--resign\f[R] ++[\f[B]rpmsign-options\f[R]] \f[I]PACKAGE_FILE ...\f[R] + .PP +-\f[B]rpm\f[R] \f[B]--delsign\f[R] \f[I]PACKAGE_FILE ...\f[R] ++\f[B]rpmsign\f[R] \f[B]--delsign\f[R] \f[I]PACKAGE_FILE ...\f[R] + .PP +-\f[B]rpm\f[R] \f[B]--delfilesign\f[R] \f[I]PACKAGE_FILE ...\f[R] ++\f[B]rpmsign\f[R] \f[B]--delfilesign\f[R] \f[I]PACKAGE_FILE ...\f[R] + .SS rpmsign-options + .PP + [\f[B]--rpmv3\f[R]] [\f[B]--fskpath \f[R]\f[I]KEY\f[R]] +@@ -40,15 +40,16 @@ replacing any existing signatures. + There are two options for historical reasons, there is no difference in + behavior currently. + .PP +-To create a signature rpm needs to verify the package\[aq]s checksum. ++To create a signature rpmsign needs to verify the package\[aq]s ++checksum. + As a result packages with a MD5/SHA1 checksums cannot be signed in FIPS + mode. + .PP +-\f[B]rpm\f[R] \f[B]--delsign\f[R] \f[I]PACKAGE_FILE ...\f[R] ++\f[B]rpmsign\f[R] \f[B]--delsign\f[R] \f[I]PACKAGE_FILE ...\f[R] + .PP + Delete all signatures from each package \f[I]PACKAGE_FILE\f[R] given. + .PP +-\f[B]rpm\f[R] \f[B]--delfilesign\f[R] \f[I]PACKAGE_FILE ...\f[R] ++\f[B]rpmsign\f[R] \f[B]--delfilesign\f[R] \f[I]PACKAGE_FILE ...\f[R] + .PP + Delete all IMA and fsverity file signatures from each package + \f[I]PACKAGE_FILE\f[R] given. +@@ -58,7 +59,7 @@ Delete all IMA and fsverity file signatu + Force RPM V3 header+payload signature addition. + These are expensive and redundant baggage on packages where a separate + payload digest exists (packages built with rpm >= 4.14). +-Rpm will automatically detect the need for V3 signatures, but this ++Rpmsign will automatically detect the need for V3 signatures, but this + option can be used to force their creation if the packages must be fully + signature verifiable with rpm < 4.14 or other interoperability reasons. + .TP diff --git a/rpm.spec b/rpm.spec index f40e80c..e9ae6da 100644 --- a/rpm.spec +++ b/rpm.spec @@ -27,7 +27,7 @@ %global rpmver 4.19.1.1 #global snapver rc1 -%global baserelease 13 +%global baserelease 14 %global sover 10 %global srcver %{rpmver}%{?snapver:-%{snapver}} @@ -645,6 +645,9 @@ fi %doc %{_defaultdocdir}/rpm/API/ %changelog +* Thu Apr 24 2025 Michal Domonkos - 4.19.1.1-14 +- Fix command references in rpmsign(8) man page, take II (RHEL-73173) + * Tue Apr 22 2025 Michal Domonkos - 4.19.1.1-13 - Make %%_passwd_path and %%_group_path into lists (RHEL-78693) - Fix memory leak in rpmspec --shell (RHEL-55284)