gentoo resync : 25.11.2020

4 files changed, 64 insertions, 19 deletions

diff --git a/net-vpn/6tunnel/6tunnel-0.12.ebuild b/net-vpn/6tunnel/6tunnel-0.12.ebuild
deleted file mode 100644
index a159170ed1c3..000000000000
--- a/net-vpn/6tunnel/6tunnel-0.12.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="TCP proxy for applications that don't speak IPv6"
-HOMEPAGE="https://github.com/wojtekka/6tunnel"
-SRC_URI="https://github.com/wojtekka/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~s390 x86"
-IUSE=""
diff --git a/net-vpn/6tunnel/6tunnel-0.13.ebuild b/net-vpn/6tunnel/6tunnel-0.13.ebuild
index 2947248fbbae..7b1c7485ecae 100644
--- a/net-vpn/6tunnel/6tunnel-0.13.ebuild
+++ b/net-vpn/6tunnel/6tunnel-0.13.ebuild
@@ -5,9 +5,12 @@ EAPI=7
 
 DESCRIPTION="TCP proxy for applications that don't speak IPv6"
 HOMEPAGE="https://github.com/wojtekka/6tunnel"
-SRC_URI="https://github.com/wojtekka/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/wojtekka/6tunnel/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~s390 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~s390 x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-test.patch"
+)
diff --git a/net-vpn/6tunnel/Manifest b/net-vpn/6tunnel/Manifest
index 7b83f7d235f6..5e6543d90a50 100644
--- a/net-vpn/6tunnel/Manifest
+++ b/net-vpn/6tunnel/Manifest
@@ -1,5 +1,4 @@
-DIST 6tunnel-0.12.tar.gz 96364 BLAKE2B 3c36cc4fc632bcb0136981dace4ae46d2823901eb92d0f82b58b801ad139879b0e2ca129099a651bc51dc8f29aa3db89a0be62d7dabda87d66361474558b66a1 SHA512 56c5b8b285c730e25a1bd57a37fc6d169c4c54a842e7763a1580231158858a098b8eb5549dd8adf0c5ae4516cce9c70b00ae82f27b6e152ca10eba7681b8808b
+AUX 6tunnel-0.13-test.patch 3041 BLAKE2B c942ef9d53874a4e5048e8e3bc3366d08a164afd9da0bacbdc9aa7e5fb70a4e9f074f68c968c889fc126d4952237409740924ad4c010db42a948a480f93e6919 SHA512 564de163518cd67a46c04c6dbbd0400e82f6d1fc4035b16fefb430d3c99613c5d840ddb06543a3eeb26b096f2a4f2f9dc10924376b963d44e35bfe8466d9a028
 DIST 6tunnel-0.13.tar.gz 103054 BLAKE2B 4aa10cd798ff3e3ab1e78bf3497c007e63a3e0cef094f507976fa495e6b544601cd9a231b828fc21db35a45e67a9dc4f13b1339e82d4f198c842c9b1177b95ad SHA512 e495b561e2fe4483417cf44291d729377fe02123f21b7d58b9aed294c676392d860de7474b6bcb4e3e4ffdcd87752ee1af070dfbab028b5de5adb778b0241f72
-EBUILD 6tunnel-0.12.ebuild 364 BLAKE2B 780fd8c0fce16a2ed6d05e49228bb5f1b67b0b7450895801522161d62823e30e2429e1faafa63ad514f2220f08b5fd0f45a37c4debfea4502346d92853732f47 SHA512 dea90ebbbd893ab828af9359c02489bca73c2e4736242a402ef6a0ce26b96e0fb79b0f81c14fed3b2b1d7b4f0ab314f7485d7ce33f08d185c7c9d41f8bd5f630
-EBUILD 6tunnel-0.13.ebuild 366 BLAKE2B b3c1979060b404e9285fd63dec26049e3077670c2dc989906da0bbd42025d36edd545101177a0fb85f04434941617909d341d69d68273e1e8af87d437db7ef06 SHA512 ea76a73975f2767e584bd245b7269c2e92d4573612518f214a52ab04050ad76a8bdf01c4ca70a9b460e3e10eff3664761d4d4a5d6775e7a875d65d96aefa494a
+EBUILD 6tunnel-0.13.ebuild 402 BLAKE2B d0a3bc2570d4977864db9cd66bf24153e54deea2700bb3cbae1dc121bdf10d23e051b6a1288fb57974a73cf18b545310495fa6bd047f1d5b1f372c4f1d75f1e9 SHA512 13d0a4f8d4e71f687a76af41300a5c966920eef289dd67dc8855372a3ab74a5ba385581ce954461133e0d701889b289e299d721533c5e5a860fe83b8b48e9954
 MISC metadata.xml 368 BLAKE2B 66dc904d7524c2f61313445e7dfe583df69a6bfbbdd1ec8b4203206ec47bb178bb2c5bdacb618cfe47409fb0328ab32e6a6bff123725ed1088e9f2422b4c9e26 SHA512 1a6a98313e5a0e60c51174622e8b96d1b25b0a9b6060a55b1ec18690bf8def973f70c6597077663ab518f4d8135bf7ea114052be801b324e91f80d2580fa7914
diff --git a/net-vpn/6tunnel/files/6tunnel-0.13-test.patch b/net-vpn/6tunnel/files/6tunnel-0.13-test.patch
new file mode 100644
index 000000000000..1cac66ea73cf
--- /dev/null
+++ b/net-vpn/6tunnel/files/6tunnel-0.13-test.patch
@@ -0,0 +1,56 @@
+From 9e4119f03f57eec67b97dddbf09d363b638791dc Mon Sep 17 00:00:00 2001
+From: Wojtek Kaniewski <wojtekka@toxygen.net>
+Date: Fri, 18 Sep 2020 20:36:19 +0200
+Subject: [PATCH] Move test script to Python 3
+
+---
+ test.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/test.py b/test.py
+index c56feca..4a754bd 100755
+--- a/test.py
++++ b/test.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ import os
+ import socket
+@@ -8,7 +8,7 @@ import select
+ (SUCCESS, COMMAND_FAIL, CONNECT_FAIL, DISCONNECT, ACCEPT_FAIL, DATA_MISMATCH) = range(6)
+ labels = ["success", "command fail", "connection fail", "disconnection", "accept fail", "data mismatch"]
+ 
+-def test(expect, client_af, server_af, from_ip, to_ip, args="", client_sends_first="NICK nick\r\n", server_receives="NICK nick\r\n", app_responds="", app_inserts="", server_sends_then=":localhost 001 nick :Welcome\r\n"):
++def test(expect, client_af, server_af, from_ip, to_ip, args="", client_sends_first=b"NICK nick\r\n", server_receives=b"NICK nick\r\n", app_responds=b"", app_inserts=b"", server_sends_then=b":localhost 001 nick :Welcome\r\n"):
+     # Open and close a socket to get random port available
+ 
+     client_sock = socket.socket(client_af, socket.SOCK_STREAM, 0)
+@@ -26,7 +26,7 @@ def test(expect, client_af, server_af, from_ip, to_ip, args="", client_sends_fir
+     server_port = server_sock.getsockname()[1]
+ 
+     all_args = "-1 %s %d %s %d" % (args, client_port, to_ip, server_port)
+-    print "Running with %s" % all_args
++    print ("Running with %s" % all_args)
+     if os.system("./6tunnel " + all_args) != 0:
+         if expect != COMMAND_FAIL:
+             raise Exception("expected %s yet command failed" % labels[expect])
+@@ -139,11 +139,11 @@ test(COMMAND_FAIL, socket.AF_INET6, socket.AF_INET6, '::1', '::1', '-6 -s 127.0.
+ 
+ # Test IRC password options
+ 
+-test(SUCCESS, socket.AF_INET, socket.AF_INET6, '127.0.0.1', '::1', '-I password', app_inserts="PASS password\r\n")
++test(SUCCESS, socket.AF_INET, socket.AF_INET6, '127.0.0.1', '::1', '-I password', app_inserts=b"PASS password\r\n")
+ 
+-test(ACCEPT_FAIL, socket.AF_INET, socket.AF_INET6, '127.0.0.1', '::1', '-i password', client_sends_first="NICK nick\r\n")
++test(ACCEPT_FAIL, socket.AF_INET, socket.AF_INET6, '127.0.0.1', '::1', '-i password', client_sends_first=b"NICK nick\r\n")
+ 
+-test(ACCEPT_FAIL, socket.AF_INET, socket.AF_INET6, '127.0.0.1', '::1', '-i password', client_sends_first="PASS invalid\r\nNICK nick\r\n", app_responds=":6tunnel 464 * :Password incorrect\r\n")
++test(ACCEPT_FAIL, socket.AF_INET, socket.AF_INET6, '127.0.0.1', '::1', '-i password', client_sends_first=b"PASS invalid\r\nNICK nick\r\n", app_responds=b":6tunnel 464 * :Password incorrect\r\n")
+ 
+-test(SUCCESS, socket.AF_INET, socket.AF_INET6, '127.0.0.1', '::1', '-i password', client_sends_first="PASS password\r\nNICK nick\r\n")
++test(SUCCESS, socket.AF_INET, socket.AF_INET6, '127.0.0.1', '::1', '-i password', client_sends_first=b"PASS password\r\nNICK nick\r\n")
+ 
+-- 
+2.26.2
+