[ntp] don't print exit status (#1050148)

[Miroslav Lichvar]

commit 49b854375bc60d48a58e955e173c00241c7c44b6
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Mon Aug 25 15:13:00 2014 +0200

    don't print exit status (#1050148)

 ntp-4.2.6p5-testmain.patch |   66 ++++++++++++++++++++++++++++++++++++++++++++
 ntp.spec                   |    5 ++-
 2 files changed, 70 insertions(+), 1 deletions(-)
---
diff --git a/ntp-4.2.6p5-testmain.patch b/ntp-4.2.6p5-testmain.patch
new file mode 100644
index 0000000..33246a1
--- /dev/null
+++ b/ntp-4.2.6p5-testmain.patch
@@ -0,0 +1,66 @@
+diff -up ntp-4.2.6p5/ntpd/ntpdbase-opts.def.testmain ntp-4.2.6p5/ntpd/ntpdbase-opts.def
+--- ntp-4.2.6p5/ntpd/ntpdbase-opts.def.testmain	2014-08-25 15:11:30.998454198 +0200
++++ ntp-4.2.6p5/ntpd/ntpdbase-opts.def	2014-08-25 15:11:31.063454347 +0200
+@@ -8,7 +8,6 @@ include = <<- _EOF_
+ 	#endif
+ 	_EOF_;
+ 
+-test-main;
+ 
+ flag = {
+     name      = ipv4;
+diff -up ntp-4.2.6p5/ntpdc/ntpdc-opts.def.testmain ntp-4.2.6p5/ntpdc/ntpdc-opts.def
+--- ntp-4.2.6p5/ntpdc/ntpdc-opts.def.testmain	2009-12-09 08:36:37.000000000 +0100
++++ ntp-4.2.6p5/ntpdc/ntpdc-opts.def	2014-08-25 15:11:31.063454347 +0200
+@@ -10,7 +10,6 @@ argument       = '[ host ...]';
+ #include homerc.def
+ #include autogen-version.def
+ 
+-test-main;
+ 
+ flag = {
+     name      = ipv4;
+diff -up ntp-4.2.6p5/ntpq/ntpq-opts.def.testmain ntp-4.2.6p5/ntpq/ntpq-opts.def
+--- ntp-4.2.6p5/ntpq/ntpq-opts.def.testmain	2009-12-09 08:36:36.000000000 +0100
++++ ntp-4.2.6p5/ntpq/ntpq-opts.def	2014-08-25 15:11:31.063454347 +0200
+@@ -10,7 +10,6 @@ prog-name      = "ntpq";
+ prog-title     = "standard NTP query program";
+ argument       = '[ host ...]';
+ 
+-test-main;
+ 
+ flag = {
+     name      = ipv4;
+diff -up ntp-4.2.6p5/ntpsnmpd/ntpsnmpd-opts.def.testmain ntp-4.2.6p5/ntpsnmpd/ntpsnmpd-opts.def
+--- ntp-4.2.6p5/ntpsnmpd/ntpsnmpd-opts.def.testmain	2010-05-03 12:01:12.000000000 +0200
++++ ntp-4.2.6p5/ntpsnmpd/ntpsnmpd-opts.def	2014-08-25 15:11:31.064454349 +0200
+@@ -9,7 +9,6 @@ autogen definitions options;
+ prog-name      = "ntpsnmpd";
+ prog-title     = "NTP SNMP MIB agent";
+ 
+-test-main;
+ 
+ flag = {
+     name      = nofork;
+diff -up ntp-4.2.6p5/sntp/sntp-opts.def.testmain ntp-4.2.6p5/sntp/sntp-opts.def
+--- ntp-4.2.6p5/sntp/sntp-opts.def.testmain	2011-09-23 05:17:26.000000000 +0200
++++ ntp-4.2.6p5/sntp/sntp-opts.def	2014-08-25 15:11:31.064454349 +0200
+@@ -19,7 +19,6 @@ environrc;
+ 
+ #include version.def
+ 
+-test-main;
+ 
+ flag = {
+     name      = ipv4;
+diff -up ntp-4.2.6p5/util/ntp-keygen-opts.def.testmain ntp-4.2.6p5/util/ntp-keygen-opts.def
+--- ntp-4.2.6p5/util/ntp-keygen-opts.def.testmain	2014-08-25 15:11:31.005454214 +0200
++++ ntp-4.2.6p5/util/ntp-keygen-opts.def	2014-08-25 15:11:31.064454349 +0200
+@@ -10,7 +10,6 @@ prog-name      = "ntp-keygen";
+ prog-title     = "Create a NTP host key";
+ package        = ntp;
+ 
+-test-main;
+ 
+ include        = '#include <stdlib.h>';
+ #include       version.def
diff --git a/ntp.spec b/ntp.spec
index 831bfaf..d4b9f47 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -91,6 +91,8 @@ Patch19: ntp-4.2.6p5-pwcipher.patch
 Patch20: ntp-4.2.6p5-noservres.patch
 # ntpbz #2612
 Patch21: ntp-4.2.6p5-monwarn.patch
+# ntpbz #2538
+Patch22: ntp-4.2.6p5-testmain.patch
 
 # handle unknown clock types
 Patch50: ntpstat-0.2-clksrc.patch
@@ -200,6 +202,7 @@ This package contains NTP documentation in HTML format.
 %patch19 -p1 -b .pwcipher
 %patch20 -p1 -b .noservres
 %patch21 -p1 -b .monwarn
+%patch22 -p1 -b .testmain
 
 # ntpstat patches
 %patch50 -p1 -b .clksrc
@@ -219,7 +222,7 @@ for f in COPYRIGHT ChangeLog; do
 done
 
 # don't regenerate texinfo files as it breaks build with _smp_mflags
-touch ntpd/ntpd-opts.texi util/ntp-keygen-opts.texi
+touch */*opts.texi
 
 %build
 sed -i 's|$CFLAGS -Wstrict-overflow|$CFLAGS|' configure sntp/configure