[ntp/f17] update to 4.2.6p5

[Miroslav Lichvar]

commit c72a7b8fb90eeb089c1b1d26ed992abf37cfb9f2
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Tue Feb 28 17:26:23 2012 +0100

    update to 4.2.6p5

 .gitignore                   |    2 +-
 ntp-4.2.6p3-delaycalib.patch |   12 ------------
 ntp-4.2.6p5-delaycalib.patch |   12 ++++++++++++
 ntp.spec                     |    6 +++---
 sources                      |    2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7a8af79..1fed9dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /ntpstat-0.2.tgz
-/ntp-4.2.6p4.tar.gz
+/ntp-4.2.6p5.tar.gz
diff --git a/ntp-4.2.6p5-delaycalib.patch b/ntp-4.2.6p5-delaycalib.patch
new file mode 100644
index 0000000..7e9a310
--- /dev/null
+++ b/ntp-4.2.6p5-delaycalib.patch
@@ -0,0 +1,12 @@
+diff -up ntp-4.2.6p5/ntpd/ntp_proto.c.delaycalib ntp-4.2.6p5/ntpd/ntp_proto.c
+--- ntp-4.2.6p5/ntpd/ntp_proto.c.delaycalib	2012-02-28 15:57:57.000000000 +0100
++++ ntp-4.2.6p5/ntpd/ntp_proto.c	2012-02-28 16:01:30.080135978 +0100
+@@ -1514,7 +1514,7 @@ process_packet(
+ 		 */
+ 		if (FLAG_BC_VOL & peer->flags) {
+ 			peer->flags &= ~FLAG_BC_VOL;
+-			peer->delay = (peer->offset - p_offset) * 2;
++			peer->delay = fabs(peer->offset - p_offset) * 2;
+ 		}
+ 		p_del = peer->delay;
+ 		p_offset += p_del / 2;
diff --git a/ntp.spec b/ntp.spec
index 284f564..456471f 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
-Version: 4.2.6p4
-Release: 3%{?dist}
+Version: 4.2.6p5
+Release: 1%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -72,7 +72,7 @@ Patch15: ntp-4.2.6p2-multiopts.patch
 # ntpbz #1670
 Patch17: ntp-4.2.6p3-broadcastdelay.patch
 # ntpbz #1671
-Patch18: ntp-4.2.6p3-delaycalib.patch
+Patch18: ntp-4.2.6p5-delaycalib.patch
 
 # handle unknown clock types
 Patch50: ntpstat-0.2-clksrc.patch
diff --git a/sources b/sources
index bd9426a..1ea52b4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 6b2bedefe2e7c63ea52609b222022121  ntpstat-0.2.tgz
-1447121a07b49361677ffda4f6e29527  ntp-4.2.6p4.tar.gz
+00df80a84ec9528fcfb09498075525bc  ntp-4.2.6p5.tar.gz