From owner-svn-ports-head@freebsd.org  Mon Apr  6 16:27:49 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7242B2B46D6;
 Mon,  6 Apr 2020 16:27:49 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48wwts2QBRz4GWt;
 Mon,  6 Apr 2020 16:27:49 +0000 (UTC)
 (envelope-from mandree@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4E2272ACE6;
 Mon,  6 Apr 2020 16:27:49 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 036GRnVm054757;
 Mon, 6 Apr 2020 16:27:49 GMT (envelope-from mandree@FreeBSD.org)
Received: (from mandree@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 036GRmsi054756;
 Mon, 6 Apr 2020 16:27:49 GMT (envelope-from mandree@FreeBSD.org)
Message-Id: <202004061627.036GRmsi054756@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mandree set sender to
 mandree@FreeBSD.org using -f
From: Matthias Andree <mandree@FreeBSD.org>
Date: Mon, 6 Apr 2020 16:27:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r530887 - in head/net/chrony: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: mandree
X-SVN-Commit-Paths: in head/net/chrony: . files
X-SVN-Commit-Revision: 530887
X-SVN-Commit-Repository: ports
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.29
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: Mon, 06 Apr 2020 16:27:49 -0000

Author: mandree
Date: Mon Apr  6 16:27:48 2020
New Revision: 530887
URL: https://svnweb.freebsd.org/changeset/ports/530887

Log:
  net/chrony: fix regression, remove pidfile= from rc.d script
  
  chrony handles its own pidfile, and still our status method works,
  so avoid missing chrony's own lock management.
  
  PR:		245399
  Reported by:	Peter Putzer

Modified:
  head/net/chrony/Makefile
  head/net/chrony/files/chronyd.in

Modified: head/net/chrony/Makefile
==============================================================================
--- head/net/chrony/Makefile	Mon Apr  6 16:07:36 2020	(r530886)
+++ head/net/chrony/Makefile	Mon Apr  6 16:27:48 2020	(r530887)
@@ -3,7 +3,7 @@
 
 PORTNAME=	chrony
 PORTVERSION=	3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.tuxfamily.org/chrony/
 

Modified: head/net/chrony/files/chronyd.in
==============================================================================
--- head/net/chrony/files/chronyd.in	Mon Apr  6 16:07:36 2020	(r530886)
+++ head/net/chrony/files/chronyd.in	Mon Apr  6 16:27:48 2020	(r530887)
@@ -28,8 +28,7 @@ load_rc_config ${name}
 : ${chronyd_config:="%%PREFIX%%/etc/chrony.conf"}
 
 command=%%PREFIX%%/sbin/${name}
-command_args="-f ${chronyd_config}"
-pidfile=/var/run/chrony/${name}.pid
-required_files=${chronyd_config}
+command_args="-f \"${chronyd_config}\""
+required_files="${chronyd_config}"
 
 run_rc_command "$1"