debian/0000755000000000000000000000000012147565501007174 5ustar debian/clean0000644000000000000000000000001212147565501010172 0ustar configure debian/watch0000644000000000000000000000031412147565501010223 0ustar version=3 opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/(\d)(rc\d*)$/$1~$2/ \ http://toxygen.net/6tunnel/6tunnel-(\d.*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz)) debian/rules0000755000000000000000000000056112147565501010256 0ustar #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic $(CPPFLAGS) export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed override_dh_auto_install: $(MAKE) install prefix=$(CURDIR)/debian/6tunnel/usr override_dh_auto_configure: [ -f Makefile ] || sh ./autogen.sh dh_auto_configure %: dh $@ # End of file debian/changelog0000644000000000000000000001014112147565501011043 0ustar 6tunnel (0.11rc2-8) unstable; urgency=low * debian/control - (standards-Version): Update to 3.9.4. * debian/copyright - Update to Format 1.0. - Update Upstream-Contact (Closes: #709332). Thanks to Jakub Wilk . - Update years. * debian/patches - (30): New. Fix typos in manual page (Closes: #709334). Thanks to Jakub Wilk . * debian/watch - Update. Add uversionmangle, dversionmangle and improve URL. Thanks to Bart Martens . -- Jari Aalto Thu, 23 May 2013 12:17:40 +0300 6tunnel (0.11rc2-7) unstable; urgency=low * debian/control - (Build-Depends): Rm dpkg-dev; not needed with debhelper 9. - (standards-Version): Update to 3.9.3.1. * debian/rules - Enable all hardening flags. - Use DEB_*_MAINT_* variables. -- Jari Aalto Thu, 22 Mar 2012 12:32:41 -0400 6tunnel (0.11rc2-6) unstable; urgency=low * debian/compat - Update to 9 * debian/control - (Build-Depends): Update to debhelper 9, dpkg-dev 1.16.1. - (Standards-Version): Update to 3.9.2. * debian/copyright - Update to DEP5. * debian/rules - Remove unnecessary rules. - Use hardened CFLAGS (release goal). http://wiki.debian.org/ReleaseGoals/SecurityHardeningBuildFlags -- Jari Aalto Sat, 11 Feb 2012 14:22:13 -0500 6tunnel (0.11rc2-5) unstable; urgency=low * debian/patches - (15): New. Adjust getopt() return value type for ARM. Patch thanks to Martijn (Closes: #602664). - (20): Refresh. -- Jari Aalto Sun, 07 Nov 2010 10:05:36 +0200 6tunnel (0.11rc2-4) unstable; urgency=low * debian/control - (Build-Depends): Update to debhelper 8. - (Standards-Version): Update to 3.9.1. * debian/compat - Update to 8. * debian/copyright - (Upstream Author): Add note that email is no longer active. * debian/patches - (20): New. Fix can't resolve IPv4 address. Patch thanks to Roland Stigge (Closes: #601030). -- Jari Aalto Sun, 24 Oct 2010 00:51:39 +0300 6tunnel (0.11rc2-3) unstable; urgency=low * New maintainer (Closes: #569181). - Move to packaging format "3.0 (quilt)". * debian/clean - New file. * debian/compat - Update to 7. * debian/control - (Build-Depends): update to debhelper 7.1. - (Depends): add ${misc:Depends}. - (Homepage): update to Freshmeat. - (Standards-Version): update to 3.8.4. - (Vcs-*): new fields. * debian/copyright - Update layout. * debian/patches/series - (Number 10): Correct option -f. Patch thanks to Olaf Rempel (Closes: #501904). * debian/rules - Update to dh(1). (not handling nostrip; Closes: #436257). * debian/source/format - New file. * debian/watch - New file. -- Jari Aalto Fri, 19 Mar 2010 06:33:20 +0200 6tunnel (0.11rc2-2) unstable; urgency=low * Add build dependency on autoconf (closes: #367005) -- Thomas Seyrat Fri, 12 May 2006 22:48:11 +0200 6tunnel (0.11rc2-1) unstable; urgency=low * New upstream release (closes: #366976) * Bumped Standards-Version to 3.7.2 * Bumped debhelper compatibility level to 5 -- Thomas Seyrat Fri, 12 May 2006 17:53:57 +0200 6tunnel (0.11rc1-1) unstable; urgency=low * New upstream release (closes: #313193) * New upstream URL * Bumped Standards-Version to 3.6.2 -- Thomas Seyrat Thu, 21 Jul 2005 16:26:46 +0200 6tunnel (0.10rel-1) unstable; urgency=low * New upstream release * Bumped Standards-Version to 3.6.0 -- Thomas Seyrat Sat, 12 Jul 2003 18:59:01 +0200 6tunnel (0.10rc2-1) unstable; urgency=high * New upstream release (closes: #194851) * Bumped Standards-Version to 3.5.10 -- Thomas Seyrat Wed, 4 Jun 2003 00:13:44 +0200 6tunnel (0.09-1) unstable; urgency=low * Initial Release. (closes: #139888) -- Thomas Seyrat Mon, 25 Mar 2002 22:54:07 +0100 debian/patches/0000755000000000000000000000000012147565501010623 5ustar debian/patches/20-resolve-ipv4-address--bug601030.patch0000644000000000000000000000677212147565501017363 0ustar From dc5f073a30eff5a6080fb046954e2ca1603a3ad4 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Sun, 7 Nov 2010 10:02:42 +0200 Subject: [PATCH] Fix can't resolve IPv4 address by Roland Stigge Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto --- 6tunnel.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/6tunnel.c b/6tunnel.c index 1e517f5..787c25c 100644 --- a/6tunnel.c +++ b/6tunnel.c @@ -43,7 +43,9 @@ } while(0) int verbose = 0, conn_count = 0; -int remote_port, verbose, hint = AF_INET6, hexdump = 0; +int remote_port, verbose, hexdump = 0; +int remote_hint = AF_INET6; +int local_hint = AF_INET; char *remote_host, *ircpass = NULL; char *ircsendpass = NULL, remote[128]; char *pid_file = NULL; @@ -218,7 +220,7 @@ void make_tunnel(int rsock, const char *remote) debug("<%d> irc proxy auth succeded\n", rsock); } - if (!(sa = resolve_host(remote_host, hint))) { + if (!(sa = resolve_host(remote_host, remote_hint))) { debug("<%d> unable to resolve %s\n", rsock, remote_host); goto cleanup; } @@ -232,12 +234,12 @@ void make_tunnel(int rsock, const char *remote) sa = NULL; if (source) { - if (!(sa = resolve_host(source, hint))) { + if (!(sa = resolve_host(source, local_hint))) { debug("<%d> unable to resolve source host (%s)\n", rsock, source); goto cleanup; } - if (bind(sock, sa, (hint == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6))) { + if (bind(sock, sa, (local_hint == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6))) { debug("<%d> unable to bind to source host (%s)\n", rsock, source); goto cleanup; } @@ -246,7 +248,7 @@ void make_tunnel(int rsock, const char *remote) sa = NULL; } - sa = resolve_host(remote_host, hint); + sa = resolve_host(remote_host, remote_hint); ((struct sockaddr_in*) sa)->sin_port = htons(remote_port); @@ -507,7 +509,7 @@ void sigterm() int main(int argc, char **argv) { int force = 0, lsock, csock, one = 0, jeden = 1, local_port; - int detach = 1, listen6 = 0, sa_len, conn_limit = 0; + int detach = 1, sa_len = 0, conn_limit = 0; char *username = NULL, *bind_host = NULL; int optc; struct sockaddr *sa; @@ -528,10 +530,10 @@ int main(int argc, char **argv) verbose = 1; break; case '4': - hint = AF_INET; break; case '6': - listen6 = 1; + remote_hint = AF_INET; + local_hint = AF_INET6; break; case 's': source_host = xstrdup(optarg); @@ -598,7 +600,7 @@ int main(int argc, char **argv) debug("resolving %s\n", remote_host); - if (!(sa = resolve_host(remote_host, hint)) && !force) { + if (!(sa = resolve_host(remote_host, remote_hint)) && !force) { fprintf(stderr, "%s: unable to resolve host %s\n", argv[0], remote_host); exit(1); } @@ -609,7 +611,7 @@ int main(int argc, char **argv) if (bind_host) { debug("resolving %s\n", bind_host); - if (!(sa = resolve_host(bind_host, (listen6) ? AF_INET6 : AF_INET))) { + if (!(sa = resolve_host(bind_host, local_hint))) { fprintf(stderr, "%s: unable to resolve host %s\n", argv[0], remote_host); exit(1); } @@ -623,7 +625,7 @@ int main(int argc, char **argv) else debug("source: %s\n", (source_host) ? source_host : "default"); - if (!listen6) { + if (local_hint == AF_INET) { lsock = socket(PF_INET, SOCK_STREAM, 0); memset(&laddr, 0, (sa_len = sizeof(laddr))); -- 1.7.2.3 debian/patches/30-manpage.patch0000644000000000000000000000131512147565501013474 0ustar From: Jari Aalto Subject: Fix typos Bug-Debian: http://bugs.debian.org/709334 --- 6tunnel.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/6tunnel.1 +++ b/6tunnel.1 @@ -76,7 +76,7 @@ .B 6tunnel will use the IPv4 one. In other cases, use .B \-4 -parameter which makes IPv4 address the preffered one. For IPv6-to-any tunnels +parameter which makes IPv4 address the preferred one. For IPv6-to-any tunnels use .B \-6 which makes @@ -88,7 +88,7 @@ Exit after first connection. .TP .B \-4 -Preffer IPv4 endpoint if the machine has both address types. +Prefer IPv4 endpoint if the machine has both address types. .TP .B \-6 Listen on IPv6 address (IPv4 is default). debian/patches/series0000644000000000000000000000015112147565501012035 0ustar 10-6tunnel.c--option-f.patch 15-arm-arch.patch 20-resolve-ipv4-address--bug601030.patch 30-manpage.patch debian/patches/15-arm-arch.patch0000644000000000000000000000163412147565501013565 0ustar From 6096ce243d5ee87e2c13c55eb3b5a3cbccf87931 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Sun, 7 Nov 2010 09:56:48 +0200 Subject: [PATCH] In ARM getopt() is unsigned by Martijn Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto --- 6tunnel.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/6tunnel.c b/6tunnel.c index ce1d292..1e517f5 100644 --- a/6tunnel.c +++ b/6tunnel.c @@ -508,7 +508,8 @@ int main(int argc, char **argv) { int force = 0, lsock, csock, one = 0, jeden = 1, local_port; int detach = 1, listen6 = 0, sa_len, conn_limit = 0; - char optc, *username = NULL, *bind_host = NULL; + char *username = NULL, *bind_host = NULL; + int optc; struct sockaddr *sa; struct sockaddr_in laddr, caddr; struct sockaddr_in6 laddr6; -- 1.7.2.3 debian/patches/10-6tunnel.c--option-f.patch0000644000000000000000000000135212147565501015505 0ustar From 353c025fd2fe72d7c342a8a694727cca7298256e Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Wed, 17 Mar 2010 10:14:18 +0200 Subject: [PATCH] 6tunnel.c: Correct option -f. By Olaf Rempel Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto --- 6tunnel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/6tunnel.c b/6tunnel.c index 7b6d657..ce1d292 100644 --- a/6tunnel.c +++ b/6tunnel.c @@ -538,7 +538,7 @@ int main(int argc, char **argv) case 'l': bind_host = xstrdup(optarg); break; - case 'r': + case 'f': force = 1; break; case 'i': -- 1.7.0 debian/source/0000755000000000000000000000000012147565501010474 5ustar debian/source/format0000644000000000000000000000001412147565501011702 0ustar 3.0 (quilt) debian/compat0000644000000000000000000000000212147565501010372 0ustar 9 debian/copyright0000644000000000000000000000277312147565501011140 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: 6tunnel Upstream-Contact: Wojtek Kaniewski Source: http://toxygen.net/6tunnel As of 2010-10-24 the upstream address wojtekka@irc.pl mentioned in the "ChangeLog" file no longer exists. Files: * Copyright: 2000-2005 Wojtek Kaniewski , Comment: Co-authors mentioned were: - Modified by tomek lipski - Thanks to KeFiR@IRCnet - Modified by Dariusz Jackowski - Modified by awayzzz License: GPL-2+ Files: debian/* Copyright: 2010, 2012, 2013 Jari Aalto 2002, 2003, 2005, 2006 Thomas Seyrat License: GPL-2+ License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program. If not, see . . On Debian systems, the complete text of the GNU General Public License can be found in "/usr/share/common-licenses/GPL-2". debian/control0000644000000000000000000000130412147565501010575 0ustar Source: 6tunnel Section: net Priority: optional Maintainer: Jari Aalto Build-Depends: debhelper (>= 9), autoconf Standards-Version: 3.9.4 Vcs-Browser: http://git.debian.org/?p=collab-maint/6tunnel.git Vcs-Git: git://git.debian.org/git/collab-maint/6tunnel.git Homepage: http://toxygen.net/6tunnel Package: 6tunnel Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: TCP proxy for non-IPv6 applications 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 or IPv6 addresses and forward all data to IPv4 or IPv6 host. . It can be used for example as an IPv6-capable IRC proxy.