From 15c69f434bb25ea989f6352c8eb0b2ababb93c74 Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Tue, 17 Nov 2015 09:45:15 +0100 Subject: [PATCH 1/3] updates-proxy: remove remaining traces of proxy filtering file from Makefile --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 9ad0efe..102a2c6 100644 --- a/Makefile +++ b/Makefile @@ -186,7 +186,6 @@ install-common: $(DESTDIR)/etc/NetworkManager/conf.d/30-qubes.conf install -D network/vif-route-qubes $(DESTDIR)/etc/xen/scripts/vif-route-qubes install -m 0644 -D network/tinyproxy-updates.conf $(DESTDIR)/etc/tinyproxy/tinyproxy-updates.conf - install -m 0644 -D network/filter-updates $(DESTDIR)/etc/tinyproxy/filter-updates install -m 0755 -D network/iptables-updates-proxy $(DESTDIR)$(LIBDIR)/qubes/iptables-updates-proxy install -d $(DESTDIR)/etc/xdg/autostart install -m 0755 network/show-hide-nm-applet.sh $(DESTDIR)$(LIBDIR)/qubes/show-hide-nm-applet.sh From fa081f1dd9af9779c98a3a92cd29cabc0925f92b Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Tue, 17 Nov 2015 09:46:16 +0100 Subject: [PATCH 2/3] rpm_spec: declare InstallUpdateGUI qrexec_service --- rpm_spec/core-vm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index affddae..fe8adac 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -313,6 +313,7 @@ rm -f %{name}-%{version} %config(noreplace) /etc/qubes-rpc/qubes.SelectDirectory %config(noreplace) /etc/qubes-rpc/qubes.GetImageRGBA %config(noreplace) /etc/qubes-rpc/qubes.SetDateTime +%config(noreplace) /etc/qubes-rpc/qubes.InstallUpdatesGUI %dir /etc/qubes/autostart /etc/qubes/autostart/README.txt %config /etc/qubes/autostart/*.desktop.d/30_qubes.conf From c70ee7049f6bb6e9e561b2e837dfbda66906d09f Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Tue, 17 Nov 2015 09:47:21 +0100 Subject: [PATCH 3/3] archlinux: enforce minimum versionning of qubes-utils --- archlinux/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 9996b63..24a387b 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -6,15 +6,15 @@ # Maintainer: Olivier Medoc pkgname=qubes-vm-core pkgver=`cat version` -pkgrel=5 +pkgrel=1 epoch= pkgdesc="The Qubes core files for installation inside a Qubes VM." arch=("x86_64") url="http://qubes-os.org/" license=('GPL') groups=() -depends=(python2-xdg ethtool ntp net-tools qubes-vm-utils gnome-packagekit imagemagick fakeroot notification-daemon dconf pygtk zenity qubes-libvchan qubes-db-vm haveged python2-gobject python2-dbus xdg-utils notification-daemon) -makedepends=(qubes-vm-utils qubes-libvchan qubes-db-vm qubes-vm-xen libx11) +depends=("qubes-vm-utils>=3.1.3" python2-xdg ethtool ntp net-tools gnome-packagekit imagemagick fakeroot notification-daemon dconf pygtk zenity qubes-libvchan qubes-db-vm haveged python2-gobject python2-dbus xdg-utils notification-daemon) +makedepends=("qubes-vm-utils>=3.1.3" qubes-libvchan qubes-db-vm qubes-vm-xen libx11) checkdepends=() optdepends=(gnome-keyring gnome-settings-daemon networkmanager iptables tinyproxy python2-nautilus gpk-update-viewer) provides=()