Package move from freenet6 to gateway6, bug #267107

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
RepoMan-Options: --force

9 files changed, 854 insertions, 0 deletions

diff --git a/net-misc/gateway6/ChangeLog b/net-misc/gateway6/ChangeLog
new file mode 100644
index 000000000000..94c60d7bdc9e
--- /dev/null
+++ b/net-misc/gateway6/ChangeLog
@@ -0,0 +1,172 @@
+# ChangeLog for net-misc/gateway6
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gateway6/ChangeLog,v 1.1 2009/06/03 15:06:34 voyageur Exp $
+
+*gateway6-6.0 (03 Jun 2009)
+*gateway6-5.1 (03 Jun 2009)
+
+  03 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/gateway6-5.1-gcc43.patch, +files/gw6c.rc, +gateway6-5.1.ebuild,
+  +gateway6-6.0.ebuild,
+  +files/gateway6-6.0_beta4-no-template-validation.patch, +files/gw6c.conf,
+  +metadata.xml:
+  Package move from freenet6 to gateway6, bug #267107
+
+  03 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org> -freenet6-5.0.ebuild,
+  -freenet6-6.0_beta4.ebuild:
+  Remove old 5.0 and beta 6.0
+
+  07 Apr 2009; Bernard Cafarelli <voyageur@gentoo.org> freenet6-6.0.ebuild:
+  Commit the correct ebuild this time, fixes bug #265115
+
+*freenet6-6.0 (06 Apr 2009)
+
+  06 Apr 2009; Bernard Cafarelli <voyageur@gentoo.org> +freenet6-6.0.ebuild:
+  Version bump, thanks to Dmitry S. Kulyabov <yamadharma@gmail.com> in bug
+  #264350
+
+  30 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org> files/gw6c.rc:
+  Stopping the tunnel needs SIGHUP, thanks Christian Limberg
+  <barneyman@gmx.de> in bug #252186
+
+  14 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> freenet6-5.1.ebuild:
+  Stable on sparc, bug #245871
+
+*freenet6-6.0_beta4 (28 Nov 2008)
+
+  28 Nov 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/freenet6-4.2.2-noretry.patch,
+  +files/freenet6-6.0_beta4-no-template-validation.patch, files/gw6c.conf,
+  +freenet6-6.0_beta4.ebuild:
+  Bump to 6.0 beta (connection stability fixes), ebuild cleanup thanks to
+  Flameeyes and Alexandre Hamelin <alexandre.hamelin@gmail.com>. Closes bugs
+  #241064 and #246577
+
+  22 Nov 2008; Jeroen Roovers <jer@gentoo.org> freenet6-5.1.ebuild:
+  Stable for HPPA (bug #245871).
+
+  08 Nov 2008; Markus Meier <maekke@gentoo.org> freenet6-5.1.ebuild:
+  amd64/x86 stable, bug #245871
+
+  16 Jun 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/freenet6-5.1-gcc43.patch, -freenet6-4.2.2.ebuild,
+  freenet6-5.1.ebuild:
+  gcc 4.3 compilation fix, thanks to Marek Miller <mlm@shells.pl>
+  Fixes bug #226663. Also remove last 4.2 version
+
+  15 Jun 2008; Zac Medico <zmedico@gentoo.org> freenet6-4.2.2.ebuild,
+  freenet6-5.0.ebuild, freenet6-5.1.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
+
+  29 Apr 2008; Raúl Porcel <armin76@gentoo.org> freenet6-5.0.ebuild:
+  sparc stable wrt #211360
+
+  27 Apr 2008; Markus Meier <maekke@gentoo.org> freenet6-5.0.ebuild:
+  amd64 stable, bug #211360
+
+  29 Feb 2008; <cla@gentoo.org> freenet6-5.0.ebuild:
+  Stable on x86 (bug #211360)
+
+  27 Feb 2008; Jeroen Roovers <jer@gentoo.org> freenet6-5.0.ebuild:
+  Stable for HPPA (bug #211360).
+
+  27 Feb 2008; Bernard Cafarelli <voyageur@gentoo.org> files/gw6c.rc:
+  Add tun module detection/load to init script, patch provided by jakub
+
+  27 Feb 2008; Bernard Cafarelli <voyageur@gentoo.org> freenet6-5.1.ebuild:
+  Honor C[XX]FLAGS+LDFLAGS, many thanks to jakub in bug #211581
+
+*freenet6-5.1 (26 Feb 2008)
+
+  26 Feb 2008; Bernard Cafarelli <voyageur@gentoo.org> files/gw6c.rc,
+  freenet6-5.0.ebuild, +freenet6-5.1.ebuild:
+  Make initscript depend on bootmisc, as the daemon writes in /tmp.
+  Thanks jakub in bug #211358
+  Also version bump to 5.1, and fix quoting
+
+  16 Jun 2007; Christoph Mende <angelos@gentoo.org> freenet6-4.2.2.ebuild:
+  Stable on amd64 wrt bug 180450
+
+  03 Jun 2007; Bernard Cafarelli <voyageur@gentoo.org> -files/gentoo.sh,
+  -files/tspc.conf, -files/tspc.rc, -freenet6-1.0.0.ebuild:
+  Remove old version
+
+  02 Jun 2007; Markus Ullmann <jokey@gentoo.org> freenet6-4.2.2.ebuild:
+  Stable on x86 wrt bug #180450
+
+*freenet6-5.0 (31 May 2007)
+
+  31 May 2007; Bernard Cafarelli <voyageur@gentoo.org> +freenet6-5.0.ebuild:
+  Version bump
+
+  30 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> freenet6-4.2.2.ebuild:
+  Stable on sparc
+
+  12 May 2007; Bernard Cafarelli <voyageur@gentoo.org> metadata.xml:
+  Added no-herd to metadata.xml
+
+  11 May 2007; Jeroen Roovers <jer@gentoo.org> freenet6-4.2.2.ebuild:
+  Marked ~hppa (bug #174840).
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> freenet6-1.0.0.ebuild,
+  freenet6-4.2.2.ebuild:
+  Fix *initd, *confd and *envd calls (#17388, #174266)
+
+  18 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> freenet6-4.2.2.ebuild:
+  Keyworded ~sparc wrt #174840
+
+*freenet6-4.2.2 (16 Apr 2007)
+
+  16 Apr 2007; Bernard Cafarelli <voyageur@gentoo.org> +files/gw6c.conf,
+  +files/freenet6-4.2.2-noretry.patch, +files/gw6c.rc,
+  +freenet6-4.2.2.ebuild:
+  Version bump, fixes bugs #32779, #63710, #102947 and #166210
+
+  15 Apr 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/freenet6-0.9.2.diff, metadata.xml, -freenet6-0.9.7.ebuild:
+  Remove old version. Also fixes bug #169209
+
+  28 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/gentoo.sh:
+  Added a patch from Steve Egbert <s.egbert@sbcglobal.net> to fix bug #118942.
+
+  28 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> freenet6-1.0.0.ebuild:
+  Add tspc to the DESCRIPTION so it shows up in searches.  Closing bug #94283.
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org> freenet6-1.0.0.ebuild:
+  Add changes to build on Gentoo/*BSD (from Kiko, bug #132553) and respect
+  CC/CFLAGS/LDFLAGS.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> freenet6-1.0.0.ebuild:
+  Stable on ppc.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  02 Oct 2004; Markus Nigbur <pyrania@gentoo.org> freenet6-0.9.7.ebuild:
+  hooray for epatch!
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> freenet6-1.0.0.ebuild:
+  Stable on alpha.
+
+*freenet6-1.0.0 (7 Dec 2003)
+
+  07 Dec 2003; Guy Martin <gmsoft@gentoo.org> files/tspc.rc,
+  files/tspc.conf, freenet6-1.0.0.ebuild :
+  Updated version. Marking stable on x86 because old version
+  does not connect anymore. Other arches are still unstable.
+
+  11 Jun 2003; Peter Johanson <latexer@gentoo.org> files/tspc.rc:
+  missing #!/sbin/runscript
+
+  10 Jun 2003; Peter Johanson <latexer@gentoo.org> freenet6-0.9.7.ebuild,
+  files/gentoo.sh:
+  Added a gentoo.sh script which matches gentoo's placement of things. bug #21865
+
+*freenet6-0.9.7 (28 May 2003)
+
+  28 May 2003; Peter Johanson <latexer@gentoo.org> freenet6-0.9.7.ebuild,
+  files/freenet6-0.9.2.diff, files/tspc.conf, files/tspc.rc:
+  Initial import. bug#9020
+
diff --git a/net-misc/gateway6/Manifest b/net-misc/gateway6/Manifest
new file mode 100644
index 000000000000..d7c71dbdd9cc
--- /dev/null
+++ b/net-misc/gateway6/Manifest
@@ -0,0 +1,10 @@
+AUX gateway6-5.1-gcc43.patch 3412 RMD160 3893e9618184f1bfbfb009f64cf4a9b9c74f9883 SHA1 11b3c622c40fe89cc2e8a9f613c909a2833e6bfc SHA256 c5f384d07109a6c1a7efa3c178544fad0f022705e2fd30413a3200e9bd8f1adb
+AUX gateway6-6.0_beta4-no-template-validation.patch 640 RMD160 446e433d29b83e6fed4c49aeac27bd207e67d800 SHA1 84a948ccfc36691c88c076154f50f0585b5d6d3b SHA256 583994c408fa82469984d41490023f0f92fc55b5c0bd497b7ac9aa57088399f1
+AUX gw6c.conf 10265 RMD160 6a5572c0161467fba06a93a99e1ccc66889e6ecf SHA1 e183c82580409334166a846368edab31490e9169 SHA256 0134ed9ce6b42fefb67b29fb83001f5fe4e5f1abec3272cdfa4b39fed6a5a4b5
+AUX gw6c.rc 651 RMD160 3933967ee0744789636ee1cef667ed474baf0b07 SHA1 b2ba9ef12a93b036c9f5013f0de7b39e6d7949ff SHA256 a4821691862f913cbcddfeafd6a95faa212887a1958a8a12e77e69e4ddd27279
+DIST gw6c-5_1-RELEASE-src.tar.gz 1055230 RMD160 bb507ce6e56e9fd71363d2fdd27ba61c04ab125f SHA1 1ffab56a93d2271001f257d4dcaea82c38aa81f9 SHA256 960a6eceebc685c0b36d75a28d3ac576424837e34ddb7d6ee43334c5c3e15b1f
+DIST gw6c-6_0.tar.gz 1515761 RMD160 48e024a1b8358cbdf0c8232dc619f912fff48ebc SHA1 f917600a39f0f8203b22778e6e9a4ccb0ec788c5 SHA256 085b026056d933255c1dcbeee94d6f0030e04eda57d87362d420b78cb8c7dd32
+EBUILD gateway6-5.1.ebuild 2048 RMD160 1ce75127368b49b869fd465ffd43f276db301b85 SHA1 021cd73de7d8d23e81e562a694002ccebd0680dd SHA256 dd1bf517edc0b76350ff6daac1e9d90534fe0d4d7d7fbb32f1b1bb332c9f12fa
+EBUILD gateway6-6.0.ebuild 2025 RMD160 095d002edde3426d0ba1818f171cf627e5b614a0 SHA1 d282df0343d343e3bda51c4524304f9ac705059c SHA256 13ad42039e750b9f257148f47fcb31032f76c24acaceed09c8ea18ee24279fe3
+MISC ChangeLog 6450 RMD160 a1d039c0cc25e823c23b37f80d473267bdbd0799 SHA1 90aed804f37793b781ad38169b016d2d4e247f4b SHA256 f9690999466f443626f2209c4478a57cffc56547401585382e1b3e7667c9d21f
+MISC metadata.xml 721 RMD160 cfc2ae3eabb9c84fcd775e2eefa24f1d762557a0 SHA1 fc6187c8bb90b51bd618e4344da80be7ad60ebd1 SHA256 c0d33d6ecb05b0eb5ea82dd1ca10a579a13e3428921fde4c0f8cb1625b35ff5e
diff --git a/net-misc/gateway6/files/gateway6-5.1-gcc43.patch b/net-misc/gateway6/files/gateway6-5.1-gcc43.patch
new file mode 100644
index 000000000000..fb8e11f6ad48
--- /dev/null
+++ b/net-misc/gateway6/files/gateway6-5.1-gcc43.patch
@@ -0,0 +1,109 @@
+
+
+--- gw6c-messaging/src/clientmsgsender.cc.orig	2008-06-16 15:28:00.000000000 +0000
++++ gw6c-messaging/src/clientmsgsender.cc	2008-06-16 15:28:11.000000000 +0000
+@@ -19,6 +19,8 @@
+ // **************************************************************************
+ #include <gw6cmessaging/clientmsgsender.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ namespace gw6cmessaging
+
+--- gw6c-messaging/src/servermsgsender.cc.orig	2008-06-16 15:31:47.000000000 +0000
++++ gw6c-messaging/src/servermsgsender.cc	2008-06-16 15:31:56.000000000 +0000
+@@ -19,6 +19,8 @@
+ // **************************************************************************
+ #include <gw6cmessaging/servermsgsender.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ #ifdef WIN32
+
+--- gw6c-config/src/namevalueparser.cc.orig	2008-06-16 15:32:41.000000000 +0000
++++ gw6c-config/src/namevalueparser.cc	2008-06-16 15:32:51.000000000 +0000
+@@ -25,6 +25,8 @@
+ #include <fstream>
+ #include <time.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ #define NV_SEPARATOR          "="                   // Name=value separator
+
+--- gw6c-config/src/gw6cconfig.cc.orig	2008-06-16 15:33:33.000000000 +0000
++++ gw6c-config/src/gw6cconfig.cc	2008-06-16 15:33:43.000000000 +0000
+@@ -25,6 +25,8 @@
+ #include <gw6cconfig/gw6cuistrings.h>
+ #include <assert.h>
+ #include <string>
++#include <cstring>
++#include <cstdlib>
+ 
+ // Configuration data variable NAMES
+
+--- gw6c-config/src/gw6cvalidation.cc.orig	2008-06-16 15:34:19.000000000 +0000
++++ gw6c-config/src/gw6cvalidation.cc	2008-06-16 15:34:29.000000000 +0000
+@@ -18,6 +18,8 @@
+ // __________________________________________________________________________
+ // **************************************************************************
+ #include <gw6cconfig/gw6cvalidation.h>
++#include <cstring>
++#include <cstdlib> 
+ 
+ #ifdef WIN32
+
+--- gw6c-config/src/gw6c_c_wrapper.cc.orig	2008-06-16 15:38:18.000000000 +0000
++++ gw6c-config/src/gw6c_c_wrapper.cc	2008-06-16 15:38:30.000000000 +0000
+@@ -22,6 +22,9 @@
+ #include <gw6cconfig/gw6cuistrings.h>
+ using namespace gw6cconfig;
+ #include <assert.h>
++#include <cstring>
++#include <cstdlib>
++
+ 
+ #ifdef WIN32
+ #define strcasecmp      _stricmp
+
+--- gw6c-messaging/src/gw6c_c_wrapper.cc.orig	2008-06-16 15:39:04.000000000 +0000
++++ gw6c-messaging/src/gw6c_c_wrapper.cc	2008-06-16 15:39:20.000000000 +0000
+@@ -17,6 +17,8 @@
+ // Creation Date: December 2006
+ // __________________________________________________________________________
+ // **************************************************************************
++
++#include <cstring>
+ #include <gw6cmessaging/gw6c_c_wrapper.h>
+ #include <gw6cmessaging/clientmsgdataretriever.h>
+ #include <gw6cmessaging/clientmessengerimpl.h>
+
+--- gw6c-config/src/hap6devicemappingconfig.cc.orig	2008-06-16 15:40:58.000000000 +0000
++++ gw6c-config/src/hap6devicemappingconfig.cc	2008-06-16 15:41:09.000000000 +0000
+@@ -22,6 +22,8 @@
+ #include <gw6cconfig/hap6devicemappingconfig.h>
+ #include <gw6cconfig/gw6cuistrings.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ #ifdef WIN32
+
+--- gw6c-config/src/hap6_devmap_c_wrap.cc.orig	2008-06-16 15:41:44.000000000 +0000
++++ gw6c-config/src/hap6_devmap_c_wrap.cc	2008-06-16 15:41:54.000000000 +0000
+@@ -22,6 +22,8 @@
+ #include <gw6cconfig/gw6cuistrings.h>
+ using namespace gw6cconfig;
+ #include <assert.h>
++#include <cstdlib>
++#include <cstring>
+ 
+ #ifdef WIN32
+ #define strcasecmp      _stricmp
+
diff --git a/net-misc/gateway6/files/gateway6-6.0_beta4-no-template-validation.patch b/net-misc/gateway6/files/gateway6-6.0_beta4-no-template-validation.patch
new file mode 100644
index 000000000000..595ea8189ca7
--- /dev/null
+++ b/net-misc/gateway6/files/gateway6-6.0_beta4-no-template-validation.patch
@@ -0,0 +1,11 @@
+--- gw6c-6_0-BETA4/gw6c-config/src/gw6cconfig.cc.orig	2008-02-04 11:48:09.000000000 -0500
++++ gw6c-6_0-BETA4/gw6c-config/src/gw6cconfig.cc	2008-11-12 23:52:57.000000000 -0500
+@@ -410,7 +410,7 @@
+   VALIDATE_LOGERRMSG( IfTunV4V6, CFG_STR_IFTUNV4V6 );
+   VALIDATE_LOGERRMSG( ClientV4, CFG_STR_CLIENTV4 );
+   VALIDATE_LOGERRMSG( ClientV6, CFG_STR_CLIENTV6 );
+-  VALIDATE_LOGERRMSG( Template, CFG_STR_TEMPLATE );
++//VALIDATE_LOGERRMSG( Template, CFG_STR_TEMPLATE );
+   VALIDATE_LOGERRMSG( ProxyClient, CFG_STR_PROXYCLIENT );
+   VALIDATE_LOGERRMSG( BrokerLstFile, CFG_STR_BROKERLIST );
+   VALIDATE_LOGERRMSG( LastServFile, CFG_STR_LASTSERVER );
diff --git a/net-misc/gateway6/files/gw6c.conf b/net-misc/gateway6/files/gw6c.conf
new file mode 100644
index 000000000000..02ddf619df6a
--- /dev/null
+++ b/net-misc/gateway6/files/gw6c.conf
@@ -0,0 +1,348 @@
+#-----------------------------------------------------------------------------
+# $Id: gw6c.conf,v 1.1 2009/06/03 15:06:34 voyageur Exp $
+#-----------------------------------------------------------------------------
+
+##########################      READ ME!      ################################
+#
+# Welcome to the Gateway6 Client configuration file.
+# In order to use the client, you need to modify the 'userid', 'passwd' and 
+# 'server' parameters below depending on which of these situations applies:
+# 
+# 1. If you created a Freenet6 account, enter your userid and password below. 
+#    Change the server name to "broker.freenet6.net" and auth_method to 'any'.
+# 2. If you would like to use Freenet6 without creating an account, 
+#    do not make any modifications and close this file. 
+# 3. If this software was provided by your ISP, enter the userid, password and 
+#    server name provided by your ISP below. 
+#
+
+
+########################## BASIC CONFIGURATION ################################
+
+#
+# User Identification and Password:
+#   Specify your user name and password as provided by your ISP or Freenet6.
+#   If you plan to connect anonymously, leave these values empty.
+#   NOTE: Change auth_method option if you are using a username/password.
+#
+#   userid=<your_userid>
+#   passwd=<your_password>
+#
+userid=anonymous
+passwd=
+
+#
+# Gateway6 Server:
+#   Specify a Gateway6 server name or IP address (provided by your ISP or 
+#   Freenet6). An optional port number can be added; the default port number 
+#   is 3653.
+#  
+#   Examples:
+#     server=hostname # FQDN
+#     server=A.B.C.D  # IPv4 address
+#     server=[X:X::X:X] # IPv6 address
+#     server=hostname:port_number  
+#     server=A.B.C.D:port_number
+#     server=[X:X::X:X]:port_number
+#
+#   Freenet6 account holders should enter broker.freenet6.net, otherwise use
+#   anon.freenet6.net. Your ISP may provide you with a different server name. 
+#
+server=anon.freenet6.net
+#server=broker.freenet6.net
+
+#
+# Authentication Method:
+#
+#  auth_method=<{anonymous}|{any|passdss-3des-1|digest-md5|plain}>
+#
+#   anonymous:      Sends no username or password
+#
+#   any:            The most secure method will be used. 
+#   passdss-3des-1: The password is sent encrypted.
+#   digest-md5:     The password is sent encrypted.
+#   plain:          Both username and password are sent as plain text.
+#
+# Recommended values:
+#   - any:          If you are authenticating a username / password.
+#   - anonymous:    If you are connecting anonymously.
+#
+auth_method=anonymous
+#auth_method=any
+
+
+########################## ROUTING CONFIGURATION ##############################
+# Use these parameters when you wish the client to act as a router and provide 
+# IPv6 connectivity to IPv6-capable devices on your network.
+
+#
+# Local Host Type:
+#   Change this value to 'router' to enable IPv6 advertisements.
+#
+#   host_type=<host|router>
+#
+host_type=host
+
+#
+# Prefix Length:
+#   Length of the requested prefix. Valid values range between 0 and 64 when 
+#   using V6*V4 tunnel modes, and between 0 and 32 when using V4V6 tunnel mode.
+#
+#   prefixlen=<integer>
+#
+prefixlen=64
+
+#
+# Advertisement Interface Prefix:
+#   Name of the interface that will be configured to send router advertisements. 
+#   This is an interface index on Windows (ex: 4) and a name on Linux
+#   and BSD (ex: eth1 or fxp1). 
+#
+#   if_prefix=<interface name>
+#
+if_prefix=
+
+#
+# DNS Server: 
+#   A DNS server list to which the reverse prefix will be delegated. Servers
+#   are separated by the colon(:) delimiter.
+#
+#   Example: dns_server=ns1.domain:ns2.domain:ns3.domain
+#
+dns_server=
+
+
+######################### ADVANCED CONFIGURATION ##############################
+
+#
+# Gateway6 Client Installation Directory:
+#   Directory where the Gateway6 Client will be installed. This value has been 
+#   set during installation.
+#
+gw6_dir=/etc/gateway6
+
+#
+# Auto-Retry Connect, Retry Delay and Max Retry Delay:
+#  When auto_retry_connect=yes, the Gateway6 Client will attempt to reconnect
+#  after a disconnection occurred. The time to wait is 'retry_delay' and that
+#  delay is doubled at every 3 failed consecutive reconnection attempt.
+#  However, the wait delay will never exceed retry_delay_max.
+#
+#
+#   auto_retry_connect=<yes|no>
+#   retry_delay=<integer: 0..3600>
+#   retry_delay_max=<integer: 0..3600>
+#
+#   Recommended values: "yes", 30, 300
+#
+auto_retry_connect=yes
+retry_delay=30
+retry_delay_max=300
+
+#
+# Keepalive Feature and Message Interval:
+#   Indicates if and how often the client will send data to keep the tunnel 
+#   active.
+#
+#   keepalive=<yes|no>
+#   keepalive_interval=<integer>
+#
+#   Recommended values: "yes" and 30
+#
+keepalive=yes
+keepalive_interval=30
+
+#
+# Tunnel Encapsulation Mode:
+#   v6v4:    IPv6-in-IPv4 tunnel.
+#   v6udpv4: IPv6-in-UDP-in-IPv4 tunnel (for clients behind a NAT).
+#   v6anyv4: Lets the broker choose the best mode for IPv6 tunnel.
+#   v4v6:    IPv4-in-IPv6 tunnel.
+#
+#   Recommended value: v6anyv4
+#
+tunnel_mode=v6anyv4
+
+#
+# Tunnel Interface Name:
+#   The interface name assigned to the tunnel. This value is O/S dependent.
+#
+#   if_tunnel_v6v4 is the tunnel interface name for v6v4 encapsulation mode
+#   if_tunnel_v6udpv4 is the tunnel interface name for v6udpv4 encapsulate mode
+#   if_tunnel_v4v6 is the tunnel interface name for v4v6 encapsulation mode
+#
+#   Default values are set during installation.
+#
+if_tunnel_v6v4=sit1
+if_tunnel_v6udpv4=tun
+if_tunnel_v4v6=sit0
+
+#
+# Local IP Address of the Client:
+#   Allows you to set a specific address as the local tunnel endpoint.
+#
+#   client_v4=<auto|A.B.C.D (valid ipv4 address)>
+#   client_v6=<auto|X:X::X:X (valid ipv6 address)>
+#     auto: The Gateway6 Client will find the local IP address endpoint.
+#
+#   Recommended value: auto
+#
+client_v4=auto
+client_v6=auto
+
+#
+# Script Name:
+#   File name of the script to run to install the tunnel interface. The 
+#   scripts are located in the template directory under the client 
+#   installation directory. 
+#
+#   template=<checktunnel|freebsd|netbsd|openbsd|linux|windows|darwin|cisco|solaris>
+#
+#   Default value is set during installation.
+# 
+template=linux
+
+#
+# Proxy client: 
+#   Indicates that this client will request a tunnel for another endpoint, 
+#   such as a Cisco router. 
+#
+#   proxy_client=<yes|no>
+#
+#   NOTE: NAT traversal is not possible in proxy mode. 
+#
+proxy_client=no
+
+
+############################ BROKER REDIRECTION ###############################
+
+#
+# Broker List File Name:
+#   The 'broker_list' directive specifies the filename where the broker
+#   list received during broker redirection will be saved. 
+#
+#   broker_list=<file_name>
+#  
+broker_list=/var/lib/gateway6/tsp-broker-list.txt
+
+#
+# Last Server Used File Name:
+#   The 'last_server' directive specifies the filename where the address of
+#   the last broker to which a connection was successfully established will 
+#   be saved.
+#
+#   last_server=<file_name>
+#
+last_server=/var/lib/gateway6/tsp-last-server.txt
+
+#
+# Always Use Last Known Working Server:
+#   The value of the 'always_use_same_server' directive determines whether the 
+#   client should always try to connect to the broker found in the 
+#   'last_server' directive filename. 
+#
+#   always_use_same_server=<yes|no>
+#
+always_use_same_server=no
+
+
+#################################### LOGGING ##################################
+
+#
+# Log Verbosity Configuration:
+#   The format is 'log_<destination>=level', where possible values for 
+#   'destination' are:
+#
+#   - console  (logging to the console [AKA stdout])
+#   - stderr   (logging to standard error)
+#   - file     (logging to a file)
+#   - syslog   (logging to syslog [Unix only])
+#
+#   and 'level' is a digit between 0 and 3. A 'level' value of 0 disables 
+#   logging to the destination, while values 1 to 3 request increasing levels 
+#   of log verbosity and detail. If 'level' is not specified, a value of 1 is 
+#   assumed.
+#
+#   Example:
+#     log_file=3   (Maximal logging to a file)
+#     log_stderr=0 (Logging to standard error disabled)
+#     log_console= (Minimal logging to the console) 
+#
+#   - Default configuration on Windows platforms:
+#
+#     log_console=0
+#     log_stderr=0
+#     log_file=1
+#
+#   - Default configuration on Unix platforms:
+#
+#     log_console=0
+#     log_stderr=1
+#     log_file=0
+#     log_syslog=0
+#
+#log_console=
+#log_stderr=
+log_file=2
+log_syslog=1
+
+#
+# Log File Name:
+#   When logging to file is requested using the 'log_file' directive, the name
+#   and path of the file to use may be specified using this directive.
+#
+#   log_filename=<file_name>
+#
+log_filename=/var/log/gw6c.log
+
+#
+# Log File Rotation:
+#   When logging to file is requested using the 'log_file' directive, log file 
+#   rotation may be enabled. When enabled, the contents of the log file will 
+#   be moved to a backup file just before it reaches the maximum log file size 
+#   specified via this directive.
+#
+#   The name of the backup file is the name of the original log file with 
+#   '.<timestamp>' inserted before the file extension. If the file does not 
+#   have an extension, '.<timestamp>' is appended to the name of the original
+#   log file. The timestamp specifies when the rotation occurred.
+#
+#   After the contents of the log file have been moved to the backup file, the 
+#   original file is cleared, and logging resumes at the beginning of the file. 
+#
+#   log_rotation=<yes|no>
+#
+log_rotation=yes
+
+#
+# Log File Rotation Size:
+#   The 'log_rotation_size' directive specifies the maximum size a log file may 
+#   reach before rotation occurs, if enabled. The value is expressed in 
+#   kilobytes.
+#
+#   log_rotation_size=<16|32|128|1024>
+#
+log_rotation_size=32
+
+#
+# Deletion of rotated log files:
+#   The 'log_rotation_delete' directive specifies that no log backup will be
+#   kept. When rotation occurs, the file is immediately wiped out and a new 
+#   log file is started.
+#
+#   log_rotation_delete=<yes|no>
+#
+log_rotation_delete=no
+
+#
+# Syslog Logging Facility [Unix Only]:
+#   When logging to syslog is requested using the 'log_syslog' directive, the 
+#   facility to use may be specified using this directive.
+#
+#   syslog_facility=<USER|LOCAL[0-7]>
+#
+syslog_facility=USER
+
+
+# end of gw6c.conf
+#------------------------------------------------------------------------------
diff --git a/net-misc/gateway6/files/gw6c.rc b/net-misc/gateway6/files/gw6c.rc
new file mode 100644
index 000000000000..45cbf71525d0
--- /dev/null
+++ b/net-misc/gateway6/files/gw6c.rc
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+
+GATEWAY6_CLIENT="/usr/sbin/gw6c"
+
+depend() {
+	need net localmount
+	after bootmisc
+	use dns logger
+}
+
+checkconfig() {
+	if [ $(uname -s) = "Linux" ] ; then
+		if [ ! -e /dev/net/tun ]; then
+			if ! modprobe tun ; then
+				eerror "TUN/TAP support is not available" \
+					"in this kernel"
+				return 1
+			fi
+		fi
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting Gateway6 IPv6 Client"
+	start-stop-daemon --start --quiet \
+		--exec $GATEWAY6_CLIENT -- -f /etc/gateway6/gw6c.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Gateway6 IPv6 Client"
+	start-stop-daemon --stop --quiet -s HUP --exec $GATEWAY6_CLIENT
+	eend $?
+}
diff --git a/net-misc/gateway6/gateway6-5.1.ebuild b/net-misc/gateway6/gateway6-5.1.ebuild
new file mode 100644
index 000000000000..cad2ad850770
--- /dev/null
+++ b/net-misc/gateway6/gateway6-5.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gateway6/gateway6-5.1.ebuild,v 1.1 2009/06/03 15:06:34 voyageur Exp $
+
+inherit eutils versionator toolchain-funcs
+
+MY_PV=$(replace_all_version_separators "_")
+DESCRIPTION="Client to connect to a tunnel broker using the TSP protocol (freenet6 for example)"
+HOMEPAGE="http://go6.net/4105/application.asp"
+SRC_URI="mirror://gentoo/gw6c-${MY_PV}-RELEASE-src.tar.gz"
+
+LICENSE="VPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 hppa sparc x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/tspc-advanced"
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}"
+
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+
+	for i in gw6c-config gw6c-messaging ; do
+		sed -i -e "/ARCHIVER=/s:ar:$(tc-getAR):" \
+			-e "/COMPILER=/s:g++:$(tc-getCXX):" \
+			-e "/C_COMPILER=/s:gcc:$(tc-getCC):" \
+			-e "/CPP_FLAGS=/s:-I.:${CXXFLAGS} -I.:" \
+			-e "/C_FLAGS=/s:-I.:${CFLAGS} -I.:" \
+			-e "/C_LINKER=/s:gcc:$(tc-getCC):" \
+			-e "/LD_FLAGS=/s:-O2::" \
+			-e "/LD_FLAGS=/s:-L:${LDFLAGS} -L:" \
+			-e "/LINKER=/s:g++:$(tc-getCXX):" \
+			-e "/RANLIB=/s:ranlib:$(tc-getRANLIB):" \
+			${i}/Makefile || die "sed failed in ${i}"
+	done
+
+	cd "${S}"
+	for i in platform/linux platform/unix-common src/lib src/net src/tsp src/xml ; do
+		sed -i -e "/CC=/s:gcc:$(tc-getCC):" \
+			-e "/CFLAGS=/s:-O2:${CFLAGS}:" \
+			-e "/LDFLAGS=/s:-L..:${LDFLAGS} -L..:" \
+			${i}/Makefile || die "sed failed in ${i}"
+	done
+}
+
+src_compile() {
+	emake all configdir=/etc/gateway6 target=linux || die "Build Failed"
+	sed -i "s#tsp-#/tmp/tsp-#" bin/gw6c.conf.sample
+}
+
+src_install() {
+	dosbin bin/gw6c
+
+	insopts -m 600
+	insinto /etc/gateway6
+	newins bin/gw6c.conf.sample gw6c.conf
+	exeinto /etc/gateway6/template
+	doexe template/linux.sh
+
+	newinitd "${FILESDIR}"/gw6c.rc gw6c
+
+	doman man/{man5/gw6c.conf.5,man8/gw6c.8}
+}
+
+pkg_postinst() {
+	elog "To add support for a TSP IPv6 connection at startup,"
+	elog "remember to run:"
+	elog "# rc-update add gw6c default"
+}
diff --git a/net-misc/gateway6/gateway6-6.0.ebuild b/net-misc/gateway6/gateway6-6.0.ebuild
new file mode 100644
index 000000000000..fc2c5b249be6
--- /dev/null
+++ b/net-misc/gateway6/gateway6-6.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gateway6/gateway6-6.0.ebuild,v 1.1 2009/06/03 15:06:34 voyageur Exp $
+
+inherit eutils versionator toolchain-funcs
+
+MY_P=gw6c-$(replace_all_version_separators "_")
+MY_P=${MY_P/_beta/-BETA}
+
+DESCRIPTION="Client to connect to a tunnel broker using the TSP protocol (freenet6 for example)"
+HOMEPAGE="http://go6.net/4105/application.asp"
+SRC_URI="http://go6.net/4105/file.asp?file_id=158&file=/${MY_P}.tar.gz"
+
+LICENSE="VPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="radvd"
+
+DEPEND="dev-libs/openssl
+	sys-apps/iproute2
+	radvd? ( net-misc/radvd )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}-RELEASE"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-6.0_beta4-no-template-validation.patch
+
+	for i in gw6c-config gw6c-messaging ; do
+		sed -i -e "s/-O2//" \
+			-e "s/CXXFLAGS=/CXXFLAGS+=/" \
+			-e "s/CFLAGS=/CFLAGS+=/" \
+			-e "s/LDFAGS=/LDFLAGS+=/" \
+			${i}/Makefile || die "sed failed in ${i}"
+	done
+
+	cd tspc-advanced
+	for i in platform/linux platform/unix-common src/lib src/net src/tsp src/xml ; do
+		sed -i -e "s/-O2//" \
+			-e "s/CXXFLAGS=/CXXFLAGS+=/" \
+			-e "s/CFLAGS=/CFLAGS+=/" \
+			-e "s/LDFAGS=/LDFLAGS+=/" \
+			${i}/Makefile || die "sed failed in ${i}"
+	done
+}
+
+src_compile() {
+	# Parallel compilation broken
+	emake -j1\
+		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		all configdir=/etc/gateway6 target=linux || die "Build Failed"
+}
+
+src_install() {
+	cd "${S}"/tspc-advanced
+	dosbin bin/gw6c
+
+	insopts -m 600
+	insinto /etc/gateway6
+	doins "${FILESDIR}"/gw6c.conf
+	exeinto /etc/gateway6/template
+	doexe template/linux.sh
+
+	newinitd "${FILESDIR}"/gw6c.rc gw6c
+
+	doman man/{man5/gw6c.conf.5,man8/gw6c.8}
+	dodir /var/lib/gateway6
+
+	dodoc "${S}"/*.pdf
+}
+
+pkg_postinst() {
+	elog "To add support for a TSP IPv6 connection at startup,"
+	elog "remember to run:"
+	elog "# rc-update add gw6c default"
+}
diff --git a/net-misc/gateway6/metadata.xml b/net-misc/gateway6/metadata.xml
new file mode 100644
index 000000000000..4408f7d69a98
--- /dev/null
+++ b/net-misc/gateway6/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>TSP is a control protocol used to establish and maintain static tunnels. The Gateway6 client is used on the host computer to connect to a tunnel broker using the TSP protocol and to get the information for its tunnel. When it receives the information for the tunnel, the Gateway6 client creates the static tunnel on its operating system</longdescription>
+	<use>
+		<flag name="radvd">Enable support for <pkg>net-misc/radvd</pkg></flag>
+	</use>
+</pkgmetadata>