Qubes 4.2 support.

Author: Rudd-O

.gitignore

@@ -9,3 +9,4 @@ pkgs/
 build
 *.egg-info
 src/*.service
+.mypy_cache

Makefile

@@ -16,7 +16,7 @@ ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 clean:
 	cd $(ROOT_DIR) || exit $$? ; find -name '*.pyc' -o -name '*~' -print0 | xargs -0 rm -f
 	cd $(ROOT_DIR) || exit $$? ; rm -rf *.tar.gz *.rpm
-	cd $(ROOT_DIR) || exit $$? ; rm -rf *.egg-info build
+	cd $(ROOT_DIR) || exit $$? ; rm -rf *.egg-info build .mypy_cache
 
 dist: clean
 	@which rpmspec || { echo 'rpmspec is not available.  Please install the rpm-build package with the command `dnf install rpm-build` to continue, then rerun this step.' ; exit 1 ; }
@@ -32,12 +32,13 @@ rpm: dist
 	cd $(ROOT_DIR) ; mv -f builddir.rpm/*/* . && rm -rf builddir.rpm
 
 install-template: all
+	PYTHONDONTWRITEBYTECODE=1 python3 routingmanagersetup.py install $(PYTHON_PREFIX_ARG) -O0 --root $(DESTDIR)
 	install -Dm 755 src/qubes-routing-manager -t $(DESTDIR)/$(SBINDIR)/
 	sed -i "s,^#!.*,#!$(PYTHON)," $(DESTDIR)/$(SBINDIR)/qubes-routing-manager
 	install -Dm 644 src/qubes-routing-manager.service -t $(DESTDIR)/$(UNITDIR)/
 
 # Python 3 is always used for Qubes admin package.
 install-dom0:
-	PYTHONDONTWRITEBYTECODE=1 python3 setup.py install $(PYTHON_PREFIX_ARG) -O0 --root $(DESTDIR)
+	PYTHONDONTWRITEBYTECODE=1 python3 networkserversetup.py install $(PYTHON_PREFIX_ARG) -O0 --root $(DESTDIR)
 
 install: install-dom0 install-template

README.md

@@ -1,12 +1,12 @@
 # Qubes network server
 
-This software lets you turn your [Qubes OS 4.1](https://www.qubes-os.org/) machine into
+This software lets you turn your [Qubes OS 4.2](https://www.qubes-os.org/) machine into
 a network server, enjoying all the benefits of Qubes OS (isolation, secure
 inter-VM process communication, ease of use) with none of the drawbacks
 of setting up your own Xen server.
 
-This release is only intended for use with Qubes OS 4.1.  Older Qubes OS releases
-will not support it.  For Qubes OS 4.0, check branch `r4.0`.
+This release is only intended for use with Qubes OS 4.2.  Older Qubes OS releases
+will not support it.  For Qubes OS 4.1, check branch `r4.1`.
 
 ## Why?
 

build.parameters

@@ -1 +1 @@
-["RELEASE": "q4.1 37"]
+["RELEASE": "q4.2 37 38 39"]

networkserversetup.py

@@ -0,0 +1,26 @@
+import os
+import setuptools
+
+if __name__ == "__main__":
+    version = (
+        open(os.path.join(os.path.dirname(__file__), "qubes-network-server.spec"))
+        .read()
+        .strip()
+    )
+    version = [v for v in version.splitlines() if v.startswith("Version:")][0]
+    version = version.split()[-1]
+    setuptools.setup(
+        name="qubesnetworkserver",
+        version=version,
+        author="Manuel Amador (Rudd-O)",
+        author_email="rudd-o@rudd-o.com",
+        description="Qubes network server dom0 component",
+        license="GPL2+",
+        url="https://github.com/Rudd-O/qubes-network-server",
+        packages=("qubesnetworkserver",),
+        entry_points={
+            "qubes.ext": [
+                "qubesnetworkserver = qubesnetworkserver:QubesNetworkServerExtension",
+            ],
+        },
+    )

qubes-network-server.spec

@@ -3,7 +3,7 @@
 %define mybuildnumber %{?build_number}%{?!build_number:1}
 
 Name:           qubes-network-server
-Version:        0.0.19
+Version:        0.1.0
 Release:        %{mybuildnumber}%{?dist}
 Summary:        Turn your Qubes OS into a network server
 BuildArch:      noarch
@@ -20,9 +20,10 @@ BuildRequires:  python3
 BuildRequires:  python3-rpm-macros
 BuildRequires:  systemd-rpm-macros
 
-Requires:       qubes-core-agent-networking >= 4.1
+Requires:       qubes-core-agent-networking >= 4.2
 Requires:       python3
 Requires:       python3-qubesdb
+Requires:       nftables
 
 %description
 This package lets you turn your Qubes OS into a network server.  Install this
@@ -44,7 +45,7 @@ BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-setuptools
 
 Requires:       python3
-Requires:       qubes-core-dom0 >= 4.1
+Requires:       qubes-core-dom0 >= 4.2
 
 %description -n qubes-core-admin-addon-network-server
 This package lets you turn your Qubes OS into a network server.  Install this
@@ -70,6 +71,8 @@ echo 'enable qubes-routing-manager.service' > "$RPM_BUILD_ROOT"/%{_presetdir}/75
 
 %files
 %attr(0755, root, root) %{_sbindir}/qubes-routing-manager
+%attr(0644, root, root) %{python3_sitelib}/qubesroutingmanager/*
+%{python3_sitelib}/qubesroutingmanager-*.egg-info
 %attr(0644, root, root) %{_presetdir}/75-%{name}.preset
 %config %attr(0644, root, root) %{_unitdir}/qubes-routing-manager.service
 %doc README.md TODO