Pullup ticket #3041 - requested by hannken

chrony: security update

Revisions pulled up:
- net/chrony/Makefile				1.26
- net/chrony/distinfo				1.7
- net/chrony/patches/patch-aa			1.4
- net/chrony/patches/patch-ab			1.4
- net/chrony/patches/patch-ac			1.4
- net/chrony/patches/patch-ad			1.3
- net/chrony/patches/patch-ae			1.4
- net/chrony/patches/patch-ag			delete
---
Module Name:    pkgsrc
Committed By:   hannken
Date:           Fri Feb 26 09:27:43 UTC 2010

Modified Files:
        pkgsrc/doc: TODO
        pkgsrc/net/chrony: Makefile distinfo
        pkgsrc/net/chrony/patches: patch-aa patch-ab patch-ac patch-ad patch-ae
Removed Files:
        pkgsrc/net/chrony/patches: patch-ag

Log Message:
Update to 1.24.

The changes in version 1.24 are

Security fixes
--------------
* Don't reply to invalid cmdmon packets (CVE-2010-0292)
* Limit client log memory size (CVE-2010-0293)
* Limit rate of syslog messages (CVE-2010-0294)

Bug fixes/Enhancements
----------------------
* Support for reference clocks (SHM, SOCK, PPS drivers)
* IPv6 support
* Linux capabilities support (to drop root privileges)
* Memory locking support on Linux
* Real-time scheduler support on Linux
* Leap second support on Linux
* Support for editline library
* Support for new Linux readonly adjtime
* NTP client support for KoD RATE
* Read kernel timestamps for received NTP packets
* Reply to NTP requests with correct address on multihomed hosts
* Retry name resolving after temporary failure
* Fix makestep command, make it available on all systems
* Add makestep directive for automatic clock stepping
* Don't require _bigadj kernel symbol on NetBSD
* Avoid blocking read in Linux RTC driver
* Support for Linux on S/390 and PowerPC
* Fix various bugs on 64-bit systems
* Fix valgrind errors and compiler warnings
* Improve configure to support common options and variables
* Improve status checking and printing in chronyc
* Return non-zero exit code on errors in chronyc
* Reduce request timeout in chronyc
* Print estimated offset in sourcestats
* Changed chronyc protocol, incompatible with older versions

Reviewed by: Joerg Sonnenberger <joerg@netbsd.org>

8 files changed, 89 insertions, 146 deletions

diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 7caceb6013c..e0cd6865bcd 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,38 +1,40 @@
-# $NetBSD: Makefile,v 1.25 2009/05/20 00:58:25 wiz Exp $
+# $NetBSD: Makefile,v 1.25.6.1 2010/03/07 00:10:17 tron Exp $
 
-DISTNAME=	chrony-1.23
-PKGREVISION=	1
+DISTNAME=	chrony-1.24
 CATEGORIES=	net
-MASTER_SITES=	ftp://chrony.sunsite.dk/projects/chrony/
+MASTER_SITES=	http://download.tuxfamily.org/chrony/
 
 MAINTAINER=	hannken@NetBSD.org
-HOMEPAGE=	http://chrony.sunsite.dk/index.php
+HOMEPAGE=	http://chrony.tuxfamily.org/
 COMMENT=	Daemon for maintaining the accuracy of computer clocks
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		YES
+BUILD_DEFS+=		VARBASE
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--mandir=${PREFIX:Q}/${PKGMANDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 AUTO_MKDIRS=		yes
 
 EGDIR=			${PREFIX}/share/examples/chrony
 EGFILES=		chrony.conf.example chrony.keys.example
 RCD_SCRIPTS=		chronyd
 
-MAKE_ENV+=		INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
-MAKE_ENV+=		INSTALL_DATA=${INSTALL_DATA:Q}
-MAKE_ENV+=		INSTALL_MAN=${INSTALL_MAN:Q}
-
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	${EGFILES:S/^/examples\//} chrony.conf.5 chronyd.8
+SUBST_FILES.paths=	${EGFILES:S/^/examples\//} conf.c chrony.conf.5 \
+			chronyd.8
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_SED.paths+=	-e 's,@VARBASE@,${VARBASE},g'
 SUBST_STAGE.paths=	post-patch
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	for file in ${EGFILES}; do				\
 		${INSTALL_DATA} ${WRKSRC}/examples/$${file}	\
-			${EGDIR}/$${file};			\
+			${DESTDIR}${EGDIR}/$${file};		\
 	done
 
 .include "../../devel/readline/buildlink3.mk"
diff --git a/net/chrony/distinfo b/net/chrony/distinfo
index 4159af80a0e..e870e537cc0 100644
--- a/net/chrony/distinfo
+++ b/net/chrony/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.6 2008/08/12 16:37:32 sborrill Exp $
+$NetBSD: distinfo,v 1.6.14.1 2010/03/07 00:10:17 tron Exp $
 
-SHA1 (chrony-1.23.tar.gz) = f0c6b32099329f358dbdb4f62753d2c7cbc13c79
-RMD160 (chrony-1.23.tar.gz) = 6f92aeac15d252821ff72a02f340fc0e562eddc1
-Size (chrony-1.23.tar.gz) = 321015 bytes
-SHA1 (patch-aa) = 84d1276a00e30ac66ae1cb142c001cba76fab4a8
-SHA1 (patch-ab) = 08716e6d8983c33f2f9e9df1a7b29f627469576f
-SHA1 (patch-ac) = 14f34e14d595e235f9febfaef7a75d332dfe5bdb
-SHA1 (patch-ad) = 98f5ba97e0052a0e83a0017769bd869ce593c461
-SHA1 (patch-ae) = f55536cf3be9c9fc55345a3d21b88500e30807ad
+SHA1 (chrony-1.24.tar.gz) = 6e17d7b8cdd3508751713bd2279202b75643e268
+RMD160 (chrony-1.24.tar.gz) = a393c3f51d99a24a1aefd1653575de5a6c642191
+Size (chrony-1.24.tar.gz) = 364311 bytes
+SHA1 (patch-aa) = 1fe34e98bcdf70686e3e38bf88bfdbbe9f27b42d
+SHA1 (patch-ab) = efec09e45ea46c7f700a507a565e27a3d9c38f78
+SHA1 (patch-ac) = e6676efc4151b394451b7de64d44351789892561
+SHA1 (patch-ad) = 621626000457731ac89778d41200e9046a4edb25
+SHA1 (patch-ae) = a1efbc23807fa74c5393946400fa2565af12e7c5
 SHA1 (patch-af) = 3d09c0aba56bdce704a923ae7c15673cdb6a7489
-SHA1 (patch-ag) = 63a2f96165d16bac2ac3796bb554bdc8ec6272e5
diff --git a/net/chrony/patches/patch-aa b/net/chrony/patches/patch-aa
index b807075c525..c41f1a2c5b1 100644
--- a/net/chrony/patches/patch-aa
+++ b/net/chrony/patches/patch-aa
@@ -1,73 +1,45 @@
-$NetBSD: patch-aa,v 1.3 2006/01/08 13:27:53 joerg Exp $
+$NetBSD: patch-aa,v 1.3.36.1 2010/03/07 00:10:17 tron Exp $
 
---- Makefile.in.orig	2003-09-20 00:48:26.000000000 +0200
+--- Makefile.in.orig	2010-02-04 13:07:19.000000000 +0100
 +++ Makefile.in
-@@ -60,7 +60,7 @@ EXTRA_CLI_LIBS=@EXTRA_CLI_LIBS@
- 
- DEFS=@SYSDEFS@
- 
--CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS)
-+CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS) -DDEFAULT_CONF_FILE=\"$(PKG_SYSCONFDIR)/chrony.conf\"
- 
- # Until we have a main procedure we can link, just build object files
- # to test compilation
-@@ -68,10 +68,10 @@ CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS)
- all : chronyd chronyc
- 
- chronyd : $(OBJS) $(EXTRA_OBJS)
--	$(CC) $(OPTFLAGS) -o chronyd $(OBJS) $(EXTRA_OBJS) $(LIBS) $(EXTRA_LIBS)
-+	$(CC) $(LDFLAGS) $(OPTFLAGS) -o chronyd $(OBJS) $(EXTRA_OBJS) $(LIBS) $(EXTRA_LIBS)
- 
- chronyc : $(CLI_OBJS)
--	$(CC) $(OPTFLAGS) -o chronyc $(CLI_OBJS) @READLINE_LINK@ $(LIBS) $(EXTRA_CLI_LIBS)
-+	$(CC) $(LDFLAGS) $(OPTFLAGS) -o chronyc $(CLI_OBJS) @READLINE_LINK@ $(LIBS) $(EXTRA_CLI_LIBS)
- 
- client.o : client.c
- 	$(CC) $(CFLAGS) $(DEFS) @READLINE_COMPILE@ -c $<
-@@ -93,34 +93,18 @@ version.h : version.txt
- # seem to vary between systems.
+@@ -104,31 +104,14 @@
  
  install: chronyd chronyc
--	[ -d $(DESTDIR)$(INSTALL_PREFIX) ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)
--	[ -d $(DESTDIR)$(INSTALL_PREFIX)/sbin ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/sbin
--	[ -d $(DESTDIR)$(INSTALL_PREFIX)/bin ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/bin
--	[ -d $(DESTDIR)$(INSTALL_PREFIX)/doc ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/doc
+-	[ -d $(DESTDIR)$(SBINDIR) ] || mkdir -p $(DESTDIR)$(SBINDIR)
+-	[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
+ 	[ -d $(DESTDIR)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR)
 -	[ -d $(DESTDIR)$(MANDIR)/man1 ] || mkdir -p $(DESTDIR)$(MANDIR)/man1
 -	[ -d $(DESTDIR)$(MANDIR)/man5 ] || mkdir -p $(DESTDIR)$(MANDIR)/man5
 -	[ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8
--	[ -d $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony
--	if [ -f $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd ]; then rm -f $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd ; fi
--	if [ -f $(DESTDIR)$(INSTALL_PREFIX)/bin/chronyc ]; then rm -f $(DESTDIR)$(INSTALL_PREFIX)/bin/chronyc ; fi
--	cp chronyd $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd
--	chmod 555 $(DESTDIR)$(INSTALL_PREFIX)/sbin/chronyd
--	cp chronyc $(DESTDIR)$(INSTALL_PREFIX)/bin/chronyc
--	chmod 555 $(DESTDIR)$(INSTALL_PREFIX)/bin/chronyc
--	cp chrony.txt $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/chrony.txt
--	chmod 444 $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/chrony.txt
--	cp COPYING $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/COPYING
--	chmod 444 $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/COPYING
--	cp README $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/README
--	chmod 444 $(DESTDIR)$(INSTALL_PREFIX)/doc/chrony/README
+-	[ -d $(DESTDIR)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR)
+-	if [ -f $(DESTDIR)$(SBINDIR)/chronyd ]; then rm -f $(DESTDIR)$(SBINDIR)/chronyd ; fi
+-	if [ -f $(DESTDIR)$(BINDIR)/chronyc ]; then rm -f $(DESTDIR)$(BINDIR)/chronyc ; fi
+-	cp chronyd $(DESTDIR)$(SBINDIR)/chronyd
+-	chmod 755 $(DESTDIR)$(SBINDIR)/chronyd
+-	cp chronyc $(DESTDIR)$(BINDIR)/chronyc
+-	chmod 755 $(DESTDIR)$(BINDIR)/chronyc
+-	cp chrony.txt $(DESTDIR)$(DOCDIR)/chrony.txt
+-	chmod 644 $(DESTDIR)$(DOCDIR)/chrony.txt
+-	cp COPYING $(DESTDIR)$(DOCDIR)/COPYING
+-	chmod 644 $(DESTDIR)$(DOCDIR)/COPYING
+-	cp README $(DESTDIR)$(DOCDIR)/README
+-	chmod 644 $(DESTDIR)$(DOCDIR)/README
 -	cp chrony.1 $(DESTDIR)$(MANDIR)/man1
--	chmod 444 $(DESTDIR)$(MANDIR)/man1/chrony.1
+-	chmod 644 $(DESTDIR)$(MANDIR)/man1/chrony.1
 -	cp chronyc.1 $(DESTDIR)$(MANDIR)/man1
--	chmod 444 $(DESTDIR)$(MANDIR)/man1/chronyc.1
+-	chmod 644 $(DESTDIR)$(MANDIR)/man1/chronyc.1
 -	cp chronyd.8 $(DESTDIR)$(MANDIR)/man8
--	chmod 444 $(DESTDIR)$(MANDIR)/man8/chronyd.8
+-	chmod 644 $(DESTDIR)$(MANDIR)/man8/chronyd.8
 -	cp chrony.conf.5 $(DESTDIR)$(MANDIR)/man5
--	chmod 444 $(DESTDIR)$(MANDIR)/man5/chrony.conf.5
-+	[ -d $(DESTDIR)$(INSTALL_PREFIX)/share/doc/chrony ] || mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/share/doc/chrony
-+	$(INSTALL_PROGRAM) chronyd $(DESTDIR)$(INSTALL_PREFIX)/sbin
-+	$(INSTALL_PROGRAM) chronyc $(DESTDIR)$(INSTALL_PREFIX)/bin
-+	$(INSTALL_DATA) chrony.txt $(DESTDIR)$(INSTALL_PREFIX)/share/doc/chrony
-+	$(INSTALL_DATA) COPYING $(DESTDIR)$(INSTALL_PREFIX)/share/doc/chrony
-+	$(INSTALL_DATA) README $(DESTDIR)$(INSTALL_PREFIX)/share/doc/chrony
-+	$(INSTALL_MAN) chrony.1 $(DESTDIR)$(MANDIR)/man1
-+	$(INSTALL_MAN) chronyc.1 $(DESTDIR)$(MANDIR)/man1
-+	sed 's|@PREFIX@|$(INSTALL_PREFIX)|g' chronyd.8 > chronyd.0
-+	$(INSTALL_MAN) chronyd.0 $(DESTDIR)$(MANDIR)/man8/chronyd.8
-+	sed 's|@PREFIX@|$(INSTALL_PREFIX)|g' chrony.conf.5 > chrony.conf.0
-+	$(INSTALL_MAN) chrony.conf.0 $(DESTDIR)$(MANDIR)/man5/chrony.conf.5
+-	chmod 644 $(DESTDIR)$(MANDIR)/man5/chrony.conf.5
++	$(BSD_INSTALL_PROGRAM) chronyd $(DESTDIR)$(SBINDIR)
++	$(BSD_INSTALL_PROGRAM) chronyc $(DESTDIR)$(BINDIR)
++	$(BSD_INSTALL_DATA) chrony.txt $(DESTDIR)$(DOCDIR)
++	$(BSD_INSTALL_DATA) COPYING $(DESTDIR)$(DOCDIR)
++	$(BSD_INSTALL_DATA) README $(DESTDIR)$(DOCDIR)
++	$(BSD_INSTALL_MAN) chrony.1 $(DESTDIR)$(MANDIR)/man1
++	$(BSD_INSTALL_MAN) chronyc.1 $(DESTDIR)$(MANDIR)/man1
++	$(BSD_INSTALL_MAN) chronyd.8 $(DESTDIR)$(MANDIR)/man8/chronyd.8
++	$(BSD_INSTALL_MAN) chrony.conf.5 $(DESTDIR)$(MANDIR)/man5/chrony.conf.5
  
  %.o : %.c
- 	$(CC) $(CFLAGS) $(DEFS) -c $<
diff --git a/net/chrony/patches/patch-ab b/net/chrony/patches/patch-ab
index ed15dc18a6d..a08ee211c64 100644
--- a/net/chrony/patches/patch-ab
+++ b/net/chrony/patches/patch-ab
@@ -1,34 +1,28 @@
-$NetBSD: patch-ab,v 1.3 2006/01/08 13:27:53 joerg Exp $
+$NetBSD: patch-ab,v 1.3.36.1 2010/03/07 00:10:17 tron Exp $
 
---- chrony.conf.5.orig	2002-11-04 00:32:08.000000000 +0100
+--- chrony.conf.5.orig	2010-02-04 13:07:19.000000000 +0100
 +++ chrony.conf.5
-@@ -3,7 +3,7 @@
- chrony.conf \- chronyd configuration file
+@@ -4,5 +4,5 @@
  
  .SH SYNOPSIS
 -.B /etc/chrony.conf
 +.B @PKG_SYSCONFDIR@/chrony.conf
  
  .SH DESCRIPTION
- \fIchrony\fR is a pair of programs for maintaining the accuracy of computer
-@@ -12,7 +12,7 @@ boot time.
- 
+@@ -13,5 +13,5 @@
  Assuming that you have found some servers, you need to set up a
  configuration file to run \fIchrony\fR.  The (compiled-in) default location
 -for this file is \fB/etc/chrony.conf\fR.  Assuming that your ntp servers
 +for this file is \fB@PKG_SYSCONFDIR@/chrony.conf\fR.  Assuming that your ntp servers
  are called `a.b.c' and `d.e.f', your \fBchrony.conf\fR file could contain
  as a minimum
- 
-@@ -29,9 +29,9 @@ useful configuration file would look som
-      server a.b.c
+@@ -30,7 +30,7 @@
       server d.e.f
       server g.h.i
 -     keyfile /etc/chrony.keys
 +     keyfile @PKG_SYSCONFDIR@/chrony.keys
       commandkey 1
 -     driftfile /etc/chrony.drift
-+     driftfile /var/db/chrony.drift
++     driftfile @VARBASE@/db/chrony.drift
  
  
- .SH "SEE ALSO"
diff --git a/net/chrony/patches/patch-ac b/net/chrony/patches/patch-ac
index e125f58f8ff..47a497eabce 100644
--- a/net/chrony/patches/patch-ac
+++ b/net/chrony/patches/patch-ac
@@ -1,9 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2006/01/08 13:27:53 joerg Exp $
+$NetBSD: patch-ac,v 1.3.36.1 2010/03/07 00:10:17 tron Exp $
 
---- chronyd.8.orig	2002-11-04 00:32:10.000000000 +0100
+--- chronyd.8.orig	2010-02-04 13:07:19.000000000 +0100
 +++ chronyd.8
-@@ -24,10 +24,10 @@ gains or loses time, and compensates for
- priviliges.
+@@ -25,8 +25,8 @@
  
  If \fBchronyd\fR has been installed to its default location
 -\fI/usr/local/sbin/chronyd\fR, starting it is simply a matter of entering the
@@ -14,22 +13,17 @@ $NetBSD: patch-ac,v 1.3 2006/01/08 13:27:53 joerg Exp $
 +\fI@PREFIX@/sbin/chronyd\fR
  
  Information messages and warnings will be logged to syslog.
- 
-@@ -43,7 +43,7 @@ to syslog.
- .TP
+@@ -53,5 +53,5 @@
  \fB\-f\fR \fIconf-file\fR
  This option can be used to specify an alternate location for the
 -configuration file (default \fI/etc/chrony.conf\fR).
 +configuration file (default \fI@PKG_SYSCONFDIR@/chrony.conf\fR).
  .TP
  .B \-r
- This option will reload sample histories for each of the servers being used.
-@@ -83,7 +83,7 @@ computer was on.
- This option displays \fBchronyd\fR's version number to the terminal and exits
+@@ -103,5 +103,5 @@
  
  .SH FILES
 -\fI/etc/chrony.conf\fR
 +\fI@PKG_SYSCONFDIR@/chrony.conf\fR
  
  .SH VERSION
- Version 1.17
diff --git a/net/chrony/patches/patch-ad b/net/chrony/patches/patch-ad
index 5b7be1aa7a1..2a7914773e6 100644
--- a/net/chrony/patches/patch-ad
+++ b/net/chrony/patches/patch-ad
@@ -1,14 +1,11 @@
-$NetBSD: patch-ad,v 1.2 2004/11/30 11:26:59 hannken Exp $
+$NetBSD: patch-ad,v 1.2.46.1 2010/03/07 00:10:17 tron Exp $
 
---- conf.c.orig	2003-09-22 23:22:30.000000000 +0200
+--- conf.c.orig	2010-02-04 13:07:19.000000000 +0100
 +++ conf.c
-@@ -55,7 +55,9 @@
+@@ -177,5 +177,5 @@
+ /* Filename to use for storing pid of running chronyd, to prevent multiple
+  * chronyds being started. */
+-static char *pidfile = "/var/run/chronyd.pid";
++static char *pidfile = "@VARBASE@/run/chronyd.pid";
  
- /* ================================================== */
- 
-+#ifndef DEFAULT_CONF_FILE
- #define DEFAULT_CONF_FILE "/etc/chrony.conf"
-+#endif
- 
- /* ================================================== */
- /* Forward prototypes */
+ /* Boolean for whether the Linux HZ value has been overridden, and the
diff --git a/net/chrony/patches/patch-ae b/net/chrony/patches/patch-ae
index b1a0c667b29..dec6ceae578 100644
--- a/net/chrony/patches/patch-ae
+++ b/net/chrony/patches/patch-ae
@@ -1,25 +1,32 @@
-$NetBSD: patch-ae,v 1.3 2006/01/08 13:27:53 joerg Exp $
+$NetBSD: patch-ae,v 1.3.36.1 2010/03/07 00:10:17 tron Exp $
 
---- examples/chrony.conf.example.orig	2002-02-03 22:46:29.000000000 +0100
-+++ examples/chrony.conf.example
-@@ -3,5 +3,5 @@
+--- examples/chrony.conf.example.orig	2010-02-04 13:07:19.000000000 +0100
++++ examples/chrony.conf.example	2010-02-26 09:06:48.000000000 +0100
+@@ -2,5 +2,5 @@
  #
  # This is an example chrony configuration file.  You should copy it to
 -# /etc/chrony.conf after uncommenting and editing the options that you
 +# @PKG_SYSCONFDIR@/chrony.conf after uncommenting and editing the options that you
- # want to enable.  I have not included the more obscure options.  Refer
+ # want to enable.  The more obscure options are not included.  Refer
  # to the documentation for these.
-@@ -91,5 +91,5 @@
+@@ -90,5 +90,5 @@
  # generally want this, so it is uncommented.
  
 -driftfile /etc/chrony.drift
-+driftfile /var/db/chrony.drift
++driftfile @VARBASE@/db/chrony.drift
  
  # If you want to use the program called chronyc to configure aspects of
-@@ -100,5 +100,5 @@ driftfile /etc/chrony.drift
+@@ -99,5 +99,5 @@
  # assumed by default.
  
 -keyfile /etc/chrony.keys
 +keyfile @PKG_SYSCONFDIR@/chrony.keys
  
  # Tell chronyd which numbered key in the file is used as the password
+@@ -130,5 +130,5 @@
+ # file, uncomment this line and edit it.  The default path is shown.
+ 
+-! pidfile /var/run/chronyd.pid
++! pidfile @VARBASE@/run/chronyd.pid
+ 
+ #######################################################################
diff --git a/net/chrony/patches/patch-ag b/net/chrony/patches/patch-ag
deleted file mode 100644
index 61aebed50b1..00000000000
--- a/net/chrony/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2008/08/12 16:37:32 sborrill Exp $
-
---- sys_netbsd.c.orig	2007-12-02 14:53:09.000000000 +0000
-+++ sys_netbsd.c	2008-08-12 17:26:28.000000000 +0100
-@@ -285,7 +285,7 @@
-   kvm_t *kt;
-   FILE *fp;
- 
--  kt = kvm_open(NULL, NULL, NULL, O_RDWR, NULL);
-+  kt = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
-   if (!kt) {
-     CROAK("Cannot open kvm\n");
-   }
-@@ -299,7 +299,7 @@
-   }
- 
-   if (kvm_read(kt, nl[1].n_value, (char *)(&kern_bigadj), sizeof(long)) < 0) {
--    CROAK("Cannot read from _bigadj\n");
-+    kern_bigadj = 1000000;
-   }
- 
-   kvm_close(kt);