chrony: update to 1.23

chrony/.md5sum

@@ -1,5 +1,4 @@
-84f76a73dff5a3c9e9f11f3c29a4e93b  chrony-1.21.tar.gz
-7c14e438020092ba2cd10d2014749088  chrony-gcc4.patch
-8450f776b8763a17a4e59b0f93aa79f8  chrony.conf
+ffce77695e55d8efda19ab0b78309c23  chrony-1.23.tar.gz
+3c53b2da1757f0c9de704b841adda511  chrony.conf
 ec43dcf700698a7d2891a1f8504b5e22  chrony.keys
 ef4b4ca7c250397656d81a329faf60d2  chronyd

chrony/Pkgfile

@@ -4,20 +4,19 @@
 # Depends on:  ncurses, readline
 
 name=chrony
-version=1.21
-release=2
+version=1.23
+release=1
 source=(http://chrony.sunsite.dk/download/$name-$version.tar.gz \
-        $name-gcc4.patch chronyd chrony.conf chrony.keys) 
+        chronyd chrony.conf chrony.keys) 
 
 build () {
     cd $name-$version
-    patch -p1 < $SRC/$name-gcc4.patch
     ./configure --prefix=/usr
     make
     make DESTDIR=$PKG install
 
     rm -r $PKG/usr/doc
-    
+
     install -d $PKG/var/{lib,log}/chrony 
     install -D -m 755 $SRC/chronyd $PKG/etc/rc.d/chronyd
     install -m 600 $SRC/chrony.* $PKG/etc

chrony/chrony-gcc4.patch

@@ -1,82 +0,0 @@
-diff -Nru chrony-1.21.orig/addrfilt.c chrony-1.21/addrfilt.c
---- chrony-1.21.orig/addrfilt.c	2006-02-20 15:54:23.000000000 +0100
-+++ chrony-1.21/addrfilt.c	2006-02-20 16:03:59.000000000 +0100
-@@ -43,17 +43,15 @@
- /* 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 {
-   State state;
--  ExtendedTable *extended;
-+  struct _TableNode *extended;
- } TableNode;
- 
-+typedef struct _TableNode ExtendedTable[TABLE_SIZE];
-+
- struct ADF_AuthTableInst {
-   TableNode base;
- };
-@@ -101,7 +99,7 @@
- 
-   if (node->extended != NULL) {
-     for (i=0; i<TABLE_SIZE; i++) {
--      child_node = &((*(node->extended))[i]);
-+      child_node = node->extended + i;
-       close_node(child_node);
-     }
-     Free(node->extended);
-@@ -124,10 +122,10 @@
- 
-   if (node->extended == NULL) {
- 
--    node->extended = MallocNew(ExtendedTable);
-+    node->extended = (TableNode *) MallocArray(ExtendedTable, TABLE_SIZE);
- 
-     for (i=0; i<TABLE_SIZE; i++) {
--      child_node = &((*(node->extended))[i]);
-+      child_node = node->extended + i;
-       child_node->state = AS_PARENT;
-       child_node->extended = NULL;
-     }
-@@ -168,7 +166,7 @@
-         if (!(node->extended)) {
-           open_node(node);
-         }
--        node = &((*(node->extended))[subnet]);
-+        node = node->extended + subnet;
-         bits_to_go -= NBITS;
-       }
- 
-@@ -187,7 +185,7 @@
-         if (!(node->extended)) {
-           open_node(node);
-         }
--        node = &((*(node->extended))[subnet]);
-+        node = node->extended + subnet;
-         bits_to_go -= NBITS;
-       }
- 
-@@ -199,7 +197,7 @@
-       }
-       
-       for (i=subnet, j=0; j<N; i++, j++) {
--        this_node = &((*(node->extended))[i]);
-+        this_node = node->extended + i;
-         if (delete_children) {
-           close_node(this_node);
-         }
-@@ -283,7 +281,7 @@
-     if (node->extended) {
-       subnet = get_subnet(residual);
-       residual = get_residual(residual);
--      node = &((*(node->extended))[subnet]);
-+      node = node->extended + subnet;
-     } else {
-       /* Make decision on this node */
-       finished = 1;

chrony/chrony.conf

@@ -24,7 +24,7 @@ logdir /var/log/chrony
 # Enable this only if you have enhanced real time
 # clock support build into your kernel
 ! log rtc
-! rtcdevice /dev/misc/rtc
+! rtcdevice /dev/rtc
 ! rtcfile /var/lib/chrony/chrony.rtc
 
 # End of file