Pullup ticket #4215 - requested by hannken

net/chrony: security update

Revisions pulled up:
- net/chrony/Makefile                                           1.29
- net/chrony/PLIST                                              1.5
- net/chrony/distinfo                                           1.8
- net/chrony/files/chronyd.sh                                   1.5
- net/chrony/patches/patch-aa                                   1.5
- net/chrony/patches/patch-ab                                   1.5
- net/chrony/patches/patch-ac                                   1.5
- net/chrony/patches/patch-ad                                   1.4
- net/chrony/patches/patch-ae                                   1.5
- net/chrony/patches/patch-af                                   1.4
- net/chrony/patches/patch-ag                                   1.4

---
   Module Name:    pkgsrc
   Committed By:   hannken
   Date:           Fri Aug 16 08:30:20 UTC 2013

   Modified Files:
           pkgsrc/net/chrony: Makefile PLIST distinfo
           pkgsrc/net/chrony/files: chronyd.sh
           pkgsrc/net/chrony/patches: patch-aa patch-ab patch-ac patch-ad patch-ae
               patch-af
   Added Files:
           pkgsrc/net/chrony/patches: patch-ag

   Log Message:
   Update chrony to version 1.29. For a full list of changes
   since 1.24 see file NEWS in the distfile.

   Security fixes since 1.24:

   * Fix crash when processing crafted commands (CVE-2012-4502)
     (possible with IP addresses allowed by cmdallow and localhost)
   * Don't send uninitialized data in SUBNETS_ACCESSED and CLIENT_ACCESSES
     replies (CVE-2012-4503) (not used by chronyc)

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

1 files changed, 29 insertions, 23 deletions

diff --git a/net/chrony/patches/patch-ab b/net/chrony/patches/patch-ab
index 7a264530e09..6038e927475 100644
--- a/net/chrony/patches/patch-ab
+++ b/net/chrony/patches/patch-ab
@@ -1,28 +1,34 @@
-$NetBSD: patch-ab,v 1.4 2010/02/26 09:27:43 hannken Exp $
+$NetBSD: patch-ab,v 1.4.28.1 2013/08/21 12:59:44 tron Exp $
 
---- chrony.conf.5.orig	2010-02-04 13:07:19.000000000 +0100
-+++ chrony.conf.5
-@@ -4,5 +4,5 @@
+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;
  
- .SH SYNOPSIS
--.B /etc/chrony.conf
-+.B @PKG_SYSCONFDIR@/chrony.conf
+   /* Skip white-space before the word */
+-  while (*q && isspace(*q))
++  while (*q && isspace((unsigned char)(*q)))
+     q++;
  
- .SH DESCRIPTION
-@@ -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
-@@ -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 @VARBASE@/db/chrony.drift
+   /* 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';