Revert "firewall: switch to python 3"

This reverts commit 5dfcf06ef4b5ae9889dddb26b30849146fa0557c.

python3-daemon isn't widespread enough yet - for Debian jessie available
only in packports.

In addition to the revert itself, adjust packaging for this change
(mostly for Debian).

Makefile

@@ -171,7 +171,7 @@ install-common:
 	install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab
 
 	# force /usr/bin before /bin to have /usr/bin/python instead of /bin/python
-	PATH="/usr/bin:$(PATH)" python3 setup.py install $(PYTHON_PREFIX_ARG) -O1 --root $(DESTDIR)
+	PATH="/usr/bin:$(PATH)" python setup.py install $(PYTHON_PREFIX_ARG) -O1 --root $(DESTDIR)
 	mkdir -p $(DESTDIR)$(SBINDIR)
 	mv $(DESTDIR)/usr/bin/qubes-firewall $(DESTDIR)$(SBINDIR)/qubes-firewall
 

debian/control

@@ -7,12 +7,12 @@ Build-Depends:
     libqubes-rpc-filecopy-dev (>= 3.1.3),
     libvchan-xen-dev,
     python,
-    python3-setuptools,
     debhelper,
     quilt,
     libxen-dev,
     pkg-config,
     dh-systemd (>= 1.5),
+    dh-python,
     lsb-release,
     xserver-xorg-dev,
     config-package-dev
@@ -54,6 +54,7 @@ Depends:
     xenstore-utils,
     xinit,
     xserver-xorg-core,
+    ${python:Depends},
     ${shlibs:Depends},
     ${misc:Depends}
 Recommends:

debian/qubes-core-agent.install

@@ -101,8 +101,8 @@ usr/bin/qvm-run
 usr/bin/xenstore-watch-qubes
 usr/lib/NetworkManager/conf.d/30-qubes.conf
 usr/lib/python2.7/dist-packages/qubesxdg.py
-usr/lib/python3/dist-packages/qubesagent-*.egg-info/*
-usr/lib/python3/dist-packages/qubesagent/*
+usr/lib/python2.7/dist-packages/qubesagent-*.egg-info/*
+usr/lib/python2.7/dist-packages/qubesagent/*
 usr/lib/qubes-bind-dirs.d/30_cron.conf
 usr/lib/qubes/close-window
 usr/lib/qubes/dispvm-prerun.sh

debian/rules

@@ -9,7 +9,7 @@ include /usr/share/dpkg/default.mk
 export DESTDIR=$(shell pwd)/debian/tmp
 
 %:
-	dh $@ --with systemd,python3 --with=config-package
+	dh $@ --with systemd,python2 --with=config-package
 
 override_dh_auto_build:
 	make all

rpm_spec/core-vm.spec

@@ -157,7 +157,6 @@ Requires:   python2-dnf-plugins-qubes-hooks
 Obsoletes:  qubes-core-vm-kernel-placeholder <= 1.0
 Obsoletes:  qubes-upgrade-vm < 3.2
 BuildRequires: xen-devel
-BuildRequires: python3-devel
 BuildRequires: libX11-devel
 BuildRequires: qubes-utils-devel >= 3.1.3
 BuildRequires: qubes-libvchan-%{backend_vmm}-devel
@@ -528,14 +527,12 @@ rm -f %{name}-%{version}
 /usr/share/glib-2.0/schemas/20_org.mate.NotificationDaemon.qubes.gschema.override
 /usr/share/glib-2.0/schemas/20_org.gnome.desktop.wm.preferences.qubes.gschema.override
 
-%dir %{python3_sitelib}/qubesagent-*.egg-info
-%{python3_sitelib}/qubesagent-*.egg-info/*
-%dir %{python3_sitelib}/qubesagent
-%dir %{python3_sitelib}/qubesagent/__pycache__
-%{python3_sitelib}/qubesagent/__pycache__/*
-%{python3_sitelib}/qubesagent/__init__.py
-%{python3_sitelib}/qubesagent/firewall.py
-%{python3_sitelib}/qubesagent/test_firewall.py
+%dir %{python_sitelib}/qubesagent-*-py2.7.egg-info
+%{python_sitelib}/qubesagent-*-py2.7.egg-info/*
+%dir %{python_sitelib}/qubesagent
+%{python_sitelib}/qubesagent/__init__.py*
+%{python_sitelib}/qubesagent/firewall.py*
+%{python_sitelib}/qubesagent/test_firewall.py*
 
 /usr/share/qubes/mime-override/globs
 /usr/share/qubes/qubes-master-key.asc