[gentoo-commits] gentoo-x86 commit in net-misc/freenet6/files: gw6c.conf freenet6-6.0_beta4-no-template-validation.patch freenet6-4.2.2-noretry.patch

[Bernard Cafarelli (voyageur)]

voyageur    08/11/28 15:58:01

  Modified:             gw6c.conf
  Added:                freenet6-6.0_beta4-no-template-validation.patch
  Removed:              freenet6-4.2.2-noretry.patch
  Log:
  Bump to 6.0 beta (connection stability fixes), ebuild cleanup thanks to Flameeyes and Alexandre Hamelin <alexandre.hamelin@×××××.com>. Closes bugs #241064 and #246577
  (Portage version: 2.2_rc16/cvs/Linux 2.6.26-gentoo x86_64)

Revision  Changes    Path
1.2                  net-misc/freenet6/files/gw6c.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/freenet6/files/gw6c.conf?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/freenet6/files/gw6c.conf?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/freenet6/files/gw6c.conf?r1=1.1&r2=1.2

Index: gw6c.conf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/freenet6/files/gw6c.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gw6c.conf	16 Apr 2007 18:45:09 -0000	1.1
+++ gw6c.conf	28 Nov 2008 15:58:01 -0000	1.2
@@ -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
-#
-#  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. 
+# 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: 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. 
 #
-# Note: NAT traversal is not possible in proxy mode. 
+#   proxy_client=<yes|no>
+#
+#   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 ###############################
+
 #
-#  Default value: tsp-broker-list.txt
+# 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=
+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:
-#
-#  console (logging to the console)
-#  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.
+# Log Verbosity Configuration:
+#   The format is 'log_<destination>=level', where possible values for 
+#   'destination' are:
 #
-#  Multiple 'log' directives may be specified.
+#   - console  (logging to the console [AKA stdout])
+#   - stderr   (logging to standard error)
+#   - file     (logging to a file)
+#   - syslog   (logging to syslog [Unix only])
 #
-#  Examples
-#    log=file;3 (Maximal logging to a file)
-#    log=stderr;0 (Logging to stdandard error disabled)
-#    log=console (Minimal logging to the console) 
+#   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.
 #
-#  If 'level' is not specified, a value of 1 is assumed.
-#  In this case, the semicolon should be left out.
+#   Example:
+#     log_file=3   (Maximal logging to a file)
+#     log_stderr=0 (Logging to standard error disabled)
+#     log_console= (Minimal logging to the console) 
 #
-#  If no 'log' directive is specified at all, the
-#  following will apply:
+#   - Default configuration on Windows platforms:
 #
-#  On Windows platforms:
+#     log_console=0
+#     log_stderr=0
+#     log_file=1
 #
-#    log=console;0
-#    log=stderr;0
-#    log=file;1
+#   - Default configuration on Unix platforms:
 #
-#  On Unix platforms:
+#     log_console=0
+#     log_stderr=1
+#     log_file=0
+#     log_syslog=0
 #
-#    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
-#-----------------------------------------------------------------------------
+#------------------------------------------------------------------------------



1.1                  net-misc/freenet6/files/freenet6-6.0_beta4-no-template-validation.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/freenet6/files/freenet6-6.0_beta4-no-template-validation.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/freenet6/files/freenet6-6.0_beta4-no-template-validation.patch?rev=1.1&content-type=text/plain

Index: freenet6-6.0_beta4-no-template-validation.patch
===================================================================
--- 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 );