diff --git a/security/tinc/Makefile b/security/tinc/Makefile index e4dfd1610..ed3e2d27a 100644 --- a/security/tinc/Makefile +++ b/security/tinc/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= tinc PLUGIN_VERSION= 1.4 -PLUGIN_REVISION= 2 +PLUGIN_REVISION= 3 PLUGIN_COMMENT= Tinc VPN PLUGIN_DEPENDS= tinc PLUGIN_MAINTAINER= ad@opnsense.org diff --git a/security/tinc/src/opnsense/scripts/OPNsense/Tinc/generate_keypair.py b/security/tinc/src/opnsense/scripts/OPNsense/Tinc/generate_keypair.py index fa3ec9859..9468cd9ca 100755 --- a/security/tinc/src/opnsense/scripts/OPNsense/Tinc/generate_keypair.py +++ b/security/tinc/src/opnsense/scripts/OPNsense/Tinc/generate_keypair.py @@ -1,7 +1,7 @@ -#!/usr/local/bin/python2.7 +#!/usr/local/bin/python3 """ - Copyright (c) 2016 Ad Schellevis + Copyright (c) 2016-2019 Ad Schellevis All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/security/tinc/src/opnsense/scripts/OPNsense/Tinc/list_ciphers.py b/security/tinc/src/opnsense/scripts/OPNsense/Tinc/list_ciphers.py index 48615280d..244491048 100755 --- a/security/tinc/src/opnsense/scripts/OPNsense/Tinc/list_ciphers.py +++ b/security/tinc/src/opnsense/scripts/OPNsense/Tinc/list_ciphers.py @@ -1,7 +1,7 @@ -#!/usr/local/bin/python2.7 +#!/usr/local/bin/python3 """ - Copyright (c) 2016 Ad Schellevis + Copyright (c) 2016-2019 Ad Schellevis All rights reserved. Redistribution and use in source and binary forms, with or without @@ -36,7 +36,7 @@ response = dict() p = Popen(['/usr/bin/openssl','enc', '-help'],stdin=PIPE, stdout=PIPE, stderr=PIPE, bufsize=-1) output, error = p.communicate() cipher_section = False -for line in error.split('\n'): +for line in error.decode().split('\n'): if line.find('Cipher Types') == 0: cipher_section = True continue diff --git a/security/tinc/src/opnsense/scripts/OPNsense/Tinc/tincd.py b/security/tinc/src/opnsense/scripts/OPNsense/Tinc/tincd.py index 9c111e2b5..30676c173 100755 --- a/security/tinc/src/opnsense/scripts/OPNsense/Tinc/tincd.py +++ b/security/tinc/src/opnsense/scripts/OPNsense/Tinc/tincd.py @@ -1,7 +1,7 @@ -#!/usr/local/bin/python2.7 +#!/usr/local/bin/python3 """ - Copyright (c) 2016 Ad Schellevis + Copyright (c) 2016-2019 Ad Schellevis All rights reserved. Redistribution and use in source and binary forms, with or without @@ -59,7 +59,7 @@ def read_config(config_filename): return result def deploy(config_filename): - interfaces = (subprocess.check_output(['/sbin/ifconfig','-l'])).split() + interfaces = (subprocess.check_output(['/sbin/ifconfig','-l'])).decode().split() networks = read_config(config_filename) # remove previous configuration os.system('rm -rf /usr/local/etc/tinc') @@ -89,7 +89,7 @@ def deploy(config_filename): # configure and rename new tun device, place all in group "tinc" symlink associated tun device if interface_name not in interfaces: - tundev = subprocess.check_output(['/sbin/ifconfig',interface_type,'create']).split()[0] + tundev = subprocess.check_output(['/sbin/ifconfig',interface_type,'create']).decode().split()[0] subprocess.call(['/sbin/ifconfig',tundev,'name',interface_name]) subprocess.call(['/sbin/ifconfig',interface_name,'group','tinc']) if os.path.islink('/dev/%s' % interface_name):