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 <ijackson@chiark.greenend.org.uk>

diff --git a/INSTALL b/INSTALL
index fa5bf3ad00201a80904acd8c3567fd584e68ec8c..c9db17412f68bd1a105a03e1b2940899146705f7 100644 (file)
--- 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 d4cdbd275d4c88981d739f6c360997bdfebdf7f3..45dfe28f63dcbff16d68c2585c379f8d8f9662e1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,13 @@ Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Uploaders: Stephen Early <steve@greenend.org.uk>,
            Richard Kettlewell <rjk@terraraq.org.uk>
 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 f17e757b07a6bf0a4f2416c40d4ac54c73cdd98f..16258f05b4985ee35a29df3d96ba6112346e2851 100755 (executable)
--- 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 158f5b36c8229b170969fe966de4cb23d4c84731..e344886782a2a7f68be67914c7798d71c37250e0 100755 (executable)
--- 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.