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

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.26-gentoo x86_64

7 files changed, 341 insertions, 221 deletions

diff --git a/net-misc/freenet6/ChangeLog b/net-misc/freenet6/ChangeLog
index 56cada3381b2..edda4ba1afdb 100644
--- a/net-misc/freenet6/ChangeLog
+++ b/net-misc/freenet6/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/freenet6
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.36 2008/11/22 17:11:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.37 2008/11/28 15:58:00 voyageur Exp $
+
+*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).
diff --git a/net-misc/freenet6/Manifest b/net-misc/freenet6/Manifest
index 3687df2075ac..ecb20c91e989 100644
--- a/net-misc/freenet6/Manifest
+++ b/net-misc/freenet6/Manifest
@@ -1,10 +1,12 @@
-AUX freenet6-4.2.2-noretry.patch 1273 RMD160 42dc48455d43ae02cf0f59bdf8c05fd85f5e09f7 SHA1 f8d9a3bb5812353312bf451b6ae97f6a58eda7b0 SHA256 8e9ce8e4fbaf92339c15c56085e3d8c41677f08645f1fa869882038721b12e2f
 AUX freenet6-5.1-gcc43.patch 3412 RMD160 3893e9618184f1bfbfb009f64cf4a9b9c74f9883 SHA1 11b3c622c40fe89cc2e8a9f613c909a2833e6bfc SHA256 c5f384d07109a6c1a7efa3c178544fad0f022705e2fd30413a3200e9bd8f1adb
-AUX gw6c.conf 8536 RMD160 633eb8d49378459d93931415be401babf88ef42c SHA1 dde098066da1014bb1374d2d5b18de200105f35e SHA256 8da6f62ed5164d54d272ae9d380f1b2387f2ad819ffcd8f52349beeca44c7b1c
+AUX freenet6-6.0_beta4-no-template-validation.patch 640 RMD160 446e433d29b83e6fed4c49aeac27bd207e67d800 SHA1 84a948ccfc36691c88c076154f50f0585b5d6d3b SHA256 583994c408fa82469984d41490023f0f92fc55b5c0bd497b7ac9aa57088399f1
+AUX gw6c.conf 10265 RMD160 66d8e85064257e24ba5db293d152381029530542 SHA1 a9c460321067f2cf6dfcc0ea6a0a194712379a2a SHA256 029694e5f649afdd972932b073fec04057598f85978a3e20335b9ed42a764fa9
 AUX gw6c.rc 644 RMD160 89bcf7d0329c59eaee58f5c98924c4c1968df6e9 SHA1 643f89719a0141b271a4808281cf79da757f3f73 SHA256 cafd899ebd4bb315b0491e47b3a2a824351e3ff61553f42dd4d5ffdb93ffe9ac
 DIST gw6c-5_0-RELEASE-src.tar.gz 2441593 RMD160 737e4d0cc74d78df9543715f8a5f0e3c9a11c699 SHA1 aad5d89ac87ef50fb930d854c7f97277f83167b4 SHA256 431e59a6590f0826f1cb34a6319bd69d024ca89e36f8578a2befe039a489e894
 DIST gw6c-5_1-RELEASE-src.tar.gz 1055230 RMD160 bb507ce6e56e9fd71363d2fdd27ba61c04ab125f SHA1 1ffab56a93d2271001f257d4dcaea82c38aa81f9 SHA256 960a6eceebc685c0b36d75a28d3ac576424837e34ddb7d6ee43334c5c3e15b1f
+DIST gw6c-6_0-BETA4.tar.gz 1382340 RMD160 c8c5095780c1b6371b136795c3c8411cce5af319 SHA1 c5546c079745f5df4da8a267a91b070b9eef727f SHA256 ecf0fc634284e254e606c516fd45256a536e277f21d89a1f0a7f76ee780b7e1f
 EBUILD freenet6-5.0.ebuild 1633 RMD160 415202f9badc666b33ea1b2e0a6b2e25a9d5f54a SHA1 ba5925de1e7215cd2f38dfbc08845e4ff404d449 SHA256 6fed189f2e7a7056c1a0285ed5f7e10bfec5953060cf014dfe45b05a4f256a69
 EBUILD freenet6-5.1.ebuild 2488 RMD160 a07e3aa6d5d2dea3be38fba84407707acaba8806 SHA1 c09be15ebdf3514274da096d713d640ef767a1f3 SHA256 571e9e0426ecea982457dae15edb52edba45aa1f7a2c04b5acda2395a565cf06
-MISC ChangeLog 4942 RMD160 cb9aa85236e6a9ee97f550e8d4e85ca40e82ef2f SHA1 bcc2d448a0cc063ff5842ba90f64e77fe22c513a SHA256 7b60182f290b03a62c06d4b06f5e5ec9e401050925558785e8022ce797d421ff
-MISC metadata.xml 348 RMD160 831527825fdc6b58538bb671987c0a562e1559df SHA1 2517554158e3a9d0cd11e7a8ecbe4fa1843a170f SHA256 9a455a8b1ebafab91dcd8d5a1c0d3cc61fc75abc59ad2988d7118032f8309730
+EBUILD freenet6-6.0_beta4.ebuild 2477 RMD160 6c4c113974be4db46e9d6c02a4b44a481d6b6f2f SHA1 9c9ad060d55df2adb1e0cd395cdc53dc43e9842a SHA256 1d48b5e7dee3307098de2ee06407f824642da72a29b9fac69e4b6c37e17c1c3c
+MISC ChangeLog 5355 RMD160 ffff7a7e7951bece4cff4899d3ae8efc6dde0954 SHA1 0866b997cb0d26ac7d355c5d72b8b01d3dab71d9 SHA256 cc842779232776623626d9b59d1438d819d497a682434f41d5b91eb5298d4b2e
+MISC metadata.xml 436 RMD160 754f03c5d3c714f546f008f8c45b42696047c687 SHA1 c0e592a5b763fcfca663d14cba80665d9e260222 SHA256 0a317704558ef21ec1c36dff9ec863e55d738880bfe8b2fc2d854cd855766f52
diff --git a/net-misc/freenet6/files/freenet6-4.2.2-noretry.patch b/net-misc/freenet6/files/freenet6-4.2.2-noretry.patch
deleted file mode 100644
index f08c96962abf..000000000000
--- a/net-misc/freenet6/files/freenet6-4.2.2-noretry.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur tspc-advanced.orig/include/tsp_redirect.h tspc-advanced/include/tsp_redirect.h
---- tspc-advanced.orig/include/tsp_redirect.h	2007-04-11 13:51:54.000000000 +0200
-+++ tspc-advanced/include/tsp_redirect.h	2007-04-11 13:52:48.000000000 +0200
-@@ -5,8 +5,8 @@
- #include "config.h"
- #include "xml_tun.h"
- 
--#define DEFAULT_REDIRECT_LAST_SERVER_FILE		"tsp-last-server.txt"
--#define DEFAULT_REDIRECT_BROKER_LIST_FILE		"tsp-broker-list.txt"
-+#define DEFAULT_REDIRECT_LAST_SERVER_FILE		"/tmp/tsp-last-server.txt"
-+#define DEFAULT_REDIRECT_BROKER_LIST_FILE		"/tmp/tsp-broker-list.txt"
- 
- #define MAX_REDIRECT_ADDRESS_LENGTH				255
- #define MAX_REDIRECT_LAST_SERVER_LENGTH			255	
-diff -Naur tspc-advanced.orig/src/tsp/tsp_client.c tspc-advanced/src/tsp/tsp_client.c
---- tspc-advanced.orig/src/tsp/tsp_client.c	2007-04-11 13:51:54.000000000 +0200
-+++ tspc-advanced/src/tsp/tsp_client.c	2007-04-11 13:53:20.000000000 +0200
-@@ -939,6 +939,11 @@
- 	    continue;
- 	  }
- 
-+	  // Do not loop on no-retry
-+	  if (c.retry == 0) {
-+		  connected = 0;
-+		  continue;
-+	  }
- 	  //Display (LOG_LEVEL_1, ELInfo, "tspMain", HEX_STR_DISCONNECTED_RETRY, tspGetErrorByCode(status), c.retry);
- 		Display (LOG_LEVEL_1, ELInfo, "tspMain", HEX_STR_DISCONNECTED_RETRY, c.retry);
- 		SLEEP(c.retry);
diff --git a/net-misc/freenet6/files/freenet6-6.0_beta4-no-template-validation.patch b/net-misc/freenet6/files/freenet6-6.0_beta4-no-template-validation.patch
new file mode 100644
index 000000000000..595ea8189ca7
--- /dev/null
+++ b/net-misc/freenet6/files/freenet6-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/freenet6/files/gw6c.conf b/net-misc/freenet6/files/gw6c.conf
index 8a3f8b4eb2d4..aecd44016d78 100644
--- a/net-misc/freenet6/files/gw6c.conf
+++ b/net-misc/freenet6/files/gw6c.conf
@@ -1,317 +1,348 @@
 #-----------------------------------------------------------------------------
-# $Id: gw6c.conf,v 1.1 2007/04/16 18:45:09 voyageur Exp $
+# $Id: gw6c.conf,v 1.2 2008/11/28 15:58:01 voyageur Exp $
 #-----------------------------------------------------------------------------
 
 ##########################      READ ME!      ################################
-# Dear user, welcome to the Gateway6 Client configuration file. 
-# In order to use the client, you have to modify the 'userid', 
-# 'passwd' and 'server' parameters below according to one of these 3 situations:
+#
+# 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 an account on Freenet6, enter your userid and password below. 
-#    Also change the server name to "broker.freenet6.net". 
+# 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 modify anything and close this file. 
-# 3. If this software was provided by your ISP, put the userid, password and 
+#    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:
-#  userid=anonymous|your_userid
-#   Specify your user name and password as provided by your ISP or Freenet6. 
-#   Use anonymous if you don't have a username and leave the password field empty. 
+# 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=
 
 #
-# Server:
-#   Tunnel broker name or IP address (provided by your ISP or Freenet6).
-#   An optional port number can be added, the default port number is 3653.
+# 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
+#   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
 #
-# For users with accounts on Freenet6, use broker.freenet6.net otherwise anon.freenet6.net.
-# Your ISP may provide you with a different server name. 
+#   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
 
-
-########################## ROUTER CONFIGURATION ###############################
 #
-# Use these parameters for the client to act as a router and give IPv6 
-# to several PCs. 
+# 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.
 #
-# Router flag: 
-#  host_type=host|router
-#   Set this value for the client to act as a router. 
+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.
+
 #
-# Default value: host
+# Local Host Type:
+#   Change this value to 'router' to enable IPv6 advertisements.
 #
-#host_type=router
+#   host_type=<host|router>
+#
+host_type=host
 
 #
-# Prefix length:
-#  prefixlen=24|48|64
-#   Length of the prefix length for the TSP client network. 
-#   Valid values are 64 or 48 for v6anyv4 tunnel, and 24 for v4v6 tunnel.
+# 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.
 #
-# Default value: 48
-# Note: Freenet6 only gives /48 prefixes. 
+#   prefixlen=<integer>
 #
-prefixlen=48
+prefixlen=64
 
 #
-# Interface prefix:
-#  Name of the interface that will be configured to send router advertisements. 
-#  This is an interface index on Windows (for example 4) and a name on Linux and 
-#  BSD, for example eth1 or fxp1. 
+# 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=
+if_prefix=
 
 #
 # DNS Server: 
-#  Specify a local DNS server to which will be delegated the reverse prefix. 
+#   A DNS server list to which the reverse prefix will be delegated. Servers
+#   are separated by the colon(:) delimiter.
 #
-# Example: dns_server=mydnsserver.domain
+#   Example: dns_server=ns1.domain:ns2.domain:ns3.domain
 #
-#dns_server=
+dns_server=
+
 
 ######################### ADVANCED CONFIGURATION ##############################
+
 #
-# Gateway6 directory:
-# Install directory for the Gateway6 Client. Do not modify.
+# Gateway6 Client Installation Directory:
+#   Directory where the Gateway6 Client will be installed. This value has been 
+#   set during installation.
 #
 gw6_dir=/etc/freenet6
 
 #
-# Authentication method:
-#  auth_method=any|digest-md5|anonymous|plain
-#   any:        The most secure method will be used. 
-#   digest-md5: The password is sent encrypted.
-#   plain:      Both username and password in clear.
-#   anonymous:  Sends no username or password
+# 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.
 #
-# Recommended value: any
-#
-auth_method=any
-
 #
-# Retry delay:
-#  Time in seconds between each reconnection in case of timeout (0 = no retry).
+#   auto_retry_connect=<yes|no>
+#   retry_delay=<integer: 0..3600>
+#   retry_delay_max=<integer: 0..3600>
 #
-# Recommended value: 30 seconds
+#   Recommended values: "yes", 30, 300
 #
-retry_delay=0
+auto_retry_connect=yes
+retry_delay=30
+retry_delay_max=300
 
 #
-# Keepalive interval:
-#  Indicates how often the client will send data to keep the tunnel active.
+# Keepalive Feature and Message Interval:
+#   Indicates if and how often the client will send data to keep the tunnel 
+#   active.
 #
-# Recommended values: "yes" and 30 seconds
+#   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: Let the broker choose the best mode for IPv6 tunnel.
-#  v4v6:    IPv4 in IPv6 tunnel.
-
+# 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
+#   Recommended value: v6anyv4
 #
 tunnel_mode=v6anyv4
 
 #
-# Tunnel enterface name:
-#  Interface name of the tunnel. This value us is OS dependent.
+# 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
 #
-# if_tunnel_v6v4 is the tunnel interface name for the v6v4 encapsulation mode
-# if_tunnel_v6udpv4 is the tunnel interface name for the v6udpv4 encap mode
-# if_tunnel_v4v6 is the tunnel interface naem for the v4v6 encapsulation mode
+#   Default values are set during installation.
 #
 if_tunnel_v6v4=sit1
 if_tunnel_v6udpv4=tun
 if_tunnel_v4v6=sit0
 
 #
-# IP addresses of the client:
-#  client_v4=auto|A.B.C.D (valid ipv4 address)
-#  client_v6=auto|X:X::X:X (valid ipv6 address)
-#  auto: Gateway6 Client will find the ip address
+# Local IP Address of the Client:
+#   Allows you to set a specific address as the local tunnel endpoint.
 #
-# Recommended value: auto
+#   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
 
 #
-# Name of the script:
-#  template=checktunnel|freebsd|netbsd|linux|windows|darwin|cisco|
-#   openbsd
+# 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. 
 #
-#  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: windows.bat or linux.sh for example.
+#   Default value is set during installation.
 # 
 template=linux
 
 #
 # Proxy client: 
-#  Indicates this client requests a tunnel for another endpoint, 
-#  a Cisco router for example. 
+#   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. 
+#   NOTE: NAT traversal is not possible in proxy mode. 
 #
 proxy_client=no
 
 
-# Broker Redirection
-#  The 'broker_list' directive specifies the name of the file
-#  where a broker list received during broker redirection will
-#  be saved. 
+############################ BROKER REDIRECTION ###############################
+
+#
+# Broker List File Name:
+#   The 'broker_list' directive specifies the filename where the broker
+#   list received during broker redirection will be saved. 
 #
-#  Default value: tsp-broker-list.txt
+#   broker_list=<file_name>
 #  
-#broker_list=
+broker_list=/var/lib/freenet6/tsp-broker-list.txt
+
 #
-#  The 'last_server' directive specifies the name of the file
-#  where the address of the last broker to which a connection
-#  was successfully established will be saved.
+# 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.
 #
-#  Default value: tsp-last-server.txt
+#   last_server=<file_name>
 #
-#last_server=
+last_server=/var/lib/freenet6/tsp-last-server.txt
+
 #
-#  The value of the 'always_use_same_server' directive determines
-#  if the client should always try to connect to the broker
-#  specified with the 'last_server' directive (if any). 
+# 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. 
 #
-#  Default value: no 
+#   always_use_same_server=<yes|no>
 #
-#always_use_same_server=
+always_use_same_server=no
 
 
+#################################### LOGGING ##################################
 
 #
-# Log destinations:
-#  The format is 'log=destination;level', where
-#  possible values of 'destination' are:
+# Log Verbosity Configuration:
+#   The format is 'log_<destination>=level', where possible values for 
+#   'destination' are:
 #
-#  console (logging to the console)
-#  stderr (logging to standard error)
-#  file (logging to a file)
-#  syslog (logging to syslog [Unix only])
+#   - 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 '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.
 #
-#  Multiple 'log' directives may be specified.
+#   Example:
+#     log_file=3   (Maximal logging to a file)
+#     log_stderr=0 (Logging to standard error disabled)
+#     log_console= (Minimal logging to the console) 
 #
-#  Examples
-#    log=file;3 (Maximal logging to a file)
-#    log=stderr;0 (Logging to stdandard error disabled)
-#    log=console (Minimal logging to the console) 
+#   - Default configuration on Windows platforms:
 #
-#  If 'level' is not specified, a value of 1 is assumed.
-#  In this case, the semicolon should be left out.
+#     log_console=0
+#     log_stderr=0
+#     log_file=1
 #
-#  If no 'log' directive is specified at all, the
-#  following will apply:
+#   - Default configuration on Unix platforms:
 #
-#  On Windows platforms:
+#     log_console=0
+#     log_stderr=1
+#     log_file=0
+#     log_syslog=0
 #
-#    log=console;0
-#    log=stderr;0
-#    log=file;1
-#
-#  On Unix platforms:
-#
-#    log=console;0
-#    log=stderr;1
-#    log=file;0
-#    log=syslog;0
-#
-#log=
+#log_console=
+#log_stderr=
+log_file=2
+log_syslog=1
 
 #
-# Log file name:
-#  When logging to file is requested using the 'log'
-#  directive, the name and path of the file to use
-#  may be specified using the 'log_filename' directive. 
+# 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.
 #
-#  Default value: gw6c.log
+#   log_filename=<file_name>
 #
-#log_filename=
+log_filename=/var/log/gw6c.log
 
 #
-# Log file rotation:
-#  When logging to file is requested using the 'log'
-#  directive, log file rotation may be enabled using
-#  the 'log_rotation' directive.
-#
-#  When enabled, the contents of the log file will be
-#  moved to a backup file just before it reaches the
-#  maximal log file size specified via the 'log_rotation_size'
-#  directive.
+# 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
-#  occured.
+#   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. 
+#   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. 
 #
-#  Default value: yes
+#   log_rotation=<yes|no>
 #
-#log_rotation=no
+log_rotation=yes
 
 #
-# Log file rotation size:
-#  The 'log_rotation_size' directive specifies the
-#  maximal size a log file may reach before rotation
-#  occurs if it is enabled via the 'log_rotation' directive.
+# 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.
 #
-#  The value is expressed in kilobytes.
+#   log_rotation_size=<16|32|128|1024>
 #
-#  Minimal value: 16
-#  Maximal value: 10240
-#  Default value: 32
-#
-#log_rotation_size=
+log_rotation_size=32
 
 #
-# Syslog logging facility [Unix only]:
+# 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>
 #
-#  When logging to syslog is requested using the 'log'
-#  directive, the facility to use may be specified using
-#  the 'syslog_facility' directive.
+log_rotation_delete=no
+
 #
-#  Valid values: USER, LOCAL[0-7]
+# 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.
 #
-#  Default value: USER
+#   syslog_facility=<USER|LOCAL[0-7]>
 #
-#syslog_facility=
+syslog_facility=USER
 
 
 # end of gw6c.conf
-#-----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
diff --git a/net-misc/freenet6/freenet6-6.0_beta4.ebuild b/net-misc/freenet6/freenet6-6.0_beta4.ebuild
new file mode 100644
index 000000000000..36c79b0e19ef
--- /dev/null
+++ b/net-misc/freenet6/freenet6-6.0_beta4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-6.0_beta4.ebuild,v 1.1 2008/11/28 15:58:00 voyageur Exp $
+
+inherit eutils versionator toolchain-funcs
+
+MY_P=gw6c-$(replace_all_version_separators "_")
+MY_P=${MY_P/_beta/-BETA}
+DESCRIPTION="Client to configure an IPv6 tunnel to freenet6"
+HOMEPAGE="http://www.freenet6.net"
+SRC_URI="http://go6.net/4105/file.asp?file_id=151&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}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-5.1-gcc43.patch
+	epatch "${FILESDIR}"/${P}-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/freenet6 target=linux || die "Build Failed"
+}
+
+src_install() {
+	cd "${S}"/tspc-advanced
+	dosbin bin/gw6c
+
+	insopts -m 600
+	insinto /etc/freenet6
+	doins "${FILESDIR}"/gw6c.conf
+	exeinto /etc/freenet6/template
+	doexe template/linux.sh
+
+	newinitd "${FILESDIR}"/gw6c.rc gw6c
+
+	doman man/{man5/gw6c.conf.5,man8/gw6c.8}
+	dodir /var/lib/freenet6
+}
+
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1*"
+	upgrade_from_1_x=$?
+}
+
+pkg_postinst() {
+	if [[ $upgrade_from_1_x = 0 ]] ; then
+		ewarn "Warning: you are upgrading from an older version"
+		ewarn "The configuration file has been renamed to gw6c.conf"
+		ewarn "Remember to port your personal settings from tspc.conf to it"
+		ewarn "The init script has been renamed to 'gw6c',"
+	else
+		elog "The freenet6 ebuild installs an init script named 'gw6c'"
+	fi
+	elog "to coincide with the name of the client binary installed"
+	elog "To add support for a freenet6 connection at startup, do"
+	elog ""
+	elog "# rc-update add gw6c default"
+}
diff --git a/net-misc/freenet6/metadata.xml b/net-misc/freenet6/metadata.xml
index 91f0d879641d..58d6e6ecf26f 100644
--- a/net-misc/freenet6/metadata.xml
+++ b/net-misc/freenet6/metadata.xml
@@ -9,4 +9,7 @@
 	<longdescription>
 		Client to configure an IPv6 tunnel to freenet6
 	</longdescription>
+	<use>
+		<flag name="radvd">Enable support for <pkg>net-misc/radvd</pkg></flag>
+	</use>
 </pkgmetadata>