From 56910db217b93bcfcfb8839ce9244c2961aed658 Mon Sep 17 00:00:00 2001
From: msmeissn <>
Date: Aug 30 2022 13:03:47 +0000
Subject: Update 6tunnel to version 0.13 / rev 4 via SR 999900
https://build.opensuse.org/request/show/999900
by user msmeissn + dimstar_suse
---
diff --git a/.files b/.files
index 5044f4b..54987a1 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 6e8150f..1141821 100644
--- a/.rev
+++ b/.rev
@@ -23,4 +23,12 @@
744010
+
+ b50b58730e2c4e242cefd7f23790e42a
+ 0.13
+
+ dimstar_suse
+
+ 999900
+
diff --git a/6tunnel.changes b/6tunnel.changes
index 7419ec7..1cf2614 100644
--- a/6tunnel.changes
+++ b/6tunnel.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Aug 16 12:23:49 UTC 2022 - Dirk Müller
+
+- add 9e4119f03f57eec67b97dddbf09d363b638791dc.patch to be
+ able to switch to python3
+
+-------------------------------------------------------------------
Mon Oct 21 20:07:55 UTC 2019 - Martin Hauke
- Update to version 0.13
diff --git a/6tunnel.spec b/6tunnel.spec
index f446171..5eb68c4 100644
--- a/6tunnel.spec
+++ b/6tunnel.spec
@@ -1,7 +1,7 @@
#
# spec file for package 6tunnel
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2018, Martin Hauke
#
# All modifications and additions to the file contributed by third parties
@@ -26,9 +26,10 @@ Group: Productivity/Networking/System
URL: https://github.com/wojtekka/6tunnel
#Git-Clone: https://github.com/wojtekka/6tunnel.git
Source: https://github.com/wojtekka/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch1: https://github.com/wojtekka/6tunnel/commit/9e4119f03f57eec67b97dddbf09d363b638791dc.patch
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: python2
+BuildRequires: python3
%description
6tunnel allows using services provided by IPv6 hosts with IPv4-only
@@ -39,18 +40,18 @@ It can be used, for example, as an IPv6-capable IRC proxy.
%prep
%setup -q
-sed -i 's|#!/usr/bin/env python|#!/usr/bin/python2|' test.py
+%patch1 -p1
%build
autoreconf -fi
%configure
-make %{?_smp_mflags}
+%make_build
%install
%make_install
%check
-make %{?_smp_mflags} check
+%make_build check
%files
%license COPYING
diff --git a/9e4119f03f57eec67b97dddbf09d363b638791dc.patch b/9e4119f03f57eec67b97dddbf09d363b638791dc.patch
new file mode 100644
index 0000000..d165605
--- /dev/null
+++ b/9e4119f03f57eec67b97dddbf09d363b638791dc.patch
@@ -0,0 +1,53 @@
+From 9e4119f03f57eec67b97dddbf09d363b638791dc Mon Sep 17 00:00:00 2001
+From: Wojtek Kaniewski
+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 @@
+ (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 @@ def test(expect, client_af, server_af, from_ip, to_ip, args="", client_sends_fir
+
+ # 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")
+