[ntp] fix system peer unmarking when unreachable

[Miroslav Lichvar]

commit 4bcdd40a65083c8b7aafeb3d4ef4a1e7485d7c42
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Thu Nov 25 16:41:20 2010 +0100

    fix system peer unmarking when unreachable

 ntp-4.2.6p3-nosyspeer.patch |   19 +++++++++++++++++++
 ntp.spec                    |    3 +++
 2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/ntp-4.2.6p3-nosyspeer.patch b/ntp-4.2.6p3-nosyspeer.patch
new file mode 100644
index 0000000..54ccbbf
--- /dev/null
+++ b/ntp-4.2.6p3-nosyspeer.patch
@@ -0,0 +1,19 @@
+==== ntpd/ntp_proto.c ====
+2010-09-30 00:43:09-04:00, stenn at deacon.udel.edu +10 -3
+  [Bug 1554]: peer may stay selected as system peer after becoming
+  unreachable.
+
+--- 1.303/ntpd/ntp_proto.c	2010-09-25 10:39:41 -07:00
++++ 1.304/ntpd/ntp_proto.c	2010-09-29 21:43:09 -07:00
+@@ -2187,8 +2187,10 @@ clock_filter(
+ 	 * save the offset, delay and jitter. Note the jitter must not
+ 	 * be less than the precision.
+ 	 */
+-	if (m == 0)
++	if (m == 0) {
++		clock_select();
+ 		return;
++	}
+ 
+ 	etemp = fabs(peer->offset - peer->filter_offset[k]);
+ 	peer->offset = peer->filter_offset[k];
diff --git a/ntp.spec b/ntp.spec
index 87c1871..14a48c4 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -72,6 +72,8 @@ Patch13: ntp-4.2.6p1-logdefault.patch
 Patch14: ntp-4.2.6p2-mlock.patch
 # allow -u and -p options to be used twice (#639101)
 Patch15: ntp-4.2.6p2-multiopts.patch
+# ntpbz #1554
+Patch16: ntp-4.2.6p3-nosyspeer.patch
 
 # handle unknown clock types
 Patch50: ntpstat-0.2-clksrc.patch
@@ -157,6 +159,7 @@ cp %{SOURCE11} include
 %patch13 -p1 -b .logdefault
 %patch14 -p1 -b .mlock
 %patch15 -p1 -b .multiopts
+%patch16 -p1 -b .nosyspeer
 
 # set default path to sntp KoD database
 sed -i 's|/var/db/ntp-kod|%{_localstatedir}/lib/ntp/sntp-kod|' sntp/{sntp.1,main.c}