From 5dfcf06ef4b5ae9889dddb26b30849146fa0557c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sat, 20 May 2017 13:19:51 +0200
Subject: [PATCH] firewall: switch to python 3

---
 Makefile              |  2 +-
 debian/control        |  1 +
 rpm_spec/core-vm.spec | 15 +++++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 208d1d1..a82b74a 100644
--- a/Makefile
+++ b/Makefile
@@ -146,7 +146,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)" python setup.py install -O1 --root $(DESTDIR)
+	PATH="/usr/bin:$(PATH)" python3 setup.py install -O1 --root $(DESTDIR)
 	mkdir -p $(DESTDIR)$(SBINDIR)
 	mv $(DESTDIR)/usr/bin/qubes-firewall $(DESTDIR)$(SBINDIR)/qubes-firewall
 
diff --git a/debian/control b/debian/control
index a54cbcc..47fd103 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
     libqubes-rpc-filecopy-dev (>= 3.1.3),
     libvchan-xen-dev,
     python,
+    python3-setuptools,
     debhelper,
     quilt,
     libxen-dev,
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index d1afe00..f0af167 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -78,6 +78,7 @@ 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
@@ -440,12 +441,14 @@ rm -f %{name}-%{version}
 /usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
 /usr/share/nautilus-python/extensions/qvm_dvm_nautilus.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*
+%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
 
 /usr/share/qubes/mime-override/globs
 /usr/share/qubes/qubes-master-key.asc