Move qubes.WaitForSession to shared qrexec package

It is also used by dom0, to avoid duplication, merge into a single
package.

For: QubesOS/qubes-notification-proxy#13
For: QubesOS/qubes-gui-agent-linux#251
For: QubesOS/qubes-core-admin#757
For: QubesOS/qubes-issues#1512
For: QubesOS/qubes-issues#9940
Fixes: QubesOS/qubes-issues#10443

Author: ben-grande

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

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,
@@ -78,6 +78,10 @@ Recommends:
     xserver-xorg-core,
     xsettingsd,
     xterm,
+Replaces:
+    qubes-core-qrexec (<< 4.3.12)
+Breaks:
+    qubes-core-qrexec (<< 4.3.12)
 Conflicts:
     pulseaudio-qubes (<< 4.2.0-1),
     qubes-core-agent-linux,

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

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 \

qubes-rpc/qubes.WaitForSession

@@ -153,7 +153,9 @@ Requires:   librsvg2-tools
 %endif
 Requires:   zenity
 Requires:   dconf
-Requires:   qubes-core-qrexec-vm >= 4.2.19
+Obsoletes:  qubes-core-qrexec < 4.3.12
+Requires:   qubes-core-qrexec >= 4.3.12
+Requires:   qubes-core-qrexec-vm >= 4.3.12
 Requires:   qubes-libvchan
 Requires:   qubes-db-vm
 # qubes.Suspend{Pre,Post}
@@ -911,7 +913,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