c7a072acc0
Add new rpmsign-sequoia and rpmsign-gnupg subpackages which can be used to switch between the two OpenPGP implementations for signing, rpm-sign-libs just requires one of them to be present. It's worth noting that unlike GnuPG, Sequoia doesn't accept names or email addresses as the signer identifier, one needs to supply the actual key fingerprint. Resolves: RHEL-56363
60 lines
2.3 KiB
Diff
60 lines
2.3 KiB
Diff
diff -up rpm-4.19.1.1/macros.in.nogpg rpm-4.19.1.1/macros.in
|
|
--- rpm-4.19.1.1/macros.in.nogpg 2024-10-14 10:01:22.265773552 +0300
|
|
+++ rpm-4.19.1.1/macros.in 2024-10-14 10:02:32.245317535 +0300
|
|
@@ -30,7 +30,6 @@
|
|
%__chown @__CHOWN@
|
|
%__cp @__CP@
|
|
%__file @__FILE@
|
|
-%__gpg @__GPG@
|
|
%__grep @__GREP@
|
|
%__gzip @__GZIP@
|
|
%__id @__ID@
|
|
@@ -321,12 +320,6 @@ Supplements: (%{name} = %{version}-%{r
|
|
# marked as %doc should be installed.
|
|
#%_excludedocs
|
|
|
|
-# The signature to use and the location of configuration files for
|
|
-# signing packages with GNU gpg.
|
|
-#
|
|
-#%_gpg_name
|
|
-#%_gpg_path
|
|
-
|
|
# The port and machine name of an HTTP proxy host (used for FTP/HTTP).
|
|
#
|
|
#%_httpport
|
|
@@ -595,10 +588,10 @@ Supplements: (%{name} = %{version}-%{r
|
|
%_fileattrsdir %{_rpmconfigdir}/fileattrs
|
|
|
|
# This macro defines how much space (in bytes) in package should be
|
|
-# reserved for gpg signatures during building of a package. If this space is
|
|
-# big enough for gpg signatures to fit into it then signing of the packages is
|
|
+# reserved for OpenPGP signatures during building of a package. If this space
|
|
+# big enough for the signature to fit into it then signing of the packages is
|
|
# very quick because it is not necessary to rewrite the whole package to make
|
|
-# some space for gpg signatures.
|
|
+# some space for the signature.
|
|
%__gpg_reserved_space 4096
|
|
|
|
#==============================================================================
|
|
@@ -613,20 +606,6 @@ Supplements: (%{name} = %{version}-%{r
|
|
%_db_backend @DB_BACKEND@
|
|
|
|
#==============================================================================
|
|
-# ---- GPG/PGP/PGP5 signature macros.
|
|
-# Macro(s) to hold the arguments passed to GPG/PGP for package
|
|
-# signing. Expansion result is parsed by popt, so be sure to use
|
|
-# %{shescape} where needed.
|
|
-#
|
|
-%__gpg_sign_cmd %{shescape:%{__gpg}} \
|
|
- gpg --no-verbose --no-armor --no-secmem-warning \
|
|
- %{?_gpg_digest_algo:--digest-algo=%{_gpg_digest_algo}} \
|
|
- %{?_gpg_sign_cmd_extra_args} \
|
|
- %{?_gpg_name:-u %{shescape:%{_gpg_name}}} \
|
|
- -sbo %{shescape:%{?__signature_filename}} \
|
|
- %{?__plaintext_filename:-- %{shescape:%{__plaintext_filename}}}
|
|
-
|
|
-#==============================================================================
|
|
# ---- Transaction macros.
|
|
# Macro(s) used to parameterize transactions.
|
|
#
|