Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 6tunnel for openSUSE:Factory checked in at 2022-08-30 14:48:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/6tunnel (Old) and /work/SRC/openSUSE:Factory/.6tunnel.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "6tunnel" Tue Aug 30 14:48:58 2022 rev:4 rq:999900 version:0.13 Changes: -------- --- /work/SRC/openSUSE:Factory/6tunnel/6tunnel.changes 2019-11-28 10:12:43.387636317 +0100 +++ /work/SRC/openSUSE:Factory/.6tunnel.new.2083/6tunnel.changes 2022-08-30 14:49:27.984118341 +0200 @@ -1,0 +2,6 @@ +Tue Aug 16 12:23:49 UTC 2022 - Dirk M??ller <dmuel...@suse.com> + +- add 9e4119f03f57eec67b97dddbf09d363b638791dc.patch to be + able to switch to python3 + +------------------------------------------------------------------- New: ---- 9e4119f03f57eec67b97dddbf09d363b638791dc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 6tunnel.spec ++++++ --- /var/tmp/diff_new_pack.nHGAeW/_old 2022-08-30 14:49:28.360119301 +0200 +++ /var/tmp/diff_new_pack.nHGAeW/_new 2022-08-30 14:49:28.364119310 +0200 @@ -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 <mar...@gmx.de> # # All modifications and additions to the file contributed by third parties @@ -26,9 +26,10 @@ 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 @@ %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 ++++++ 9e4119f03f57eec67b97dddbf09d363b638791dc.patch ++++++ >From 9e4119f03f57eec67b97dddbf09d363b638791dc Mon Sep 17 00:00:00 2001 From: Wojtek Kaniewski <wojte...@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 @@ (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")
