Compare commits
No commits in common. "rawhide" and "f43" have entirely different histories.
4 changed files with 61 additions and 10 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1 @@
|
|||
/6tunnel-0.13.tar.gz
|
||||
/6tunnel-0.14.tar.gz
|
||||
|
|
|
|||
15
6tunnel.spec
15
6tunnel.spec
|
|
@ -1,6 +1,6 @@
|
|||
Name: 6tunnel
|
||||
Version: 0.14
|
||||
Release: 2%{?dist}
|
||||
Version: 0.13
|
||||
Release: 12%{?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
|
||||
|
|
@ -45,12 +50,6 @@ autoreconf -vif
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Sun Nov 16 2025 Filipe Rosset <rosset.filipe@gmail.com> - 0.14-1
|
||||
- update to 0.14 remove upstreamed patch
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
53
9e4119f03f57eec67b97dddbf09d363b638791dc.patch
Normal file
53
9e4119f03f57eec67b97dddbf09d363b638791dc.patch
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
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 @@
|
||||
(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")
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (6tunnel-0.14.tar.gz) = d0a7f655f6d170dfdb089f8585c246dfd36fd911411ce8215bafb9742cf2871cd6a0a6312178f09d7c4f103ffccc6f7f0b35bf00ef62e38d0177245ce700fc78
|
||||
SHA512 (6tunnel-0.13.tar.gz) = 6b6f41e8dabd96a7997a467424865ab7d4e96442a7a91247a869959630a1606935d64cb0b2972264333d35b55f590d781a0cf987013bf8d1432b6fa81591df1b
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue