diff --git a/net/Makefile b/net/Makefile index 0782339d5c8a..6ba16fc1ac2b 100644 --- a/net/Makefile +++ b/net/Makefile @@ -161,7 +161,6 @@ SUBDIR += fping SUBDIR += freebsd-uucp SUBDIR += freediameter - SUBDIR += freenet6 SUBDIR += freeradius-client SUBDIR += freeradius3 SUBDIR += freerdp diff --git a/net/freenet6/Makefile b/net/freenet6/Makefile deleted file mode 100644 index 20ec8ce19064..000000000000 --- a/net/freenet6/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# Created by: Edwin Groothuis -# $FreeBSD$ - -PORTNAME= freenet6 -DISTVERSION= 6_0_1 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= http://go6.net/4105/file.asp?file_id=166& -DISTNAME= tspc-${PORTVERSION}-src - -MAINTAINER= ports@FreeBSD.org -COMMENT= Hexago Freenet6 Tunnel Setup Protocol Client - Free IPv6 tunnel - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/../CLIENT-LICENSE.TXT - -USES= gmake ssl tar:tgz -MAKE_ARGS= target=freebsd CC="${CC}" CXX="${CXX}" \ - installdir="${STAGEDIR}${PREFIX}" ETCDIR="${ETCDIR}" - -WRKSRC= ${WRKDIR}/gw6c-${DISTVERSION}/tspc-advanced - -USE_RC_SUBR= freenet6 -SUB_FILES= pkg-message - -MAKE_JOBS_UNSAFE=yes - -.include - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= incomplete definition of type 'struct dsa_st' -BROKEN_FreeBSD_13= incomplete definition of type 'struct dsa_st' -.endif - -post-fetch: - @if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ - ${MV} ${DISTDIR}/file.asp*file_id*166* \ - ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; \ - fi - -.include diff --git a/net/freenet6/distinfo b/net/freenet6/distinfo deleted file mode 100644 index 4847c976833e..000000000000 --- a/net/freenet6/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (tspc-6.0.1-src.tgz) = e6b345f11398026c8be17e0c26fc22632a6a1053bbf18b5303e514cf44b52c4a -SIZE (tspc-6.0.1-src.tgz) = 2873856 diff --git a/net/freenet6/files/freenet6.in b/net/freenet6/files/freenet6.in deleted file mode 100644 index 070ab843c53d..000000000000 --- a/net/freenet6/files/freenet6.in +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# -# PROVIDE: freenet6 -# REQUIRE: NETWORKING netif named -# BEFORE: ip6addrctl -# KEYWORD: shutdown -# - -# -# Start or stop the IPv6 tunnel to Freenet6.net -# -# Add the following lines to /etc/rc.conf to enable freenet6: -# -# freenet6_enable="YES" -# freenet6_flags="-f %%PREFIX%%/etc/gw6c.conf" -# - -. /etc/rc.subr - -name=freenet6 -rcvar=freenet6_enable -sig_stop="HUP" - -command=%%PREFIX%%/bin/gw6c -required_files=%%PREFIX%%/etc/freenet6/gw6c.conf - -# set defaults - -freenet6_enable=${freenet6_enable:-"NO"} -freenet6_flags=${freenet6_flags:-"-f %%PREFIX%%/etc/freenet6/gw6c.conf"} - -load_rc_config $name -run_rc_command "$1" diff --git a/net/freenet6/files/patch-Makefile b/net/freenet6/files/patch-Makefile deleted file mode 100644 index 5b2733c35166..000000000000 --- a/net/freenet6/files/patch-Makefile +++ /dev/null @@ -1,59 +0,0 @@ ---- ./Makefile.orig 2009-05-19 12:51:11.000000000 -0400 -+++ ./Makefile 2014-06-27 04:03:52.000000000 -0400 -@@ -74,7 +74,7 @@ - # - .PHONY: all platform-check check-gw6c-pal check-gw6c-config check-gw6c-messaging build-gw6c check-gw6c-install install clean cleanall - --all: platform-check check-gw6c-pal check-gw6c-config check-gw6c-messaging build-gw6c -+all: platform-check check-gw6c-config check-gw6c-messaging build-gw6c - - - # This makefile target will check the platform. -@@ -117,7 +117,7 @@ - # This makefile target will check and build the Gateway6 Client Configuration - # Subsystem if it is not built. - # --check-gw6c-config: -+check-gw6c-config: check-gw6c-pal - @[ -d ${GW6CCFG_DIR} ] || { \ - echo "Gateway6 Client Configuration Subsystem module is not found. (${GW6CCFG_DIR})"; \ - exit 1 ; \ -@@ -131,7 +131,7 @@ - # This makefile target will check and build the Gateway6 Client Messaging - # Subsystem if it is not built. - # --check-gw6c-messaging: -+check-gw6c-messaging: check-gw6c-pal - @[ -d ${GW6CMSG_DIR} ] || { \ - echo "Gateway6 Client Messaging Subsystem module is not found. (${GW6CMSG_DIR})"; \ - exit 1 ; \ -@@ -144,7 +144,7 @@ - - # This makefile target will build the Gateway6 Client. - # --build-gw6c: -+build-gw6c: check-gw6c-pal - mkdir -p $(OBJS_DIR) - mkdir -p $(BIN_DIR) - @for dir in ${SUBDIRS}; do \ -@@ -167,17 +167,14 @@ - @mkdir -p $(INSTALL_DIR) - @mkdir -p $(INSTALL_BIN) - @mkdir -p $(INSTALL_MAN) -- @mkdir -p $(INSTALL_TEMPL) - - @for dir in ${SUBDIRS}; do \ - $(MAKE) -C $$dir install || exit 1; \ - done - -- @cp $(TARGET) $(INSTALL_BIN) -- @cp $(BIN_DIR)/gw6c.conf.sample $(INSTALL_BIN) -- @[ -f $(INSTALL_BIN)/gw6c.conf ] || { \ -- cp $(INSTALL_BIN)/gw6c.conf.sample $(INSTALL_BIN)/gw6c.conf; \ -- } -+ ${BSD_INSTALL_PROGRAM} $(TARGET) $(INSTALL_BIN) -+ @mkdir -p $(DESTDIR)$(ETCDIR) -+ ${BSD_INSTALL_DATA} $(BIN_DIR)/gw6c.conf.sample $(DESTDIR)$(ETCDIR) - - - # This makefile target will clean the build tree of the Gateway6 Client. diff --git a/net/freenet6/files/patch-conf__Makefile b/net/freenet6/files/patch-conf__Makefile deleted file mode 100644 index 9c2efccfb25f..000000000000 --- a/net/freenet6/files/patch-conf__Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ./conf/Makefile.orig 2009-05-19 12:50:14.000000000 -0400 -+++ ./conf/Makefile 2014-06-27 03:51:00.000000000 -0400 -@@ -32,7 +32,7 @@ - -e "s+@ifname_v6udpv4@+$(PLATFORM_V6UDPV4)+" \ - -e "s+@ifname_v6v4@+$(PLATFORM_V6V4)+" \ - -e "s+@conf_template@+$(PLATFORM)+" \ -- -e "s+@conf_gw6_dir@+$(INSTALL_DIR)+" \ -+ -e "s+@conf_gw6_dir@+$(PREFIX)+" \ - gw6c.conf.in > $(BIN_DIR)/gw6c.conf.sample - @chmod 700 $(BIN_DIR)/gw6c.conf.sample - 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 cca41389a4e8..000000000000 --- a/net/freenet6/files/patch-src__lib__config.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/config.c.orig 2009-05-19 18:22:06.000000000 +0200 -+++ src/lib/config.c 2009-11-15 17:57:52.000000000 +0100 -@@ -264,7 +264,7 @@ - { - tConf CmdLine; - gw6c_status status = STATUS_SUCCESS_INIT; -- const char* cszTemplDir = "template"; -+ const char* cszTemplDir = "bin"; - - - // Hard-coded parameters. Not configurable anymore. diff --git a/net/freenet6/files/patch-src__tsp__tsp_setup.c b/net/freenet6/files/patch-src__tsp__tsp_setup.c deleted file mode 100644 index a948b5dbb1e7..000000000000 --- a/net/freenet6/files/patch-src__tsp__tsp_setup.c +++ /dev/null @@ -1,27 +0,0 @@ ---- src/tsp/tsp_setup.c.orig 2009-11-15 20:06:20.000000000 +0100 -+++ src/tsp/tsp_setup.c 2009-11-15 20:07:10.000000000 +0100 -@@ -262,7 +262,7 @@ - // - if( buffer[0] == 0x00 ) - { -- pal_snprintf( buffer, sizeof buffer, "%s%c%s.%s", ScriptDir, DirSeparator, pConfig->template, ScriptExtension); -+ pal_snprintf( buffer, sizeof buffer, "%s%cgw6c-%s.%s", ScriptDir, DirSeparator, pConfig->template, ScriptExtension); - - f_test = fopen( buffer, "r" ); - if( f_test == NULL ) -@@ -279,13 +279,13 @@ - if( ScriptInterpretor != NULL ) - { - pal_snprintf( buffer, sizeof buffer, -- "%s \"%s%c%s.%s\"", -+ "%s \"%s%cgw6c-%s.%s\"", - ScriptInterpretor, ScriptDir, DirSeparator, pConfig->template, ScriptExtension); - } - else - { - pal_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_net_icmp__echo__engine.c b/net/freenet6/files/patch-src_net_icmp__echo__engine.c deleted file mode 100644 index b9f4608a6fc7..000000000000 --- a/net/freenet6/files/patch-src_net_icmp__echo__engine.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/net/icmp_echo_engine.c.orig 2017-06-16 09:08:10 UTC -+++ src/net/icmp_echo_engine.c -@@ -238,7 +238,7 @@ iee_ret_t IEE_init( void** pp_config, iee_mode_t eng_m - p_engine->clbk_recv = recv_clbk; - - // Initialize engine socket variables. -- p_engine->icmp_echo_id = pal_getpid(); -+ p_engine->icmp_echo_id = pal_getpid() % 65536; - p_engine->icmp_saf = af; - switch( p_engine->icmp_saf ) - { diff --git a/net/freenet6/files/patch-template__Makefile b/net/freenet6/files/patch-template__Makefile deleted file mode 100644 index 3a122fa9d7d7..000000000000 --- a/net/freenet6/files/patch-template__Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- ./template/Makefile.orig 2008-01-09 10:09:18.000000000 -0500 -+++ ./template/Makefile 2014-06-27 03:51:00.000000000 -0400 -@@ -17,8 +17,10 @@ - - install: - @echo "Installing templates ..." -- @for template_var in README $(PLATFORM).sh; do \ -- cp $${template_var} $(INSTALL_TEMPL)/$${template_var}; \ -+ @for template_var in $(PLATFORM).sh; do \ -+ cp $${template_var} $(INSTALL_BIN)/gw6c-$${template_var}; \ - done -+ @mkdir -p $(DESTDIR)$(ETCDIR) -+ ${BSD_INSTALL_DATA} README $(DESTDIR)$(ETCDIR) - - clean: diff --git a/net/freenet6/files/patch-template_freebsd.sh b/net/freenet6/files/patch-template_freebsd.sh deleted file mode 100644 index f74cd585ba22..000000000000 --- a/net/freenet6/files/patch-template_freebsd.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- template/freebsd.sh.orig 2017-06-16 09:11:57 UTC -+++ template/freebsd.sh -@@ -201,7 +201,7 @@ if [ X"${TSP_TUNNEL_MODE}" = X"v6v4" ] || [ X"${TSP_TU - fi - # - # Configured tunnel config (IPv6) -- -+ Exec $ifconfig $TSP_TUNNEL_INTERFACE inet6 -ifdisabled - Exec $ifconfig $TSP_TUNNEL_INTERFACE inet6 $TSP_CLIENT_ADDRESS_IPV6 $TSP_SERVER_ADDRESS_IPV6 prefixlen $TSP_TUNNEL_PREFIXLEN alias - Exec $ifconfig $TSP_TUNNEL_INTERFACE mtu 1280 - # diff --git a/net/freenet6/files/pkg-message.in b/net/freenet6/files/pkg-message.in deleted file mode 100644 index eb3a58b7d298..000000000000 --- a/net/freenet6/files/pkg-message.in +++ /dev/null @@ -1,12 +0,0 @@ -[ -{ type: install - message: <