Showing with 19 additions and 2 deletions.
  1. +9 −0 debian/changelog
  2. +9 −1 rpm_spec/qubes-dom0-meta-packages.spec.in
  3. +1 −1 version
9 changes: 9 additions & 0 deletions debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
qubes-meta-packages (4.3.4-1) unstable; urgency=medium

[ deeplow ]
* Remove qubes-contrib key from RPM's DB
* Attempt key import/del every 5s until 15m timeout
* Increase systemd timer accuracy for postinst

-- Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> Thu, 16 Oct 2025 23:45:29 +0200

qubes-meta-packages (4.3.3-1) unstable; urgency=medium

[ Demi Marie Obenour ]
Expand Down
10 changes: 9 additions & 1 deletion rpm_spec/qubes-dom0-meta-packages.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,16 @@ make -C repos install-dom0 DESTDIR=$RPM_BUILD_ROOT

%files -n qubes-dom0-unwanted-packages

%postun -n qubes-repo-contrib
if [ $1 -eq 0 ] ; then
systemd-run --timer-property=AccuracySec=1s --on-active=5s timeout 15m \
bash -c "while ! rpm -e gpg-pubkey-d0941e87-5d8c9210; do sleep 5; done"
fi

%posttrans -n qubes-repo-contrib
systemd-run --on-active=5min rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-contrib-fedora
systemd-run --timer-property=AccuracySec=1s --on-active=5s timeout 15m bash -c \
"while ! rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-contrib-fedora; do \
sleep 5; done"

%changelog
@CHANGELOG@
2 changes: 1 addition & 1 deletion version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.3.3
4.3.4