Received: by mail.netbsd.org (Postfix, from userid 605) id BDF5384EC4; Sat, 10 Jul 2021 18:32:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0236F84CFC for ; Sat, 10 Jul 2021 18:32:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id PI7h0xWxLsE0 for ; Sat, 10 Jul 2021 18:32:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 70B8784EB5 for ; Sat, 10 Jul 2021 18:32:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5C899FA95; Sat, 10 Jul 2021 18:32:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_162594193568900" MIME-Version: 1.0 Date: Sat, 10 Jul 2021 18:32:15 +0000 From: "David A. Holland" Subject: CVS commit: pkgsrc/net/openntpd To: pkgsrc-changes@NetBSD.org Reply-To: dholland@netbsd.org X-Mailer: log_accum Message-Id: <20210710183215.5C899FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_162594193568900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: dholland Date: Sat Jul 10 18:32:15 UTC 2021 Modified Files: pkgsrc/net/openntpd: Makefile pkgsrc/net/openntpd/files: openntpd.sh Log Message: net/openntpd: make the rc script set the pidfile. Seems the daemon writes no pid file unless explicitly told where. Fixes PR 55244. PKGREVISION -> 1. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 pkgsrc/net/openntpd/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/openntpd/files/openntpd.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_162594193568900 Content-Disposition: inline Content-Length: 1291 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/openntpd/Makefile diff -u pkgsrc/net/openntpd/Makefile:1.44 pkgsrc/net/openntpd/Makefile:1.45 --- pkgsrc/net/openntpd/Makefile:1.44 Wed Jun 15 05:40:21 2016 +++ pkgsrc/net/openntpd/Makefile Sat Jul 10 18:32:15 2021 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2016/06/15 05:40:21 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2021/07/10 18:32:15 dholland Exp $ DISTNAME= openntpd-6.0p1 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_OPENBSD:=OpenNTPD/} Index: pkgsrc/net/openntpd/files/openntpd.sh diff -u pkgsrc/net/openntpd/files/openntpd.sh:1.1.1.1 pkgsrc/net/openntpd/files/openntpd.sh:1.2 --- pkgsrc/net/openntpd/files/openntpd.sh:1.1.1.1 Mon Jul 19 19:17:25 2004 +++ pkgsrc/net/openntpd/files/openntpd.sh Sat Jul 10 18:32:15 2021 @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: openntpd.sh,v 1.1.1.1 2004/07/19 19:17:25 xtraeme Exp $ +# $NetBSD: openntpd.sh,v 1.2 2021/07/10 18:32:15 dholland Exp $ # # PROVIDE: openntpd @@ -12,7 +12,14 @@ name="ntpd" rcvar="openntpd" command="@PREFIX@/sbin/${name}" +pidfile="/var/run/${name}.pid" required_files="@PKG_SYSCONFDIR@/ntpd.conf" +start_precmd="$openntpd_precmd" + +openntpd_precmd() +{ + rc_flags="-p ${pidfile} $rc_flags" +} load_rc_config $name run_rc_command "$1" --_----------=_162594193568900--