From cb5b66236379a40ed30c4fe5707c22e9017dbaf9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 24 Oct 2019 19:05:42 +0100 Subject: [PATCH] make-secnet-sites: Switch to python3 ipaddress is in the python3 stdlib. python-future is not needed either as it is aliases for things from the python3 stdlib. We have to explicitly add python3 to Build-Depends now; it was previously pulled in implicitly. Signed-off-by: Ian Jackson --- INSTALL | 4 +--- debian/control | 6 +++--- ipaddrset-test.py | 2 +- make-secnet-sites | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/INSTALL b/INSTALL index fa5bf3a..c9db174 100644 --- a/INSTALL +++ b/INSTALL @@ -29,9 +29,7 @@ http://vtun.sourceforge.net/tun/ You will probably be using the supplied `make-secnet-sites' program to generate your VPN's list of sites as a secnet configuration from a -more-human-writeable form. If so you need to install the standard -`future' and `ipaddress' Python modules (python-future and -python-ipaddress on Debian-derived systems). +more-human-writeable form. ** System and network configuration diff --git a/debian/control b/debian/control index d4cdbd2..45dfe28 100644 --- a/debian/control +++ b/debian/control @@ -5,13 +5,13 @@ Maintainer: Ian Jackson Uploaders: Stephen Early , Richard Kettlewell Build-Depends: debhelper (>= 5), libgmp3-dev, libadns1-dev, bison, flex, - libbsd-dev, python-ipaddress, python-future, tclx, tcl, libtcl-chiark-1 + libbsd-dev, python3, tclx, tcl, libtcl-chiark-1 Standards-Version: 3.0.1 Package: secnet Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python-future, python-ipaddr -Recommends: python +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: python3 Description: VPN software for distributed networks secnet allows multiple private networks, each 'hidden' behind a single globally-routable IP address, to be bridged together. diff --git a/ipaddrset-test.py b/ipaddrset-test.py index f17e757..16258f0 100755 --- a/ipaddrset-test.py +++ b/ipaddrset-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # This file is Free Software. It was originally written for secnet. # diff --git a/make-secnet-sites b/make-secnet-sites index 158f5b3..e344886 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # # This file is part of secnet. # See README for full list of copyright holders. -- 2.30.2