[pkgsrc/trunk]: pkgsrc Update to 1.24.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Update to 1.24.
From: hannken <hannken%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:06:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7b6cce94654
branches:  trunk
changeset: 572440:f7b6cce94654
user:      hannken <hannken%pkgsrc.org@localhost>
date:      Fri Feb 26 09:27:43 2010 +0000

description:
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@localhost>

diffstat:

 doc/TODO                    |   3 +-
 net/chrony/Makefile         |  26 ++++++-----
 net/chrony/distinfo         |  19 ++++----
 net/chrony/patches/patch-aa |  92 +++++++++++++++-----------------------------
 net/chrony/patches/patch-ab |  18 ++-----
 net/chrony/patches/patch-ac |  16 ++-----
 net/chrony/patches/patch-ad |  19 +++-----
 net/chrony/patches/patch-ae |  23 +++++++---
 net/chrony/patches/patch-ag |  22 ----------
 9 files changed, 90 insertions(+), 148 deletions(-)

diffs (truncated from 388 to 300 lines):

diff -r ef5986525448 -r f7b6cce94654 doc/TODO
--- a/doc/TODO  Fri Feb 26 05:09:54 2010 +0000
+++ b/doc/TODO  Fri Feb 26 09:27:43 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.9077 2010/02/26 03:16:31 taca Exp $
+$NetBSD: TODO,v 1.9078 2010/02/26 09:27:43 hannken Exp $
 
 Suggested new packages
 ======================
@@ -474,7 +474,6 @@
        o cgicc-3.2.9
        o cheese-2.28.1 [GNOME 2.28]
        o cherokee-0.99.43
-       o chrony-1.24
        o cinepaint-0.23
        o cint-5.16
        o cjk-lyx-1.4.4
diff -r ef5986525448 -r f7b6cce94654 net/chrony/Makefile
--- a/net/chrony/Makefile       Fri Feb 26 05:09:54 2010 +0000
+++ b/net/chrony/Makefile       Fri Feb 26 09:27:43 2010 +0000
@@ -1,38 +1,40 @@
-# $NetBSD: Makefile,v 1.25 2009/05/20 00:58:25 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/02/26 09:27:43 hannken 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@localhost
-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 -r ef5986525448 -r f7b6cce94654 net/chrony/distinfo
--- a/net/chrony/distinfo       Fri Feb 26 05:09:54 2010 +0000
+++ b/net/chrony/distinfo       Fri Feb 26 09:27:43 2010 +0000
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.6 2008/08/12 16:37:32 sborrill Exp $
+$NetBSD: distinfo,v 1.7 2010/02/26 09:27:43 hannken 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 -r ef5986525448 -r f7b6cce94654 net/chrony/patches/patch-aa
--- a/net/chrony/patches/patch-aa       Fri Feb 26 05:09:54 2010 +0000
+++ b/net/chrony/patches/patch-aa       Fri Feb 26 09:27:43 2010 +0000
@@ -1,73 +1,45 @@
-$NetBSD: patch-aa,v 1.3 2006/01/08 13:27:53 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2010/02/26 09:27:43 hannken 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 -r ef5986525448 -r f7b6cce94654 net/chrony/patches/patch-ab
--- a/net/chrony/patches/patch-ab       Fri Feb 26 05:09:54 2010 +0000
+++ b/net/chrony/patches/patch-ab       Fri Feb 26 09:27:43 2010 +0000
@@ -1,34 +1,28 @@
-$NetBSD: patch-ab,v 1.3 2006/01/08 13:27:53 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2010/02/26 09:27:43 hannken 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 -r ef5986525448 -r f7b6cce94654 net/chrony/patches/patch-ac
--- a/net/chrony/patches/patch-ac       Fri Feb 26 05:09:54 2010 +0000
+++ b/net/chrony/patches/patch-ac       Fri Feb 26 09:27:43 2010 +0000
@@ -1,9 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2006/01/08 13:27:53 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2010/02/26 09:27:43 hannken 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 @@
 +\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 -r ef5986525448 -r f7b6cce94654 net/chrony/patches/patch-ad
--- a/net/chrony/patches/patch-ad       Fri Feb 26 05:09:54 2010 +0000
+++ b/net/chrony/patches/patch-ad       Fri Feb 26 09:27:43 2010 +0000
@@ -1,14 +1,11 @@
-$NetBSD: patch-ad,v 1.2 2004/11/30 11:26:59 hannken Exp $
+$NetBSD: patch-ad,v 1.3 2010/02/26 09:27:43 hannken Exp $
 
---- conf.c.orig        2003-09-22 23:22:30.000000000 +0200
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of time/ruby-tzinfo package to 0.3.16.
Next by Date: [pkgsrc/trunk]: pkgsrc/misc/root first attempt to make this DESTDIR ready and...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of time/ruby-tzinfo package to 0.3.16.
Next by Thread: [pkgsrc/trunk]: pkgsrc/misc/root first attempt to make this DESTDIR ready and...
Indexes:
Home | Main Index | Thread Index | Old Index