From dd99f2e3be34549cbd6cbf0d3d1f198d40813d69 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 6 Jul 2008 11:51:30 +0000
Subject: [PATCH] Update chrony to 1.23 (#3644)

SVN-Revision: 11691
---
 net/chrony/Makefile                           |  8 +++-----
 net/chrony/patches/001-crosscompile.patch     | 15 +++++++-------
 .../patches/002-mips_ioc_constants.patch      | 19 ------------------
 net/chrony/patches/003-gcc4.patch             | 20 -------------------
 4 files changed, 10 insertions(+), 52 deletions(-)

diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 090cdadd5c..7c5d552b7e 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -9,15 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chrony
-PKG_VERSION:=1.21
-PKG_RELEASE:=2
+PKG_VERSION:=1.23
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= ftp://chrony.sunsite.dk/projects/chrony/ \
 	http://chrony.sunsite.dk/download/
-PKG_MD5SUM:=84f76a73dff5a3c9e9f11f3c29a4e93b
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_MD5SUM:=ffce77695e55d8efda19ab0b78309c23
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/chrony/patches/001-crosscompile.patch b/net/chrony/patches/001-crosscompile.patch
index 0c968a11d7..cdc5939b34 100644
--- a/net/chrony/patches/001-crosscompile.patch
+++ b/net/chrony/patches/001-crosscompile.patch
@@ -1,7 +1,6 @@
-diff -ru chrony-1.21.orig/configure chrony-1.21/configure
---- chrony-1.21.orig/configure	2005-08-11 22:32:54.000000000 +0200
-+++ chrony-1.21/configure	2006-08-08 22:24:39.000000000 +0200
-@@ -185,6 +185,13 @@
+--- a/configure
++++ b/configure
+@@ -187,6 +187,13 @@
      --prefix=* | --install_prefix=* )
        INSTALL_PREFIX=`echo $option | sed -e 's/[^=]*=//;'`
      ;;
@@ -15,12 +14,12 @@ diff -ru chrony-1.21.orig/configure chrony-1.21/configure
      --trace )
        EXTRA_DEFS="-DTRACEON"
      ;;
-@@ -237,7 +244,7 @@
+@@ -242,7 +249,7 @@
          ;;
      esac
      ;;
 -    Linux* )
 +    Linux* | linux* )
-         EXTRA_OBJECTS="sys_linux.o wrap_adjtimex.o rtc_linux.o"
-         SYSDEFS="-DLINUX"
-         echo "Configuring for " $SYSTEM
+         EXTRA_OBJECTS="sys_linux.o wrap_adjtimex.o"
+         if [ $feat_rtc -eq 1 ] ; then
+             EXTRA_OBJECTS+=" rtc_linux.o"
diff --git a/net/chrony/patches/002-mips_ioc_constants.patch b/net/chrony/patches/002-mips_ioc_constants.patch
index c25bd31d09..e69de29bb2 100644
--- a/net/chrony/patches/002-mips_ioc_constants.patch
+++ b/net/chrony/patches/002-mips_ioc_constants.patch
@@ -1,19 +0,0 @@
-diff -ru chrony-1.21.orig/io_linux.h chrony-1.21/io_linux.h
---- chrony-1.21.orig/io_linux.h	2005-08-11 22:32:54.000000000 +0200
-+++ chrony-1.21/io_linux.h	2006-08-08 22:24:43.000000000 +0200
-@@ -24,6 +24,15 @@
- #define CHRONY_IOC_NONE        1U
- #define CHRONY_IOC_READ        2U
- #define CHRONY_IOC_WRITE       4U
-+#elif defined(__mips__) || (__powerpc__) || (__arm__)
-+#define CHRONY_IOC_NRBITS	8
-+#define CHRONY_IOC_TYPEBITS	8
-+#define CHRONY_IOC_SIZEBITS	13
-+#define CHRONY_IOC_DIRBITS	3
-+
-+#define CHRONY_IOC_NONE        1U
-+#define CHRONY_IOC_READ        2U
-+#define CHRONY_IOC_WRITE       4U
- #else
- #error "I don't know the values of the _IOC_* constants for your architecture"
- #endif
diff --git a/net/chrony/patches/003-gcc4.patch b/net/chrony/patches/003-gcc4.patch
index b92268c64a..e69de29bb2 100644
--- a/net/chrony/patches/003-gcc4.patch
+++ b/net/chrony/patches/003-gcc4.patch
@@ -1,20 +0,0 @@
---- chrony-1.21/addrfilt.c.orig	2005-08-11 22:32:54.000000000 +0200
-+++ chrony-1.21/addrfilt.c	2005-09-04 11:05:54.000000000 +0200
-@@ -45,7 +45,7 @@
- 
- struct _TableNode;
- 
--typedef struct _TableNode ExtendedTable[TABLE_SIZE];
-+typedef struct _TableNode *ExtendedTable;
- 
- typedef enum {DENY, ALLOW, AS_PARENT} State;
- 
-@@ -124,7 +124,7 @@
- 
-   if (node->extended == NULL) {
- 
--    node->extended = MallocNew(ExtendedTable);
-+    node->extended = MallocArray(ExtendedTable, TABLE_SIZE);
- 
-     for (i=0; i<TABLE_SIZE; i++) {
-       child_node = &((*(node->extended))[i]);
-- 
2.30.2