diff --git a/macros.in b/macros.in index e6d21296e6..b379af959c 100644 --- a/macros.in +++ b/macros.in @@ -639,9 +639,9 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ %__sq_sign_cmd() %{shescape:%{__sq}} \ sign \ %{?_sq_path:--homedir %{shescape:%{_sq_path}}} \ - %{?_openpgp_sign_id:--signer-key %{_openpgp_sign_id}} \ + %{?_openpgp_sign_id:--signer %{_openpgp_sign_id}} \ %{?_sq_sign_cmd_extra_args} \ - --binary --detached --output %{shescape:%{2}} -- %{shescape:%{1}} + --binary --signature-file %{shescape:%{2}} -- %{shescape:%{1}} %__openpgp_sign_cmd %{expand:%{__%{_openpgp_sign}_sign_cmd}} diff --git a/tests/Dockerfile.fedora b/tests/Dockerfile.fedora index 266dcc1f0c..d325c60493 100644 --- a/tests/Dockerfile.fedora +++ b/tests/Dockerfile.fedora @@ -55,8 +55,10 @@ RUN dnf -y install \ sequoia-sq \ libasan \ libubsan +# Incapacitate IMA, needed until #3234 lands in fedora +RUN rm -f /usr/lib/rpm/macros.d/macros.transaction_ima # If updates to specific packages are needed, do it here -# RUN dnf --enablerepo=updates update ... +RUN dnf -y --enablerepo=updates install "sequoia-sq >= 1.0" RUN dnf clean all RUN echo "%_dbpath $(rpm --eval '%_dbpath')" > /root/.rpmmacros diff --git a/tests/rpmsigdig.at b/tests/rpmsigdig.at index 117240f1a5..ee956c2875 100644 --- a/tests/rpmsigdig.at +++ b/tests/rpmsigdig.at @@ -292,7 +292,7 @@ runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm []) RPMTEST_CHECK([[ -runroot_other sq --cert-store=/usr/lib/sysimage/rpm/pubkeys pki list --gossip 2>&1 | grep -e "^[[:xdigit:]]\{40\}" +runroot_other sq --cert-store=/usr/lib/sysimage/rpm/pubkeys cert list --gossip 2>&1 | grep -e "^ - [[:xdigit:]]\{40\}" | cut -c4- ]], [0], [771B18D3D7BAA28734333C424344591E1964C5FC