From owner-svn-ports-head@freebsd.org  Thu Jan 14 06:02:06 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
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 C3498A812D4;
 Thu, 14 Jan 2016 06:02:06 +0000 (UTC)
 (envelope-from dinoex@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 91DE31858;
 Thu, 14 Jan 2016 06:02:06 +0000 (UTC)
 (envelope-from dinoex@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0E625L3066561;
 Thu, 14 Jan 2016 06:02:05 GMT (envelope-from dinoex@FreeBSD.org)
Received: (from dinoex@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0E625mw066559;
 Thu, 14 Jan 2016 06:02:05 GMT (envelope-from dinoex@FreeBSD.org)
Message-Id: <201601140602.u0E625mw066559@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dinoex set sender to
 dinoex@FreeBSD.org using -f
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 14 Jan 2016 06:02:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r406095 - in head/security/tinc: . 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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jan 2016 06:02:06 -0000

Author: dinoex
Date: Thu Jan 14 06:02:05 2016
New Revision: 406095
URL: https://svnweb.freebsd.org/changeset/ports/406095

Log:
  - fix startup order conflict
  - allow tinc to start early, so "static_routes" in /etc/rc.conf works.
  PR:		202371

Modified:
  head/security/tinc/Makefile
  head/security/tinc/files/tincd.in

Modified: head/security/tinc/Makefile
==============================================================================
--- head/security/tinc/Makefile	Thu Jan 14 05:55:28 2016	(r406094)
+++ head/security/tinc/Makefile	Thu Jan 14 06:02:05 2016	(r406095)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tinc
 PORTVERSION=	1.0.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.tinc-vpn.org/packages/
 

Modified: head/security/tinc/files/tincd.in
==============================================================================
--- head/security/tinc/files/tincd.in	Thu Jan 14 05:55:28 2016	(r406094)
+++ head/security/tinc/files/tincd.in	Thu Jan 14 06:02:05 2016	(r406095)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: tincd
-# REQUIRE: ipfilter FILESYSTEMS sysctl netif ldconfig
+# REQUIRE: ipfilter FILESYSTEMS sysctl netif
 # BEFORE:  SERVERS routing
 # KEYWORD: nojail
 #
@@ -33,11 +33,13 @@ stop_cmd="tincd_stop"
 reload_cmd="tincd_reload"
 extra_commands="reload"
 procname=${command:-tincd}
+ldconfig_command="/sbin/ldconfig"
 
 load_rc_config $name
 
 tincd_start()
 {
+	${ldconfig_command} -elf -m %%LOCALBASE%%/lib
 	if test -z "${tincd_cfg}"
 	then
 		echo "Starting tincd"