From 9a8d16602e7a9da0d526ef28c794f9e1e7177d7a Mon Sep 17 00:00:00 2001
From: sborrill <sborrill@pkgsrc.org>
Date: Tue, 12 Aug 2008 16:37:32 +0000
Subject: Update to 1.23 and fix coredump on NetBSD 4.0 and later.

The changes in version 1.23 are

    * Support for MIPS, x86_64, sparc, alpha, arm, FreeBSD
    * Fix serious sign-extension error in handling IP addresses
    * RTC support can be excluded at compile time
    * Make sources gcc-4 compatible
    * Fix various compiler warnings
    * Handle fluctuations in peer distance better.
    * Fixed handling of stratum zero.
    * Fix various problems for 64-bit systems
    * Flush chronyc output streams after each command, to allow it to be
    driven through pipes
    * Manpage improvements

The changes in version 1.21 are

    * Don't include Linux kernel header files any longer : allows chrony to
      compile on recent distros.
    * Stop trying to use RTC if continuous streams of error messages would
      occur (Linux with HPET).
---
 net/chrony/Makefile         |  5 ++---
 net/chrony/distinfo         | 11 +++++------
 net/chrony/patches/patch-ag | 17 +++++++++++++----
 net/chrony/patches/patch-ah | 33 ---------------------------------
 4 files changed, 20 insertions(+), 46 deletions(-)
 delete mode 100644 net/chrony/patches/patch-ah

(limited to 'net')

diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 9bc392781b2..4bf9b4ca1aa 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2008/01/05 15:04:57 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2008/08/12 16:37:32 sborrill Exp $
 
-DISTNAME=	chrony-1.20
-PKGREVISION=	3
+DISTNAME=	chrony-1.23
 CATEGORIES=	net
 MASTER_SITES=	ftp://chrony.sunsite.dk/projects/chrony/
 
diff --git a/net/chrony/distinfo b/net/chrony/distinfo
index 9bdbc8cbe50..4159af80a0e 100644
--- a/net/chrony/distinfo
+++ b/net/chrony/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.5 2007/11/30 22:53:54 rillig Exp $
+$NetBSD: distinfo,v 1.6 2008/08/12 16:37:32 sborrill Exp $
 
-SHA1 (chrony-1.20.tar.gz) = 8a739038b208bf63e4d0afbee44e8fea3c9aa480
-RMD160 (chrony-1.20.tar.gz) = ec6f570c29b68983752ff8b025d908372bdf2fb1
-Size (chrony-1.20.tar.gz) = 308253 bytes
+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 (patch-af) = 3d09c0aba56bdce704a923ae7c15673cdb6a7489
-SHA1 (patch-ag) = 4616fdfed44467d48962303b8e34ca96b6ac0fc5
-SHA1 (patch-ah) = da3edfff06381b2d028faa1a6d2f1a79da818404
+SHA1 (patch-ag) = 63a2f96165d16bac2ac3796bb554bdc8ec6272e5
diff --git a/net/chrony/patches/patch-ag b/net/chrony/patches/patch-ag
index fa3d34f8f5e..61aebed50b1 100644
--- a/net/chrony/patches/patch-ag
+++ b/net/chrony/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2004/11/30 11:26:59 hannken Exp $
+$NetBSD: patch-ag,v 1.2 2008/08/12 16:37:32 sborrill Exp $
 
---- sys_netbsd.c.orig	2002-02-17 23:13:49.000000000 +0100
-+++ sys_netbsd.c
-@@ -285,7 +285,7 @@ SYS_NetBSD_Initialise(void)
+--- 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;
  
@@ -11,3 +11,12 @@ $NetBSD: patch-ag,v 1.1 2004/11/30 11:26:59 hannken Exp $
    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);
diff --git a/net/chrony/patches/patch-ah b/net/chrony/patches/patch-ah
deleted file mode 100644
index dff29fb5352..00000000000
--- a/net/chrony/patches/patch-ah
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2007/11/30 22:53:54 rillig Exp $
-
-Resolved recursive data type.
-
---- addrfilt.c.orig	2002-02-28 23:27:08.000000000 +0000
-+++ addrfilt.c	2007-11-30 22:49:50.000000000 +0000
-@@ -43,15 +43,11 @@
- /* Define the table size */
- #define TABLE_SIZE (1UL<<NBITS)
- 
--struct _TableNode;
--
--typedef struct _TableNode ExtendedTable[TABLE_SIZE];
--
- typedef enum {DENY, ALLOW, AS_PARENT} State;
- 
--typedef struct _TableNode {
-+typedef struct TableNode {
-   State state;
--  ExtendedTable *extended;
-+  struct TableNode **extended;	/* [TABLE_SIZE] */
- } TableNode;
- 
- struct ADF_AuthTableInst {
-@@ -124,7 +120,7 @@ open_node(TableNode *node)
- 
-   if (node->extended == NULL) {
- 
--    node->extended = MallocNew(ExtendedTable);
-+    node->extended = malloc(sizeof(*node->extended) * TABLE_SIZE);
- 
-     for (i=0; i<TABLE_SIZE; i++) {
-       child_node = &((*(node->extended))[i]);
-- 
cgit v1.2.3