Update to 5.1

Please note that the name of the program and the configuration files
has changed dramatically.

8 files changed, 48 insertions, 76 deletions

diff --git a/net/freenet6/files/freenet6.sh.in b/net/freenet6/files/freenet6.in
index a7f9ffe50d9a..ee544e898472 100644
--- a/net/freenet6/files/freenet6.sh.in
+++ b/net/freenet6/files/freenet6.in
@@ -16,7 +16,7 @@
 # Add the following lines to /etc/rc.conf to enable freenet6:
 #
 # freenet6_enable="YES"
-# freenet6_flags="-f %%PREFIX%%/etc/tspc.conf"
+# freenet6_flags="-f %%PREFIX%%/etc/gw6c.conf"
 #
 
 . %%RC_SUBR%%
@@ -24,13 +24,13 @@
 name=freenet6
 rcvar=`set_rcvar`
 
-command=%%PREFIX%%/bin/tspc
-required_files=%%PREFIX%%/etc/tspc.conf
+command=%%PREFIX%%/bin/gw6c
+required_files=%%PREFIX%%/etc/gw6c.conf
 
 # set defaults
 
 freenet6_enable=${freenet6_enable:-"NO"}
-freenet6_flags=${freenet6_flags:-"-f %%PREFIX%%/etc/tspc.conf"}
+freenet6_flags=${freenet6_flags:-"-f %%PREFIX%%/etc/gw6c.conf"}
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/net/freenet6/files/patch-conf::tspc.conf.in b/net/freenet6/files/patch-conf::tspc.conf.in
deleted file mode 100644
index 9d6954203dc2..000000000000
--- a/net/freenet6/files/patch-conf::tspc.conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/tspc.conf.in.orig	Sat Nov 20 14:57:43 2004
-+++ conf/tspc.conf.in	Sat Nov 20 14:57:53 2004
-@@ -87,7 +87,7 @@
- # on unix, '.sh' is added to the name of the script. 
- # on windows, '.bat' is added to the name of the script.
- # 
--template=@target@
-+template=tspc-@target@
- 
- #
- # 'server' is the tunnel broker identifier
diff --git a/net/freenet6/files/patch-src::lib::config.c b/net/freenet6/files/patch-src::lib::config.c
deleted file mode 100644
index 235cf1186313..000000000000
--- a/net/freenet6/files/patch-src::lib::config.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/config.c.orig	Wed Jun 30 01:06:13 2004
-+++ src/lib/config.c	Sat Nov 20 14:44:44 2004
-@@ -270,7 +270,7 @@
- int tspInitialize(int argc, char *argv[], tConf *Conf)
- {
-   tConf CmdLine;
--  char *Templ = "template";
-+  char *Templ = "bin";
- 
-   Conf->tsp_dir      = NULL;
-   Conf->server       = "";
diff --git a/net/freenet6/files/patch-src__tsp__tsp_setup.c b/net/freenet6/files/patch-src__tsp__tsp_setup.c
new file mode 100644
index 000000000000..5b7d2ca84de5
--- /dev/null
+++ b/net/freenet6/files/patch-src__tsp__tsp_setup.c
@@ -0,0 +1,27 @@
+--- src/tsp/tsp_setup.c.orig	2008-07-20 23:56:23.000000000 +1000
++++ src/tsp/tsp_setup.c	2008-07-20 23:57:19.000000000 +1000
+@@ -273,7 +273,7 @@
+   //
+   if( buffer[0] == 0x00 )
+   {
+-    snprintf( buffer, sizeof buffer, "%s%c%s.%s", ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
++    snprintf( buffer, sizeof buffer, "%s%cgw6c-%s.%s", ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
+ 
+     f_test = fopen( buffer, "r" );
+     if( f_test == NULL )
+@@ -290,13 +290,13 @@
+     if( ScriptInterpretor != NULL )
+     {
+       snprintf( buffer, sizeof buffer, 
+-               "%s \"%s%c%s.%s\"", 
++               "%s \"%s%cgw6c-%s.%s\"", 
+                ScriptInterpretor, ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
+     }
+     else
+     {
+       snprintf( buffer, sizeof buffer, 
+-                "\"%s%c%s.%s\"",  
++                "\"%s%cgw6c-%s.%s\"",  
+                 ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
+     }
+   }
diff --git a/net/freenet6/files/patch-src_lib_config.c b/net/freenet6/files/patch-src_lib_config.c
new file mode 100644
index 000000000000..87f5e1c39cea
--- /dev/null
+++ b/net/freenet6/files/patch-src_lib_config.c
@@ -0,0 +1,11 @@
+--- src/lib/config.c.orig	2007-11-29 04:27:29.000000000 +1100
++++ src/lib/config.c	2008-07-20 23:56:02.000000000 +1000
+@@ -284,7 +284,7 @@
+   tConf CmdLine;
+   int status = NO_ERROR;
+   struct in_addr addr;
+-  const char* cszTemplDir = "template";
++  const char* cszTemplDir = "bin";
+ #ifdef V4V6_SUPPORT
+   struct in6_addr addr6;
+ #endif
diff --git a/net/freenet6/files/patch5-template::freebsd.sh b/net/freenet6/files/patch5-template::freebsd.sh
deleted file mode 100644
index 4b0c23d9e681..000000000000
--- a/net/freenet6/files/patch5-template::freebsd.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- template/freebsd.sh.orig	Fri Jun 11 12:41:18 2004
-+++ template/freebsd.sh	Sat Nov 20 14:56:36 2004
-@@ -80,7 +80,7 @@
- Display 1 '--- Start of configuration script. ---'
- Display 1 "Script: " `basename $0`
- 
--gifconfig=/usr/sbin/gifconfig
-+gifconfig=/usr/sbin/ifconfig
- ifconfig=/sbin/ifconfig
- route=/sbin/route
- rtadvd=/usr/sbin/rtadvd
diff --git a/net/freenet6/files/patch7-plstform__freebsd__tsp_local.c b/net/freenet6/files/patch7-plstform__freebsd__tsp_local.c
deleted file mode 100644
index e6b9ddb5849f..000000000000
--- a/net/freenet6/files/patch7-plstform__freebsd__tsp_local.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- platform/freebsd/tsp_local.c.orig	2004-03-30 23:27:35.000000000 +0200
-+++ platform/freebsd/tsp_local.c	2007-07-11 13:40:26.000000000 +0200
-@@ -74,21 +74,16 @@
- /* freebsd specific to setup an env variable */
- 
- void
- tspSetEnv(char *Variable, char *Value, int Flag)
- {
--	char *buf;
- 	if(Value) {
--		int size=(strlen(Variable) + strlen(Value) + 2);
--		if((buf=malloc(size)) == NULL) {
-+	        if(setenv(Variable, Value, Flag) == -1) {
- 			Display(1, ELError, "SetEnv", "Not enough memory!");
- 			return;
- 		}
--		snprintf(buf, size, "%s=%s", Variable, Value);
--		putenv(buf);
--		Display(2, ELNotice, "tspSetEnv", "%s", buf);
--		free(buf);
-+		Display(2, ELNotice, "tspSetEnv", "%s=%s", Variable, Value);
- 	}
- }
- 
- 
- /* tspSetupTunnel() will callback here */
-
-
diff --git a/net/freenet6/files/pkg-message.in b/net/freenet6/files/pkg-message.in
index 67aae6f922db..835029612ef6 100644
--- a/net/freenet6/files/pkg-message.in
+++ b/net/freenet6/files/pkg-message.in
@@ -1,14 +1,9 @@
 Now that the package is installed, please finish it with the following steps:
 
-- Copy %%EXAMPLESDIR%%/tspc.conf.sample to %%PREFIX%%/etc/tspc.conf
-- Check the values of %%PREFIX%%/etc/tspc.conf. If you have registered at
+- Copy %%EXAMPLESDIR%%/gw5c.conf to %%PREFIX%%/etc/gw6c.conf
+- Check the values of %%PREFIX%%/etc/gw6c.conf. If you have registered at
   the website, fill in your userid and password there.
-- Run %%PREFIX%%/etc/rc.d/freenet6.sh to start the tunnel.
-- Try to ping a IPv6 host, for example: ping6 www.jp.freebsd.org
-
-Please note that tsps[12].freenet6.net are not in service anymore,
-please use broker.freenet6.net instead.
-
-Net/freenet6 now supports rc.subr.
-Please add 'freenet6_enable="YES"' to your /etc/rc.conf to make it
-start autoamtically at startup.
+- Add 'freenet6_enable="YES"' to your /etc/rc.conf to make it start
+  automatically.
+- Run %%PREFIX%%/etc/rc.d/freenet6 to start the tunnel.
+- Try to ping a IPv6 host, for example: ping6 www.freebsd.org