diff --git a/.gitignore b/.gitignore index 7fce1b0..4a9d61c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /6tunnel-0.13.tar.gz -/6tunnel-0.14.tar.gz diff --git a/6tunnel.spec b/6tunnel.spec index 9a6b6e2..cb64b9a 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel -Version: 0.14 -Release: 2%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -14,6 +14,11 @@ BuildRequires: make # needed for tests BuildRequires: python3 +# https://github.com/wojtekka/6tunnel/issues/11 +# issue is closed but commit is not in a tagged release +# anything after 0.13 should have it natively +Patch: 9e4119f03f57eec67b97dddbf09d363b638791dc.patch + %description 6tunnel allows you to use services provided by IPv6 hosts with IPv4-only applications and vice-versa. It can bind to any of your IPv4 (default) or @@ -26,7 +31,7 @@ IPv6 addresses and forward all data to IPv4 or IPv6 (default) host. %build autoreconf -vif %configure -%make_build CFLAGS="%{optflags} -std=gnu17" +%make_build %check @@ -45,44 +50,5 @@ autoreconf -vif %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 0.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Sun Nov 16 2025 Filipe Rosset - 0.14-1 -- update to 0.14 remove upstreamed patch - -* Wed Jul 23 2025 Fedora Release Engineering - 0.13-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 23 2025 Jonathan Wright - 0.13-11 -- fix ftbfs rbhz#2333049 rhbz#2341610 - -* Mon Jan 20 2025 Fedora Release Engineering - 0.13-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 0.13-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 0.13-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 29 2024 Fedora Release Engineering - 0.13-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 0.13-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.13-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 18 2024 Fedora Release Engineering - 0.13-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 0.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Fri Jul 22 2022 jonathanspw - 0.13-1 - Initial package build 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") + diff --git a/sources b/sources index 4699eb5..94b5dc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (6tunnel-0.14.tar.gz) = d0a7f655f6d170dfdb089f8585c246dfd36fd911411ce8215bafb9742cf2871cd6a0a6312178f09d7c4f103ffccc6f7f0b35bf00ef62e38d0177245ce700fc78 +SHA512 (6tunnel-0.13.tar.gz) = 6b6f41e8dabd96a7997a467424865ab7d4e96442a7a91247a869959630a1606935d64cb0b2972264333d35b55f590d781a0cf987013bf8d1432b6fa81591df1b