pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/chrony Update chrony to version 1.31.1. For a full...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c5ff277ce07a
branches: trunk
changeset: 649929:c5ff277ce07a
user: hannken <hannken%pkgsrc.org@localhost>
date: Mon Apr 13 10:03:21 2015 +0000
description:
Update chrony to version 1.31.1. For a full list of changes
since 1.29 see file NEWS in the distfile.
Security fixes since 1.29:
* Modify chronyc protocol to prevent amplification attacks (CVE-2014-0021)
(incompatible with previous protocol version, chronyc supports both)
* Protect authenticated symmetric NTP associations against DoS attacks
(CVE-2015-1799)
* Fix access configuration with subnet size indivisible by 4 (CVE-2015-1821)
* Fix initialization of reply slots for authenticated commands (CVE-2015-1822)
diffstat:
net/chrony/Makefile | 8 +-
net/chrony/distinfo | 21 +++----
net/chrony/patches/patch-Makefile.in | 51 +++++++++++++++++++
net/chrony/patches/patch-aa | 51 -------------------
net/chrony/patches/patch-ab | 34 ------------
net/chrony/patches/patch-ac | 14 -----
net/chrony/patches/patch-ad | 15 -----
net/chrony/patches/patch-ae | 42 ---------------
net/chrony/patches/patch-af | 14 -----
net/chrony/patches/patch-ag | 15 -----
net/chrony/patches/patch-conf.c | 15 +++++
net/chrony/patches/patch-examples_chrony.conf.example | 42 +++++++++++++++
net/chrony/patches/patch-examples_chrony.keys.example | 14 +++++
net/chrony/patches/patch-ntp__io.c | 14 ++--
14 files changed, 143 insertions(+), 207 deletions(-)
diffs (truncated from 434 to 300 lines):
diff -r 4bbf70a3efe8 -r c5ff277ce07a net/chrony/Makefile
--- a/net/chrony/Makefile Mon Apr 13 09:14:00 2015 +0000
+++ b/net/chrony/Makefile Mon Apr 13 10:03:21 2015 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2013/08/16 08:30:20 hannken Exp $
+# $NetBSD: Makefile,v 1.30 2015/04/13 10:03:21 hannken Exp $
-DISTNAME= chrony-1.29
+DISTNAME= chrony-1.31.1
CATEGORIES= net
MASTER_SITES= http://download.tuxfamily.org/chrony/
@@ -32,8 +32,8 @@
post-install:
set -e; for file in ${EGFILES}; do \
- ${INSTALL_DATA} ${WRKSRC}/examples/$${file} \
- ${DESTDIR}${EGDIR}/$${file}; \
+ ${INSTALL_DATA} "${WRKSRC}/examples/$${file}" \
+ "${DESTDIR}${EGDIR}/$${file}"; \
done
.include "../../mk/readline.buildlink3.mk"
diff -r 4bbf70a3efe8 -r c5ff277ce07a net/chrony/distinfo
--- a/net/chrony/distinfo Mon Apr 13 09:14:00 2015 +0000
+++ b/net/chrony/distinfo Mon Apr 13 10:03:21 2015 +0000
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.9 2013/08/31 14:53:45 joerg Exp $
+$NetBSD: distinfo,v 1.10 2015/04/13 10:03:21 hannken Exp $
-SHA1 (chrony-1.29.tar.gz) = 442fb7d62a6f23bf1057864a3dbdfa55e1b6eb35
-RMD160 (chrony-1.29.tar.gz) = 53518efdd90c4695005d7cc929077985f16887d7
-Size (chrony-1.29.tar.gz) = 392880 bytes
-SHA1 (patch-aa) = c28f5b7ff6c3ebc67b68d574c1b10bd54334b6a3
-SHA1 (patch-ab) = 1af7c5699147d4c05165c4e1f90bf127814511ce
-SHA1 (patch-ac) = 5830215f11573ca88541f661fffb17365e7d206c
-SHA1 (patch-ad) = df47df974995f9f947b731a4812fb7633fd874a4
-SHA1 (patch-ae) = 133e90d0614ef5961305b952d9a7a4047a2edcc7
-SHA1 (patch-af) = 43c5e0f14aa8a980af83ba4ea5691705a4738064
-SHA1 (patch-ag) = 165daaab8507cca8b29a61af576711c0ec05a3a6
-SHA1 (patch-ntp__io.c) = 9b9503cf63fba28f57aa6da9020ca02b5d198bf9
+SHA1 (chrony-1.31.1.tar.gz) = 8e92871e164dad89b315a5dda99d94ff7b31770a
+RMD160 (chrony-1.31.1.tar.gz) = 7dd53fb95c1ecf30099bb580adeccd1a808c4dff
+Size (chrony-1.31.1.tar.gz) = 395797 bytes
+SHA1 (patch-Makefile.in) = 28abbbf1cfd037f018a92c3827642e749fd8768a
+SHA1 (patch-conf.c) = df47df974995f9f947b731a4812fb7633fd874a4
+SHA1 (patch-examples_chrony.conf.example) = ed17d749b1e4ad1c168da7a0393ef35a5e68aac0
+SHA1 (patch-examples_chrony.keys.example) = 5be7672dc40a1a1cb4451db05a4318185ef4f4d2
+SHA1 (patch-ntp__io.c) = edd1b5cf49fc24d3bfed128cd686b17633335a4d
diff -r 4bbf70a3efe8 -r c5ff277ce07a net/chrony/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/chrony/patches/patch-Makefile.in Mon Apr 13 10:03:21 2015 +0000
@@ -0,0 +1,51 @@
+$NetBSD: patch-Makefile.in,v 1.1 2015/04/13 10:03:21 hannken Exp $
+
+Adapt install target for pkgsrc.
+
+--- Makefile.in.orig 2015-04-07 14:35:16.000000000 +0000
++++ Makefile.in
+@@ -96,35 +96,15 @@ getdate :
+ # seem to vary between systems.
+
+ install: chronyd chronyc chrony.txt
+- [ -d $(DESTDIR)$(SYSCONFDIR) ] || mkdir -p $(DESTDIR)$(SYSCONFDIR)
+- [ -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)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR)
+- [ -d $(DESTDIR)$(CHRONYVARDIR) ] || mkdir -p $(DESTDIR)$(CHRONYVARDIR)
+- 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 644 $(DESTDIR)$(MANDIR)/man1/chrony.1
+- cp chronyc.1 $(DESTDIR)$(MANDIR)/man1
+- chmod 644 $(DESTDIR)$(MANDIR)/man1/chronyc.1
+- cp chronyd.8 $(DESTDIR)$(MANDIR)/man8
+- chmod 644 $(DESTDIR)$(MANDIR)/man8/chronyd.8
+- cp chrony.conf.5 $(DESTDIR)$(MANDIR)/man5
+- 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) $(CPPFLAGS) -c $<
diff -r 4bbf70a3efe8 -r c5ff277ce07a net/chrony/patches/patch-aa
--- a/net/chrony/patches/patch-aa Mon Apr 13 09:14:00 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2013/08/16 08:30:20 hannken Exp $
-
-Adapt install target for pkgsrc.
-
---- Makefile.in.orig 2013-08-08 13:58:07.000000000 +0000
-+++ Makefile.in
-@@ -93,35 +93,17 @@ getdate :
- # seem to vary between systems.
-
- install: chronyd chronyc
-- [ -d $(DESTDIR)$(SYSCONFDIR) ] || mkdir -p $(DESTDIR)$(SYSCONFDIR)
-- [ -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)$(DOCDIR) ] || mkdir -p $(DESTDIR)$(DOCDIR)
- [ -d $(DESTDIR)$(CHRONYVARDIR) ] || mkdir -p $(DESTDIR)$(CHRONYVARDIR)
-- 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 644 $(DESTDIR)$(MANDIR)/man1/chrony.1
-- cp chronyc.1 $(DESTDIR)$(MANDIR)/man1
-- chmod 644 $(DESTDIR)$(MANDIR)/man1/chronyc.1
-- cp chronyd.8 $(DESTDIR)$(MANDIR)/man8
-- chmod 644 $(DESTDIR)$(MANDIR)/man8/chronyd.8
-- cp chrony.conf.5 $(DESTDIR)$(MANDIR)/man5
-- 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) $(CPPFLAGS) -c $<
diff -r 4bbf70a3efe8 -r c5ff277ce07a net/chrony/patches/patch-ab
--- a/net/chrony/patches/patch-ab Mon Apr 13 09:14:00 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2013/08/16 08:30:20 hannken Exp $
-
-The ctype functions work on integers.
-
---- cmdparse.c.orig 2013-08-08 13:58:07.000000000 +0000
-+++ cmdparse.c
-@@ -203,7 +203,7 @@ CPS_NormalizeLine(char *line)
-
- /* Remove white-space at beginning and replace white-spaces with space char */
- for (p = q = line; *p; p++) {
-- if (isspace(*p)) {
-+ if (isspace((unsigned char)(*p))) {
- if (!space)
- *q++ = ' ';
- space = 1;
-@@ -233,15 +233,15 @@ CPS_SplitWord(char *line)
- char *p = line, *q = line;
-
- /* Skip white-space before the word */
-- while (*q && isspace(*q))
-+ while (*q && isspace((unsigned char)(*q)))
- q++;
-
- /* Move the word to the beginning */
-- while (*q && !isspace(*q))
-+ while (*q && !isspace((unsigned char)(*q)))
- *p++ = *q++;
-
- /* Find the next word */
-- while (*q && isspace(*q))
-+ while (*q && isspace((unsigned char)(*q)))
- q++;
-
- *p = '\0';
diff -r 4bbf70a3efe8 -r c5ff277ce07a net/chrony/patches/patch-ac
--- a/net/chrony/patches/patch-ac Mon Apr 13 09:14:00 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2013/08/16 08:30:20 hannken Exp $
-
-Remove unused variable.
-
---- sys_netbsd.c.orig 2013-08-08 13:58:07.000000000 +0000
-+++ sys_netbsd.c
-@@ -281,7 +281,6 @@ SYS_NetBSD_Initialise(void)
- };
-
- kvm_t *kt;
-- FILE *fp;
-
- kt = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
- if (!kt) {
diff -r 4bbf70a3efe8 -r c5ff277ce07a net/chrony/patches/patch-ad
--- a/net/chrony/patches/patch-ad Mon Apr 13 09:14:00 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2013/08/16 08:30:20 hannken Exp $
-
-Prepare for SUBST, not processed by configure.
-
---- conf.c.orig 2013-08-08 13:58:07.000000000 +0000
-+++ conf.c
-@@ -197,7 +197,7 @@ static IPAddr bind_cmd_address4, bind_cm
-
- /* 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";
-
- /* Temperature sensor, update interval and compensation coefficients */
- static char *tempcomp_file = NULL;
diff -r 4bbf70a3efe8 -r c5ff277ce07a net/chrony/patches/patch-ae
--- a/net/chrony/patches/patch-ae Mon Apr 13 09:14:00 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2013/08/16 08:30:20 hannken Exp $
-
-Prepare for SUBST, not processed by configure.
-
---- examples/chrony.conf.example.orig 2013-08-08 13:58:07.000000000 +0000
-+++ examples/chrony.conf.example
-@@ -1,7 +1,7 @@
- #######################################################################
- #
- # 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. The more obscure options are not included. Refer
- # to the documentation for these.
- #
-@@ -89,7 +89,7 @@
- # immediately so that it doesn't gain or lose any more time. You
- # generally want this, so it is uncommented.
-
--driftfile /var/lib/chrony/drift
-+driftfile @VARBASE@/lib/chrony/chrony.drift
-
- # If you want to use the program called chronyc to configure aspects of
- # chronyd's operation once it is running (e.g. tell it the Internet link
-@@ -98,7 +98,7 @@ driftfile /var/lib/chrony/drift
- # exchanges between cooperating machines.) Again, this option is
- # 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
- # for chronyc. (You can pick any integer up to 2**32-1. '1' is just a
-@@ -129,7 +129,7 @@ commandkey 1
- # still running and bail out. If you want to change the path to the PID
- # file, uncomment this line and edit it. The default path is shown.
-
--! pidfile /var/run/chronyd.pid
-+! pidfile @VARBASE@/run/chronyd.pid
-
- #######################################################################
- ### INITIAL CLOCK CORRECTION
diff -r 4bbf70a3efe8 -r c5ff277ce07a net/chrony/patches/patch-af
--- a/net/chrony/patches/patch-af Mon Apr 13 09:14:00 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.4 2013/08/16 08:30:20 hannken Exp $
-
-Prepare for SUBST, not processed by configure.
-
---- examples/chrony.keys.example.orig 2013-08-08 13:58:07.000000000 +0000
-+++ examples/chrony.keys.example
-@@ -1,6 +1,6 @@
- #######################################################################
- #
--# This is an example chrony keys file. You should copy it to /etc/chrony.keys
-+# This is an example chrony keys file. You should copy it to @PKG_SYSCONFDIR@/chrony.keys
- # after editing it to set up the key(s) you want to use. It should be readable
- # only by root or the user chronyd drops the root privileges to. In most
- # situations, you will require a single key (the 'commandkey') so that you can
diff -r 4bbf70a3efe8 -r c5ff277ce07a net/chrony/patches/patch-ag
--- a/net/chrony/patches/patch-ag Mon Apr 13 09:14:00 2015 +0000
Home |
Main Index |
Thread Index |
Old Index