From 6334f22e2325271f0bf079838e1b474e479ae64b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 19:35:38 +0000 Subject: [PATCH 01/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 6tunnel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/6tunnel.spec b/6tunnel.spec index cb64b9a..5412a0a 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -50,5 +50,8 @@ autoreconf -vif %changelog +* 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 From 454213ba2f0cb24a790735365591d2a76830c58c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 10:55:22 +0000 Subject: [PATCH 02/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 6tunnel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/6tunnel.spec b/6tunnel.spec index 5412a0a..af6ec46 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -50,6 +50,9 @@ autoreconf -vif %changelog +* 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 From 81adfdf9d49142a67c5dea27b6bde4ad344a050d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jan 2024 12:01:55 +0000 Subject: [PATCH 03/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- 6tunnel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/6tunnel.spec b/6tunnel.spec index af6ec46..3804312 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -50,6 +50,9 @@ autoreconf -vif %changelog +* 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 From d35d9722db99f64625d7d365ba0f96406234516c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 09:08:02 +0000 Subject: [PATCH 04/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- 6tunnel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/6tunnel.spec b/6tunnel.spec index 3804312..34ee622 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -50,6 +50,9 @@ autoreconf -vif %changelog +* 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 From c620b3ab74605b5bf5ff15055bb71fd58749b838 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 20:41:05 +0000 Subject: [PATCH 05/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- 6tunnel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/6tunnel.spec b/6tunnel.spec index 34ee622..d19af81 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.13 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -50,6 +50,9 @@ autoreconf -vif %changelog +* 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 From cccb0756f33a277477bcff06f93d5b639081875d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 29 Jan 2024 10:43:45 +0000 Subject: [PATCH 06/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- 6tunnel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/6tunnel.spec b/6tunnel.spec index d19af81..bfdbaf3 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.13 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -50,6 +50,9 @@ autoreconf -vif %changelog +* 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 From 46aa8f1976f33449d123521cecc91328009c2782 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 14:41:12 +0000 Subject: [PATCH 07/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- 6tunnel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/6tunnel.spec b/6tunnel.spec index bfdbaf3..116d949 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.13 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -50,6 +50,9 @@ autoreconf -vif %changelog +* 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 From 6402e0b66e89afde41f5ccd6ca92c8c32664b9c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 08:21:39 +0000 Subject: [PATCH 08/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- 6tunnel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/6tunnel.spec b/6tunnel.spec index 116d949..fcdd627 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.13 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -50,6 +50,9 @@ autoreconf -vif %changelog +* 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 From 61e29a2731ffc2029eab264ceaf298778834bef4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 07:17:58 +0000 Subject: [PATCH 09/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- 6tunnel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/6tunnel.spec b/6tunnel.spec index fcdd627..58a2f85 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.13 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -50,6 +50,9 @@ autoreconf -vif %changelog +* 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 From 343ddb48563c55d02a6d10012d7767fa252fd5ca Mon Sep 17 00:00:00 2001 From: Jonathan Wright Date: Thu, 23 Jan 2025 10:42:52 -0600 Subject: [PATCH 10/13] fix ftbfs with gcc 15 --- 6tunnel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/6tunnel.spec b/6tunnel.spec index 58a2f85..ee7525f 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.13 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -31,7 +31,7 @@ IPv6 addresses and forward all data to IPv4 or IPv6 (default) host. %build autoreconf -vif %configure -%make_build +%make_build CFLAGS="%{optflags} -std=gnu17" %check @@ -50,6 +50,9 @@ autoreconf -vif %changelog +* 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 From 19464e1c93af56046fc1491869f6b7e94cc58cb0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 15:40:02 +0000 Subject: [PATCH 11/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- 6tunnel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/6tunnel.spec b/6tunnel.spec index ee7525f..65b3840 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.13 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -50,6 +50,9 @@ autoreconf -vif %changelog +* 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 From 0059201c1033e2c9461d593cc0ec133f944fe365 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sun, 16 Nov 2025 16:27:35 -0300 Subject: [PATCH 12/13] update to 0.14 remove upstreamed patch --- .gitignore | 1 + 6tunnel.spec | 12 ++--- ...19f03f57eec67b97dddbf09d363b638791dc.patch | 53 ------------------- sources | 2 +- 4 files changed, 7 insertions(+), 61 deletions(-) delete mode 100644 9e4119f03f57eec67b97dddbf09d363b638791dc.patch diff --git a/.gitignore b/.gitignore index 4a9d61c..7fce1b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /6tunnel-0.13.tar.gz +/6tunnel-0.14.tar.gz diff --git a/6tunnel.spec b/6tunnel.spec index 65b3840..e806eb4 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel -Version: 0.13 -Release: 12%{?dist} +Version: 0.14 +Release: 1%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -14,11 +14,6 @@ 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 @@ -50,6 +45,9 @@ autoreconf -vif %changelog +* 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 diff --git a/9e4119f03f57eec67b97dddbf09d363b638791dc.patch b/9e4119f03f57eec67b97dddbf09d363b638791dc.patch deleted file mode 100644 index d165605..0000000 --- a/9e4119f03f57eec67b97dddbf09d363b638791dc.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 94b5dc5..4699eb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (6tunnel-0.13.tar.gz) = 6b6f41e8dabd96a7997a467424865ab7d4e96442a7a91247a869959630a1606935d64cb0b2972264333d35b55f590d781a0cf987013bf8d1432b6fa81591df1b +SHA512 (6tunnel-0.14.tar.gz) = d0a7f655f6d170dfdb089f8585c246dfd36fd911411ce8215bafb9742cf2871cd6a0a6312178f09d7c4f103ffccc6f7f0b35bf00ef62e38d0177245ce700fc78 From 15833094097c8ff86ac3b3f3c1b73bc073d12cc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 02:26:21 +0000 Subject: [PATCH 13/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- 6tunnel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/6tunnel.spec b/6tunnel.spec index e806eb4..9a6b6e2 100644 --- a/6tunnel.spec +++ b/6tunnel.spec @@ -1,6 +1,6 @@ Name: 6tunnel Version: 0.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tunnelling for application that don't speak IPv6 License: GPL-2.0-only @@ -45,6 +45,9 @@ 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