[pkg-ntp-maintainers] [pkg-ntp] 03/06: Install upstream manpages where available

Bernhard Schmidt berni at moszumanska.debian.org
Fri Mar 31 21:19:28 UTC 2017


This is an automated email from the git hooks/post-receive script.

berni pushed a commit to branch berni-wip
in repository pkg-ntp.

commit 41f10c3a93817a2c6d49774cf7b1cc5c97a625a3
Author: Bernhard Schmidt <berni at debian.org>
Date:   Wed Mar 15 23:30:37 2017 +0100

    Install upstream manpages where available
    
    Closes: #794182, #806645, #803709, #805325
---
 debian/man/ntp-keygen.8 |  12 --
 debian/man/ntp-wait.8   |  23 ----
 debian/man/ntp.conf.5   | 358 ------------------------------------------------
 debian/man/ntpd.8       | 175 -----------------------
 debian/man/ntpdc.1      |  46 -------
 debian/man/ntpq.1       |  40 ------
 debian/man/ntptrace.1   |  27 ----
 debian/ntp.install      |   7 +-
 debian/ntp.manpages     |   7 -
 debian/rules            |  12 +-
 10 files changed, 11 insertions(+), 696 deletions(-)

diff --git a/debian/man/ntp-keygen.8 b/debian/man/ntp-keygen.8
deleted file mode 100644
index fa99ae6..0000000
--- a/debian/man/ntp-keygen.8
+++ /dev/null
@@ -1,12 +0,0 @@
-.\" transcribed from ntp 4.2.2p3
-.TH NTP-KEYGEN 8 "October 7, 2006" "Network Time Protocol"
-.SH NAME
-ntp-keygen \- generate public and private keys
-.SH SYNOPSIS
-.B ntp\-keygen
-[ \-deGgHIMnPT ] [ \-c [RSA-MD2 | RSA-MD5 | RSA-SHA | RSA-SHA1 | RSA-MDC2 | RSA-RIPEMD160 | DSA-SHA | DSA-SHA1 ] ] [ \-i \fIname\fR ] [ \-p \fIpassword\fR ] [ \-S [ RSA | DSA ] ] [ \-s \fIname\fR ] [ \-v \fInkeys\fR ]
-.SH DESCRIPTION
-This program generates cryptographic data files used by the NTPv4 authentication and identification schemes. It generates MD5 key files used in symmetric key cryptography. In addition, if the OpenSSL software library has been installed, it generates keys, certificate and identity files used in public key cryptography. These files are used for cookie encryption, digital signature and challenge/response identification algorithms compatible with the Internet standard security infrastructure.
-.SH "SEE ALSO"
-.I /usr/share/doc/ntp\-doc/html/keygen.html
-for the full documentation.
diff --git a/debian/man/ntp-wait.8 b/debian/man/ntp-wait.8
deleted file mode 100644
index 17c3f44..0000000
--- a/debian/man/ntp-wait.8
+++ /dev/null
@@ -1,23 +0,0 @@
-.TH NTPQ 8 "October 7, 2006" "Network Time Protocol"
-.SH NAME
-ntp\-wait \- wait for NTP server to synchronize
-.SH SYNOPSIS
-.B ntp\-wait
-[ \-f ] [ \-n \fItries\fR ] [ \-s \fIsleep\fR ] [ \-v ]
-.SH DESCRIPTION
-ntp\-wait waits until the locally running ntpd is in state 4 (synchronized).
-This could be useful at boot time, to delay the boot sequence until after
-"ntpd \-g" has set the time.
-.SH OPTIONS
-.TP
-\-f
-Force hard failure if state is unknown.
-.TP
-\-n \fItries\fR
-Number of tries before giving up (default 1000 = 10min+)
-.TP
-\-s \fIsleep\fR
-Seconds to sleep between tries (default 6s = 10/min)
-.TP
-\-v
-Be verbose.
diff --git a/debian/man/ntp.conf.5 b/debian/man/ntp.conf.5
deleted file mode 100644
index 47d54b2..0000000
--- a/debian/man/ntp.conf.5
+++ /dev/null
@@ -1,358 +0,0 @@
-.TH NTP.CONF 5 "2008-04-09" "Debian" "The Network Time Protocol (NTP) Distribution"
-.SH NAME
-ntp.conf \- NTP server configuration file
-.SH SYNOPSIS
-ntp.conf
-.SH "DESCRIPTION"
-Ordinarily, \fBntpd\fR reads the \fIntp.conf\fR configuration file at startup 
-time in order to determine the synchronization sources and operating modes.  
-It is also possible to specify a working, although limited, configuration 
-entirely on the command line, obviating the need for a configuration file.  
-This may be particularly useful when the local host is to be configured as a 
-broadcast/multicast client, with all peers being determined by listening to 
-broadcasts at run time.
-
-Usually, the configuration file is installed in the \fI/etc\fR directory, but 
-could be installed elsewhere (see the \-c \fIconffile\fR command line option).  
-The file format is similar to other Unix configuration files - comments begin 
-with a # character and extend to the end of the line; blank lines are ignored.
-
-Configuration commands consist of an initial keyword followed by a list of 
-arguments, some of which may be optional, separated by whitespace.  Commands 
-may not be continued over multiple lines. Arguments may be host names, host 
-addresses written in numeric, dotted-quad form, integers, floating point 
-numbers (when specifying times in seconds) and text strings.  Optional 
-arguments are delimited by [ ] in the following descriptions, while 
-alternatives are separated by |.  The notation [ ... ] means an optional, 
-indefinite repetition of the last item before the [ ... ].
-
-Following is a description of the configuration commands in NTPv4.  There are 
-two classes of commands, configuration commands that configure an association 
-with a remote server, peer or reference clock, and auxiliary commands that 
-specify environmental variables that control various related operations.
-.SS "Configuration Commands"
-The various modes are determined by the command keyword and the required IP 
-address.  Addresses are classed by type as (s) a remote server or peer (IPv4 
-class A, B and C), (b) the broadcast address of a local interface, (m) a 
-multicast address (IPv4 class D), or (r) a reference clock address 
-(127.127.x.x).  The options that can be used with these commands are listed 
-below.
-
-If the Basic Socket Interface Extensions for IPv6 (RFC-2553) is detected, 
-support for the IPv6 address family is generated in addition to the default 
-support of the IPv4 address family.  IPv6 addresses can be identified by the 
-presence of colons ":" in the address field.  IPv6 addresses can be used 
-almost everywhere where IPv4 addresses can be used, with the exception of 
-reference clock addresses, which are always IPv4.  Note that in contexts where 
-a host name is expected, a \-4 qualifier preceding the host name forces DNS 
-resolution to the IPv4 namespace, while a \-6 qualifier forces DNS resolution 
-to the IPv6 namespace.
-
-There are three types of associations: persistent, preemptable and ephemeral. 
-Persistent associations are mobilized by a configuration command and never 
-demobilized.  Preemptable associations, which are new to NTPv4, are mobilized 
-by a configuration command which includes the \fBprempt\fR flag and are 
-demobilized by timeout or error.  Ephemeral associations are mobilized upon 
-arrival of designated messages and demobilized by timeout or error.
-.TP
-.B server \fIaddress\fR [\fIoptions\fR ...]
-.TP
-.B peer \fIaddress\fR [\fIoptions\fR ...]
-.TP
-.B broadcast \fIaddress\fR [\fIoptions\fR ...]
-.TP
-.B manycastclient \fIaddress\fR [\fIoptions\fR ...]
-These four commands specify the time server name or address to be used and the 
-mode in which to operate.  The \fIaddress\fR can be either a DNS name or a IP 
-address in dotted-quad notation.  Additional information on association 
-behavior can be found in the Association Management page.
-.RS
-.TP
-.B server 
-For type s and r addresses (only), this command normally mobilizes a 
-persistent client mode association with the specified remote server or local 
-reference clock. If the preempt flag is specified, a preemptable association 
-is mobilized instead. In client mode the client clock can synchronize to the 
-remote server or local reference clock, but the remote server can never be 
-synchronized to the client clock. This command should NOT be used for type b 
-or m addresses.
-.TP
-.B peer 
-For type s addresses (only), this command mobilizes a persistent 
-symmetric-active mode association with the specified remote peer. In this mode 
-the local clock can be synchronized to the remote peer or the remote peer can 
-be synchronized to the local clock. This is useful in a network of servers 
-where, depending on various failure scenarios, either the local or remote peer 
-may be the better source of time. This command should NOT be used for type b, 
-m or r addresses.
-.TP
-.B broadcast 
-For type b and m addresses (only), this command mobilizes a persistent 
-broadcast mode association. Multiple commands can be used to specify multiple 
-local broadcast interfaces (subnets) and/or multiple multicast groups. Note 
-that local broadcast messages go only to the interface associated with the 
-subnet specified, but multicast messages go to all interfaces.
-
-In broadcast mode the local server sends periodic broadcast messages to a 
-client population at the \fIaddress\fR specified, which is usually the 
-broadcast address on (one of) the local network(s) or a multicast address 
-assigned to NTP. The IANA has assigned the multicast group address IPv4 
-224.0.1.1 and IPv6 ff05::101 (site local) exclusively to NTP, but other 
-nonconflicting addresses can be used to contain the messages within 
-administrative boundaries. Ordinarily, this specification applies only to the 
-local server operating as a sender; for operation as a broadcast client, see 
-the \fBbroadcastclient\fR or \fBmulticastclient\fR commands below.
-.TP
-.B manycastclient 
-For type m addresses (only), this command mobilizes a preemptable manycast 
-client mode association for the multicast group address specified. In this 
-mode a specific address must be supplied which matches the address used on the 
-manycastserver command for the designated manycast servers. The NTP multicast 
-address 224.0.1.1 assigned by the IANA should NOT be used, unless specific 
-means are taken to avoid spraying large areas of the Internet with these 
-messages and causing a possibly massive implosion of replies at the sender.
-
-The \fBmanycastclient\fR command specifies that the host is to operate in 
-client mode with the remote servers that are discovered as the result of 
-broadcast/multicast messages. The client broadcasts a request message to the 
-group address associated with the specified \fIaddress\fR and specifically 
-enabled servers respond to these messages. The client selects the servers 
-providing the best time and continues as with the server command. The 
-remaining servers are discarded as if never heard.
-.RE
-.SS "Command Options"
-.TP
-.B autokey
-All packets sent to and received from the server or peer are to include 
-authentication fields encrypted using the autokey scheme described in the 
-Authentication Options page.  This option is valid with all commands.
-.TP
-.B burst
-When the server is reachable, send a burst of eight packets instead of the 
-usual one.  The packet spacing is normally 2 s; however, the spacing between 
-the first and second packets can be changed with the \fBcalldelay\fR command 
-to allow additional time for a modem or ISDN call to complete.  This option is 
-valid with only the \fBserver\fR command and is a recommended option with this 
-command when the \fBmaxpoll\fR option is 11 or greater.
-.TP
-.B iburst
-When the server is unreachable, send a burst of eight packets instead of the 
-usual one.  The packet spacing is normally 2 s; however, the spacing between 
-the first and second packets can be changed with the \fBcalldelay\fR command 
-to allow additional time for a modem or ISDN call to complete.  This option is 
-valid with only the \fBserver\fR command and is a recommended option with this 
-command.
-.TP
-.B key \fIkey\fR
-All packets sent to and received from the server or peer are to include 
-authentication fields encrypted using the specified key identifier with values 
-from 1 to 65534, inclusive.  The default is to include no encryption field. 
-This option is valid with all commands.
-.TP
-.B minpoll \fIminpoll\fR, \fBmaxpoll\fR \fImaxpoll\fR
-These options specify the minimum and maximum poll intervals for NTP messages, 
-in seconds as a power of two.  The maximum poll interval defaults to 10 (1,024 
-s), but can be increased by the maxpoll option to an upper limit of 17 (36.4 
-h).  The minimum poll interval defaults to 6 (64 s), but can be decreased by 
-the minpoll option to a lower limit of 4 (16 s).  These option are valid only 
-with the \fBserver\fR and \fBpeer\fR commands.
-.TP
-.B mode \fIoption\fR
-Pass the \fIoption\fR to a reference clock driver, where \fIoption\fR
-is an integer in the range from 0 to 255, inclusive. This option is
-valid only with type r addresses.
-.TP
-.B noselect 
-Marks the server as unused, except for display purposes.  The server is 
-discarded by the selection algorithm.  This option is valid only with the 
-\fBserver\fR and \fBpeer\fR commands.
-.TP
-.B preempt 
-Specifies the association as preemptable rather than the default persistent. 
-This option is valied only with the \fBserver\fR command.
-.TP
-.B prefer
-Marks the server as preferred.  All other things being equal, this host will 
-be chosen for synchronization among a set of correctly operating hosts.  See 
-the Mitigation Rules and the \fBprefer\fR Keyword page for further 
-information.  This option is valid only with the \fBserver\fR and \fBpeer\fR 
-commands.
-.TP
-.B true 
-Force the association to assume truechimer status; that is, always survive the 
-selection and clustering algorithms.  This option can be used with any 
-association, but is most useful for reference clocks with large jitter on the 
-serial port and precision pulse-per-second (PPS) signals.  Caution: this 
-option defeats the algorithms designed to cast out falsetickers and can allow 
-these sources to set the system clock.  This option is valid only with the 
-\fBserver\fR and \fBpeer\fR commands.
-.TP
-.B ttl \fIttl\fR
-This option is used only with broadcast server and manycast client modes.  It 
-specifies the time-to-live \fIttl\fR to use on broadcast server and multicast 
-server and the maximum \fIttl\fR for the expanding ring search with manycast 
-client packets.  Selection of the proper value, which defaults to 127, is 
-something of a black art and should be coordinated with the network 
-administrator.
-.TP
-.B version \fIversion\fR
-Specifies the version number to be used for outgoing NTP packets.  Versions 
-1-4 are the choices, with version 4 the default.  This option is valid only 
-with the \fBserver\fR, \fBpeer\fR and \fBbroadcast\fR commands.
-.TP
-.B xleave
-Operate in interleaved mode (symmetric and broadcast modes only). (see
-NTP Interleaved Modes)
-.SS "Auxiliary Commands"
-.TP
-.B broadcastclient \fR[\fBnovolley\fR]
-This command enables reception of broadcast server messages to any local 
-interface (type b) address.  Ordinarily, upon receiving a message for the 
-first time, the broadcast client measures the nominal server propagation delay 
-using a brief client/server exchange with the server, after which it continues 
-in listen-only mode.  If the \fBnovolley\fR keyword is present, the exchange 
-is not used and the value specified in the \fBbroadcastdelay\fR command is 
-used or, if the \fBbroadcastdelay\fR command is not used, the default 4.0 ms.  
-Note that, in order to avoid accidental or malicious disruption in this mode, 
-both the server and client should operate using symmetric key or public key 
-authentication as described in the Authentication Options page.  Note that the 
-\fBnovolley\fR keyword is incompatible with public key authentication.
-.TP
-.B manycastserver \fIaddress\fR [...]
-This command enables reception of manycast client messages to the multicast 
-group address(es) (type m) specified.  At least one address is required.  The 
-NTP multicast address 224.0.1.1 assigned by the IANA should NOT be used, 
-unless specific means are taken to limit the span of the reply and avoid a 
-possibly massive implosion at the original sender.  Note that, in order to 
-avoid accidental or malicious disruption in this mode, both the server and 
-client should operate using symmetric key or public key authentication as 
-described in the Authentication Options page.
-.TP
-.B multicastclient \fIaddress\fR [...]
-This command enables reception of multicast server messages to the multicast 
-group address(es) (type m) specified.  Upon receiving a message for the first 
-time, the multicast client measures the nominal server propagation delay using 
-a brief client/server exchange with the server, then enters the broadcast 
-client mode, in which it synchronizes to succeeding multicast messages.  Note 
-that, in order to avoid accidental or malicious disruption in this mode, both 
-the server and client should operate using symmetric key or public key 
-authentication as described in the Authentication Options page.
-.SS "Authentication Commands"
-.TP
-.B autokey \fR[\fIlogsec\fR]
-Specifies the interval between regenerations of the session key list
-used with the autokey feature.  Note that the size of the key list for
-each association depends on this interval and the current poll interval.
-The default value is 12 (4096 s or about 1.1 hours).  For poll intervals
-above the specified interval, a session key list with a single entry
-will be regenerated for every message sent.
-.TP
-.B revoke \fR[\fIlogsec\fR]
-Specifies the interval between recomputations of the private value used
-with the autokey feature, which ordinarily requires an expensive public-
-key computation.  The default value is 12 (65,536 s or about 18 hours).
-For poll intervals above the specified interval, a new private value
-will be recomputed for every message sent.
-.SS "Miscellaneous Options"
-.TP
-.B driftfile \fIdriftfile\fR
-This command specifies the name of the file use to record the frequency
-offset of the local clock oscillator.  If the file exists, it is read at
-startup in order to set the initial frequency offset and then updated
-once per hour with the current frequency offset computed by the daemon.
-If the file does not exist or this command is not given, the initial
-frequency offset is assumed to be zero.  In this case, it may take some hours
-for the frequency to stabilize and the residual timing errors to
-subside.
-
-The file format consists of a single line containing a single floating
-point number, which records the frequency offset measured in
-parts-per-million (PPM).  The file is updated by first writing the
-current drift value into a temporary file and then renaming this file to
-replace the old version.  This implies that ntpd must have write
-permission for the directory the drift file is located in, and that file
-system links, symbolic or otherwise, should be avoided.
-.TP
-.B enable \fR[auth | bclient | calibrate | kernel | monitor | ntp | pps | stats]
-.TP
-.B disable \fR[auth | bclient | calibrate | kernel | monitor | ntp | pps | stats]
-Provides a way to enable or disable various server options.  Flags not
-mentioned are unaffected.  Note that all of these flags can be
-controlled remotely using the \fBntpdc\fR utility program.
-.RS
-.TP
-.B auth
-Enables the server to synchronize with unconfigured peers only if the peer has 
-been correctly authenticated using either public key or private key 
-cryptography.  The default for this flag is enable.
-.TP
-.B bclient
-Enables the server to listen for a message from a broadcast or multicast 
-server, as in the \fBmulticastclient\fR command with default address.  The 
-default for this flag is disable.
-.TP
-.B calibrate
-Enables the calibrate feature for reference clocks.  The default for this flag 
-is disable.
-.TP
-.B kernel
-Enables the kernel time discipline, if available.  The default for this flag 
-is enable if support is available, otherwise disable.
-.TP
-.B monitor
-Enables the monitoring facility.  See the \fBntpdc\fR program and the 
-\fBmonlist\fR command or further information.  The default for this flag is 
-enable.
-.TP
-.B ntp
-Enables time and frequency discipline.  In effect, this switch opens and 
-closes the feedback loop, which is useful for testing.  The default for this 
-flag is enable.
-.TP
-.B pps 
-Enables the pulse-per-second (PPS) signal when frequency and time is 
-disciplined by the precision time kernel modifications.  See the A Kernel 
-Model for Precision Timekeeping page for further information.  The default for 
-this flag is disable.
-.TP
-.B stats
-Enables the statistics facility.  See the Monitoring Options page for further 
-information.  The default for this flag is disable.
-.RE
-.TP
-.B includefile \fIincludefile\fR
-This command allows additional configuration commands to be included from a 
-separate file.  Include files may be nested to a depth of five; upon reaching 
-the end of any include file, command processing resumes in the previous 
-configuration file.  This option is useful for sites that run \fBntpd\fR on 
-multiple hosts, with (mostly) common options (e.g., a restriction list).
-.TP
-.B interface \fR[\fBlisten\fR | \fBignore\fR | \fBdrop\fR] [\fBall\fR | \fBipv4\fR | \fBipv6\fR | \fBwildcard\fR | \fIname\fR | \fIaddress\fR[/\fIprefixlen\fR]]
-This command controls which network addresses \fBntpd\fR opens, and
-whether input is dropped without processing. The first parameter
-determines the action for addresses which match the second
-parameter. That parameter specifies a class of addresses, or a
-specific interface name, or an address. In the address case,
-\fIprefixlen\fR determines how many bits must match for this rule to
-apply. \fBignore\fR prevents opening matching addresses, \fBdrop\fR
-causes \fBntpd\fR to open the address and drop all received packets
-without examination. Multiple \fBinterface\fR commands can be
-used. The last rule which matches a particular address determines the
-action for it. \fBinterface\fR commands are disabled if any \fB\-I\fR,
-\fB\-\-interface\fR, \fB\-L\fR, or \fB\-\-novirtualips\fR command-line
-options are used. If none of those options are used and no
-\fBinterface\fR actions are specified in the configuration file, all
-available network addresses are opened. The \fBnic\fR command is an
-alias for \fBinterface\fR.
-.SH FILES
-/etc/ntp.conf
-.SH NOTES
-Note that this manual page shows only the most important configuration commands.  
-The full documentation (see below) contains more details.
-.SH BUGS
-The syntax checking is not picky; some combinations of ridiculous and even 
-hilarious options and modes may not be detected.
-.SH "SEE ALSO"
-.BR ntpd (8)
-.PP
-The complete documentation can be found at \fI/usr/share/doc/ntp\-doc/html/ntpd.html#cfg\fR in the package ntp\-doc.
diff --git a/debian/man/ntpd.8 b/debian/man/ntpd.8
deleted file mode 100644
index e53b695..0000000
--- a/debian/man/ntpd.8
+++ /dev/null
@@ -1,175 +0,0 @@
-.TH NTPD 8 "2007-12-07" "Debian" "The Network Time Protocol (NTP) Distribution"
-.SH NAME
-ntpd \- Network Time Protocol (NTP) daemon
-.SH SYNOPSIS
-.B ntpd
-[ \-46aAbgLmnNqx ]
-[ \-c \fIconffile\fR ]
-[ \-f \fIdriftfile\fR ]
-[ \-i \fIjaildir\fR ]
-[ \-k \fIkeyfile\fR ]
-[ \-l \fIlogfile\fR ]
-[ \-p \fIpidfile\fR ]
-[ \-P \fIpriority\fR ]
-[ \-r \fIbroadcastdelay\fR ]
-[ \-s \fIstatsdir\fR ]
-[ \-t \fIkey\fR ]
-[ \-u \fIuser\fR[:\fIgroup\fR] ]
-[ \-U \fIinterface_update_interval\fR ]
-[ \-v \fIvariable\fR ]
-[ \-V \fIvariable\fR ]
-.SH DESCRIPTION
-The \fBntpd\fR 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.
-\fBntpd\fR 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.
-.PP
-The daemon can operate in any of several modes, including symmetric
-active/passive, client/server broadcast/multicast and manycast.  A
-broadcast/multicast or manycast client can discover remote servers,
-compute server-client propagation delay correction factors and configure
-itself automatically.  This makes it possible to deploy a fleet of
-workstations without specifying configuration details specific to the
-local environment.
-.PP
-Ordinarily, \fBntpd\fR reads the \fIntp.conf\fR configuration file at startup time
-in order to determine the synchronization sources and operating modes.
-It is also possible to specify a working, although limited
-configuration entirely on the command line, obviating the need for a
-configuration file.  This may be particularly appropriate when the
-local host is to be configured as a broadcast/multicast client or manycast
-client, with all peers being determined by listening to broadcasts at
-run time.
-.PP
-Various internal
-.B ntpd
-variables can be displayed and configuration
-options altered while the daemon is running using the
-.B ntpq
-and
-.B ntpd
-utility programs.
-.PP
-When
-.B ntpd
-starts it looks at the value of umask, and if it is zero
-.B ntpd
-will set the umask to 0222.
-.SH OPTIONS
-.TP
-.B \-a
-Require cryptographic authentication for broadcast client, multicast client and symmetric passive associations.
-This is the default.
-.TP
-.B \-A
-Do not require cryptographic authentication for broadcast client, multicast client and symmetric passive associations.
-This is almost never a good idea.
-.TP
-.B \-b
-Enable the client to synchronize to broadcast servers.
-.TP
-\fB\-c\fR \fIconffile\fR
-Specify the name and path of the configuration file, default \fI/etc/ntp.conf\fR.
-.TP
-\fB\-f\fR \fIdriftfile\fR
-Specify the name and path of the frequency file, default \fI/etc/ntp.drift\fR.
-This is the same operation as the driftfile \fIdriftfile\fR configuration command.
-.TP
-.B \-g
-Normally, \fBntpd\fR exits with a message to the system log if the offset exceeds the panic threshold, which is 1000 s by default.
-This option allows the time to be set to any value without restriction; however, this can happen only once.
-If the threshold is exceeded after that, \fBntpd\fR will exit with a message to the system log.
-This option can be used with the \fB\-q\fR and \fB\-x\fR options.
-.TP
-\fB\-i\fR \fIjaildir\fR
-Chroot the server to the directory \fIjaildir\fR.
-This option also implies that the server attempts to drop root privileges at startup (otherwise, chroot gives very little additional security).
-You may need to also specify a \fB\-u\fR option.
-.TP
-.B \-I \fR[\fIaddress\fR | \fIinterface name\fR]
-Open the network address given, or all the addresses associated with
-the given interface name.  This option may appear multiple times.
-This option also implies not opening other addresses, except wildcard
-and localhost.  This option is deprecated.  Please consider using the
-configuration file \fBinterface\fR command, which is more versatile.
-.TP
-\fB\-k\fR \fIkeyfile\fR
-Specify the name and path of the symmetric key file, default \fI/etc/ntp.keys\fR.
-This is the same operation as the keys \fIkeyfile\fR configuration command.
-.TP
-\fB\-l\fR \fIlogfile\fR
-Specify the name and path of the log file.
-The default is the system log file.
-This is the same operation as the logfile \fIlogfile\fR configuration command.
-.TP
-.B \-L
-Do not listen to virtual IPs.
-The default is to listen.
-.TP
-.B \-n
-Don't fork.
-.TP
-.B \-N
-To the extent permitted by the operating system, run the \fBntpd\fR at the highest priority.
-.TP
-\fB\-p\fR \fIpidfile\fR
-Specify the name and path of the file used to record the \fBntpd\fR process ID.
-This is the same operation as the pidfile \fIpidfile\fR configuration command.
-.TP
-\fB\-P\fR \fIpriority\fR
-To the extent permitted by the operating system, run the \fBntpd\fR at the specified priority.
-.TP
-.B \-q
-Exit the \fBntpd\fR just after the first time the clock is set.
-This behavior mimics that of the \fBntpdate\fR program, which is to be retired.
-The \fB\-g\fR and \fB\-x\fR options can be used with this option.
-Note: The kernel time discipline is disabled with this option.
-.TP
-\fB\-r\fR \fIbroadcastdelay\fR
-Specify the default propagation delay from the broadcast/multicast server to this client.
-This is necessary only if the delay cannot be computed automatically by the protocol.
-.TP
-\fB\-s\fR \fIstatsdir\fR
-Specify the directory path for files created by the statistics facility.
-This is the same operation as the statsdir \fIstatsdir\fR configuration command.
-.TP
-\fB\-t\fR \fIkey\fR
-Add a key number to the trusted key list.
-This option can occur more than once.
-.TP
-\fB\-u\fR \fIuser\fR[:\fIgroup\fR]
-Specify a user, and optionally a group, to switch to.
-.TP
-\fB\-U\fR \fIinterface_update_interval\fR
-Number of seconds to wait between interface list scans to pick up new and delete network interface.
-Set to 0 to disable dynamic interface list updating.
-The default is to scan every 5 minutes.
-.TP
-\fB\-v\fR \fIvariable\fR, \fB\-V\fR \fIvariable\fR
-Add a system variable listed by default.
-.TP
-.B \-x
-Normally, the time is slewed if the offset is less than the step threshold, which is 128 ms by default, and stepped if above the threshold.
-This option sets the threshold to 600 s, which is well within the accuracy window to set the clock manually.
-Note: Since the slew rate of typical Unix kernels is limited to 0.5 ms/s, each second of adjustment requires an amortization interval of 2000 s.
-Thus, an adjustment as much as 600 s will take almost 14 days to complete.
-This option can be used with the \fB\-g\fR and \fB\-q\fR options.
-Note: The kernel time discipline is disabled with this option.
-.TP
-.B \-4
-Force IPv4 DNS name resolution.
-.TP
-.B \-6
-Force IPv6 DNS name resolution.
-.SH FILES
-.TP
-.I /etc/ntp.conf
-default name of the configuration file
-.TP
-.I /etc/ntp.drift
-default name of the drift file
-.SH SEE ALSO
-.BR ntp.conf (5),
-.BR ntpdate (8)
-.PP
-The complete documentation can be found at \fI/usr/share/doc/ntp\-doc/html/ntpd.html\fR in the package ntp\-doc.
diff --git a/debian/man/ntpdc.1 b/debian/man/ntpdc.1
deleted file mode 100644
index 6ef3699..0000000
--- a/debian/man/ntpdc.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.\" transcribed from ntp 4.2.2p3
-.TH NTPDC 1 "October 7, 2006" "Network Time Protocol"
-.SH NAME
-ntpdc \- special NTP query program
-.SH SYNOPSIS
-.B ntpdc
-[\-ilnps] [\-c \fIcommand\fR] [\fIhost\fR] [...]
-.SH DESCRIPTION
-ntpdc is used to query the ntpd daemon about its current state and to request changes in that state. The program may be run either in interactive mode or controlled using command line arguments. Extensive state and statistics information is available through the ntpdc interface. In addition, nearly all the configuration options which can be specified at startup using ntpd's configuration file may also be specified at run time using ntpdc.
-.PP
-If one or more request options are included on the command line when ntpdc is executed, each of the requests will be sent to the NTP servers running on each of the hosts given as command line arguments, or on localhost by default. If no request options are given, ntpdc will attempt to read commands from the standard input and execute these on the NTP server running on the first host given on the command line, again defaulting to localhost when no other host is specified. ntpdc will promp [...]
-.PP
-ntpdc uses NTP mode 7 packets to communicate with the NTP server, and hence can be used to query any compatible server on the network which permits it. Note that since NTP is a UDP protocol this communication will be somewhat unreliable, especially over large distances in terms of network topology. ntpdc makes no attempt to retransmit requests, and will time requests out if the remote host is not heard from within a suitable timeout time.
-.PP
-The operation of ntpdc are specific to the particular implementation of the ntpd daemon and can be expected to work only with this and maybe some previous versions of the daemon. Requests from a remote ntpdc program which affect the state of the local server must be authenticated, which requires both the remote program and local server share a common key and key identifier.
-.PP
-Note that in contexts where a host name is expected, a \-4 qualifier preceding the host name forces DNS resolution to the IPv4 namespace, while a \-6 qualifier forces DNS resolution to the IPv6 namespace.
-.SH OPTIONS
-Specifying a command line option other than \-i or \-n will cause the specified query (queries) to be sent to the indicated host(s) immediately. Otherwise, ntpdc will attempt to read interactive format commands from the standard input.
-.TP
-\-4
-Force DNS resolution of following host names on the command line to the IPv4 namespace.
-.TP
-\-6
-Force DNS resolution of following host names on the command line to the IPv6 namespace.
-.TP
-\-c command
-The following argument is interpreted as an interactive format command and is added to the list of commands to be executed on the specified host(s). Multiple \-c options may be given.
-.TP
-\-i
-Force ntpdc to operate in interactive mode. Prompts will be written to the standard output and commands read from the standard input.
-.TP
-\-l
-Obtain a list of peers which are known to the server(s). This switch is equivalent to \-c listpeers.
-.TP
-\-n
-Output all host addresses in dotted-quad numeric format rather than converting to the canonical host names.
-.TP
-\-p
-Print a list of the peers known to the server as well as a summary of their state. This is equivalent to \-c peers.
-.TP
-\-s
-Print a list of the peers known to the server as well as a summary of their state, but in a slightly different format than the \-p switch. This is equivalent to \-c dmpeers.
-.SH "SEE ALSO"
-.I /usr/share/doc/ntp\-doc/html/ntpdc.html
-for the full documentation.
diff --git a/debian/man/ntpq.1 b/debian/man/ntpq.1
deleted file mode 100644
index 83ee5fe..0000000
--- a/debian/man/ntpq.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.\" transcribed from ntp 4.2.2p3
-.TH NTPQ 1 "November 9, 2007" "Network Time Protocol"
-.SH NAME
-ntpq \- standard NTP query program
-.SH SYNOPSIS
-.B ntpq
-[\-inp] [\-c \fIcommand\fR] [\fIhost\fR] [...]
-.SH DESCRIPTION
-The ntpq utility program is used to monitor NTP daemon ntpd operations and determine performance. It uses the standard NTP mode 6 control message formats defined in Appendix B of the NTPv3 specification RFC1305. The same formats are used in NTPv4, although some of the variables have changed and new ones added. The description on this page is for the NTPv4 variables.
-.PP
-The program can be run either in interactive mode or controlled using command line arguments. Requests to read and write arbitrary variables can be assembled, with raw and pretty-printed output options being available. The ntpq can also obtain and print a list of peers in a common format by sending multiple queries to the server.
-.PP
-If one or more request options is included on the command line when ntpq is executed, each of the requests will be sent to the NTP servers running on each of the hosts given as command line arguments, or on localhost by default. If no request options are given, ntpq will attempt to read commands from the standard input and execute these on the NTP server running on the first host given on the command line, again defaulting to localhost when no other host is specified. ntpq will prompt fo [...]
-.PP
-ntpq uses NTP mode 6 packets to communicate with the NTP server, and hence can be used to query any compatible server on the network which permits it. Note that since NTP is a UDP protocol this communication will be somewhat unreliable, especially over large distances in terms of network topology. ntpq makes one attempt to retransmit requests, and will time requests out if the remote host is not heard from within a suitable timeout time.
-.PP
-Note that in contexts where a host name is expected, a \-4 qualifier preceding the host name forces DNS resolution to the IPv4 namespace, while a \-6 qualifier forces DNS resolution to the IPv6 namespace.
-.SH OPTIONS
-Command line options are described following. Specifying a command line option other than \-i or \-n will cause the specified query (queries) to be sent to the indicated host(s) immediately. Otherwise, ntpq will attempt to read interactive format commands from the standard input.
-.TP
-\-4
-Force DNS resolution of following host names on the command line to the IPv4 namespace.
-.TP
-\-6
-Force DNS resolution of following host names on the command line to the IPv6 namespace.
-.TP
-\-c
-The following argument is interpreted as an interactive format command and is added to the list of commands to be executed on the specified host(s). Multiple \-c options may be given.
-.TP
-\-i
-Force ntpq to operate in interactive mode. Prompts will be written to the standard output and commands read from the standard input.
-.TP
-\-n
-Output all host addresses in dotted-quad numeric format rather than converting to the canonical host names.
-.TP
-\-p
-Print a list of the peers known to the server as well as a summary of their state. This is equivalent to the peers interactive command.
-.SH "SEE ALSO"
-.I /usr/share/doc/ntp\-doc/html/ntpq.html
-for the full documentation.
diff --git a/debian/man/ntptrace.1 b/debian/man/ntptrace.1
deleted file mode 100644
index 3325908..0000000
--- a/debian/man/ntptrace.1
+++ /dev/null
@@ -1,27 +0,0 @@
-.\" transcribed from ntp 4.2.2p3, modulo bug #593417
-.TH NTPTRACE 1 "December 4, 2011" "Network Time Protocol"
-.SH NAME
-ntptrace \- trace a chain of NTP servers back to the primary source
-.SH SYNOPSIS
-.B ntptrace
-[ \-m \fImax_hops\fR ] [ \-n ]
-.SH DESCRIPTION
-ntptrace determines where a given Network Time Protocol (NTP) server gets its time from, and follows the chain of NTP servers back to their master time source. If given no arguments, it starts with localhost. Here is an example of the output from ntptrace:
-.PP
-.nf
-% ntptrace
-localhost: stratum 4, offset 0.0019529, synch distance 0.144135
-server2ozo.com: stratum 2, offset 0.0124263, synch distance 0.115784
-usndh.edu: stratum 1, offset 0.0019298, synch distance 0.011993, refid 'WWVB'
-.fi
-.PP
-On each line, the fields are (left to right): the host name, the host stratum, the time offset between that host and the local host (as measured by ntptrace; this is why it is not always zero for "localhost"), the host synchronization distance, and (only for stratum-1 servers) the reference clock ID. All times are given in seconds. Note that the stratum is the server hop count to the primary source, while the synchronization distance is the estimated error relative to the primary source. [...]
-.SH OPTIONS
-.TP
-.B \-m \fImax_hops\fR
-Sets the number of server hops to follow (default = 99).
-.TP
-.B \-n
-Turns off the printing of host names; instead, host IP addresses are given. This may be useful if a nameserver is down.
-.SH BUGS
-This program makes no attempt to improve accuracy by doing multiple samples.
diff --git a/debian/ntp.install b/debian/ntp.install
index a362541..af7071d 100644
--- a/debian/ntp.install
+++ b/debian/ntp.install
@@ -8,6 +8,7 @@ debian/tmp/usr/sbin/ntp-wait
 debian/tmp/usr/sbin/ntpd
 debian/tmp/usr/sbin/ntptime
 debian/tmp/usr/share/ntp/lib/NTP/Util.pm
+debian/tmp/usr/share/doc/ntp/ntp-keygen.html
 debian/tmp/usr/share/doc/ntp/ntp-wait.html
 debian/tmp/usr/share/doc/ntp/ntp.conf.html
 debian/tmp/usr/share/doc/ntp/ntp.keys.html
@@ -18,8 +19,4 @@ debian/tmp/usr/share/doc/ntp/ntpsnmpd.html
 debian/tmp/usr/share/doc/ntp/ntpsweep.html
 debian/tmp/usr/share/doc/ntp/ntptrace.html
 debian/tmp/usr/share/doc/ntp/update-leap.html
-debian/tmp/usr/share/man/man1/calc_tickadj.1
-debian/tmp/usr/share/man/man1/ntp-wait.1
-debian/tmp/usr/share/man/man1/sntp.1
-debian/tmp/usr/share/man/man1/update-leap.1
-debian/tmp/usr/share/man/man5/ntp.keys.5
+debian/tmp/usr/share/man/man*/*
diff --git a/debian/ntp.manpages b/debian/ntp.manpages
index 9dc2de9..d8d5c4e 100644
--- a/debian/ntp.manpages
+++ b/debian/ntp.manpages
@@ -1,9 +1,2 @@
-debian/man/ntp.conf.5
-debian/man/ntpd.8
-debian/man/ntpdc.1
-debian/man/ntp-keygen.8
-debian/man/ntpq.1
 debian/man/ntpsweep.1
 debian/man/ntptime.8
-debian/man/ntptrace.1
-debian/man/ntp-wait.8
diff --git a/debian/rules b/debian/rules
index 021110f..04d9aa5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,13 +53,19 @@ override_dh_install:
 	install -D -m 0644 debian/apparmor-profile.tunable debian/ntp/etc/apparmor.d/tunables/ntpd
 	dh_link -pntp etc/apparmor.d/usr.sbin.ntpd etc/apparmor/init/network-interface-security/usr.sbin.ntpd
 
-	# remove upstream man pages, which are currently not as nice as ours / ntpsnmpd we don't want
-	rm $(addprefix debian/tmp/usr/share/man/man1/,ntpd.1 ntpdc.1 ntp-keygen.1 ntpq.1)
+	# move upstream manpages to the locations used before 4.2.8p9+dfsg-2.1
+	mkdir -p debian/tmp/usr/share/man/man8/
+	mv debian/tmp/usr/share/man/man1/ntp-keygen.1 debian/tmp/usr/share/man/man8/ntp-keygen.8
+	mv debian/tmp/usr/share/man/man1/ntp-wait.1 debian/tmp/usr/share/man/man8/ntp-wait.8
+	mv debian/tmp/usr/share/man/man1/ntpd.1 debian/tmp/usr/share/man/man8/ntpd.8
+
+	# drop documentation for programs not shipped in Debian
+	rm debian/tmp/usr/share/doc/sntp/sntp.html
 
 	# Remove empty directory (/usr/libexec/)
 	find debian/tmp -type d -empty -delete
 
-	dh_install
+	dh_install --fail-missing
 
 	rm -f debian/ntp-doc/usr/share/doc/ntp-doc/html/hints/solaris*
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ntp/pkg-ntp.git



More information about the pkg-ntp-maintainers mailing list