[ntp] allow -u and -p options to be used twice (#639101)

[Miroslav Lichvar]

commit a3187bc57650e6ceaca8c2b91f6187fd9a8fb2fa
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Fri Oct 1 14:17:17 2010 +0200

    allow -u and -p options to be used twice (#639101)

 ntp-4.2.6p2-multiopts.patch |   21 +++++++++++++++++++++
 ntp.spec                    |    8 +++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/ntp-4.2.6p2-multiopts.patch b/ntp-4.2.6p2-multiopts.patch
new file mode 100644
index 0000000..c4ea459
--- /dev/null
+++ b/ntp-4.2.6p2-multiopts.patch
@@ -0,0 +1,21 @@
+diff -up ntp-4.2.6p2/ntpd/ntpd-opts.c.multiopts ntp-4.2.6p2/ntpd/ntpd-opts.c
+--- ntp-4.2.6p2/ntpd/ntpd-opts.c.multiopts	2010-09-15 17:37:10.000000000 +0200
++++ ntp-4.2.6p2/ntpd/ntpd-opts.c	2010-10-01 13:28:49.000000000 +0200
+@@ -755,7 +755,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
+   {  /* entry idx, value */ 18, VALUE_OPT_PIDFILE,
+      /* equiv idx, value */ 18, VALUE_OPT_PIDFILE,
+      /* equivalenced to  */ NO_EQUIVALENT,
+-     /* min, max, act ct */ 0, 1, 0,
++     /* min, max, act ct */ 0, 2, 0,
+      /* opt state flags  */ PIDFILE_FLAGS, 0,
+      /* last opt argumnt */ { NULL },
+      /* arg list/cookie  */ NULL,
+@@ -839,7 +839,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
+   {  /* entry idx, value */ 25, VALUE_OPT_USER,
+      /* equiv idx, value */ 25, VALUE_OPT_USER,
+      /* equivalenced to  */ NO_EQUIVALENT,
+-     /* min, max, act ct */ 0, 1, 0,
++     /* min, max, act ct */ 0, 2, 0,
+      /* opt state flags  */ USER_FLAGS, 0,
+      /* last opt argumnt */ { NULL },
+      /* arg list/cookie  */ NULL,
diff --git a/ntp.spec b/ntp.spec
index 7929cb2..d356a9d 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.6p2
-Release: 6%{?dist}
+Release: 7%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -71,6 +71,8 @@ Patch12: ntp-4.2.4p7-getprecision.patch
 Patch13: ntp-4.2.6p1-logdefault.patch
 # add option -m to lock memory
 Patch14: ntp-4.2.6p2-mlock.patch
+# allow -u and -p options to be used twice (#639101)
+Patch15: ntp-4.2.6p2-multiopts.patch
 
 # handle unknown clock types
 Patch50: ntpstat-0.2-clksrc.patch
@@ -156,6 +158,7 @@ cp %{SOURCE11} include
 %patch12 -p1 -b .getprecision
 %patch13 -p1 -b .logdefault
 %patch14 -p1 -b .mlock
+%patch15 -p1 -b .multiopts
 
 # set default path to sntp KoD database
 sed -i 's|/var/db/ntp-kod|%{_localstatedir}/lib/ntp/sntp-kod|' sntp/*.{1,c}
@@ -354,6 +357,9 @@ fi
 %{ntpdocdir}/html
 
 %changelog
+* Fri Oct 01 2010 Miroslav Lichvar <mlichvar at redhat.com> 4.2.6p2-7
+- allow -u and -p options to be used twice (#639101)
+
 * Wed Sep 29 2010 jkeating - 4.2.6p2-6
 - Rebuilt for gcc bug 634757