From owner-svn-ports-all@FreeBSD.ORG Sun May 18 17:21:12 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 755264D2; Sun, 18 May 2014 17:21:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 49A702AA4; Sun, 18 May 2014 17:21:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4IHLCUj051251; Sun, 18 May 2014 17:21:12 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4IHLBP1051245; Sun, 18 May 2014 17:21:11 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201405181721.s4IHLBP1051245@svn.freebsd.org> From: Hajimu UMEMOTO Date: Sun, 18 May 2014 17:21:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354443 - in head/net/u6rd: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 17:21:12 -0000 Author: ume Date: Sun May 18 17:21:11 2014 New Revision: 354443 URL: http://svnweb.freebsd.org/changeset/ports/354443 QAT: https://qat.redports.org/buildarchive/r354443/ Log: Make ${u6rd_fib} work. Modified: head/net/u6rd/Makefile head/net/u6rd/files/u6rd.in Modified: head/net/u6rd/Makefile ============================================================================== --- head/net/u6rd/Makefile Sun May 18 17:11:18 2014 (r354442) +++ head/net/u6rd/Makefile Sun May 18 17:21:11 2014 (r354443) @@ -2,7 +2,7 @@ PORTNAME= u6rd PORTVERSION= 1.6 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://ftp.scythe.jp/pub/u6rd/release/ Modified: head/net/u6rd/files/u6rd.in ============================================================================== --- head/net/u6rd/files/u6rd.in Sun May 18 17:11:18 2014 (r354442) +++ head/net/u6rd/files/u6rd.in Sun May 18 17:21:11 2014 (r354443) @@ -15,6 +15,7 @@ u6rd_my_v4_addr=${u6rd_my_v4_addr:-""} # u6rd_my_v6_addr=${u6rd_my_v6_addr:-""} # Your global IPv6 address (addr/len) u6rd_defaultrouter=${u6rd_defaultrouter:-""} u6rd_interface=${u6rd_interface:-"tun0"} +u6rd_interface_flags=${u6rd_interface_flags:-"inet6 -nud"} u6rd_username=${u6rd_username:-"nobody"} . /etc/rc.subr @@ -51,34 +52,41 @@ plen_equal() start_precmd() { - ifconfig ${u6rd_interface} create + ifconfig ${u6rd_interface} create ${iface_fib} ifconfig ${u6rd_interface} inet6 -ifdisabled >/dev/null 2>&1 - ifconfig ${u6rd_interface} inet6 -nud + if [ -n "${u6rd_interface_flags}" ]; then + ifconfig ${u6rd_interface} ${u6rd_interface_flags} + fi if [ -n "${u6rd_my_v6_addr}" ]; then ifconfig ${u6rd_interface} inet6 ${u6rd_my_v6_addr} fi ifconfig ${u6rd_interface} up if ! plen_equal ${u6rd_prefix} ${u6rd_my_v6_addr}; then - route delete -inet6 ${u6rd_prefix} >/dev/null 2>&1 - route add -inet6 ${u6rd_prefix} ::1 -ifp ${u6rd_interface} + route delete -inet6 ${u6rd_prefix} ${route_fib} >/dev/null 2>&1 + route add -inet6 ${u6rd_prefix} ::1 -ifp ${u6rd_interface} ${route_fib} fi if [ -n "${u6rd_defaultrouter}" ]; then - route delete -inet6 default >/dev/null 2>&1 - route add -inet6 default ${u6rd_defaultrouter} + route delete -inet6 default ${route_fib} >/dev/null 2>&1 + route add -inet6 default ${u6rd_defaultrouter} ${route_fib} fi } stop_postcmd() { if [ -n "${u6rd_defaultrouter}" ]; then - route delete -inet6 default + route delete -inet6 default ${route_fib} fi if ! plen_equal ${u6rd_prefix} ${u6rd_my_v6_addr}; then - route delete -inet6 ${u6rd_prefix} + route delete -inet6 ${u6rd_prefix} ${route_fib} fi ifconfig ${u6rd_interface} destroy } load_rc_config ${name} command_args="-u ${u6rd_username} ${u6rd_interface} ${u6rd_prefix} ${u6rd_relay_v4_addr} ${u6rd_my_v4_addr}" +if [ -n "${u6rd_fib}" ]; then + iface_fib="fib ${u6rd_fib}" + route_fib="-fib ${u6rd_fib}" + u6rd_fib= +fi run_rc_command "$1"