Date: Mon, 16 Nov 2009 21:34:31 +0100 (CET) From: "Emanuele A. Bagnaschi" <zephyrus.271@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/140610: Update port: net/freenet6 Port update to 6.0.1 Message-ID: <20091116203431.19923446@polaris.localdomain> Resent-Message-ID: <200911162100.nAGL0Bbp023095@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140610
>Category: ports
>Synopsis: Update port: net/freenet6 Port update to 6.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 16 21:00:10 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Emanuele A. Bagnaschi <zephyrus.271@gmail.com>
>Release: FreeBSD 8.0-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD polaris 8.0-PRERELEASE FreeBSD 8.0-PRERELEASE #4: Sat Nov 14 11:20:31 CET 2009 toor@polaris:/usr/obj/usr/src/sys/POLARIS amd64
>Description:
I've updated the freenet6 port to version 6.0.1.
The patches that were present in the previous version were also ported (they are needed to run the 'gw6c-'freebsd.sh script in the 'bin/' directory instead of 'template/' which was
the one chosen upstream).
To cope with the fact that now the configuration
file is dinamically generated in the install phase, I had to move
from manual installation in the port Makefile (as it was done in the old port) to the usage of 'make install'.
I also moved the configuration file 'gw6c.conf.example', along with the 'README' of 'gw6c-freebsd.sh', to ' etc/freenet6/ instead of just plain etc/.
If you would like to revert to the old position, or have any other requests, please let me know.
I've tested it personally as it seems to work as expected.
Best Regards
Emanuele A. Bagnaschi
>How-To-Repeat:
>Fix:
--- freenet6.shar begins here ---
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# freenet6
# freenet6/files
# freenet6/files/freenet6.in
# freenet6/files/pkg-message.in
# freenet6/files/patch-src_lib_config.c
# freenet6/files/patch-Makefiles-etcdir.patch
# freenet6/files/patch-src__tsp__tsp_setup.c
# freenet6/Makefile
# freenet6/distinfo
# freenet6/pkg-descr
# freenet6/pkg-plist
#
echo c - freenet6
mkdir -p freenet6 > /dev/null 2>&1
echo c - freenet6/files
mkdir -p freenet6/files > /dev/null 2>&1
echo x - freenet6/files/freenet6.in
sed 's/^X//' >freenet6/files/freenet6.in << '3827c6b6a79d8aa0320e385f1e9d30a3'
X#!/bin/sh
X#
X# $FreeBSD: ports/net/freenet6/files/freenet6.in,v 1.1 2008/07/20 14:02:42 edwin Exp $
X#
X
X#
X# PROVIDE: freenet6
X# REQUIRE: NETWORKING netif named
X# BEFORE: ip6addrctl
X# KEYWORD: shutdown
X#
X
X#
X# Start or stop the IPv6 tunnel to Freenet6.net
X#
X# Add the following lines to /etc/rc.conf to enable freenet6:
X#
X# freenet6_enable="YES"
X# freenet6_flags="-f %%PREFIX%%/etc/gw6c.conf"
X#
X
X. %%RC_SUBR%%
X
Xname=freenet6
Xrcvar=`set_rcvar`
X
Xcommand=%%PREFIX%%/bin/gw6c
Xrequired_files=%%PREFIX%%/etc/freenet6/gw6c.conf
X
X# set defaults
X
Xfreenet6_enable=${freenet6_enable:-"NO"}
Xfreenet6_flags=${freenet6_flags:-"-f %%PREFIX%%/etc/freenet6/gw6c.conf"}
X
Xload_rc_config $name
Xrun_rc_command "$1"
3827c6b6a79d8aa0320e385f1e9d30a3
echo x - freenet6/files/pkg-message.in
sed 's/^X//' >freenet6/files/pkg-message.in << 'e9d85208dc5361f95b1b8cdff2f5e83b'
XNow that the package is installed, please finish it with the following steps:
X
X- Copy %%PREFIX%%/etc/gw6c.conf.example to %%PREFIX%%/etc/gw6c.conf
X- Check the values of %%PREFIX%%/etc/gw6c.conf. If you have registered at
X the website, fill in your userid and password there.
X- Add 'freenet6_enable="YES"' to your /etc/rc.conf to make it start
X automatically.
X- Run %%PREFIX%%/etc/rc.d/freenet6 to start the tunnel.
X- Try to ping a IPv6 host, for example: ping6 www.freebsd.org
e9d85208dc5361f95b1b8cdff2f5e83b
echo x - freenet6/files/patch-src_lib_config.c
sed 's/^X//' >freenet6/files/patch-src_lib_config.c << '8d2ded0bdbab66bed1dd4dd75039fdff'
X--- src/lib/config.c.orig 2009-05-19 18:22:06.000000000 +0200
X+++ src/lib/config.c 2009-11-15 17:57:52.000000000 +0100
X@@ -264,7 +264,7 @@
X {
X tConf CmdLine;
X gw6c_status status = STATUS_SUCCESS_INIT;
X- const char* cszTemplDir = "template";
X+ const char* cszTemplDir = "bin";
X
X
X // Hard-coded parameters. Not configurable anymore.
8d2ded0bdbab66bed1dd4dd75039fdff
echo x - freenet6/files/patch-Makefiles-etcdir.patch
sed 's/^X//' >freenet6/files/patch-Makefiles-etcdir.patch << 'b716a596810420e92563e5fd4a476f9d'
X--- template/Makefile.orig 2009-11-15 19:42:51.000000000 +0100
X+++ template/Makefile 2009-11-15 19:43:01.000000000 +0100
X@@ -17,8 +17,10 @@
X
X install:
X @echo "Installing templates ..."
X- @for template_var in README $(PLATFORM).sh; do \
X- cp $${template_var} $(INSTALL_TEMPL)/$${template_var}; \
X+ @for template_var in $(PLATFORM).sh; do \
X+ cp $${template_var} $(INSTALL_BIN)/gw6c-$${template_var}; \
X done
X+ @mkdir -p $(ETCDIR)
X+ @cp README $(ETCDIR)
X
X clean:
X--- Makefile.orig 2009-11-15 19:50:40.000000000 +0100
X+++ Makefile 2009-11-15 19:50:57.000000000 +0100
X@@ -167,17 +167,14 @@
X @mkdir -p $(INSTALL_DIR)
X @mkdir -p $(INSTALL_BIN)
X @mkdir -p $(INSTALL_MAN)
X- @mkdir -p $(INSTALL_TEMPL)
X
X @for dir in ${SUBDIRS}; do \
X $(MAKE) -C $$dir install || exit 1; \
X done
X
X @cp $(TARGET) $(INSTALL_BIN)
X- @cp $(BIN_DIR)/gw6c.conf.sample $(INSTALL_BIN)
X- @[ -f $(INSTALL_BIN)/gw6c.conf ] || { \
X- cp $(INSTALL_BIN)/gw6c.conf.sample $(INSTALL_BIN)/gw6c.conf; \
X- }
X+ @mkdir -p $(ETCDIR)
X+ @cp $(BIN_DIR)/gw6c.conf.sample $(ETCDIR)
X
X
X # This makefile target will clean the build tree of the Gateway6 Client.
b716a596810420e92563e5fd4a476f9d
echo x - freenet6/files/patch-src__tsp__tsp_setup.c
sed 's/^X//' >freenet6/files/patch-src__tsp__tsp_setup.c << '9502ea30cdf018d2e9a49aa569516ecd'
X--- src/tsp/tsp_setup.c.orig 2009-11-15 20:06:20.000000000 +0100
X+++ src/tsp/tsp_setup.c 2009-11-15 20:07:10.000000000 +0100
X@@ -262,7 +262,7 @@
X //
X if( buffer[0] == 0x00 )
X {
X- pal_snprintf( buffer, sizeof buffer, "%s%c%s.%s", ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
X+ pal_snprintf( buffer, sizeof buffer, "%s%cgw6c-%s.%s", ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
X
X f_test = fopen( buffer, "r" );
X if( f_test == NULL )
X@@ -279,13 +279,13 @@
X if( ScriptInterpretor != NULL )
X {
X pal_snprintf( buffer, sizeof buffer,
X- "%s \"%s%c%s.%s\"",
X+ "%s \"%s%cgw6c-%s.%s\"",
X ScriptInterpretor, ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
X }
X else
X {
X pal_snprintf( buffer, sizeof buffer,
X- "\"%s%c%s.%s\"",
X+ "\"%s%cgw6c-%s.%s\"",
X ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
X }
X }
9502ea30cdf018d2e9a49aa569516ecd
echo x - freenet6/Makefile
sed 's/^X//' >freenet6/Makefile << '1095d8b0d75b4eaef10192744f26129b'
X# New ports collection makefile for: freenet6
X# Date created: 11 Oct 2001
X# Whom: Edwin Groothuis (edwin@mavetju.org)
X#
X# $FreeBSD: ports/net/freenet6/Makefile,v 1.29 2008/07/24 08:15:26 edwin Exp $
X#
X
XPORTNAME= freenet6
XPORTVERSION= 6.0.1
XCATEGORIES= net ipv6
XMASTER_SITES= http://go6.net/4105/file.asp?file_id=166&;
XDISTNAME= tspc-${PORTVERSION}-src
XEXTRACT_SUFX= .tgz
X
XMAINTAINER= edwin@mavetju.org
XCOMMENT= Hexago Freenet6 Tunnel Setup Protocol Client - Free IPv6 tunnel
X
XUSE_RC_SUBR= yes
XWRKSRC= ${WRKDIR}/gw6c-6_0_1/tspc-advanced
X
XMAN8= gw6c.8
XMAN5= gw6c.conf.5
X
XPKGMESSAGE= ${WRKDIR}/pkg-message
XUSE_RC_SUBR= freenet6
XSUB_FILES= pkg-message
X
XUSE_GMAKE= yes
XMAKE_ARGS= target=freebsd installdir=${PREFIX} ETCDIR=${ETCDIR}
X
X.include <bsd.port.pre.mk>
X
Xpost-fetch:
X if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
X ${MV} ${DISTDIR}/file.asp*file_id*166* \
X ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; \
X fi
X
Xpost-install:
X @${CAT} ${PKGMESSAGE}
X
X.include <bsd.port.post.mk>
1095d8b0d75b4eaef10192744f26129b
echo x - freenet6/distinfo
sed 's/^X//' >freenet6/distinfo << '895a0639b47929bfd746faf4c18e8c67'
XMD5 (tspc-6.0.1-src.tgz) = 0851184a08605e0a2b7395899e55c433
XSHA256 (tspc-6.0.1-src.tgz) = e6b345f11398026c8be17e0c26fc22632a6a1053bbf18b5303e514cf44b52c4a
XSIZE (tspc-6.0.1-src.tgz) = 2873856
895a0639b47929bfd746faf4c18e8c67
echo x - freenet6/pkg-descr
sed 's/^X//' >freenet6/pkg-descr << 'faa0d22fcbd3c763fec2bb9721f4103a'
XWhat is Freenet6?
X
XFreenet6 is an IPv6 access service offered for free to the community.
XThis service enables thousands of people from all over the world
Xto experience the best solution for a smooth and incremental
Xdeployment of IPv6. Freenet6 users can get IPv6 connectivity from
Xanywhere, including from behind any NAT device or from outside of
Xtheir home network.
X
XOn Freenet6, a single, permanent IPv6 address and a DNS name are
Xassigned to each user, making their PC reachable from anywhere on
Xthe IPv6 internet. A full /48 prefix may also be assigned to a
Xrouter, enabling the distribution of IPv6 connectivity to an entire
Xnetwork. Freenet 6 - Get Connected For Free!
X
XInstead of a Web interface, which is usually offered by traditional
Xtunnel brokers, Freenet6 uses an innovative model based on a
Xclient/server architecture. The Gateway6 Client is software that
Xusually runs on a PC and that implements the Tunnel Setup Protocol
X(TSP). The Gateway6 Client is used to automatically negotiate a
Xconfigured tunnel between a PC or router and the Freenet6 tunnel
Xbroker, making IPv6 easy to install and maintain. The Gateway6
XClient source code is licensed under the GPL. A commercial license
Xis also available.
X
XWWW: http://www.go6.net/4105/freenet.asp
faa0d22fcbd3c763fec2bb9721f4103a
echo x - freenet6/pkg-plist
sed 's/^X//' >freenet6/pkg-plist << '70b1606e5906099b51be91e7b184d157'
Xbin/gw6c
Xbin/gw6c-freebsd.sh
Xetc/freenet6/README
Xetc/freenet6/gw6c.conf.sample
X@dirrm etc/freenet6
70b1606e5906099b51be91e7b184d157
exit
--- freenet6.shar ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091116203431.19923446>