Big version bump

(Portage version: 2.1.2.4)

6 files changed, 438 insertions, 1 deletions

diff --git a/net-misc/freenet6/ChangeLog b/net-misc/freenet6/ChangeLog
index 0b0c9ecfad6a..c60e67c3909f 100644
--- a/net-misc/freenet6/ChangeLog
+++ b/net-misc/freenet6/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/freenet6
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.15 2007/04/15 22:22:28 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.16 2007/04/16 18:45:09 voyageur Exp $
+
+*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:
diff --git a/net-misc/freenet6/files/digest-freenet6-4.2.2 b/net-misc/freenet6/files/digest-freenet6-4.2.2
new file mode 100644
index 000000000000..462f244cf921
--- /dev/null
+++ b/net-misc/freenet6/files/digest-freenet6-4.2.2
@@ -0,0 +1,3 @@
+MD5 5e64305e1408b0d3c2c2a5803692eb93 gw6c4_2_2src.tar.gz 113738
+RMD160 d918e08bf1670a2e875880bdef582ad2a971ed38 gw6c4_2_2src.tar.gz 113738
+SHA256 938021f16f88f984c33f714b3f7a75c54927e0d63f1a0bdfc723a03758e9ee73 gw6c4_2_2src.tar.gz 113738
diff --git a/net-misc/freenet6/files/freenet6-4.2.2-noretry.patch b/net-misc/freenet6/files/freenet6-4.2.2-noretry.patch
new file mode 100644
index 000000000000..f08c96962abf
--- /dev/null
+++ b/net-misc/freenet6/files/freenet6-4.2.2-noretry.patch
@@ -0,0 +1,29 @@
+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/gw6c.conf b/net-misc/freenet6/files/gw6c.conf
new file mode 100644
index 000000000000..8a3f8b4eb2d4
--- /dev/null
+++ b/net-misc/freenet6/files/gw6c.conf
@@ -0,0 +1,317 @@
+#-----------------------------------------------------------------------------
+# $Id: gw6c.conf,v 1.1 2007/04/16 18:45:09 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:
+# 
+# 1. If you created an account on Freenet6, enter your userid and password below. 
+#    Also change the server name to "broker.freenet6.net". 
+# 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 
+#    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. 
+#
+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.
+#  
+# 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. 
+#
+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. 
+#
+# Router flag: 
+#  host_type=host|router
+#   Set this value for the client to act as a router. 
+#
+# Default value: host
+#
+#host_type=router
+
+#
+# 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.
+#
+# Default value: 48
+# Note: Freenet6 only gives /48 prefixes. 
+#
+prefixlen=48
+
+#
+# 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. 
+#
+#if_prefix=
+
+#
+# DNS Server: 
+#  Specify a local DNS server to which will be delegated the reverse prefix. 
+#
+# Example: dns_server=mydnsserver.domain
+#
+#dns_server=
+
+######################### ADVANCED CONFIGURATION ##############################
+#
+# Gateway6 directory:
+# Install directory for the Gateway6 Client. Do not modify.
+#
+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
+#
+# Recommended value: any
+#
+auth_method=any
+
+#
+# Retry delay:
+#  Time in seconds between each reconnection in case of timeout (0 = no retry).
+#
+# Recommended value: 30 seconds
+#
+retry_delay=0
+
+#
+# Keepalive interval:
+#  Indicates how often the client will send data to keep the tunnel active.
+#
+# Recommended values: "yes" and 30 seconds
+#
+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.
+
+#
+# Recommended value: v6anyv4
+#
+tunnel_mode=v6anyv4
+
+#
+# Tunnel enterface name:
+#  Interface name of the tunnel. This value us is OS dependent.
+#
+# 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
+#
+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
+#
+# 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. 
+#
+# Default value: windows.bat or linux.sh for example.
+# 
+template=linux
+
+#
+# Proxy client: 
+#  Indicates this client requests a tunnel for another endpoint, 
+#  a Cisco router for example. 
+#
+# 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. 
+#
+#  Default value: tsp-broker-list.txt
+#  
+#broker_list=
+#
+#  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.
+#
+#  Default value: tsp-last-server.txt
+#
+#last_server=
+#
+#  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). 
+#
+#  Default value: no 
+#
+#always_use_same_server=
+
+
+
+#
+# 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.
+#
+#  Multiple 'log' directives may be specified.
+#
+#  Examples
+#    log=file;3 (Maximal logging to a file)
+#    log=stderr;0 (Logging to stdandard error disabled)
+#    log=console (Minimal logging to the console) 
+#
+#  If 'level' is not specified, a value of 1 is assumed.
+#  In this case, the semicolon should be left out.
+#
+#  If no 'log' directive is specified at all, the
+#  following will apply:
+#
+#  On Windows platforms:
+#
+#    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 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. 
+#
+#  Default value: gw6c.log
+#
+#log_filename=
+
+#
+# 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.
+#
+#  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.
+#
+#  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=no
+
+#
+# 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.
+#
+#  The value is expressed in kilobytes.
+#
+#  Minimal value: 16
+#  Maximal value: 10240
+#  Default value: 32
+#
+#log_rotation_size=
+
+#
+# Syslog logging facility [Unix only]:
+#
+#  When logging to syslog is requested using the 'log'
+#  directive, the facility to use may be specified using
+#  the 'syslog_facility' directive.
+#
+#  Valid values: USER, LOCAL[0-7]
+#
+#  Default value: USER
+#
+#syslog_facility=
+
+
+# end of gw6c.conf
+#-----------------------------------------------------------------------------
diff --git a/net-misc/freenet6/files/gw6c.rc b/net-misc/freenet6/files/gw6c.rc
new file mode 100644
index 000000000000..e7bdb5e01ce2
--- /dev/null
+++ b/net-misc/freenet6/files/gw6c.rc
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+
+FREENET6_CLIENT="/usr/sbin/gw6c"
+
+depend() {
+	need net
+	use dns logger
+}
+
+start() {
+	ebegin "Starting Freenet6 IPv6 Client"
+	start-stop-daemon --start --quiet \
+		--exec $FREENET6_CLIENT -- -f /etc/freenet6/gw6c.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Freenet6 IPv6 Client"
+	start-stop-daemon --stop --quiet --exec $FREENET6_CLIENT
+	eend $?
+}
diff --git a/net-misc/freenet6/freenet6-4.2.2.ebuild b/net-misc/freenet6/freenet6-4.2.2.ebuild
new file mode 100644
index 000000000000..cb1502d6f6c8
--- /dev/null
+++ b/net-misc/freenet6/freenet6-4.2.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-4.2.2.ebuild,v 1.1 2007/04/16 18:45:09 voyageur Exp $
+
+inherit eutils versionator
+
+MY_PV=$(replace_all_version_separators "_")
+DESCRIPTION="Client to configure an IPv6 tunnel to freenet6"
+HOMEPAGE="http://www.freenet6.net/"
+SRC_URI="mirror://gentoo/gw6c${MY_PV}src.tar.gz"
+
+LICENSE="VPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/tspc-advanced"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-noretry.patch
+}
+
+src_compile() {
+	emake all target=linux || die "Build Failed"
+}
+
+src_install() {
+	dosbin bin/gw6c
+
+	insopts -m 600
+	insinto /etc/freenet6
+	doins ${FILESDIR}/gw6c.conf
+	exeinto /etc/freenet6/template
+	doexe template/{linux,checktunnel}.sh
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/gw6c.rc gw6c
+
+	doman man/{man5/gw6c.conf.5,man8/gw6c.8}
+}
+
+pkg_postinst() {
+	if has_version '=net-misc/freenet6-1*' ; 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"
+}