rpms/ntp/devel ntp-4.2.4-bcast.patch, NONE, 1.1 ntp-4.2.4-mlock.patch, NONE, 1.1 ntp-4.2.4-optvalues.patch, NONE, 1.1 ntp-4.2.4-sleep.patch, NONE, 1.1 ntp-4.2.4-html2man.patch, 1.2, 1.3 ntp.spec, 1.63, 1.64
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 29 13:33:48 UTC 2007
Author: mlichvar
Update of /cvs/dist/rpms/ntp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13040
Modified Files:
ntp-4.2.4-html2man.patch ntp.spec
Added Files:
ntp-4.2.4-bcast.patch ntp-4.2.4-mlock.patch
ntp-4.2.4-optvalues.patch ntp-4.2.4-sleep.patch
Log Message:
- don't wake up every second (#204748)
- add option to enable memory locking (#195617)
- fix broadcast client
- use option values in ntp-keygen
- improve man pages
Resolves: #204748, #195617
ntp-4.2.4-bcast.patch:
ntp_io.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE ntp-4.2.4-bcast.patch ---
Upstream bug #768
--- ntp-4.2.4/ntpd/ntp_io.c.bcast 2006-12-28 13:03:29.000000000 +0100
+++ ntp-4.2.4/ntpd/ntp_io.c 2007-01-29 13:02:20.000000000 +0100
@@ -1870,7 +1870,7 @@
*/
interf->family = AF_INET;
interf->bfd = open_socket(&interf->bcast,
- INT_BROADCAST, 1, interf);
+ INT_BROADCAST, 0, interf);
/*
* If we succeeded then we use it otherwise
ntp-4.2.4-mlock.patch:
html/ntpd.html | 4 +++-
ntpd/ntpd-opts.c | 23 ++++++++++++++++++++++-
ntpd/ntpd-opts.h | 19 +++++++++++++------
ntpd/ntpd.c | 4 +++-
4 files changed, 41 insertions(+), 9 deletions(-)
--- NEW FILE ntp-4.2.4-mlock.patch ---
--- ntp-4.2.4/html/ntpd.html.mlock 2007-01-29 13:26:21.000000000 +0100
+++ ntp-4.2.4/html/ntpd.html 2007-01-29 13:26:22.000000000 +0100
@@ -34,7 +34,7 @@
</ul>
<hr>
<h4 id="synop">Synopsis</h4>
- <tt>ntpd [ -46aAbdDgLnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
+ <tt>ntpd [ -46aAbdDgLmnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
<h4 id="descr">Description</h4>
<p>The <tt>ntpd</tt> program is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. <tt>ntpd</tt> does most computations in 64-bit floating point arithmetic and does relatively clumsy 64-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with ordinary workstations and networks of today, it may be required with future gigahertz CPU clocks and gigabit LANs.</p>
<h4 id="op">How NTP Operates</h4>
@@ -95,6 +95,8 @@
<dd>Specify the name and path of the log file. The default is the system log file. This is the same operation as the <tt>logfile <i>logfile</i></tt> configuration command.
<dt><tt>-L</tt>
<dd>Do not listen to virtual IPs. The default is to listen.
+ <dt><tt>-m</tt>
+ <dd>Lock memory.
<dt><tt>-n</tt>
<dd>Don't fork.
<dt><tt>-N</tt>
--- ntp-4.2.4/ntpd/ntpd.c.mlock 2007-01-29 13:26:21.000000000 +0100
+++ ntp-4.2.4/ntpd/ntpd.c 2007-01-29 13:26:22.000000000 +0100
@@ -704,7 +704,8 @@
}
#endif
-#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && defined(MCL_FUTURE)
+#if defined(MCL_CURRENT) && defined(MCL_FUTURE)
+ if (HAVE_OPT( MLOCK )) {
# ifdef HAVE_SETRLIMIT
/*
* Set the stack limit to something smaller, so that we don't lock a lot
@@ -742,6 +743,7 @@
*/
if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
msyslog(LOG_ERR, "mlockall(): %m");
+ }
#else /* not (HAVE_MLOCKALL && MCL_CURRENT && MCL_FUTURE) */
# ifdef HAVE_PLOCK
# ifdef PROCLOCK
--- ntp-4.2.4/ntpd/ntpd-opts.c.mlock 2007-01-29 13:26:22.000000000 +0100
+++ ntp-4.2.4/ntpd/ntpd-opts.c 2007-01-29 13:26:22.000000000 +0100
@@ -265,6 +265,15 @@
#define NICE_FLAGS (OPTST_DISABLED)
/*
+ * Mlock option description:
+ */
+tSCC zMlockText[] =
+ "Lock memory";
+tSCC zMlock_NAME[] = "MLOCK";
+tSCC zMlock_Name[] = "mlock";
+#define MLOCK_FLAGS (OPTST_DISABLED)
+
+/*
* Pidfile option description:
*/
tSCC zPidfileText[] =
@@ -796,6 +805,18 @@
/* desc, NAME, name */ zSlewText, zSlew_NAME, zSlew_Name,
/* disablement strs */ NULL, NULL },
+ { /* entry idx, value */ 29, VALUE_OPT_MLOCK,
+ /* equiv idx, value */ 29, VALUE_OPT_MLOCK,
+ /* equivalenced to */ NO_EQUIVALENT,
+ /* min, max, act ct */ 0, 1, 0,
+ /* opt state flags */ MLOCK_FLAGS, 0,
+ /* last opt argumnt */ { NULL },
+ /* arg list/cookie */ NULL,
+ /* must/cannot opts */ NULL, NULL,
+ /* option proc */ NULL,
+ /* desc, NAME, name */ zMlockText, zMlock_NAME, zMlock_Name,
+ /* disablement strs */ NULL, NULL },
+
{ /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
@@ -913,7 +934,7 @@
NO_EQUIVALENT /* index of '-#' option */,
NO_EQUIVALENT /* index of default opt */
},
- OPTION_CT, 29 /* user option count */
+ OPTION_CT, 30 /* user option count */
};
/*
--- ntp-4.2.4/ntpd/ntpd-opts.h.mlock 2006-12-29 01:11:53.000000000 +0100
+++ ntp-4.2.4/ntpd/ntpd-opts.h 2007-01-29 13:26:22.000000000 +0100
@@ -82,14 +82,15 @@
INDEX_OPT_VAR = 26,
INDEX_OPT_DVAR = 27,
INDEX_OPT_SLEW = 28,
- INDEX_OPT_VERSION = 29,
- INDEX_OPT_HELP = 30,
- INDEX_OPT_MORE_HELP = 31,
- INDEX_OPT_SAVE_OPTS = 32,
- INDEX_OPT_LOAD_OPTS = 33
+ INDEX_OPT_MLOCK = 29,
+ INDEX_OPT_VERSION = 30,
+ INDEX_OPT_HELP = 31,
+ INDEX_OPT_MORE_HELP = 32,
+ INDEX_OPT_SAVE_OPTS = 33,
+ INDEX_OPT_LOAD_OPTS = 34
} teOptIndex;
-#define OPTION_CT 34
+#define OPTION_CT 35
#define NTPD_VERSION "4.2.4"
#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4"
@@ -182,6 +183,10 @@
# warning undefining MODIFYMMTIMER due to option name conflict
# undef MODIFYMMTIMER
# endif
+# ifdef MLOCK
+# warning undefining MLOCK due to option name conflict
+# undef MLOCK
+# endif
# ifdef NOFORK
# warning undefining NOFORK due to option name conflict
# undef NOFORK
@@ -251,6 +256,7 @@
# undef LOGFILE
# undef NOVIRTUALIPS
# undef MODIFYMMTIMER
+# undef MLOCK
# undef NOFORK
# undef NICE
# undef PIDFILE
@@ -293,6 +299,7 @@
#ifdef SYS_WINNT
#define VALUE_OPT_MODIFYMMTIMER 'M'
#endif /* SYS_WINNT */
+#define VALUE_OPT_MLOCK 'm'
#define VALUE_OPT_NOFORK 'n'
#define VALUE_OPT_NICE 'N'
#define VALUE_OPT_PIDFILE 'p'
ntp-4.2.4-optvalues.patch:
ntp-keygen.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE ntp-4.2.4-optvalues.patch ---
--- ntp-4.2.4/util/ntp-keygen.c.optvalues 2006-12-29 00:02:02.000000000 +0100
+++ ntp-4.2.4/util/ntp-keygen.c 2007-01-29 10:53:42.000000000 +0100
@@ -323,7 +323,7 @@
#ifdef OPENSSL
if (HAVE_OPT( MODULUS ))
- modulus = DESC(MODULUS).optOccCt;
+ modulus = OPT_VALUE_MODULUS;
if (HAVE_OPT( PVT_CERT ))
exten = EXT_KEY_PRIVATE;
@@ -345,12 +345,12 @@
if (HAVE_OPT( MV_PARAMS )) {
mvpar++;
- nkeys = DESC(MV_PARAMS).optOccCt;
+ nkeys = OPT_VALUE_MV_PARAMS;
}
if (HAVE_OPT( MV_KEYS )) {
mvkey++;
- nkeys = DESC(MV_KEYS).optOccCt;
+ nkeys = OPT_VALUE_MV_KEYS;
}
#endif
ntp-4.2.4-sleep.patch:
include/ntp_stdlib.h | 1
include/ntpd.h | 7 ++--
libntp/authkeys.c | 18 ++++++++++
ntpd/ntp_loopfilter.c | 16 ++++++++-
ntpd/ntp_timer.c | 53 ++++++++++++++++++++++++++++---
ntpd/ntpd.c | 85 +++++++++++++++++++++++++++++++-------------------
6 files changed, 141 insertions(+), 39 deletions(-)
--- NEW FILE ntp-4.2.4-sleep.patch ---
--- ntp-4.2.4/include/ntp_stdlib.h.sleep 2006-12-28 13:03:05.000000000 +0100
+++ ntp-4.2.4/include/ntp_stdlib.h 2007-01-29 13:31:38.000000000 +0100
@@ -101,6 +101,7 @@
extern void signal_no_reset P((int, RETSIGTYPE (*func)(int)));
extern void getauthkeys P((const char *));
+extern int auth_agekeys_is_needed P((void));
extern void auth_agekeys P((void));
extern void rereadkeys P((void));
--- ntp-4.2.4/include/ntpd.h.sleep 2006-12-28 13:03:06.000000000 +0100
+++ ntp-4.2.4/include/ntpd.h 2007-01-29 13:31:38.000000000 +0100
@@ -118,8 +118,10 @@
/* ntp_loopfilter.c */
extern void init_loopfilter P((void));
extern int local_clock P((struct peer *, double));
-extern void adj_host_clock P((void));
+extern int adj_host_clock_is_needed P((void));
+extern void adj_host_clock P((int));
extern void loop_config P((int, double));
+extern int huffpuff_enabled P((void));
extern void huffpuff P((void));
extern u_long sys_clocktime;
extern u_long sys_tai;
@@ -219,7 +221,8 @@
/* ntp_timer.c */
extern void init_timer P((void));
extern void reinit_timer P((void));
-extern void timer P((void));
+extern int when_next_event P((void));
+extern void timer P((int));
extern void timer_clr_stats P((void));
extern void timer_interfacetimeout P((u_long));
extern volatile int interface_interval;
--- ntp-4.2.4/libntp/authkeys.c.sleep 2004-02-25 06:58:03.000000000 +0100
+++ ntp-4.2.4/libntp/authkeys.c 2007-01-29 13:31:38.000000000 +0100
@@ -394,6 +394,24 @@
}
}
+int auth_agekeys_is_needed() {
+ struct savekey *sk;
+ int i;
+
+ if (authnumkeys > 20)
+ return 1;
+
+ for (i = 0; i < HASHSIZE; i++) {
+ sk = key_hash[i];
+ while (sk != 0) {
+ if (sk->lifetime > 0)
+ return 1;
+ sk = sk->next;
+ }
+ }
+ return 0;
+}
+
/*
* auth_agekeys - delete keys whose lifetimes have expired
*/
--- ntp-4.2.4/ntpd/ntp_loopfilter.c.sleep 2007-01-29 13:31:38.000000000 +0100
+++ ntp-4.2.4/ntpd/ntp_loopfilter.c 2007-01-29 13:42:05.000000000 +0100
@@ -765,6 +765,10 @@
#endif /* LOCKCLOCK */
}
+int adj_host_clock_is_needed() {
+ return !(!ntp_enable || mode_ntpdate || (pll_control &&
+ kern_enable && clock_max < 0.5));
+}
/*
* adj_host_clock - Called once every second to update the local clock.
@@ -774,7 +778,7 @@
*/
void
adj_host_clock(
- void
+ int time_elapsed
)
{
double adjustment;
@@ -789,7 +793,10 @@
* maximum error and the local clock driver will pick it up and
* pass to the common refclock routines. Very elegant.
*/
- sys_rootdispersion += clock_phi;
+ sys_rootdispersion += clock_phi * time_elapsed;
+#if 0
+ printf("loopfilter: %d\n", time_elapsed);
+#endif
#ifndef LOCKCLOCK
/*
@@ -849,6 +856,11 @@
}
+int huffpuff_enabled()
+{
+ return sys_huffpuff != NULL;
+}
+
/*
* huff-n'-puff filter
*/
--- ntp-4.2.4/ntpd/ntpd.c.sleep 2007-01-29 13:31:38.000000000 +0100
+++ ntp-4.2.4/ntpd/ntpd.c 2007-01-29 13:31:38.000000000 +0100
@@ -188,8 +188,6 @@
char const *progname;
-int was_alarmed;
-
#ifdef DECL_SYSCALL
/*
* We put this here, since the argument profile is syscall-specific
@@ -443,6 +441,7 @@
msyslog(LOG_ERR, "set_process_priority: No way found to improve our priority");
}
+#define TS_LAST_SIZE 2
/*
* Main program. Initialize us, disconnect us from the tty if necessary,
@@ -455,6 +454,9 @@
)
{
l_fp now;
+ l_fp ts_last[TS_LAST_SIZE];
+ unsigned int ts_last_index;
+ int time_elapsed;
struct recvbuf *rbuf;
#ifdef _AIX /* HMS: ifdef SIGDANGER? */
struct sigaction sa;
@@ -1012,7 +1014,11 @@
#else /* normal I/O */
BLOCK_IO_AND_ALARM();
- was_alarmed = 0;
+
+ for (ts_last_index = 0; ts_last_index < TS_LAST_SIZE; ts_last_index++)
+ L_CLR(&ts_last[ts_last_index]);
+ time_elapsed = 0;
+
for (;;)
{
# if !defined(HAVE_SIGNALED_IO)
@@ -1023,39 +1029,61 @@
int nfound;
# endif
- if (alarm_flag) /* alarmed? */
- {
- was_alarmed = 1;
- alarm_flag = 0;
- }
-
- if (!was_alarmed && has_full_recv_buffer() == ISC_FALSE)
+ if (has_full_recv_buffer() == ISC_FALSE)
{
/*
* Nothing to do. Wait for something.
*/
# ifndef HAVE_SIGNALED_IO
+ extern l_fp timer_base;
+ l_fp ts, ts2, ts3;
+ double d;
+
rdfdes = activefds;
-# if defined(VMS) || defined(SYS_VXWORKS)
- /* make select() wake up after one second */
- {
+ ts2 = timer_base;
+ get_systime(&ts);
+ ts3 = ts;
+ L_SUB(&ts3, &ts_last[ts_last_index]);
+
+ /* don't call when_next_event() too often */
+ if (ts3.l_ui)
+ ts2.l_ui += when_next_event();
+ else
+ ts2.l_ui += 1;
+
+ L_SUB(&ts2, &ts);
+ LFPTOD(&ts2, d);
+#if 0
+ printf("%f ", d);
+#endif
+ if (d >= 0.0) {
struct timeval t1;
- t1.tv_sec = 1; t1.tv_usec = 0;
+ /* shoot 1ms over */
+ d += 0.001;
+ t1.tv_sec = floor(d);
+ t1.tv_usec = (d - t1.tv_sec) * 1000000;
nfound = select(maxactivefd+1, &rdfdes, (fd_set *)0,
(fd_set *)0, &t1);
- }
-# else
- nfound = select(maxactivefd+1, &rdfdes, (fd_set *)0,
- (fd_set *)0, (struct timeval *)0);
-# endif /* VMS */
- if (nfound > 0)
- {
- l_fp ts;
-
get_systime(&ts);
+ } else
+ nfound = 0;
+ ts2 = ts;
+ L_SUB(&ts2, &timer_base);
+ time_elapsed += ts2.l_ui;
+ timer_base.l_ui += ts2.l_ui;
+#if 0
+ ts2 = ts;
+ ts2.l_ui = 0;
+ LFPTOD(&ts2, d);
+ printf("%f\n", d);
+#endif
+ if (nfound > 0)
+ {
(void)input_handler(&ts);
+ ts_last[ts_last_index] = ts;
+ ts_last_index = (ts_last_index + 1) % TS_LAST_SIZE;
}
else if (nfound == -1 && errno != EINTR)
netsyslog(LOG_ERR, "select() error: %m");
@@ -1067,22 +1095,17 @@
wait_for_signal();
# endif /* HAVE_SIGNALED_IO */
- if (alarm_flag) /* alarmed? */
- {
- was_alarmed = 1;
- alarm_flag = 0;
- }
}
- if (was_alarmed)
+ if (time_elapsed)
{
UNBLOCK_IO_AND_ALARM();
/*
* Out here, signals are unblocked. Call timer routine
* to process expiry.
*/
- timer();
- was_alarmed = 0;
+ timer(time_elapsed);
+ time_elapsed = 0;
BLOCK_IO_AND_ALARM();
}
--- ntp-4.2.4/ntpd/ntp_timer.c.sleep 2006-12-28 13:03:34.000000000 +0100
+++ ntp-4.2.4/ntpd/ntp_timer.c 2007-01-29 13:40:38.000000000 +0100
@@ -63,6 +63,7 @@
#define HOUR (60*60)
u_long current_time;
+l_fp timer_base;
/*
* Stats. Number of overflows and number of calls to transmit().
@@ -116,6 +117,8 @@
itimer.it_interval.tv_nsec = 0;
timer_settime(ntpd_timerid, 0 /*!TIMER_ABSTIME*/, &itimer, NULL);
# else
+ get_systime(&timer_base);
+ return;
getitimer(ITIMER_REAL, &itimer);
if (itimer.it_value.tv_sec < 0 || itimer.it_value.tv_sec > (1<<EVENT_TIMEOUT)) {
itimer.it_value.tv_sec = (1<<EVENT_TIMEOUT);
@@ -160,6 +163,8 @@
timer_timereset = 0;
#if !defined(SYS_WINNT)
+ get_systime(&timer_base);
+ return;
/*
* Set up the alarm interrupt. The first comes 2**EVENT_TIMEOUT
* seconds from now and they continue on every 2**EVENT_TIMEOUT
@@ -252,11 +257,51 @@
}
#endif
+int when_next_event() {
+ register struct peer *peer, *next_peer;
+ u_int n;
+ int next = current_time + HOUR;
+
+ if (adj_host_clock_is_needed())
+ return 1;
+ for (n = 0; n < NTP_HASH_SIZE; n++) {
+ for (peer = peer_hash[n]; peer != 0; peer = next_peer) {
+ next_peer = peer->next;
+#ifdef REFCLOCK
+ if (peer->flags & FLAG_REFCLOCK)
+ return 1;
+#endif /* REFCLOCK */
+ if (peer->action && peer->nextaction < next)
+ next = peer->nextaction;
+ if (peer->nextdate < next)
+ next = peer->nextdate;
+ }
+ }
+
+ if (auth_agekeys_is_needed() && keys_timer < next)
+ next = keys_timer;
+ if (huffpuff_enabled() && huffpuff_timer < next)
+ next = huffpuff_timer;
+#ifdef OPENSSL
+ if (revoke_timer < next)
+ next = revoke_timer;
+#endif /* OPENSSL */
+ if (interface_interval && interface_timer < next)
+ next = interface_timer;
+ if (stats_timer < next)
+ next = stats_timer;
+
+ next -= current_time;
+ if (next <= 0)
+ next = 1;
+ return next;
+}
+
/*
* timer - dispatch anyone who needs to be
*/
void
-timer(void)
+timer(int time_elapsed)
{
register struct peer *peer, *next_peer;
#ifdef OPENSSL
@@ -264,14 +309,14 @@
#endif /* OPENSSL */
u_int n;
- current_time += (1<<EVENT_TIMEOUT);
+ current_time += time_elapsed;
/*
* Adjustment timeout first.
*/
if (adjust_timer <= current_time) {
- adjust_timer += 1;
- adj_host_clock();
+ adj_host_clock(current_time - adjust_timer + 1);
+ adjust_timer = current_time + 1;
kod_proto();
#ifdef REFCLOCK
for (n = 0; n < NTP_HASH_SIZE; n++) {
ntp-4.2.4-html2man.patch:
html2man.in | 101 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 35 deletions(-)
Index: ntp-4.2.4-html2man.patch
===================================================================
RCS file: /cvs/dist/rpms/ntp/devel/ntp-4.2.4-html2man.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ntp-4.2.4-html2man.patch 23 Jan 2007 15:56:58 -0000 1.2
+++ ntp-4.2.4-html2man.patch 29 Jan 2007 13:33:45 -0000 1.3
@@ -1,6 +1,6 @@
--- ntp-4.2.4/scripts/html2man.in.html2man 2006-06-06 22:17:10.000000000 +0200
+++ ntp-4.2.4/scripts/html2man.in 2007-01-08 12:47:31.000000000 +0100
-@@ -23,7 +23,7 @@
+@@ -23,10 +23,10 @@
'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'],
'ntpdate' => ['ntpdate', 8, 'ntpd(8)'],
'ntpdc' => ['ntpdc', 8, 'ntpd(8)'],
@@ -8,7 +8,11 @@
+ 'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'],
'ntptrace' => ['ntptrace', 8, 'ntpd(8)'],
'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'],
- 'confopt' => ['ntp.conf', 5, 'ntpd(8)'],
+- 'confopt' => ['ntp.conf', 5, 'ntpd(8)'],
++ 'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'],
+ 'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'],
+ 'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'],
+ 'accopt' => ['ntp_acc', 5, 'ntp.conf(5)'],
@@ -34,17 +34,8 @@
'miscopt' => ['ntp_misc', 5, 'ntp.conf(5)']);
@@ -54,7 +58,7 @@
- print MANOUT "$name\n\n";
-
- print MANOUT "$top_disclaimer\n";
-+ print MANOUT "$name\n.SH\n\n";
++ print MANOUT "$name\n.SH \\ \n\n";
+ @fontstack = ();
+ $deflevel = 0;
Index: ntp.spec
===================================================================
RCS file: /cvs/dist/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ntp.spec 23 Jan 2007 15:56:58 -0000 1.63
+++ ntp.spec 29 Jan 2007 13:33:45 -0000 1.64
@@ -3,7 +3,7 @@
Summary: Synchronizes system time using the Network Time Protocol (NTP).
Name: ntp
Version: 4.2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
License: distributable
Group: System Environment/Daemons
Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz
@@ -29,6 +29,10 @@
Patch11: ntp-stable-4.2.0a-20050816-keyfile.patch
Patch12: ntp-4.2.4-sprintf.patch
Patch13: ntp-4.2.4-autoopts.patch
+Patch14: ntp-4.2.4-mlock.patch
+Patch15: ntp-4.2.4-optvalues.patch
+Patch16: ntp-4.2.4-bcast.patch
+Patch17: ntp-4.2.4-sleep.patch
URL: http://www.ntp.org
Requires(pre): shadow-utils
@@ -65,6 +69,10 @@
%patch11 -p1 -b .keyfile
%patch12 -p1 -b .sprintf
%patch13 -p1 -b .autoopts
+%patch14 -p1 -b .mlock
+%patch15 -p1 -b .optvalues
+%patch16 -p1 -b .bcast
+%patch17 -p1 -b .sleep
%ifarch ia64
%patch5 -p1 -b .linkfastmath
@@ -176,6 +184,13 @@
%changelog
+* Mon Jan 29 2007 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4-4
+- don't wake up every second (#204748)
+- add option to enable memory locking (#195617)
+- fix broadcast client
+- use option values in ntp-keygen
+- improve man pages
+
* Tue Jan 23 2007 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4-3
- disable autoopts option preset mechanisms for ntpd
- document -I option of ntpd
More information about the fedora-cvs-commits
mailing list