Thu Oct 8 09:47:33 2015 UTC ()
Honour chronyd in rc.conf. Prior to this, chronyd would run regardless and
could not be disabled.
Bump PKGREVISION


(sborrill)
diff -r1.32 -r1.33 pkgsrc/net/chrony/Makefile
diff -r1.5 -r1.6 pkgsrc/net/chrony/files/chronyd.sh
cvs diff -r1.32 -r1.33 pkgsrc/net/chrony/Makefile (expand / switch to unified diff)

--- pkgsrc/net/chrony/Makefile 2015/08/18 07:31:14 1.32
+++ pkgsrc/net/chrony/Makefile 2015/10/08 09:47:33 1.33
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.32 2015/08/18 07:31:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.33 2015/10/08 09:47:33 sborrill Exp $
2 2
3DISTNAME= chrony-1.31.1 3DISTNAME= chrony-1.31.1
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://download.tuxfamily.org/chrony/ 6MASTER_SITES= http://download.tuxfamily.org/chrony/
7 7
8MAINTAINER= hannken@NetBSD.org 8MAINTAINER= hannken@NetBSD.org
9HOMEPAGE= http://chrony.tuxfamily.org/ 9HOMEPAGE= http://chrony.tuxfamily.org/
10COMMENT= Daemon for maintaining the accuracy of computer clocks 10COMMENT= Daemon for maintaining the accuracy of computer clocks
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_TOOLS+= gmake 13USE_TOOLS+= gmake
14HAS_CONFIGURE= YES 14HAS_CONFIGURE= YES
15BUILD_DEFS+= VARBASE 15BUILD_DEFS+= VARBASE
16CONFIGURE_ARGS+= --prefix=${PREFIX} 16CONFIGURE_ARGS+= --prefix=${PREFIX}
17CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 17CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
cvs diff -r1.5 -r1.6 pkgsrc/net/chrony/files/chronyd.sh (expand / switch to unified diff)

--- pkgsrc/net/chrony/files/chronyd.sh 2013/08/16 08:30:20 1.5
+++ pkgsrc/net/chrony/files/chronyd.sh 2015/10/08 09:47:33 1.6
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: chronyd.sh,v 1.5 2013/08/16 08:30:20 hannken Exp $ 3# $NetBSD: chronyd.sh,v 1.6 2015/10/08 09:47:33 sborrill Exp $
4# 4#
5# PROVIDE: chronyd 5# PROVIDE: chronyd
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7 7
8. /etc/rc.subr 8. /etc/rc.subr
9 9
10name="chronyd" 10name="chronyd"
 11rcvar="$name"
11command="@PREFIX@/sbin/${name}" 12command="@PREFIX@/sbin/${name}"
12pidfile="@VARBASE@/run/${name}.pid" 13pidfile="@VARBASE@/run/${name}.pid"
13required_files="@PKG_SYSCONFDIR@/chrony.conf" 14required_files="@PKG_SYSCONFDIR@/chrony.conf"
14extra_commands="online offline" 15extra_commands="online offline"
15online_cmd="chronyd_online" 16online_cmd="chronyd_online"
16online_precmd="chronyd_precmd" 17online_precmd="chronyd_precmd"
17offline_cmd="chronyd_offline" 18offline_cmd="chronyd_offline"
18offline_precmd="chronyd_precmd" 19offline_precmd="chronyd_precmd"
19 20
20chronyd_precmd() 21chronyd_precmd()
21{ 22{
22 local id kfile 23 local id kfile
23 id=`awk '$1 == "commandkey" { print $2 }' @PKG_SYSCONFDIR@/chrony.conf` 24 id=`awk '$1 == "commandkey" { print $2 }' @PKG_SYSCONFDIR@/chrony.conf`