diff options
author | hannken <hannken> | 2004-11-30 11:26:59 +0000 |
---|---|---|
committer | hannken <hannken> | 2004-11-30 11:26:59 +0000 |
commit | 43b3a5694fc96809d65e47f27c60a0527635384d (patch) | |
tree | 5edfbc2c589a09827ca547ab829bf82901afcdee /net/chrony | |
parent | 1225e0c412e822ba0e9422e843d5d2f8259b848c (diff) | |
download | pkgsrc-43b3a5694fc96809d65e47f27c60a0527635384d.tar.gz |
Update to version 1.20
- Many small tidy-ups and security improvements.
- Merge support for 64bit architectures.
- Generate more informative syslog messages before exiting on failed
assertions.
- Fix bugs in clamping code for the tick value used when slewing a large
offset.
Diffstat (limited to 'net/chrony')
-rw-r--r-- | net/chrony/Makefile | 10 | ||||
-rw-r--r-- | net/chrony/distinfo | 19 | ||||
-rw-r--r-- | net/chrony/patches/patch-aa | 105 | ||||
-rw-r--r-- | net/chrony/patches/patch-ab | 8 | ||||
-rw-r--r-- | net/chrony/patches/patch-ac | 10 | ||||
-rw-r--r-- | net/chrony/patches/patch-ad | 6 | ||||
-rw-r--r-- | net/chrony/patches/patch-ae | 6 | ||||
-rw-r--r-- | net/chrony/patches/patch-af | 4 | ||||
-rw-r--r-- | net/chrony/patches/patch-ag | 13 |
9 files changed, 97 insertions, 84 deletions
diff --git a/net/chrony/Makefile b/net/chrony/Makefile index 78ff77b68f4..30616dc9a8b 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2004/10/03 00:17:49 tv Exp $ +# $NetBSD: Makefile,v 1.13 2004/11/30 11:26:59 hannken Exp $ -DISTNAME= chrony-1.17 -PKGREVISION= 2 +DISTNAME= chrony-1.20 CATEGORIES= net MASTER_SITES= ftp://chrony.sunsite.dk/projects/chrony/ @@ -11,6 +10,7 @@ COMMENT= Daemon for maintaining the accuracy of computer clocks USE_BUILDLINK3= YES USE_PKGINSTALL= YES +USE_GNU_TOOLS+= make HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX} @@ -18,6 +18,10 @@ EGDIR= ${LOCALBASE}/share/examples/chrony EGFILES= chrony.conf.example chrony.keys.example RCD_SCRIPTS= chronyd +MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" +MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" +MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}" + pre-install: for file in ${EGFILES}; do \ ${SED} ${FILES_SUBST_SED} \ diff --git a/net/chrony/distinfo b/net/chrony/distinfo index e032e7ef808..dbd80e5915e 100644 --- a/net/chrony/distinfo +++ b/net/chrony/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ +$NetBSD: distinfo,v 1.2 2004/11/30 11:26:59 hannken Exp $ -SHA1 (chrony-1.17.tar.gz) = 67615fb76a220f0119debae6cf46f2ab8f146976 -Size (chrony-1.17.tar.gz) = 283964 bytes -SHA1 (patch-aa) = e3ff4b508be2451e9e6c451e354e86156a6580fa -SHA1 (patch-ab) = d61a8b123ad471f263062f709ba852a420723b4a -SHA1 (patch-ac) = b5a766e0db8fffbd66584ab6beb77cf8008786fd -SHA1 (patch-ad) = 4d51086153119ba2d2a8691f13c02317f5b3c1f0 -SHA1 (patch-ae) = 2377448814346c85fe49468eec3e743e20accae8 -SHA1 (patch-af) = 1262d144bb74ad9b5b72d2715cd01a177d8fef1e +SHA1 (chrony-1.20.tar.gz) = 8a739038b208bf63e4d0afbee44e8fea3c9aa480 +Size (chrony-1.20.tar.gz) = 308253 bytes +SHA1 (patch-aa) = 10f5a5301c2f0ae2da840386a563551ad0fbfb1c +SHA1 (patch-ab) = adeb6a5bceb15aee05efcf4a7ecd25a0d0197e39 +SHA1 (patch-ac) = 67bf960ab1434050461e682aae9f1f1f030ca88c +SHA1 (patch-ad) = 98f5ba97e0052a0e83a0017769bd869ce593c461 +SHA1 (patch-ae) = 6f692c25f35e857fe93dcc0e7a6b9c23337bd72e +SHA1 (patch-af) = 0cd339cceb6af8dcafc5f58ee4855fe72781d609 +SHA1 (patch-ag) = 4616fdfed44467d48962303b8e34ca96b6ac0fc5 diff --git a/net/chrony/patches/patch-aa b/net/chrony/patches/patch-aa index 15757a496f7..73272573a3b 100644 --- a/net/chrony/patches/patch-aa +++ b/net/chrony/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ +$NetBSD: patch-aa,v 1.2 2004/11/30 11:26:59 hannken Exp $ ---- Makefile.in.orig Sun Feb 17 23:23:12 2002 +--- Makefile.in.orig 2003-09-20 00:48:26.000000000 +0200 +++ Makefile.in -@@ -43,7 +43,7 @@ +@@ -60,7 +60,7 @@ EXTRA_CLI_LIBS=@EXTRA_CLI_LIBS@ DEFS=@SYSDEFS@ @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ # Until we have a main procedure we can link, just build object files # to test compilation -@@ -51,10 +51,10 @@ +@@ -68,10 +68,10 @@ CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS) all : chronyd chronyc chronyd : $(OBJS) $(EXTRA_OBJS) @@ -24,55 +24,50 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ client.o : client.c $(CC) $(CFLAGS) $(DEFS) @READLINE_COMPILE@ -c $< -@@ -79,37 +79,38 @@ - [ -d $(INSTALL_PREFIX) ] || mkdir $(INSTALL_PREFIX) - [ -d $(INSTALL_PREFIX)/sbin ] || mkdir $(INSTALL_PREFIX)/sbin - [ -d $(INSTALL_PREFIX)/bin ] || mkdir $(INSTALL_PREFIX)/bin -- [ -d $(INSTALL_PREFIX)/doc ] || mkdir $(INSTALL_PREFIX)/doc -+ [ -d $(INSTALL_PREFIX)/share ] || mkdir $(INSTALL_PREFIX)/share - [ -d $(INSTALL_PREFIX)/man ] || mkdir $(INSTALL_PREFIX)/man -+ [ -d $(INSTALL_PREFIX)/share/doc ] || mkdir $(INSTALL_PREFIX)/share/doc - [ -d $(INSTALL_PREFIX)/man/man1 ] || mkdir $(INSTALL_PREFIX)/man/man1 - [ -d $(INSTALL_PREFIX)/man/man5 ] || mkdir $(INSTALL_PREFIX)/man/man5 - [ -d $(INSTALL_PREFIX)/man/man8 ] || mkdir $(INSTALL_PREFIX)/man/man8 -- [ -d $(INSTALL_PREFIX)/doc/chrony ] || mkdir $(INSTALL_PREFIX)/doc/chrony -+ [ -d $(INSTALL_PREFIX)/share/doc/chrony ] || mkdir $(INSTALL_PREFIX)/share/doc/chrony - cp chronyd $(INSTALL_PREFIX)/sbin/chronyd - chown root $(INSTALL_PREFIX)/sbin/chronyd - chmod 555 $(INSTALL_PREFIX)/sbin/chronyd - cp chronyc $(INSTALL_PREFIX)/bin/chronyc - chown root $(INSTALL_PREFIX)/bin/chronyc - chmod 555 $(INSTALL_PREFIX)/bin/chronyc -- cp chrony.txt $(INSTALL_PREFIX)/doc/chrony/chrony.txt -- chown root $(INSTALL_PREFIX)/doc/chrony/chrony.txt -- chmod 444 $(INSTALL_PREFIX)/doc/chrony/chrony.txt -- cp COPYING $(INSTALL_PREFIX)/doc/chrony/COPYING -- chown root $(INSTALL_PREFIX)/doc/chrony/COPYING -- chmod 444 $(INSTALL_PREFIX)/doc/chrony/COPYING -- cp README $(INSTALL_PREFIX)/doc/chrony/README -- chown root $(INSTALL_PREFIX)/doc/chrony/README -- chmod 444 $(INSTALL_PREFIX)/doc/chrony/README -+ cp chrony.txt $(INSTALL_PREFIX)/share/doc/chrony/chrony.txt -+ chown root $(INSTALL_PREFIX)/share/doc/chrony/chrony.txt -+ chmod 444 $(INSTALL_PREFIX)/share/doc/chrony/chrony.txt -+ cp COPYING $(INSTALL_PREFIX)/share/doc/chrony/COPYING -+ chown root $(INSTALL_PREFIX)/share/doc/chrony/COPYING -+ chmod 444 $(INSTALL_PREFIX)/share/doc/chrony/COPYING -+ cp README $(INSTALL_PREFIX)/share/doc/chrony/README -+ chown root $(INSTALL_PREFIX)/share/doc/chrony/README -+ chmod 444 $(INSTALL_PREFIX)/share/doc/chrony/README - cp chrony.1 $(INSTALL_PREFIX)/man/man1 - chown root $(INSTALL_PREFIX)/man/man1/chrony.1 - chmod 444 $(INSTALL_PREFIX)/man/man1/chrony.1 - cp chronyc.1 $(INSTALL_PREFIX)/man/man1 - chown root $(INSTALL_PREFIX)/man/man1/chronyc.1 - chmod 444 $(INSTALL_PREFIX)/man/man1/chronyc.1 -- cp chronyd.8 $(INSTALL_PREFIX)/man/man8 -+ sed 's|@PREFIX@|$(INSTALL_PREFIX)|g' chronyd.8 > $(INSTALL_PREFIX)/man/man8/chronyd.8 - chown root $(INSTALL_PREFIX)/man/man8/chronyd.8 - chmod 444 $(INSTALL_PREFIX)/man/man8/chronyd.8 -- cp chrony.conf.5 $(INSTALL_PREFIX)/man/man5 -+ sed 's|@PREFIX@|$(INSTALL_PREFIX)|g' chrony.conf.5 > $(INSTALL_PREFIX)/man/man5/chrony.conf.5 - chown root $(INSTALL_PREFIX)/man/man5/chrony.conf.5 - chmod 444 $(INSTALL_PREFIX)/man/man5/chrony.conf.5 +@@ -93,34 +93,18 @@ version.h : version.txt + # seem to vary between systems. + 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)$(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 +- cp chrony.1 $(DESTDIR)$(MANDIR)/man1 +- chmod 444 $(DESTDIR)$(MANDIR)/man1/chrony.1 +- cp chronyc.1 $(DESTDIR)$(MANDIR)/man1 +- chmod 444 $(DESTDIR)$(MANDIR)/man1/chronyc.1 +- cp chronyd.8 $(DESTDIR)$(MANDIR)/man8 +- chmod 444 $(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 + + %.o : %.c + $(CC) $(CFLAGS) $(DEFS) -c $< diff --git a/net/chrony/patches/patch-ab b/net/chrony/patches/patch-ab index 3b167f16626..c363603970e 100644 --- a/net/chrony/patches/patch-ab +++ b/net/chrony/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ +$NetBSD: patch-ab,v 1.2 2004/11/30 11:26:59 hannken Exp $ ---- chrony.conf.5.orig Sun Feb 17 23:23:12 2002 +--- chrony.conf.5.orig 2002-11-04 00:32:08.000000000 +0100 +++ chrony.conf.5 @@ -3,7 +3,7 @@ chrony.conf \- chronyd configuration file @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ .SH DESCRIPTION \fIchrony\fR is a pair of programs for maintaining the accuracy of computer -@@ -12,7 +12,7 @@ +@@ -12,7 +12,7 @@ boot time. Assuming that you have found some servers, you need to set up a configuration file to run \fIchrony\fR. The (compiled-in) default location @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ are called `a.b.c' and `d.e.f', your \fBchrony.conf\fR file could contain as a minimum -@@ -29,9 +29,9 @@ +@@ -29,9 +29,9 @@ useful configuration file would look som server a.b.c server d.e.f server g.h.i diff --git a/net/chrony/patches/patch-ac b/net/chrony/patches/patch-ac index 2c1130e78fc..0cc7bb27175 100644 --- a/net/chrony/patches/patch-ac +++ b/net/chrony/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ +$NetBSD: patch-ac,v 1.2 2004/11/30 11:26:59 hannken Exp $ ---- chronyd.8.orig Sun Feb 17 23:23:14 2002 +--- chronyd.8.orig 2002-11-04 00:32:10.000000000 +0100 +++ chronyd.8 -@@ -24,10 +24,10 @@ +@@ -24,10 +24,10 @@ gains or loses time, and compensates for priviliges. If \fBchronyd\fR has been installed to its default location @@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ Information messages and warnings will be logged to syslog. -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ to syslog. .TP \fB\-f\fR \fIconf-file\fR This option can be used to specify an alternate location for the @@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ .TP .B \-r This option will reload sample histories for each of the servers being used. -@@ -83,7 +83,7 @@ +@@ -83,7 +83,7 @@ computer was on. This option displays \fBchronyd\fR's version number to the terminal and exits .SH FILES diff --git a/net/chrony/patches/patch-ad b/net/chrony/patches/patch-ad index 629b3478415..5b7be1aa7a1 100644 --- a/net/chrony/patches/patch-ad +++ b/net/chrony/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ +$NetBSD: patch-ad,v 1.2 2004/11/30 11:26:59 hannken Exp $ ---- conf.c.orig Sun Feb 17 23:23:15 2002 +--- conf.c.orig 2003-09-22 23:22:30.000000000 +0200 +++ conf.c -@@ -45,7 +45,9 @@ +@@ -55,7 +55,9 @@ /* ================================================== */ diff --git a/net/chrony/patches/patch-ae b/net/chrony/patches/patch-ae index fafe7447691..ea51e4387c7 100644 --- a/net/chrony/patches/patch-ae +++ b/net/chrony/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ +$NetBSD: patch-ae,v 1.2 2004/11/30 11:26:59 hannken Exp $ ---- examples/chrony.conf.example.orig Sun Feb 17 23:23:19 2002 +--- examples/chrony.conf.example.orig 2002-02-03 22:46:29.000000000 +0100 +++ examples/chrony.conf.example @@ -3,5 +3,5 @@ # @@ -16,7 +16,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ +driftfile /var/db/chrony.drift # If you want to use the program called chronyc to configure aspects of -@@ -100,5 +100,5 @@ +@@ -100,5 +100,5 @@ driftfile /etc/chrony.drift # assumed by default. -keyfile /etc/chrony.keys diff --git a/net/chrony/patches/patch-af b/net/chrony/patches/patch-af index 72c9a253b21..0a0d19c07db 100644 --- a/net/chrony/patches/patch-af +++ b/net/chrony/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/03/22 23:01:52 tron Exp $ +$NetBSD: patch-af,v 1.2 2004/11/30 11:26:59 hannken Exp $ ---- examples/chrony.keys.example.orig Sun Feb 17 23:23:19 2002 +--- examples/chrony.keys.example.orig 2002-01-31 01:00:08.000000000 +0100 +++ examples/chrony.keys.example @@ -3,3 +3,3 @@ # diff --git a/net/chrony/patches/patch-ag b/net/chrony/patches/patch-ag new file mode 100644 index 00000000000..fa3d34f8f5e --- /dev/null +++ b/net/chrony/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2004/11/30 11:26:59 hannken Exp $ + +--- sys_netbsd.c.orig 2002-02-17 23:13:49.000000000 +0100 ++++ sys_netbsd.c +@@ -285,7 +285,7 @@ SYS_NetBSD_Initialise(void) + 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"); + } |