[chrony/f14/master] update to 1.25

[Miroslav Lichvar]

commit 4bf7c395c6859c95f158a97d1c057a661ed831e1
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Thu May 5 14:10:44 2011 +0200

    update to 1.25

 .gitignore            |    5 ++---
 chrony-retryres.patch |   12 ------------
 chrony.spec           |   13 +++++--------
 chronyd.init          |   14 ++------------
 sources               |    3 +--
 5 files changed, 10 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b198657..e958fa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-chrony-1.24.tar.gz
-timepps.h
-chrony-1.24-20100428git73d775.patch.gz
+/timepps.h
+/chrony-1.25.tar.gz
diff --git a/chrony.spec b/chrony.spec
index 35dc8cd..a24368c 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -1,7 +1,6 @@
-%define gitpatch 20100428git73d775
 Name:           chrony
-Version:        1.24
-Release:        4.%{?gitpatch}%{?dist}
+Version:        1.25
+Release:        1%{?gitpatch}%{?dist}
 Summary:        An NTP client/server
 
 Group:          System Environment/Daemons
@@ -17,8 +16,7 @@ Source5:        chrony.logrotate
 Source6:        timepps.h
 Source7:        chrony.nm-dispatcher
 Source8:        chrony.dhclient
-Patch0:         chrony-%{version}-%{gitpatch}.patch.gz
-Patch1:         chrony-retryres.patch
+%{?gitpatch:Patch0: chrony-%{version}-%{gitpatch}.patch.gz}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libcap-devel libedit-devel bison texinfo
@@ -38,8 +36,7 @@ clocks, system real-time clock or manual input as time references.
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
 mkdir pps; cp -p %{SOURCE6} pps
-%patch0 -p1
-%patch1 -p1 -b .retryres
+%{?gitpatch:%patch0 -p1}
 
 %{?gitpatch: echo %{version}-%{gitpatch} > version.txt}
 
@@ -54,7 +51,7 @@ export CFLAGS
 export CPPFLAGS="-Ipps"
 export LDFLAGS="-Wl,-z,relro,-z,now"
 
-%configure --docdir=%{_docdir}
+%configure --docdir=%{_docdir} --enable-forcednsretry
 make %{?_smp_mflags} getdate all docs
 
 %install
diff --git a/chronyd.init b/chronyd.init
index 9877c04..9375d25 100644
--- a/chronyd.init
+++ b/chronyd.init
@@ -48,20 +48,10 @@ chrony_command() {
     commandkey=$(get_key $commandkeyid)
     [ -z "$commandkey" ] && return 2
 
-    ! (
-        $chronyc <<EOF &
+    $chronyc <<EOF | grep -v '200 OK'
 password $commandkey
 $1
 EOF
-        chronycpid=$!
-
-        # chronyc will hang if the daemon doesn't respond, kill it after 4 s 
-        (sleep 4; kill $chronycpid) < /dev/null &> /dev/null &
-        killerpid=$!
-
-        wait $chronycpid &> /dev/null
-        kill $killerpid &> /dev/null || echo "chronyd not responding"
-    ) | grep -v '200 OK'
 }
 
 generate_commandkey() {
@@ -85,7 +75,7 @@ add_dhclient_servers() {
     if [ -n "$command" ]; then
         echo -n $"Adding dhclient NTP servers to chrony: "
         chrony_command "$command" &> /dev/null && success || failure
-	echo
+        echo
     fi
 }
 
diff --git a/sources b/sources
index 16d59b7..be7a908 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-8849e95428f43c5ab2692a2812653e65  chrony-1.24.tar.gz
 b494eddf72f3455c333eed80642dc20d  timepps.h
-fd084bd4bf10c8fb4208d2a582177dc1  chrony-1.24-20100428git73d775.patch.gz
+9de3605616228ee010790da09df27500  chrony-1.25.tar.gz