gaschz/qubes-network-server
1
0
Fork 0
mirror of https://github.com/Rudd-O/qubes-network-server.git synced 2025-03-01 14:22:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Python 3.

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2020-04-14 01:47:04 +00:00
parent ddf5bd36b8
commit 605f5f4c73
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubes-network-server.spec
View File

@ -5,7 +5,7 @@
%define mybuildnumber %{?build_number}%{?!build_number:1} %define mybuildnumber %{?build_number}%{?!build_number:1}
Name: qubes-network-server Name: qubes-network-server
Version: 0.0.11 Version: 0.0.12
Release: %{mybuildnumber}%{?dist} Release: %{mybuildnumber}%{?dist}
Summary: Turn your Qubes OS into a network server Summary: Turn your Qubes OS into a network server
BuildArch: noarch BuildArch: noarch
@ -22,10 +22,9 @@ BuildRequires: findutils
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
Requires: qubes-core-agent-networking >= 4.0.51-1 Requires: qubes-core-agent-networking >= 4.1
Requires: qubes-core-agent-networking < 4.1 Requires: python3
Requires: python2 Requires: python3-qubesdb
Requires: python2-qubesdb
%description %description
This package lets you turn your Qubes OS into a network server. This package lets you turn your Qubes OS into a network server.

4
src/qubes-routing-manager
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2 #!/usr/bin/python3
''' '''
This program reads the /qubes-firewall/{ip}/qubes-routing-method file This program reads the /qubes-firewall/{ip}/qubes-routing-method file
@ -42,7 +42,7 @@ class AdjunctWorker(object):
def run_ipt(*args): def run_ipt(*args):
return subprocess.check_call([cmd, '-w'] + list(args)) return subprocess.check_call([cmd, '-w'] + list(args))
out = subprocess.check_output([cmd + '-save']).splitlines() out = subprocess.check_output([cmd + '-save', '-w'], universal_newlines=True).splitlines()
if enable: if enable:
# Create necessary prerouting chain. # Create necessary prerouting chain.