From owner-svn-ports-head@freebsd.org Thu Mar 23 12:54:47 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F345BD180B2; Thu, 23 Mar 2017 12:54:47 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CDE05F27; Thu, 23 Mar 2017 12:54:47 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2NCskKa009564; Thu, 23 Mar 2017 12:54:46 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2NCskns009559; Thu, 23 Mar 2017 12:54:46 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201703231254.v2NCskns009559@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Thu, 23 Mar 2017 12:54:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436769 - in head/net/gogoc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2017 12:54:48 -0000 Author: robak Date: Thu Mar 23 12:54:46 2017 New Revision: 436769 URL: https://svnweb.freebsd.org/changeset/ports/436769 Log: net/gogoc: new patch with various improvements - When shutdown, the correct behavior is to send SIGHUP. - New patch patch-icmp_echo_engine.c: When PID of the gogoc process greater than 65536, it can not perform timeout ping check correctly, due to echo_id in icmp_hdr is declared as uint16_t. - New patch patch-freebsd.sh: To mute dmesg noise "nd6_dad_timer: cancel DAD on tun0 because of ND6_IFF_IFDISABLED." - Don't overwrite gogoc.conf on install. PR: 211426 Submitted by: Clive Lin Approved by: maintainer timeout (8 months) Added: head/net/gogoc/files/patch-freebsd.sh (contents, props changed) head/net/gogoc/files/patch-icmp_echo_engine.c (contents, props changed) Modified: head/net/gogoc/Makefile head/net/gogoc/files/gogoc.in head/net/gogoc/pkg-plist Modified: head/net/gogoc/Makefile ============================================================================== --- head/net/gogoc/Makefile Thu Mar 23 12:48:32 2017 (r436768) +++ head/net/gogoc/Makefile Thu Mar 23 12:54:46 2017 (r436769) @@ -3,7 +3,7 @@ PORTNAME= gogoc PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= http://gogo6.com/downloads/ DISTNAME= gogoc-1_2-RELEASE Modified: head/net/gogoc/files/gogoc.in ============================================================================== --- head/net/gogoc/files/gogoc.in Thu Mar 23 12:48:32 2017 (r436768) +++ head/net/gogoc/files/gogoc.in Thu Mar 23 12:54:46 2017 (r436769) @@ -17,6 +17,7 @@ name="gogoc" rcvar=gogoc_enable +sig_stop="HUP" command=%%LOCALBASE%%/bin/${name} Added: head/net/gogoc/files/patch-freebsd.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gogoc/files/patch-freebsd.sh Thu Mar 23 12:54:46 2017 (r436769) @@ -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 + # Added: head/net/gogoc/files/patch-icmp_echo_engine.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gogoc/files/patch-icmp_echo_engine.c Thu Mar 23 12:54:46 2017 (r436769) @@ -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 ) + { Modified: head/net/gogoc/pkg-plist ============================================================================== --- head/net/gogoc/pkg-plist Thu Mar 23 12:48:32 2017 (r436768) +++ head/net/gogoc/pkg-plist Thu Mar 23 12:54:46 2017 (r436769) @@ -1,6 +1,5 @@ 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