diff --git a/archlinux/PKGBUILD.in b/archlinux/PKGBUILD.in index 2e0a4d3c5..1505a5259 100644 --- a/archlinux/PKGBUILD.in +++ b/archlinux/PKGBUILD.in @@ -79,7 +79,7 @@ package_qubes-vm-core() { python-xdg qubes-db-vm qubes-libvchan - 'qubes-vm-qrexec>=4.2.19' + 'qubes-vm-qrexec>=4.3.12' qubes-vm-utils sed socat diff --git a/debian/control b/debian/control index e30d89f69..dbb4a7a4a 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Depends: python3-gi, python3-qubesdb, python3-xdg, - qubes-core-qrexec (>= 4.2.19), + qubes-core-qrexec (>= 4.3.12), qubes-utils (>= 3.1.3), qubesdb-vm, systemd, diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index 6312641a6..aff8b036c 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -37,7 +37,6 @@ etc/qubes-rpc/qubes.VMRootShell etc/qubes-rpc/qubes.VMExec etc/qubes-rpc/qubes.VMExecGUI etc/qubes-rpc/qubes.VMRootExec -etc/qubes-rpc/qubes.WaitForSession etc/qubes-rpc/qubes.WaitForRunningSystem etc/qubes-rpc/qubes.WaitForNetworkUplink etc/qubes-rpc/qubes.GetDate diff --git a/qubes-rpc/Makefile b/qubes-rpc/Makefile index 0c2673f67..ff17defda 100644 --- a/qubes-rpc/Makefile +++ b/qubes-rpc/Makefile @@ -78,7 +78,6 @@ install: qubes.SuspendPre qubes.SuspendPost qubes.GetAppmenus \ qubes.SuspendPreAll \ qubes.SuspendPostAll \ - qubes.WaitForSession \ qubes.WaitForRunningSystem \ qubes.WaitForNetworkUplink \ qubes.DetachPciDevice \ diff --git a/qubes-rpc/qubes.WaitForSession b/qubes-rpc/qubes.WaitForSession deleted file mode 100755 index 9146b24e3..000000000 --- a/qubes-rpc/qubes.WaitForSession +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -set -eu - -if test "$(qubesdb-read --default=True /qubes-gui-enabled)" = "True"; then - user="$(qubesdb-read /default-user || echo 'user')" - while ! [ -e "/var/run/qubes/qrexec-server.$user.sock" ]; do - sleep 0.1 - done -fi - -systemctl --user --wait --quiet is-system-running - -exit 0 diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index e2fb2fdf5..3d4db7a18 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -153,7 +153,7 @@ Requires: librsvg2-tools %endif Requires: zenity Requires: dconf -Requires: qubes-core-qrexec-vm >= 4.2.19 +Requires: qubes-core-qrexec-vm >= 4.3.12 Requires: qubes-libvchan Requires: qubes-db-vm # qubes.Suspend{Pre,Post} @@ -911,7 +911,6 @@ rm -f %{name}-%{version} %config(noreplace) /etc/qubes-rpc/qubes.SuspendPreAll %config(noreplace) /etc/qubes-rpc/qubes.SuspendPost %config(noreplace) /etc/qubes-rpc/qubes.SuspendPostAll -%config(noreplace) /etc/qubes-rpc/qubes.WaitForSession %config(noreplace) /etc/qubes-rpc/qubes.WaitForRunningSystem %config(noreplace) /etc/qubes-rpc/qubes.WaitForNetworkUplink %config(noreplace) /etc/qubes-rpc/qubes.DetachPciDevice diff --git a/version b/version index 920606561..ba1ffe831 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.3.37 +4.3.38