From 3e914725590b0c8fea1cffa3243e55cee810f942 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 4 Feb 2012 19:41:21 +0000
Subject: [PATCH] [packages_10.03.2] chrony: merge r28330

SVN-Revision: 30083
---
 net/chrony/Makefile                       |  6 +++---
 net/chrony/patches/001-crosscompile.patch | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 21e5d84fd2..7ce3ec330d 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chrony
-PKG_VERSION:=1.23
-PKG_RELEASE:=3
+PKG_VERSION:=1.26
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= ftp://download.tuxfamily.org/projects/chrony/ \
 	http://download.tuxfamily.org/chrony/
-PKG_MD5SUM:=ffce77695e55d8efda19ab0b78309c23
+PKG_MD5SUM:=ad6dd619ff1986e4ff780363c64e2246
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/chrony/patches/001-crosscompile.patch b/net/chrony/patches/001-crosscompile.patch
index cdc5939b34..d712e06a73 100644
--- a/net/chrony/patches/001-crosscompile.patch
+++ b/net/chrony/patches/001-crosscompile.patch
@@ -1,8 +1,8 @@
 --- a/configure
 +++ b/configure
-@@ -187,6 +187,13 @@
-     --prefix=* | --install_prefix=* )
-       INSTALL_PREFIX=`echo $option | sed -e 's/[^=]*=//;'`
+@@ -254,6 +254,13 @@ do
+     --host-machine=* )
+       MACHINE=`echo $option | sed -e 's/^.*=//;'`
      ;;
 +    --target=* )
 +      TARGET=`echo $option | sed -e 's/[^=]*=//;'`
@@ -11,15 +11,15 @@
 +      VERSION=""
 +      SYSTEM=${OPERATINGSYSTEM}-${MACHINE}
 +    ;;
-     --trace )
-       EXTRA_DEFS="-DTRACEON"
-     ;;
-@@ -242,7 +249,7 @@
+     --help | -h )
+       usage
+       exit 0
+@@ -287,7 +294,7 @@ case $SYSTEM in
          ;;
      esac
      ;;
 -    Linux* )
 +    Linux* | linux* )
          EXTRA_OBJECTS="sys_linux.o wrap_adjtimex.o"
-         if [ $feat_rtc -eq 1 ] ; then
-             EXTRA_OBJECTS+=" rtc_linux.o"
+         try_linuxcaps=1
+         try_rtc=1
-- 
2.30.2