diff -ruN gogoc~/Makefile gogoc/Makefile --- gogoc~/Makefile 2019-04-07 03:40:00.000000000 +0800 +++ gogoc/Makefile 2019-09-26 19:05:00.000000000 +0800 @@ -3,12 +3,12 @@ PORTNAME= gogoc PORTVERSION= 1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net ipv6 -MASTER_SITES= http://gogo6.com/downloads/ +MASTER_SITES= http://ghsng.tongi.org/files/ DISTNAME= gogoc-1_2-RELEASE -MAINTAINER= kami@k5-storitve.net +MAINTAINER= clive@tongi.org COMMENT= GogoCLIENT, connect to Freenet6 tunnel USES= gmake ssl @@ -25,9 +25,8 @@ .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' +.if ${OSVERSION} >= 1200085 +CFLAGS+= -DNO_OPENSSL .endif do-install: diff -ruN gogoc~/files/patch-freebsd.sh gogoc/files/patch-freebsd.sh --- gogoc~/files/patch-freebsd.sh 2017-03-23 20:54:00.000000000 +0800 +++ gogoc/files/patch-freebsd.sh 2019-09-26 19:04:00.000000000 +0800 @@ -1,6 +1,37 @@ ---- gogoc-tsp/template/freebsd.sh~ 2016-07-28 01:31:15.964503000 +0800 -+++ gogoc-tsp/template/freebsd.sh 2016-07-28 01:33:41.691541000 +0800 -@@ -212,6 +212,7 @@ +--- gogoc-tsp/template/freebsd.sh~ 2010-03-08 03:31:17.000000000 +0800 ++++ gogoc-tsp/template/freebsd.sh 2019-09-26 19:02:20.914958000 +0800 +@@ -76,6 +76,7 @@ + ifconfig=/sbin/ifconfig + route=/sbin/route + rtadvd=/usr/sbin/rtadvd ++rtadvctl=/usr/sbin/rtadvctl + sysctl=/sbin/sysctl + # find the release rel=4 for freebsd4.X, =5 for freebsd5.X + rel=`/usr/bin/uname -r | cut -f1 -d"."` +@@ -125,11 +126,13 @@ + ExecNoCheck $route delete -inet6 $TSP_PREFIX:: -prefixlen $TSP_PREFIXLEN -interface lo0 + fi + ++ # Kill router advertisement daemon gracefully (shutdown command) ++ $rtadvctl shutdown ++ # 10 seconds enough for shutdown gracefully ++ sleep 10 ++ + # Remove static IPv6 address + ExecNoCheck $ifconfig $TSP_HOME_INTERFACE inet6 $TSP_PREFIX::1 delete +- +- # Kill router advertisement daemon gracefully (SIGTERM) +- KillProcess rtadvd + fi + + # Delete any routes +@@ -207,11 +210,13 @@ + do + Exec $ifconfig $TSP_TUNNEL_INTERFACE inet6 $ipv6address delete + done ++ sleep $(($($sysctl -n net.inet6.ip6.dad_count) + 1)) + Exec $ifconfig $TSP_TUNNEL_INTERFACE up + fi # # Configured tunnel config (IPv6) diff -ruN gogoc~/files/patch-gogoc.conf.in gogoc/files/patch-gogoc.conf.in --- gogoc~/files/patch-gogoc.conf.in 1970-01-01 08:00:00.000000000 +0800 +++ gogoc/files/patch-gogoc.conf.in 2019-09-24 13:23:00.000000000 +0800 @@ -0,0 +1,29 @@ +--- gogoc-tsp/conf/gogoc.conf.in~ 2018-12-05 16:16:00.916968000 +0800 ++++ gogoc-tsp/conf/gogoc.conf.in 2018-12-05 16:16:23.103639000 +0800 +@@ -224,7 +224,7 @@ + # + # broker_list= + # +-broker_list=tsp-broker-list.txt ++broker_list=/var/run/tsp-broker-list.txt + + # + # Last Server Used File Name: +@@ -234,7 +234,7 @@ + # + # last_server= + # +-last_server=tsp-last-server.txt ++last_server=/var/run/tsp-last-server.txt + + # + # Always Use Last Known Working Server: +@@ -294,7 +294,7 @@ + # + # log_filename= + # +-log_filename=gogoc.log ++log_filename=/var/log/gogoc.log + + # + # Log File Rotation: