Index: head/net/gogoc/Makefile =================================================================== --- head/net/gogoc/Makefile (revision 436768) +++ head/net/gogoc/Makefile (revision 436769) @@ -1,46 +1,46 @@ # Created by: Tomaž Muraus # $FreeBSD$ PORTNAME= gogoc PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= http://gogo6.com/downloads/ DISTNAME= gogoc-1_2-RELEASE MAINTAINER= kami@k5-storitve.net COMMENT= GogoCLIENT, connect to Freenet6 tunnel USES= gmake ssl USE_RC_SUBR= gogoc OPTIONS_DEFINE= DOCS EXAMPLES MAKE_JOBS_UNSAFE= yes PORTDOCS= CLIENT-LICENSE.TXT GUI-LICENSE.TXT INSTALL README SUB_FILES= gogoc SUB_LIST= LOCALBASE=${LOCALBASE} .include do-install: cd ${WRKSRC}/gogoc-tsp/ && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} \ ${MAKE_CMD} platform=freebsd installdir=${STAGEDIR}${PREFIX} install ${RM} ${STAGEDIR}${PREFIX}/bin/gogoc.conf* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gogoc ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/gogoc-tsp/bin/gogoc.conf.sample ${STAGEDIR}${EXAMPLESDIR} @${REINPLACE_CMD} -e \ 's|gogoc_dir=${STAGEDIR}${PREFIX}|gogoc_dir=${PREFIX}|g' \ ${STAGEDIR}${EXAMPLESDIR}/gogoc.conf.sample @${RM} ${STAGEDIR}${EXAMPLESDIR}/gogoc.conf.sample.bak # pass stage-qa ${INSTALL_DATA} ${STAGEDIR}${EXAMPLESDIR}/gogoc.conf.sample \ ${STAGEDIR}${PREFIX}/etc/gogoc.conf ${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/net/gogoc/files/gogoc.in =================================================================== --- head/net/gogoc/files/gogoc.in (revision 436768) +++ head/net/gogoc/files/gogoc.in (revision 436769) @@ -1,31 +1,32 @@ #!/bin/sh # PROVIDE: gogoc # REQUIRE: NETWORK # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # gogoc_enable (bool): Set to NO by default. # Set it to YES to enable gogoc. # # Additional configurable variables: # gogoc_config (path): Set to %%LOCALBASE%%/etc/gogoc.conf # by default. . /etc/rc.subr name="gogoc" rcvar=gogoc_enable +sig_stop="HUP" command=%%LOCALBASE%%/bin/${name} load_rc_config $name : ${gogoc_enable="NO"} : ${gogoc_config="%%LOCALBASE%%/etc/gogoc.conf"} command_args="-f $gogoc_config" run_rc_command "$1" Index: head/net/gogoc/files/patch-freebsd.sh =================================================================== --- head/net/gogoc/files/patch-freebsd.sh (nonexistent) +++ head/net/gogoc/files/patch-freebsd.sh (revision 436769) @@ -0,0 +1,10 @@ +--- 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 @@ + # + # 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 + # Property changes on: head/net/gogoc/files/patch-freebsd.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/net/gogoc/files/patch-icmp_echo_engine.c =================================================================== --- head/net/gogoc/files/patch-icmp_echo_engine.c (nonexistent) +++ head/net/gogoc/files/patch-icmp_echo_engine.c (revision 436769) @@ -0,0 +1,11 @@ +--- gogoc-tsp/src/net/icmp_echo_engine.c~ 2016-07-22 15:16:32.382995000 +0800 ++++ gogoc-tsp/src/net/icmp_echo_engine.c 2016-07-22 15:16:44.244691000 +0800 +@@ -238,7 +238,7 @@ + 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 ) + { Property changes on: head/net/gogoc/files/patch-icmp_echo_engine.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/net/gogoc/pkg-plist =================================================================== --- head/net/gogoc/pkg-plist (revision 436768) +++ head/net/gogoc/pkg-plist (revision 436769) @@ -1,7 +1,6 @@ bin/gogoc -etc/gogoc.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gogoc.conf.sample +@sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gogoc.conf.sample etc/gogoc.conf man/man5/gogoc.conf.5.gz man/man8/gogoc.8.gz template/README template/freebsd.sh