diff options
| -rw-r--r-- | app-arch/rpm/files/rpm-6.0.0-fix-build-without-sequoia.patch | 22 | ||||
| -rw-r--r-- | app-arch/rpm/rpm-6.0.0.ebuild | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/app-arch/rpm/files/rpm-6.0.0-fix-build-without-sequoia.patch b/app-arch/rpm/files/rpm-6.0.0-fix-build-without-sequoia.patch new file mode 100644 index 000000000000..233c66f6f8d0 --- /dev/null +++ b/app-arch/rpm/files/rpm-6.0.0-fix-build-without-sequoia.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/965006 +https://github.com/rpm-software-management/rpm/commit/aadbe7d611149f583b8b23f1b58a6a0300c02c82 + +From: Panu Matilainen <pmatilai@redhat.com> +Date: Wed, 1 Oct 2025 12:45:40 +0300 +Subject: [PATCH] Fix build regression on WITH_SEQUOIA=OFF + +Commit c36c717f41683953b9c23e447a8df0d0ac7c845c neglected to add the +stub for non-sequoia builds. + +Fixes: #3970 +--- a/rpmio/rpmpgp_dummy.cc ++++ b/rpmio/rpmpgp_dummy.cc +@@ -121,3 +121,8 @@ rpmRC pgpPubkeyMerge(const uint8_t *pkts1, size_t pkts1len, const uint8_t *pkts2 + { + return RPMRC_FAIL; + } ++ ++int pgpDigParamsSalt(pgpDigParams digp, const uint8_t **datap, size_t *lenp) ++{ ++ return -1; ++} diff --git a/app-arch/rpm/rpm-6.0.0.ebuild b/app-arch/rpm/rpm-6.0.0.ebuild index 6111658e7e18..c43b5e5ed0ba 100644 --- a/app-arch/rpm/rpm-6.0.0.ebuild +++ b/app-arch/rpm/rpm-6.0.0.ebuild @@ -64,6 +64,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.0.0-musl-compat.patch "${FILESDIR}"/${PN}-4.20.0-libdir.patch "${FILESDIR}"/${PN}-6.0.0-no-hardened.patch + "${FILESDIR}"/${PN}-6.0.0-fix-build-without-sequoia.patch ) pkg_pretend() { |