Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpm, deb: add strict version dependency between qubes-core-agent-* pkgs

Browse Source 
Base qubes-core-agent package have common files used by various
subpackages. It is important to update them at the same time, otherwise
for example python stubs in /usr/bin/* (like qubes-firewall) will not
match actual python modules.

Fixes QubesOS/qubes-issues#4499
This commit is contained in:
Marek Marczykowski-Górecki 2018-11-13 03:42:24 +01:00
parent afaf88f153
commit 3fe42d4a27
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/control vendored
View File

@ -125,7 +125,7 @@ Description: Scripts required to handle dom0 updates.
Package: qubes-core-agent-networking Package: qubes-core-agent-networking
Architecture: any Architecture: any
Depends: Depends:
qubes-core-agent, qubes-core-agent (= ${binary:Version}),
tinyproxy, tinyproxy,
iptables, iptables,
net-tools, net-tools,
@ -151,7 +151,7 @@ Description: Networking support for Qubes VM
Package: qubes-core-agent-network-manager Package: qubes-core-agent-network-manager
Architecture: any Architecture: any
Depends: Depends:
qubes-core-agent-networking, qubes-core-agent-networking (= ${binary:Version}),
libglib2.0-bin, libglib2.0-bin,
network-manager (>= 0.8.1-1), network-manager (>= 0.8.1-1),
network-manager-gnome, network-manager-gnome,

16
rpm_spec/core-agent.spec.in
View File

@ -196,7 +196,7 @@ requested by dom0 or other VMs, according to dom0-enforced policy.
%package nautilus %package nautilus
Summary: Qubes integration for Nautilus Summary: Qubes integration for Nautilus
Requires: qubes-core-agent Requires: qubes-core-agent = %{version}
Requires: nautilus-python Requires: nautilus-python
Conflicts: qubes-core-vm < 4.0.0 Conflicts: qubes-core-vm < 4.0.0
@ -205,7 +205,7 @@ Nautilus addons for inter-VM file copy/move/open.
%package dom0-updates %package dom0-updates
Summary: Scripts required to handle dom0 updates Summary: Scripts required to handle dom0 updates
Requires: qubes-core-agent Requires: qubes-core-agent = %{version}
Requires: fakeroot Requires: fakeroot
Conflicts: qubes-core-vm < 4.0.0 Conflicts: qubes-core-vm < 4.0.0
Requires: tar Requires: tar
@ -220,7 +220,7 @@ Requires: iptables
Requires: net-tools Requires: net-tools
Requires: nftables Requires: nftables
Requires: socat Requires: socat
Requires: qubes-core-agent Requires: qubes-core-agent = %{version}
Requires: tinyproxy Requires: tinyproxy
Conflicts: qubes-core-vm < 4.0.0 Conflicts: qubes-core-vm < 4.0.0
@ -238,7 +238,7 @@ Summary: NetworkManager integration for Qubes VM
# to show/hide nm-applet # to show/hide nm-applet
Requires: NetworkManager >= 0.8.1-1 Requires: NetworkManager >= 0.8.1-1
Requires: glib2 Requires: glib2
Requires: qubes-core-agent-networking Requires: qubes-core-agent-networking = %{version}
Conflicts: qubes-core-vm < 4.0.0 Conflicts: qubes-core-vm < 4.0.0
%description network-manager %description network-manager
@ -767,9 +767,9 @@ Summary: Qubes unit files for SysV init style or upstart
License: GPL v2 only License: GPL v2 only
Group: Qubes Group: Qubes
Requires: upstart Requires: upstart
Requires: qubes-core-agent Requires: qubes-core-agent = %{version}
Requires: qubes-core-agent-qrexec Requires: qubes-core-agent-qrexec = %{version}
Requires: qubes-core-agent-networking Requires: qubes-core-agent-networking = %{version}
Provides: qubes-core-agent-init-scripts Provides: qubes-core-agent-init-scripts
Conflicts: qubes-core-agent-systemd Conflicts: qubes-core-agent-systemd
Provides: qubes-core-vm-sysvinit = %{version}-%{release} Provides: qubes-core-vm-sysvinit = %{version}-%{release}
@ -837,7 +837,7 @@ Requires: systemd
Requires(post): systemd-units Requires(post): systemd-units
Requires(preun): systemd-units Requires(preun): systemd-units
Requires(postun): systemd-units Requires(postun): systemd-units
Requires: qubes-core-agent Requires: qubes-core-agent = %{version}
Provides: qubes-core-agent-init-scripts Provides: qubes-core-agent-init-scripts
Conflicts: qubes-core-agent-sysvinit Conflicts: qubes-core-agent-sysvinit
Provides: qubes-core-vm-systemd = %{version}-%{release} Provides: qubes-core-vm-systemd = %{version}-%{release}