debian/0000755000000000000000000000000012225311046007162 5ustar debian/ntpdate.manpages0000644000000000000000000000006110513200774012336 0ustar debian/man/ntpdate.8 debian/man/ntpdate-debian.8 debian/compat0000644000000000000000000000000211003145033010352 0ustar 6 debian/ntp.docs0000644000000000000000000000004610740161157010643 0ustar NEWS README.refclocks README.versions debian/ntpdate.dirs0000644000000000000000000000002011174104311011471 0ustar var/lib/ntpdate debian/source_ntp.py0000644000000000000000000000074512126756215011736 0ustar '''apport package hook for ntp (c) 2010-2011 Canonical Ltd. Author: Chuck Short ''' from apport.hookutils import * from os import path import re def add_info(report): attach_conffiles(report, 'ntp') # get apparmor stuff attach_mac_events(report, '/usr/sbin/ntpd') attach_file(report, '/etc/apparmor.d/usr.sbin.ntpd') # get syslog stuff recent_syslog(re.compile(r'ntpd\[')) # Get debug information report['NtpStatus'] = command_output(['ntpq', '-p']) debian/ntp.default0000644000000000000000000000001710462721321011331 0ustar NTPD_OPTS='-g' debian/ntp-doc.doc-base0000644000000000000000000000103310775514410012132 0ustar Document: ntp-doc Title: The Network Time Protocol (NTP) Distribution Author: Walt Kelly Abstract: The Network Time Protocol (NTP) is used to synchronize the time of a computer client or server to another server or reference time source, such as a radio or satellite receiver or modem. It provides client accuracies typically within a millisecond on LANs and up to a few tens of milliseconds on WANs. Section: System/Administration Format: HTML Index: /usr/share/doc/ntp-doc/html/index.html Files: /usr/share/doc/ntp-doc/html/*.html debian/man/0000755000000000000000000000000011753423671007752 5ustar debian/man/ntptime.80000644000000000000000000000224111177766333011527 0ustar .\" transcribed from ntp 4.2.2p3 .TH NTPTIME 8 "October 7, 2006" "Network Time Protocol" .SH NAME ntptime \- read kernel time variables .SH SYNOPSIS .B ntptime [ \-chr ] [ \-e \fIest_error\fR ] [ \-f \fIfrequency\fR ] [ \-m \fImax_error\fR ] [ \-o \fIoffset\fR ] [ \-s \fIstatus\fR ] [ \-t \fItime_constant\fR ] .SH DESCRIPTION This program is useful only with special kernels described in the A Kernel Model for Precision Timekeeping page. It reads and displays time-related kernel variables using the ntp_gettime() system call. A similar display can be obtained using the ntpdc program and kerninfo command. .SH OPTIONS .TP \-c Display the execution time of ntptime itself. .TP \-e \fIest_error\fR Specify estimated error, in microseconds. .TP \-f \fIfrequency\fR Specify frequency offset, in parts per million. .TP \-h Display help information. .TP \-m \fImax_error\fR Specify max possible errors, in microseconds. .TP \-o \fIoffset\fR Specify clock offset, in microseconds. .TP \-r Display Unix and NTP times in raw format. .TP \-s \fIstatus\fR Specify clock status. Better know what you are doing. .TP \-t \fItime_constant\fR Specify time constant, an integer in the range 0-10. debian/man/ntpd.80000644000000000000000000001625411665620636011022 0ustar .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. debian/man/ntptrace.10000644000000000000000000000310711667175361011661 0ustar .\" 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. These terms are precisely defined in RFC-1305. .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. debian/man/ntpdc.10000644000000000000000000000710411177766333011153 0ustar .\" 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 prompt for commands if the standard input is a terminal device. .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. debian/man/ntp-keygen.80000644000000000000000000000173711177766333012141 0ustar .\" 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. debian/man/ntpdate.80000644000000000000000000001310511413532760011473 0ustar .TH ntpdate 8 .SH NAME ntpdate \- set the date and time via NTP .SH SYNOPSIS .B ntpdate .RB [\| \-bBdoqsuv \|] .RB [\| \-a .IR key \|] .RB [\| \-e .IR authdelay \|] .RB [\| \-k .IR keyfile \|] .RB [\| \-o .IR version \|] .RB [\| \-p .IR samples \|] .RB [\| \-t .IR timeout \|] .IR server .RB [\| ... \|] .SH DESCRIPTION .B ntpdate sets the local date and time by polling the Network Time Protocol (NTP) server(s) given as the .I server arguments to determine the correct time. It must be run as root on the local host (unless the option \fB\-q\fR is used). A number of samples are obtained from each of the servers specified and a subset of the NTP clock filter and selection algorithms are applied to select the best of these. Note that the accuracy and reliability of ntpdate depends on the number of servers, the number of polls each time it is run and the interval between runs. ntpdate can be run manually as necessary to set the host clock, or it can be run from the host startup script to set the clock at boot time. This is useful in some cases to set the clock initially before starting the NTP daemon ntpd. It is also possible to run ntpdate from a cron script. However, it is important to note that ntpdate with contrived cron scripts is no substitute for the NTP daemon, which uses sophisticated algorithms to maximize accuracy and reliability while minimizing resource use. Finally, since ntpdate does not discipline the host clock frequency as does ntpd, the accuracy using ntpdate is limited. Time adjustments are made by ntpdate in one of two ways. If ntpdate determines the clock is in error more than 0.5 second it will simply step the time by calling the system settimeofday() routine. If the error is less than 0.5 seconds, it will slew the time by calling the system adjtime() routine. The latter technique is less disruptive and more accurate when the error is small, and works quite well when ntpdate is run by cron every hour or two. ntpdate will decline to set the date if an NTP server daemon (e.g., ntpd) is running on the same host. When running ntpdate on a regular basis from cron as an alternative to running a daemon, doing so once every hour or two will result in precise enough timekeeping to avoid stepping the clock. .SH OPTIONS .TP .BI \-a \ key Enable the authentication function and specify the key identifier to be used for authentication as the argument keyntpdate. The keys and key identifiers must match in both the client and server key files. The default is to disable the authentication function. .TP .B \-B Force the time to always be slewed using the adjtime() system call, even if the measured offset is greater than +-128 ms. The default is to step the time using settimeofday() if the offset is greater than +-128 ms. Note that, if the offset is much greater than +-128 ms in this case, that it can take a long time (hours) to slew the clock to the correct value. During this time, the host should not be used to synchronize clients. .TP .B \-b Force the time to be stepped using the settimeofday() system call, rather than slewed (default) using the adjtime() system call. This option should be used when called from a startup file at boot time. .TP .B \-d Enable the debugging mode, in which ntpdate will go through all the steps, but not adjust the local clock. Information useful for general debugging will also be printed. .TP .BI \-e \ authdelay Specify the processing delay to perform an authentication function as the value authdelay, in seconds and fraction (see ntpd for details). This number is usually small enough to be negligible for most purposes, though specifying a value may improve timekeeping on very slow CPU's. .TP .BI \-k \ keyfile Specify the path for the authentication key file as the string keyfile. The default is /etc/ntp.keys. This file should be in the format described in ntpd. .TP .BI \-o \ version Specify the NTP version for outgoing packets as the integer version, which can be 1 or 2. The default is 3. This allows ntpdate to be used with older NTP versions. .TP .BI \-p \ samples Specify the number of samples to be acquired from each server as the integer samples, with values from 1 to 8 inclusive. The default is 4. .TP .B \-q Query only - don't set the clock. .TP .B \-s Divert logging output from the standard output (default) to the system syslog facility. This is designed primarily for convenience of cron scripts. .TP .BI \-t \ timeout Specify the maximum time waiting for a server response as the value timeout, in seconds and fraction. The value is is rounded to a multiple of 0.2 seconds. The default is 1 second, a value suitable for polling across a LAN. .TP .B \-u Direct ntpdate to use an unprivileged port for outgoing packets. This is most useful when behind a firewall that blocks incoming traffic to privileged ports, and you want to synchronise with hosts beyond the firewall. Note that the \-d option always uses unprivileged ports. .TP .B \-v Be verbose. This option will cause ntpdate's version identification string to be logged. .SH DIAGNOSTICS \fBntpdate\fP's exit status is zero if it found a server and could update the clock, and nonzero otherwise. .SH FILES .TP .I /etc/ntp.keys \- encryption keys used by ntpdate. .SH BUGS The slew adjustment is actually 50% larger than the measured offset, since this (it is argued) will tend to keep a badly drifting clock more accurate. This is probably not a good idea and may cause a troubling hunt for some values of the kernel variables tick and tickadj. .SH AUTHOR David L. Mills (mills@udel.edu) .br This manpage converted from html to roff by Fabrizio Polacco .SH "SEE ALSO" \fBntpdate\-debian\fR(8) debian/man/ntp.conf.50000644000000000000000000004477411413532425011574 0ustar .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. debian/man/ntp-wait.80000644000000000000000000000115211177766333011612 0ustar .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. debian/man/ntpsweep.10000644000000000000000000000156111177766333011711 0ustar .\" -*- nroff -*" .TH NTPSWEEP 1 .SH NAME ntpsweep \- Sweep NTP Servers and Report Relationships .SH SYNOPSIS .B ntpsweep [ \-\-help|\-\-peers|\-\-strip ] |[\-\-host ] .SH DESCRIPTION .B ntpsweep prints per host given in the NTP stratum level, the clock offset in seconds, the daemon version, the operating system and the processor. .SH OPTIONS .TP .I \-\-help Print this short help text and exit. .TP .I Specify the hosts file. File format is one hostname or ip number per line. Lines beginning with # are considered as comment. .TP .I \-\-host Speficy a single host, bypassing the need for a hosts file. .TP .I \-\-peers List all peers a host synchronizes to. .TP .I \-\-strip Strip from hostnames. .SH AUTHOR Hans Lambermont. Manpage by Bdale Garbee for the Debian GNU/Linux distribution. debian/man/ntpq.10000644000000000000000000000633111177766333011026 0ustar .\" 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 for commands if the standard input is a terminal device. .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. debian/man/ntpdate-debian.80000644000000000000000000000102710513200774012710 0ustar .TH ntpdate-debian 8 .SH NAME ntpdate-debian \- set the date and time via NTP .SH SYNOPSIS .B ntpdate-debian .RB [\| \-bBdoqsuv \|] .RB [\| \-a .IR key \|] .RB [\| \-e .IR authdelay \|] .RB [\| \-k .IR keyfile \|] .RB [\| \-o .IR version \|] .RB [\| \-p .IR samples \|] .RB [\| \-t .IR timeout \|] .SH DESCRIPTION .B ntpdate-debian is identical to .BR ntpdate (8) except that it uses the configuration in .I /etc/default/ntpdate by default. .B ntpdate sets the local date and time by polling Network Time Protocol (NTP) servers. debian/ntp.manpages0000644000000000000000000000027411003335342011501 0ustar 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 debian/ntp.postrm0000644000000000000000000000134111413656502011237 0ustar #!/bin/sh set -e if dpkg-maintscript-helper supports rm_conffile; then dpkg-maintscript-helper rm_conffile \ /etc/logcheck/ignore.d.server/ntp 1:4.2.6+dfsg-1 -- "$@" dpkg-maintscript-helper rm_conffile \ /etc/dhcp3/dhclient-enter-hooks.d/ntp 1:4.2.6+dfsg-1 -- "$@" dpkg-maintscript-helper rm_conffile \ /etc/network/if-up.d/ntp 1:4.2.6+dfsg-1 -- "$@" fi if dpkg-maintscript-helper supports mv_conffile; then dpkg-maintscript-helper mv_conffile \ /etc/dhcp3/dhclient-exit-hooks.d/ntp \ /etc/dhcp/dhclient-exit-hooks.d/ntp \ 1:4.2.6.p1+dfsg-1 -- "$@" fi installinit_error() { exit $? } #DEBHELPER# if [ "$1" = "purge" ]; then deluser --system --quiet ntp || true rm -rf /var/lib/ntp/ rm -rf /var/log/ntpstats/ fi debian/ntpdate.files0000644000000000000000000000002110444102766011646 0ustar usr/sbin/ntpdate debian/ntpdate.logcheck.ignore.server0000644000000000000000000000016311145336262015120 0ustar ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ ntpdate\[[0-9]+\]: (adjust|step) time server [0-9.]{7,15} offset -?[0-9.]+ sec$ debian/apparmor-profile.tunable0000644000000000000000000000105212126756215014026 0ustar # vim:syntax=apparmor # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE # Copyright (C) 2011 Canonical, Ltd. # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public # License published by the Free Software Foundation. # # ------------------------------------------------------------------ #Add your ntpd devices here eg. if you have a DCF clock # @{NTPD_DEVICE}="/dev/ttyS1" @{NTPD_DEVICE}="/dev/null" debian/ntpdate.default0000644000000000000000000000071012126756215012200 0ustar # The settings in this file are used by the program ntpdate-debian, but not # by the upstream program ntpdate. # Set to "yes" to take the server list from /etc/ntp.conf, from package ntp, # so you only have to keep it in one place. NTPDATE_USE_NTP_CONF=yes # List of NTP servers to use (Separate multiple servers with spaces.) # Not used if NTPDATE_USE_NTP_CONF is yes. NTPSERVERS="ntp.ubuntu.com" # Additional options to pass to ntpdate NTPOPTIONS="" debian/svn-deblayout0000644000000000000000000000002410444317105011700 0ustar origDir=../upstream debian/source/0000755000000000000000000000000011753423671010477 5ustar debian/source/format0000644000000000000000000000001411274342272011700 0ustar 3.0 (quilt) debian/ntpdate.dhcp0000644000000000000000000000144611174104311011463 0ustar NTPDATE_CONF=/etc/default/ntpdate NTPDATE_DHCP_CONF=/var/lib/ntpdate/default.dhcp ntp_servers_setup_remove() { rm -f $NTPDATE_DHCP_CONF } ntp_servers_setup_add() { if [ -e $NTPDATE_DHCP_CONF ] && [ "$new_ntp_servers" = "$old_ntp_servers" ]; then return fi if [ -z "$new_ntp_servers" ]; then ntp_servers_setup_remove return fi tmp=$(mktemp "$NTPDATE_DHCP_CONF.XXXXXX") || return chmod --reference=$NTPDATE_CONF $tmp chown --reference=$NTPDATE_CONF $tmp ( echo "# NTP server entries received from DHCP server" echo "NTPSERVERS='$new_ntp_servers'" ) >>$tmp mv $tmp $NTPDATE_DHCP_CONF } ntp_servers_setup() { case $reason in BOUND|RENEW|REBIND|REBOOT) ntp_servers_setup_add ;; EXPIRE|FAIL|RELEASE|STOP) ntp_servers_setup_remove ;; esac } ntp_servers_setup debian/watch0000644000000000000000000000020310515661450010215 0ustar version=3 opts=dversionmangle=s/\+dfsg(\.\d+)?$//;s/\.p/p/ \ http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-([0-9.p]+)\.tar\.gz debian/source.lintian-overrides0000644000000000000000000000014711753422557014063 0ustar # need a multiarch-enabled version build-depends-on-1-revision build-depends: libssl-dev (>= 1.0.0e-1) debian/ntpdate.postrm0000644000000000000000000000072011413656502012075 0ustar #!/bin/sh set -e if dpkg-maintscript-helper supports rm_conffile; then dpkg-maintscript-helper rm_conffile \ /etc/dhcp3/dhclient-enter-hooks.d/ntpdate 1:4.2.6+dfsg-1 -- "$@" fi if dpkg-maintscript-helper supports mv_conffile; then dpkg-maintscript-helper mv_conffile \ /etc/dhcp3/dhclient-exit-hooks.d/ntpdate \ /etc/dhcp/dhclient-exit-hooks.d/ntpdate \ 1:4.2.6.p1+dfsg-1 -- "$@" fi #DEBHELPER# if [ "$1" = "purge" ]; then rm -rf /var/lib/ntpdate/ fi debian/ntpdate.preinst0000644000000000000000000000063211413656502012237 0ustar #!/bin/sh set -e if dpkg-maintscript-helper supports rm_conffile; then dpkg-maintscript-helper rm_conffile \ /etc/dhcp3/dhclient-enter-hooks.d/ntpdate 1:4.2.6+dfsg-1 -- "$@" fi if dpkg-maintscript-helper supports mv_conffile; then dpkg-maintscript-helper mv_conffile \ /etc/dhcp3/dhclient-exit-hooks.d/ntpdate \ /etc/dhcp/dhclient-exit-hooks.d/ntpdate \ 1:4.2.6.p1+dfsg-1 -- "$@" fi #DEBHELPER# debian/ntpdate.if-up0000644000000000000000000000242212126756215011576 0ustar #!/bin/sh set -e PATH=/sbin:/bin:/usr/sbin:/usr/bin # This is a heuristic: The idea is that if a static interface is brought # up, that is a major event, and we can put in some extra effort to fix # the system time. Feel free to change this, especially if you regularly # bring up new network interfaces. if [ "$METHOD" = static ]; then OPTS="-b" fi if [ "$METHOD" = loopback ]; then exit 0 fi # Check whether ntpdate was removed but not purged; it's useless to wait for # it in that case. if [ ! -x /usr/sbin/ntpdate-debian ] && [ -d /usr/sbin ]; then exit 0 fi ( # This is for the case that /usr will be mounted later. if [ -r /lib/udev/hotplug.functions ]; then . /lib/udev/hotplug.functions wait_for_file /usr/sbin/ntpdate-debian fi LOCKFILE=/var/lock/ntpdate-ifup # Avoid running more than one at a time if [ -x /usr/bin/lockfile-create ]; then lockfile-create $LOCKFILE lockfile-touch $LOCKFILE & LOCKTOUCHPID="$!" fi if [ -e /usr/sbin/openntpd ]; then service='openntpd' else service='ntp' fi invoke-rc.d --quiet $service stop >/dev/null 2>&1 || true /usr/sbin/ntpdate-debian -s $OPTS 2>/dev/null || : invoke-rc.d --quiet $service start >/dev/null 2>&1 || true if [ -x /usr/bin/lockfile-create ] ; then kill $LOCKTOUCHPID lockfile-remove $LOCKFILE fi ) & debian/control0000644000000000000000000000647012126755332010606 0ustar Source: ntp Section: net Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian NTP Team Uploaders: Bdale Garbee , Peter Eisentraut , Kurt Roeckx Build-Depends: autotools-dev, debhelper (>= 6), libedit-dev, libcap2-dev [linux-any], libssl-dev (>= 1.0.0e-1), autogen (>= 1:5.11), hardening-wrapper, dh-apparmor Build-Conflicts: libavahi-compat-libdnssd-dev, libwww-dev, libwww-ssl-dev Standards-Version: 3.9.3 Homepage: http://support.ntp.org/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-ntp/ntp/trunk/ Vcs-Svn: svn://svn.debian.org/pkg-ntp/ntp/trunk/ Package: ntp Architecture: any Depends: adduser, lsb-base (>= 3.2-13), netbase, ${misc:Depends}, ${shlibs:Depends} Pre-Depends: dpkg (>= 1.15.7.2) Recommends: ${perl:Depends} Suggests: ntp-doc, apparmor (>= 2.1+1075-0ubuntu6) Conflicts: apparmor-profiles (<< 2.3.1+1403-0ubuntu10), apparmor (<< 2.3.1+1403-0ubuntu10) Replaces: apparmor-profiles (<< 2.3.1+1403-0ubuntu10), apparmor (<< 2.3.1+1403-0ubuntu10) Breaks: dhcp3-client (<< 4.1.0-1) Description: Network Time Protocol daemon and utility programs NTP, the Network Time Protocol, is used to keep computer clocks accurate by synchronizing them over the Internet or a local network, or by following an accurate hardware receiver that interprets GPS, DCF-77, NIST or similar time signals. . This package contains the NTP daemon and utility programs. An NTP daemon needs to be running on each host that is to have its clock accuracy controlled by NTP. The same NTP daemon is also used to provide NTP service to other hosts. . For more information about the NTP protocol and NTP server configuration and operation, install the package "ntp-doc". Package: ntpdate Architecture: any Depends: netbase, ${misc:Depends}, ${shlibs:Depends} Pre-Depends: dpkg (>= 1.15.7.2) Recommends: lockfile-progs Breaks: dhcp3-client (<< 4.1.0-1) Description: client for setting system time from NTP servers NTP, the Network Time Protocol, is used to keep computer clocks accurate by synchronizing them over the Internet or a local network, or by following an accurate hardware receiver that interprets GPS, DCF-77, NIST or similar time signals. . ntpdate is a simple NTP client that sets a system's clock to match the time obtained by communicating with one or more NTP servers. It is not sufficient, however, for maintaining an accurate clock in the long run. ntpdate by itself is useful for occasionally setting the time on machines that do not have full-time network access, such as laptops. . If the full NTP daemon from the package "ntp" is installed, then ntpdate is not necessary. Package: ntp-doc Architecture: all Depends: ${misc:Depends} Section: doc Description: Network Time Protocol documentation NTP, the Network Time Protocol, is used to keep computer clocks accurate by synchronizing them over the Internet or a local network, or by following an accurate hardware receiver that interprets GPS, DCF-77, NIST or similar time signals. . This package contains HTML documentation for the ntp packages (ntp, ntpdate). Since there are no substantive man pages for ntp's programs and configuration files, this package is desirable for any setup beyond the simple default configuration. debian/changelog0000644000000000000000000030330712225311046011042 0ustar ntp (1:4.2.6.p5+dfsg-3ubuntu2) saucy; urgency=low * debian/apparmor-profile: fix spurious noisy denials (LP: #1237508) -- Jamie Strandboge Wed, 09 Oct 2013 12:28:02 -0500 ntp (1:4.2.6.p5+dfsg-3ubuntu1) saucy; urgency=low * Merge from Debian testing to regain crypto support (LP: #1236065). Remaining changes: + debian/ntp.conf, debian/ntpdate.default: Change default server to ntp.ubuntu.com. + debian/ntpdate.if-up: Stop ntp before running ntpdate when an interface comes up, then start again afterwards. + debian/ntp.init, debian/rules: Only stop when entering single user mode. + Add enforcing AppArmor profile: - debian/control: Add Conflicts/Replaces on apparmor-profiles. - debian/control: Add Suggests on apparmor. - debian/ntp.dirs: Add apparmor directories. - debian/ntp.preinst: Force complain on certain upgrades. - debian/ntp.postinst: Reload apparmor profile. - debian/ntp.postrm: Remove the force-complain file. - add debian/apparmor-profile*. - debian/rules: install apparmor-profile and apparmor-profile.tunable. - debian/README.Debian: Add note on AppArmor. + debian/{control,rules}: Add and enable hardened build for PIE. + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook. + debian/ntpdate-debian: Disregard empty ntp.conf files. + debian/ntp.preinst: Remove empty /etc/ntp.conf on fresh intallation. + debian/ntpdate.if-up: Fix interaction with openntpd. + debian/source_ntp.py: Add filter on AppArmor profile names to prevent false positives from denials originating in other packages. + debian/rules: Update config.{guess,sub} for AArch64. -- Tyler Hicks Sun, 06 Oct 2013 12:34:00 -0700 ntp (1:4.2.6.p5+dfsg-3) unstable; urgency=low * Look for rather than , which is due to move to a different location in order to support multiarch. Patch by Colin Watson (Closes: #696390) -- Kurt Roeckx Mon, 20 May 2013 16:14:07 +0200 ntp (1:4.2.6.p5+dfsg-2ubuntu3) saucy; urgency=low * Update config.{guess,sub} for AArch64. -- Matthias Klose Mon, 05 Aug 2013 18:51:48 +0200 ntp (1:4.2.6.p5+dfsg-2ubuntu2) saucy; urgency=low * debian/apparmor-profile: Add /var/log/ntpstats/protostats* (LP: #1195898) -- Jamie Strandboge Fri, 05 Jul 2013 10:06:47 -0500 ntp (1:4.2.6.p5+dfsg-2ubuntu1) raring; urgency=low * New upstream version, fixing build failure in raring. * Merge with Debian; remaining changes: + debian/ntp.conf, debian/ntpdate.default: Change default server to ntp.ubuntu.com. + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface comes up, then start again afterwards. + debian/ntp.init, debian/rules: Only stop when entering single user mode. + Add enforcing AppArmor profile: - debian/control: Add Conflicts/Replaces on apparmor-profiles. - debian/control: Add Suggests on apparmor. - debian/ntp.dirs: Add apparmor directories. - debian/ntp.preinst: Force complain on certain upgrades. - debian/ntp.postinst: Reload apparmor profile. - debian/ntp.postrm: Remove the force-complain file. - add debian/apparmor-profile*. - debian/rules: install apparmor-profile and apparmor-profile.tunable. - debian/README.Debian: Add note on AppArmor. + debian/{control,rules}: Add and enable hardened build for PIE. + debian/apparmor-profile: Adjust location of drift files. + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook. + debian/ntpdate-debian: Disregard empty ntp.conf files. + debian/ntp.preinst: Remove empty /etc/ntp.conf on fresh intallation. + debian/ntpdate.ifup: Fix interaction with openntpd. + debian/source_ntp.py: Add filter on AppArmor profile names to prevent false positives from denials originating in other packages. + debian/apparmor-profile: Add samba4 ntp signing socket to ntpd apparmor profile. + debian/apparmor-profile: adjust for IPv6. -- Matthias Klose Wed, 03 Apr 2013 07:21:01 +0200 ntp (1:4.2.6.p5+dfsg-2) unstable; urgency=medium * Re-enable crypto support by pointing openssl libdir to multiarch dir. Also increase libssl-dev build dependency to the first multiarch version. (closes: #670662) -- Peter Eisentraut Sat, 12 May 2012 12:04:06 +0300 ntp (1:4.2.6.p5+dfsg-1) unstable; urgency=low * New upstream release (closes: #644673) * Updated instructions on generating autotools.patch * Updated standards version -- Peter Eisentraut Mon, 27 Feb 2012 13:55:56 +0200 ntp (1:4.2.6.p3+dfsg-3) unstable; urgency=medium * Update format-security.patch to include kfreebsd-specific fixes (closes: #653771) -- Peter Eisentraut Thu, 05 Jan 2012 19:37:28 +0200 ntp (1:4.2.6.p3+dfsg-2) unstable; urgency=low * Use architecture wildcard for libcap2-dev build dependency, removing type-handing dependency (closes: #528440, #587871) * Updated standards version * Get build flags from dpkg-buildflags, and fix the resulting -Wformat-security errors using patch from Colin Watson (closes: #542721, #627403) * Add -Wl,--as-needed to LDFLAGS, which drops the dependency of ntpdate on libcap2 * Add sntp-manpage.patch to fix some errors in sntp man page pointed out by lintian * Re-remove tickadj. The previous method of achieving this by tweaking configure cache variables apparently broke at some point, so this time do it more directly. * Explicitly disable building ntpsnmpd and remove man page (closes: #608542; see also #622819) * ntpdate-debian: Improve parsing of ntp.conf (closes: #606349) * Add descriptions of -4/-6 options to ntpd man page (closes: #613349) * Update options list on ntptrace man page to match reality (closes: #593417) * Add build-arch and build-indep debian/rules targets, per lintian * Create ntp user and group separately, to handle the case where the user already exists but not the group (closes: #624275) * Don't ignore errors from adduser. If the system user or group already exist, this is ignored anyway. Anything else we want to know about. * Generalize ntp.cron.daily to cover all possible filegen stats files (closes: #644120) -- Peter Eisentraut Sat, 17 Dec 2011 19:00:10 +0200 ntp (1:4.2.6.p3+dfsg-1ubuntu5) quantal; urgency=low * debian/source_ntp.py: add filter on AppArmor profile names to prevent false positives from denials originating in other packages. -- Marc Deslauriers Mon, 20 Aug 2012 10:13:30 -0400 ntp (1:4.2.6.p3+dfsg-1ubuntu4) quantal; urgency=low * Re-enable crypto support by pointing openssl libdir to multiarch dir, change backported from Debian, thanks Yves-Alexis Perez (lp: #998403) -- Sebastien Bacher Mon, 04 Jun 2012 16:35:25 +0200 ntp (1:4.2.6.p3+dfsg-1ubuntu3) precise; urgency=low * debian/apparmor-profile: Add samba4 ntp signing socket to ntpd apparmor profile (LP: #930266) * debian/control: Build-Depends on dh-apparmor -- Jamie Strandboge Tue, 06 Mar 2012 08:06:06 -0600 ntp (1:4.2.6.p3+dfsg-1ubuntu2) precise; urgency=low * debian/apparmor-profile: adjust for IPv6 (LP: #892332) -- Jamie Strandboge Tue, 03 Jan 2012 17:03:44 -0600 ntp (1:4.2.6.p3+dfsg-1ubuntu1) precise; urgency=low * Merge from debian unstable, remaining changes are: + debian/ntp.conf, debian/ntpdate.default: Change default server to ntp.ubuntu.com. + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface comes up, then start again afterwards. + debian/ntp.init, debian/rules: Only stop when entering single user mode. + Add enforcing AppArmor profile (LP: #382905): - debian/control: add Conflicts/Replaces on apparmor-profiles < 2.3.1+1403-0ubuntu10 (since we are now shipping usr.sbin.ntpd) and apparmor < 2.3.1+1403-0ubuntu10 (since we are now shipping tunables/ntpd) - debian/control: add Suggests on apparmor - debian/ntp.dirs: add apparmor directories - debian/ntp.preinst: force complain on certain upgrades - debian/ntp.postinst: reload apparmor profile - debian/ntp.postrm: remove the force-complain file - add debian/apparmor-profile* - debian/rules: install apparmor-profile and apparmor-profile.tunable - debian/README.Debian: add note on AppArmor + debian/{control,rules}: add and enable hardened build for PIE (Debian bug 542721). + debian/apparmor-profile: adjust location of drift files (LP: #456308) + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook. + debian/ntpdate-debian: Disregard empty ntp.conf files. (LP: #83604) + debian/ntp.preinst: Remove empty /etc/ntp.conf on fresh intallation, to work around the system-tools-backends part of LP #83604. + debian/ntpdate.ifup: Fix interaction with openntpd. (LP: #877210) + Dropped: - ntpdate-accept-same-timestamp-replies.patch: Accepted upstream -- Chuck Short Wed, 26 Oct 2011 10:24:21 -0400 ntp (1:4.2.6.p3+dfsg-1) unstable; urgency=low * New upstream version - Require newer autogen version * Include sntp in source, it got rewritting and licensed changed. * Re-add neoclock4x driver, license got changed. * Drop nanokernel-status.patch. 2.6.26 was part of lenny, so everybody really should have nanokernel support now. The patch also didn't actually enable the nano kernel. * Drop mod_nano.patch, libc now provides the proper defines. * We now build against a libc that has NTP_API 4 support, which means that we get TAI offset support. -- Kurt Roeckx Fri, 03 Jun 2011 16:39:02 +0200 ntp (1:4.2.6.p2+dfsg-1ubuntu13) precise; urgency=low * debian/ntpdate.if-up: Fix interaction with openntpd, LP: #872210 -- Reinhard Tartler Tue, 11 Oct 2011 12:33:01 +0200 ntp (1:4.2.6.p2+dfsg-1ubuntu12) oneiric; urgency=low * debian/apparmor-profile: also allow access to /var/log/ntpstats/rawstats* -- Jamie Strandboge Fri, 02 Sep 2011 12:35:08 -0500 ntp (1:4.2.6.p2+dfsg-1ubuntu11) oneiric; urgency=low * debian/apparmor-profile: allow sys_nice for -N option to work. More work is needed to make ntpd start niced, so not auto-closing the bug. - LP: 229632 -- Jamie Strandboge Fri, 19 Aug 2011 07:39:20 -0500 ntp (1:4.2.6.p2+dfsg-1ubuntu10) oneiric; urgency=low * debian/source_ntp.py: use new apport MAC function instead of parsing and attaching AppArmor events here. -- Marc Deslauriers Fri, 15 Jul 2011 08:33:08 -0400 ntp (1:4.2.6.p2+dfsg-1ubuntu9) oneiric; urgency=low * debian/apparmor-profile: Allow /var/run and /run. (LP: #810270) -- Martin Pitt Thu, 14 Jul 2011 15:12:09 +0200 ntp (1:4.2.6.p2+dfsg-1ubuntu8) oneiric; urgency=low * debian/patches/ntpdate-accept-same-timestamp-replies.patch: Resolving regression where ntpdate ignores replies from some ntp servers where recieve and transmit timestamps are equal. Patch cherry picked from upstream commit. (LP: #787551) -- Dave Walker (Daviey) Mon, 13 Jun 2011 15:22:29 +0100 ntp (1:4.2.6.p2+dfsg-1ubuntu7) oneiric; urgency=low * Fix a number of -Wformat-security warnings. -- Colin Watson Fri, 20 May 2011 12:20:07 +0100 ntp (1:4.2.6.p2+dfsg-1ubuntu6) oneiric; urgency=low * Rebuild for OpenSSL 1.0.0. -- Colin Watson Tue, 17 May 2011 17:24:01 +0100 ntp (1:4.2.6.p2+dfsg-1ubuntu5) natty; urgency=low * debian/apparmor-profile: add note about using shared memory for a clock source (LP: #722815). -- Kees Cook Thu, 10 Mar 2011 12:54:59 -0800 ntp (1:4.2.6.p2+dfsg-1ubuntu4) natty; urgency=low * debian/ntp.conf: adjust to use X.ubuntu.pool.ntp.org in addition to ntp.ubuntu.com (LP: #104525) -- Jamie Strandboge Tue, 08 Feb 2011 10:03:19 -0600 ntp (1:4.2.6.p2+dfsg-1ubuntu3) natty; urgency=low * debian/apparmor-profile: allow access to clockstats too (LP: #701896) -- Jamie Strandboge Wed, 12 Jan 2011 10:05:41 -0600 ntp (1:4.2.6.p2+dfsg-1ubuntu2) natty; urgency=low * debian/ntpdate-debian: Disregard empty ntp.conf files (thanks, Mika Wahlroos; LP: #83604). * debian/ntp.preinst: Remove empty /etc/ntp.conf on fresh installation, to work around the system-tools-backends part of LP #83604. -- Colin Watson Mon, 06 Dec 2010 11:13:04 +0000 ntp (1:4.2.6.p2+dfsg-1ubuntu1) natty; urgency=low * Merge from debian unstable, remaining changes are: + debian/ntp.conf, debian/ntpdate.default: Change default server to ntp.ubuntu.com. + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface comes up, then start again afterwards. + debian/ntp.init, debian/rules: Only stop when entering single user mode. + Add enforcing AppArmor profile (LP: #382905): - debian/control: add Conflicts/Replaces on apparmor-profiles < 2.3.1+1403-0ubuntu10 (since we are now shipping usr.sbin.ntpd) and apparmor < 2.3.1+1403-0ubuntu10 (since we are now shipping tunables/ntpd) - debian/control: add Suggests on apparmor - debian/ntp.dirs: add apparmor directories - debian/ntp.preinst: force complain on certain upgrades - debian/ntp.postinst: reload apparmor profile - debian/ntp.postrm: remove the force-complain file - add debian/apparmor-profile* - debian/rules: install apparmor-profile and apparmor-profile.tunable - debian/README.Debian: add note on AppArmor + debian/{control,rules}: add and enable hardened build for PIE (Debian bug 542721). + debian/apparmor-profile: adjust location of drift files (LP: #456308) + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook. -- Chuck Short Tue, 30 Nov 2010 11:14:31 -0500 ntp (1:4.2.6.p2+dfsg-1) unstable; urgency=low [ Peter Eisentraut ] * Update command options section in ntp.conf(5) man page, drop "dynamic" option (closes: #553976, #439734) * Document ntpd -I option and ntp.conf interface command (closes: #506389) * Fix type in ntpdate man page (closes: #566621) * Added explanation of options to ntptrace man page (closes: #558289) * Removed no longer needed build conflict against libreadline-dev [ Kurt Roeckx ] * New upstream version. - Fixes problem with ipv6 multicast (Closes: #584927) * Move dhcp exit hooks from /etc/dhcp3/dhclient-enter-hooks.d to /etc/dhcp/dhclient-enter-hooks.d. Add dpkg-maintscript-helper to maintainer scripts to move them, and add a Breaks on dhcp3-client (<< 4.1.0-1) (Closes: #585054, #585055) * Remove ntp's Replaces on logcheck-database, we don't ship log logcheck entries anymore for ntp. -- Kurt Roeckx Tue, 13 Jul 2010 20:33:47 +0200 ntp (1:4.2.6.p1+dfsg-1) unstable; urgency=low * New upstream version - They no longer ship arlib, adjust dfsg.patch. - Drop kfreebsd.patch, applied upstream - Update patches for upstream changes. * Remove the obsolete config files: for ntp: - /etc/logcheck/ignore.d.server/ntp, removed in 1:4.2.6+dfsg-1 - /etc/dhcp3/dhclient-enter-hooks.d/ntp, replaced by exit hooks in 1:4.2.4p4+dfsg-3 - /etc/network/if-up.d/ntp, removed in 1:4.2.4p0+dfsg-1 for ntpdate: - /etc/dhcp3/dhclient-enter-hooks.d/ntpdate, replaced by exit hooks in 1:4.2.4p4+dfsg-3 Use dpkg 1.15.7.2's dpkg-maintscript-helper. This needs a Pre-Depends to work, else it's never going to be removed. (Closes: #569530) * Add "Depends: ${misc:Depends}" to ntp-doc. -- Kurt Roeckx Mon, 24 May 2010 11:09:51 +0200 ntp (1:4.2.6+dfsg-1) unstable; urgency=low * New upstream version - They no longer use the built in md5 with unclear license: adjust dfsg.sh and dfsg.patch. - Location of the html pages has changed location: adjust dfsg.sh - Remove ntptimeval.patch and ntptrace-getopt.patch, applied upstream. - Change libedit.patch and call configure with --with-lineeditlibs=edit instead. - Update nanokernel-status.patch to also do it for the new direct_freq() function. - includes.diff: Stop including ntp_refclock.h, since it breaks things. - Upstream no longer provides an ntpdsim.1 manpage, so don't try to to remove it. * Use the system libopts instead of the internal copy: add build-dependency on autogen, call configure with --disable-local-libopts. There is also no need anymore to remove the usr/lib dir. * Remove ntp_gettime.patch, it wasn't used, and we have libc calls that wrap adjtimex now anyway. * Remove the doc.patch, it's either just wrong or more confusing than the original text. * Merge the ntpd-char-fix.patch into ntpd-ni-maxhost.patch * Fix kfreebsd.patch's comment to be about the right patch. * Add comment to dfsg.patch * Update autotools.patch's comment on how to recreate it. * Split ntpd-linux-caps.patch in ntpd-linux-caps-runtime.patch and ntpd-linux-caps-inheritable.patch and add comments * Don't run init script to stop ntpd, just let sendsigs/killprocs deal with it. (Closes: #540694) * Compile with --enable-ntp-signd to enable mssntp for use with samba (Closes: #562065) * Remove ntp.logcheck.ignore.server, none of those messages are send to syslog now. (Closes: #498992) -- Kurt Roeckx Sat, 26 Dec 2009 14:12:22 +0100 ntp (1:4.2.4p8+dfsg-1ubuntu6) maverick; urgency=low * debian/rules: move dh_apparmor before dh_installinit -- Jamie Strandboge Fri, 06 Aug 2010 17:40:04 -0500 ntp (1:4.2.4p8+dfsg-1ubuntu5) maverick; urgency=low * convert to dh_apparmor: - debian/rules, debian/ntp.postrm, debian/ntp.postinst: use dh_apparmor - control: Build-Depends on debhelper >= 7.4.20ubuntu5 * debian/apparmor-profile: include local override * remove now unneeded debian/ntp.preinst -- Jamie Strandboge Fri, 06 Aug 2010 13:55:12 -0500 ntp (1:4.2.4p8+dfsg-1ubuntu4) maverick; urgency=low * debian/dhcp.ntp: Dont remove *all* ntp server from ntp.conf. (LP: #575458) * debian/apparmor-profile: Allow access to /dev/ttyS* (LP: #596859) -- Chuck Short Tue, 22 Jun 2010 09:24:02 -0400 ntp (1:4.2.4p8+dfsg-1ubuntu3) maverick; urgency=low * debian/apparmor-profile: allow access to /var/log/ntpstats/sysstats* (LP: #574343) -- Jamie Strandboge Fri, 18 Jun 2010 07:54:24 -0500 ntp (1:4.2.4p8+dfsg-1ubuntu2) lucid; urgency=low * debian/apparmor-profile: allow reading of /var/lib/ntp/ntp.conf.dhcp (LP: #517701) -- Jamie Strandboge Thu, 08 Apr 2010 16:24:42 -0500 ntp (1:4.2.4p8+dfsg-1ubuntu1) lucid; urgency=low * Merge from debian testing, remaining changes: + debian/ntp.conf, debian/ntpdate.default: Change default server to ntp.ubuntu.com. + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface comes up, then start again afterwards. + debian/ntp.init, debian/rules: Only stop when entering single user mode. + Add enforcing AppArmor profile (LP: #382905): - debian/control: add Conflicts/Replaces on apparmor-profiles < 2.3.1+1403-0ubuntu10 (since we are now shipping usr.sbin.ntpd) and apparmor < 2.3.1+1403-0ubuntu10 (since we are now shipping tunables/ntpd) - debian/control: add Suggests on apparmor - debian/ntp.dirs: add apparmor directories - debian/ntp.preinst: force complain on certain upgrades - debian/ntp.postinst: reload apparmor profile - debian/ntp.postrm: remove the force-complain file - add debian/apparmor-profile* - debian/rules: install apparmor-profile and apparmor-profile.tunable - debian/README.Debian: add note on AppArmor + debian/{control,rules}: add and enable hardened build for PIE (Debian bug 542721). + debian/apparmor-profile: adjust location of drift files (LP: #456308) + Dropped changes, merged in debian: - fix-nano.patch: Use mod_nano.patch from debian. + Dropped changes, superseded upstream/in Debian: - debian/patches/CVE-2009-1252.patch: No longer needed. - debian/patches/debian/patches/CVE-2009-0159.patch: No longer needed. [Chuck Short] + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook, apart of the server-lucid-apport-hooks specification. -- Chuck Short Tue, 02 Feb 2010 18:36:29 -0500 ntp (1:4.2.4p8+dfsg-1) unstable; urgency=high * New upstream release. - Fixes DoS with mode 7 packets (CVE-2009-3563) (Closes: #560074) -- Kurt Roeckx Tue, 08 Dec 2009 21:41:51 +0100 ntp (1:4.2.4p7+dfsg-4) unstable; urgency=low * Use uname -s instead of dpkg-architecture to found the kernel we're running on. dpkg-architecture is part of dpkg-dev. (Closes: #558145) * Make the package fail to build on hurd since it does not provided the needed system calls for ntpd to work. -- Kurt Roeckx Thu, 26 Nov 2009 22:16:37 +0100 ntp (1:4.2.4p7+dfsg-3) unstable; urgency=low * Don't pass --enable-linuxcaps to configure anymore. It now detects it itself when it's available, and it breaks on non-Linux systems. * Configure didn't know what to set certain options to on kfreebsd. Patch by Aurelien Jarno. (Closes: #522696) * Running as user ntp does not work on kfreebsd because it doesn't support capabilities. Adjust the init script to start as root. -- Kurt Roeckx Wed, 25 Nov 2009 20:03:58 +0100 ntp (1:4.2.4p7+dfsg-2) unstable; urgency=low * Refresh libedit patch because it's fuzzy and fails to apply on the buildds. -- Kurt Roeckx Sat, 21 Nov 2009 18:01:36 +0000 ntp (1:4.2.4p7+dfsg-1) unstable; urgency=low [ Peter Eisentraut ] * Fixed FTBFS because of missing MOD_NANO definition (closes: #552882) * Changed source format to 3.0 (quilt) [ Kurt Roeckx ] * New upstream version. - Remove patches for CVE-2009-1252.patch and CVE-2009-0159.patch, applied upstream - Regenerate patches to apply to the current version. * Detect that we run a kernel with nano support or not. Otherwise it breaks when running on kernels older than 2.6.26. -- Kurt Roeckx Sat, 21 Nov 2009 17:27:11 +0100 ntp (1:4.2.4p6+dfsg-2ubuntu4) lucid; urgency=low * debian/rules: install symlink for early loading of per-interface triggered ntp AppArmor profile. -- Kees Cook Tue, 15 Dec 2009 11:35:33 -0800 ntp (1:4.2.4p6+dfsg-2ubuntu3) lucid; urgency=low * SECURITY UPDATE: fix DoS with mode 7 (MODE_PRIVATE) packets - debian/patches/CVE-2009-3563.patch: update ntpd/ntp_request.c to not send a response packet for and rate limit logging of invalid mode 7 requests and responses - CVE-2009-3563 -- Jamie Strandboge Tue, 08 Dec 2009 13:52:12 -0600 ntp (1:4.2.4p6+dfsg-2ubuntu2) lucid; urgency=low * debian/rules: enable debugging (LP: #47683) * debian/ntpdate-if.up: Hide invoke-rc.d output. (LP: #489585) * debian/man/ntptrace.1: Update man page removed ghost options. (LP: #351989) -- Chuck Short Mon, 07 Dec 2009 14:59:28 -0500 ntp (1:4.2.4p6+dfsg-2ubuntu1) lucid; urgency=low * Merge from debian testing, remaining changes: + debian/ntp.conf, debian/ntpdate.default: Change default server to ntp.ubuntu.com. + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface comes up, then start again afterwards + debian/ntp.init, debian/rules: Only stop when entering single user mode. + Add enforcing AppArmor profile (LP: #382905) - debian/control: add Conflicts/Replaces on apparmor-profiles < 2.3.1+1403-0ubuntu10 (since we are now shipping usr.sbin.ntpd) and apparmor < 2.3.1+1403-0ubuntu10 (since we are now shipping tunables/ntpd) - debian/control: add Suggests on apparmor - debian/ntp.dirs: add apparmor directories - debian/ntp.preinst: force complain on certain upgrades - debian/ntp.postinst: reload apparmor profile - debian/ntp.postrm: remove the force-complain file - add debian/apparmor-profile* - debian/rules: install apparmor-profile and apparmor-profile.tunable - debian/README.Debian: add note on AppArmor + debian/patches/fix-nano.patch: enable nanokernel support (LP: #412242) + debian/{control,rules}: add and enable hardened build for PIE (Debian bug 542721). + debian/apparmor-profile: adjust location of drift files (LP: #456308) + Dropped changes, merged in Debian: - debian/man/ntpdate.8 - fix debian shipped manpage; patch by Josh Holland + Dropped changes, superseded upstream/in Debian: - debian/patches/CVE-2009-0159.patch: Use Debian's version of the patch. - debian/patches/CVE-2009-1252.patch: Use Debian's version of the patch. -- Chuck Short Fri, 06 Nov 2009 01:34:35 +0000 ntp (1:4.2.4p6+dfsg-2) unstable; urgency=medium * Fixed typo in ntpdate man page (closes: #526086) * Updated standards version * Moved .dhcp version of configuration files to /var/lib/ntp and /var/lib/ntpdate (closes: #524035) * Cleaned up man pages to satisfy lintian's hyphen-used-as-minus-sign complaint * Fixed limited buffer overflow in ntpq (CVE-2009-0159) (closes: #525373) * Fixed stack buffer overflow in ntpd (CVE-2009-1252) (closes: #525373) * Use new status_of_proc function to report status in ntp init script * Updated the config.guess/sub handling as recommended by autotools-dev to not clutter the diff, added autotools-dev to build dependencies -- Peter Eisentraut Fri, 12 Jun 2009 17:24:22 +0300 ntp (1:4.2.4p6+dfsg-1ubuntu5) karmic; urgency=low * debian/apparmor-profile: adjust location of drift files (LP: #456308) -- Jamie Strandboge Wed, 21 Oct 2009 07:07:31 -0500 ntp (1:4.2.4p6+dfsg-1ubuntu4) karmic; urgency=low * debian/{control,rules}: add and enable hardened build for PIE (Debian bug 542721). -- Kees Cook Thu, 20 Aug 2009 17:12:44 -0700 ntp (1:4.2.4p6+dfsg-1ubuntu3) karmic; urgency=low * Add enforcing AppArmor profile (LP: #382905) - debian/control: add Conflicts/Replaces on apparmor-profiles < 2.3.1+1403-0ubuntu10 (since we are now shipping usr.sbin.ntpd) and apparmor < 2.3.1+1403-0ubuntu10 (since we are now shipping tunables/ntpd) - debian/control: add Suggests on apparmor - debian/ntp.dirs: add apparmor directories - debian/ntp.preinst: force complain on certain upgrades - debian/ntp.postinst: reload apparmor profile - debian/ntp.postrm: remove the force-complain file - add debian/apparmor-profile* - debian/rules: install apparmor-profile and apparmor-profile.tunable - debian/README.Debian: add note on AppArmor * debian/patches/fix-nano.patch: enable nanokernel support (LP: #412242) -- Jamie Strandboge Tue, 11 Aug 2009 18:25:50 -0500 ntp (1:4.2.4p6+dfsg-1ubuntu2) karmic; urgency=low * SECURITY UPDATE: stack overflow in ntpd when autokey is enabled - debian/patches/CVE-2009-1252.patch: update ntpd/ntp_crypto.c to use snprintf() with NTP_MAXSTRLEN when writing to statstr. Also defensively adjust ntp_peer.c and ntp_timer.c to do the same. - CVE-2009-1252 * SECURITY UPDATE: stack overflow in ntpq when contacting malicious ntp server - debian/patches/CVE-2009-0159.patch: increase size of buffer in cookedprint() in ntpq/ntpq.c and adjust to use snprintf() - CVE-2009-0159 -- Jamie Strandboge Tue, 19 May 2009 15:26:41 -0500 ntp (1:4.2.4p6+dfsg-1ubuntu1) karmic; urgency=low * Merge from Debian unstable, remaining changes: - debian/ntp.conf, debian/ntpdate.default: Change default server to ntp.ubuntu.com. - debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface comes up, then start again afterwards - debian/ntp.init, debian/rules: Only stop when entering single user mode. - debian/man/ntpdate.8 - fix debian shipped manpage; patch by Josh Holland * Dropped changes, merged in Debian: - Build against libcap2 instead of libcap1, fixing a kernel warning about using an old interface. * Dropped changes, superseded upstream/in Debian: - debian/patches/CVE-2009-0021.patch: update ntpd/ntp_crypto.c to properly check the return code of EVP_VerifyFinal() - debian/patches/ipv6-gnu-source.patch: Define _GNU_SOURCE to make IPv6 work. * Fixes LP: #217699 -- Steve Langasek Wed, 29 Apr 2009 06:08:19 +0000 ntp (1:4.2.4p6+dfsg-1) unstable; urgency=low * New upstream release - Updated ntpdate-ipv6.patch, autotools.patch - Obsoletes no-ipv6-fix.patch, CVE-2009-0021.patch * Switched build dependency from libcap-dev to libcap2-dev (closes: #474639) * Added -D_GNU_SOURCE to CPPFLAGS, to support glibc 2.8 (closes: #507806) * Recognize "adjust" in ntpdate logcheck rules (closes: #493907) * Removed "dynamic" key word from default ntp.conf, because this is now obsolete and the default -- Peter Eisentraut Wed, 18 Feb 2009 20:24:14 +0200 ntp (1:4.2.4p4+dfsg-8) unstable; urgency=low * It did not properly check the return value of EVP_VerifyFinal which results in an malformed DSA signature being treated as a good signature rather than as an error. (CVE-2009-0021) -- Kurt Roeckx Mon, 05 Jan 2009 21:10:03 +0100 ntp (1:4.2.4p4+dfsg-7ubuntu5) jaunty; urgency=low * Build against libcap2 instead of libcap1, fixing a kernel warning about using an old interface. LP: #328376. -- Steve Langasek Fri, 20 Mar 2009 19:53:25 +0000 ntp (1:4.2.4p4+dfsg-7ubuntu4) jaunty; urgency=low * LP: #314810 - ntpdate typo in manpage - debian/man/ntpdate.8 - fix debian shipped manpage; patch by Josh Holland -- Alexander Sack Mon, 23 Feb 2009 11:57:32 +0100 ntp (1:4.2.4p4+dfsg-7ubuntu3) jaunty; urgency=low * SECURITY UPDATE: clients treat malformed signatures as good when verifying server DSA and ECDSA certificates. - debian/patches/CVE-2009-0021.patch: update ntpd/ntp_crypto.c to properly check the return code of EVP_VerifyFinal() - CVE-2009-0021 -- Jamie Strandboge Tue, 06 Jan 2009 01:19:55 -0600 ntp (1:4.2.4p4+dfsg-7ubuntu2) jaunty; urgency=low * Add ipv6-gnu-source.patch: Define _GNU_SOURCE to make IPv6 work. (LP: #305043) -- Matt LaPlante Thu, 04 Dec 2008 00:39:51 -0600 ntp (1:4.2.4p4+dfsg-7ubuntu1) jaunty; urgency=low * Merge from debian unstable, remaining changes: - debian/ntp.conf, debian/ntpdate.default: Change default server to ntp.ubuntu.com. - debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface comes up, then start again afterwards (LP: #114505) - debian/ntp.init, debian/rules: Only stop when entering single user mode. -- Scott James Remnant Tue, 11 Nov 2008 17:18:15 +0000 ntp (1:4.2.4p4+dfsg-7) unstable; urgency=low * Added support for numeric IPv6 address in ntpdate-debian (closes: #489712) * Updated standards version * Added PATH to ntpdate.if-up (closes: #490061) -- Peter Eisentraut Wed, 16 Jul 2008 14:09:41 +0200 ntp (1:4.2.4p4+dfsg-6ubuntu2) intrepid; urgency=low * debian/ntpdate.ifup: use a different lockfile to avoid dead-locks when restarting ntpd (LP: #246203). -- Kees Cook Wed, 20 Aug 2008 09:48:33 -0700 ntp (1:4.2.4p4+dfsg-6ubuntu1) intrepid; urgency=low * Merge from debian unstable, remaining changes: - debian/ntp.conf, debian/ntpdate.default: - Change default server to ntp.ubuntu.com. - debian/control: - Set Ubuntu maintainer address. - debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface comes up, then start again afterwards (LP: #114505) * debian/rules: - Call update-rcd-params with manual arguments instead of defaults. * debian/ntp.init: - Update LSB Default-Stop header. * Dropped: - Update TearDown spec implementation: - Update version in conflicts/replaces to that which was shipped in edgy, which was later than that in Debian (due to the ubuntuX). - Add sysv-rc dependency. - debian/rules: - Call update-rcd-params with multiuser instead defaults. - debian/ntp-server.postinst (dapper upgrade): - Remove stop script symlinks from rc0 and rc6. -- Mathias Gug Wed, 18 Jun 2008 22:28:16 -0400 ntp (1:4.2.4p4+dfsg-6) unstable; urgency=low * Put back accidentally removed /etc/defaults/ntpdate (closes: #482605) * Updated Homepage (closes: #482628) * Use libedit instead of libreadline, added libedit.patch (closes: #448408) * While updating autotools.patch, added description how it is generated (closes: #446756) * Since the scripts summary and plot_summary are not installed in a binary package, drop their mention from the copyright file, thus deconfusing lintian * Avoid timeout message from ntpdate.if-up when ntpdate package was removed but not purged (closes: #481049) -- Peter Eisentraut Mon, 16 Jun 2008 12:55:54 +0200 ntp (1:4.2.4p4+dfsg-5) unstable; urgency=low * Removed mentions of -d and -D options from ntpd man page, because the Debian package does not support these options (closes: #479015) * Ignore errors from ntpdate-debian call in ntpdate.if-up (closes: #478655) -- Peter Eisentraut Fri, 09 May 2008 10:28:24 +0200 ntp (1:4.2.4p4+dfsg-4) unstable; urgency=low * Small ntp.conf man page fix (patch by Justin Pryzby) (closes: #450721) * Removed incorrect mention of -m option on ntpd man page (closes: #468348) * Corrected doc-base section for ntp-doc * Added build conflicts against libavahi-compat-libdnssd-dev, so that that feature isn't accidentally enabled (closes: #462597) * Added build conflicts against libwww-dev, libwww-ssl-dev, so we don't accidentally link with their libmd5 (closes: #462597) * Use lockfile-progs to ensure that only one ntpdate.ifup is running at a time (closes: #471358) * Also use lockfile-progs to ensure that ntpd does not start while ntpdate.ifup is running (closes: #436029) * Updated ntp.conf man page from HTML (closes: #466046) * Changed control fields XS-Vcs-* to Vcs-*, and added trunk path * Removed code used for sarge to etch transition * Changed to Debhelper level 6 * Use dh_installifupdown * Removed tickadj program from installation. It is quite unportable, the documentation is inaccurate, and adjtimex could be used instead. -- Peter Eisentraut Tue, 29 Apr 2008 11:19:54 +0200 ntp (1:4.2.4p4+dfsg-3ubuntu2) hardy; urgency=low * Stop ntp before running ntpdate when an interface comes up, then start again afterwards (LP: #114505) -- Onno Benschop Thu, 6 Mar 2008 14:00:42 +0900 ntp (1:4.2.4p4+dfsg-3ubuntu1) hardy; urgency=low * Merge from debian unstable, remaining changes: - debian/ntp.conf, debian/ntpdate.default: - Change default server to ntp.ubuntu.com. - debian/rules: - Call update-rcd-params with multiuser instead defaults. - debian/control: - Set Ubuntu maintainer address. - Update version in conflicts/replaces to that which was shipped in edgy, which was later than that in Debian (due to the ubuntuX). - Add sysv-rc dependency. - debian/ntp-server.postinst: - Remove stop script symlinks from rc0 and rc6. -- Scott Kitterman Mon, 25 Feb 2008 19:36:36 -0500 ntp (1:4.2.4p4+dfsg-3) unstable; urgency=low * Various man page and NEWS fixes (patches by Justin Pryzby and Vincent Lefevre) (closes: #439726, #450721) * Run DHCP hooks as exit hooks instead of enter hooks (closes: #408219) * Use try-restart to restart ntpd after DHCP event * Wait for /usr to appear when running ntpdate on network events (closes: #448462) * Updated standards version * Updated ntpd man page from HTML (closes: #444633) * Moved configuration file description from ntpd(8) to ntp.conf(5) * Made NTPDATE_USE_NTP_CONF work with openntpd (initial patch by Benoît Dejean) (closes: #420692) * Added documentary comments to ntp.conf, reformatted the file a bit (closes: #416818) * Fixed whitespace in doc-base, pointed out by lintian * Removed ntpdate-debug.patch; debug behavior is now again consistent with upstream (closes: #451525) * Dropped some useless documentation files -- Peter Eisentraut Sun, 13 Jan 2008 12:18:13 +0100 ntp (1:4.2.4p4+dfsg-2ubuntu1) hardy; urgency=low * Merge from debian unstable, remaining changes: - debian/ntp.conf, debian/ntpdate.default: - Change default server to ntp.ubuntu.com. - debian/rules: - Call update-rcd-params with multiuser instead defaults. - debian/control: - Set Ubuntu maintainer address. - Update version in conflicts/replaces to that which was shipped in edgy, which was later than that in Debian (due to the ubuntuX). - Add sysv-rc dependency. - debian/ntp-server.postinst: - Remove stop script symlinks from rc0 and rc6. -- Mathias Gug Mon, 26 Nov 2007 15:42:41 -0500 ntp (1:4.2.4p4+dfsg-2) unstable; urgency=low * Disable checking of openssl library version. (Closes: #446710, #446711, #447431) Patch from Steve Langasek -- Kurt Roeckx Tue, 23 Oct 2007 18:39:47 +0200 ntp (1:4.2.4p4+dfsg-1) unstable; urgency=medium * New upstream release - Updated patches - Rebuilt for new OpenSSL version (closes: #446710) * Removed obsolete build dependency lynx (closes: #446722) * Added Homepage control field * Don't ignore errors from make distclean, as per lintian check * Downgraded perl dependency to Recommends (closes: #324559, #416875) * Removed useless directory /usr/lib/ from ntp package -- Peter Eisentraut Mon, 15 Oct 2007 13:59:34 +0200 ntp (1:4.2.4p3+dfsg-1) unstable; urgency=low [ Kurt Roeckx ] * New upstream release [ Peter Eisentraut ] * Removed mentions of -d and -D options from ntpd and ntpq man pages (closes: #427634, #428241) * Added reference from ntpdate man page to ntpdate-debian (closes: #427981) -- Kurt Roeckx Mon, 13 Aug 2007 15:58:08 +0000 ntp (1:4.2.4p0+dfsg-1ubuntu2) gutsy; urgency=low * Trigger rebuild for hppa -- LaMont Jones Thu, 04 Oct 2007 12:15:33 -0600 ntp (1:4.2.4p0+dfsg-1ubuntu1) gutsy; urgency=low * Merge from Debian unstable. * Remaining Ubuntu changes: - Update version in conflicts/replaces to that which was shipped in edgy, which was later than that in Debian (due to the ubuntuX). - Change default server to ntp.ubuntu.com. - Remove stop links from rc0 and rc6 - Call dh_installinit with --error-handler - Set Ubuntu maintainer address. -- Steve Kowalik Fri, 18 May 2007 22:41:56 +1000 ntp (1:4.2.4p0+dfsg-1) unstable; urgency=low [ Peter Eisentraut ] * New upstream release - Updated patches - ntpd usage message now shows debug option only if actually available (closes: #327347) - Dynamic interface scanning should work now (closes: #253597, #317250, #399905, #407216, #417468, #422861) * Added XS-Vcs-Browser field * Made ntpdate-debian handle empty ntp.conf better (closes: #413692) * Removed ntp-keygen-option.patch; options parsing has changed * Removed new upstream man pages, which are currently not as nice as the ones we already have. * Removed transition packages ntp-simple and ntp-refclock * Updated information about pool.ntp.org in ntp.conf * Disabled statsdir by default (closes: #316669) * Added "dynamic" option to default server entries in ntp.conf * Removed ntp.ifup; supplanted by dynamic interface rescanning (closes: #422860) [ Kurt Roeckx ] * Change ntpd-linux-caps.patch to also request CAP_NET_BIND_SERVICE. -- Peter Eisentraut Thu, 10 May 2007 14:52:48 +0200 ntp (1:4.2.2.p4+dfsg-2) unstable; urgency=low [ Peter Eisentraut ] * Removed obsolete logcheck entry * Improved formatting and fixed random whitespace in cron job [ Kurt Roeckx ] * Set a default restriction list for ipv6 too. (Closes: #411809) * Stop using dhcp provided servers on release and stop. Thanks to Torne (Closes: #411200) * Don't use the nomodify option for localhost. Modification is only allowed when authenticated, so having the nomodify option doesn't buy us anything. It just prevents the resolver slave process who does authenticate itself from properly working (Closes: #385334, #401847) * Make sure that we disable ntp-server for everybody. (Closes: #410383) -- Kurt Roeckx Sun, 4 Mar 2007 13:01:11 +0000 ntp (1:4.2.2.p4+dfsg-1ubuntu3) feisty; urgency=low * Rebuild for changes in the amd64 toolchain. * Set Ubuntu maintainer address. -- Matthias Klose Mon, 5 Mar 2007 01:23:22 +0000 ntp (1:4.2.2.p4+dfsg-1ubuntu2) feisty; urgency=low * Update version in conflicts/replaces to that which was shipped in edgy, which was later than that in Debian (due to the ubuntuX). LP: #73506. -- Scott James Remnant Tue, 28 Nov 2006 10:27:08 +0000 ntp (1:4.2.2.p4+dfsg-1ubuntu1) feisty; urgency=low * Merge from debian unstable, remaining changes: - change default server to ntp.ubuntu.com - remove stop links from rc0 and rc6 -- Scott James Remnant Mon, 27 Nov 2006 13:51:15 +0000 ntp (1:4.2.2.p4+dfsg-1) unstable; urgency=low * New upstream release - Fixes off-by-one error in compat getnameinfo() (closes: #387627) - Updated autotools.patch * Fixed watch file for mangled version number * Split out configure.ac hunk from autotools.patch into logical pieces - Removed error cache disabling code, which was nonfunctional from the start * Added web sites to package descriptions -- Peter Eisentraut Sat, 21 Oct 2006 16:34:35 +0200 ntp (1:4.2.2.p3+dfsg-1) unstable; urgency=medium * New upstream release - Updated copyright file - Updated autotools.patch, dfsg.patch * Check for existence of ntp user in init script only in start action * Handle failure to stop daemon in ntp.prerm (closes: #391352) * Added watch file * Added XS-X-Vcs-Svn field * Fixes for Hurd build (closes: #387665) (patches by Marc Dequènes and Kurt Roeckx) * Use server names sent by DHCP server if available (closes: #268328) * Added real man pages, transcribed from HTML documentation (closes: #84979, #201529, #343123, #388503) * Use dh_perl to calculate Perl dependencies * Split code.patch into more logical pieces * Removed obsolete msyslog.c patch * Removed obsolete dependencies: psmisc (killall no longer used), lsb-base for ntpdate (no longer has an init script) * Added script ntpdate-debian. This is identical to ntpdate but reads /etc/default/ntpdate automatically, allowing for centralized configuration. (closes: #147590, #372119, #392098) * Moved ntp.conf parsing logic to ntpdate-debian (closes: #392325) * Redirect error output of ntpdate.ifup to /dev/null (closes: #391819) * Added Replaces: logcheck-database (closes: #392562) -- Peter Eisentraut Sat, 14 Oct 2006 02:20:21 +0200 ntp (1:4.2.2+dfsg.2-3) unstable; urgency=high * Check ntp.conf existence before parsing it in /etc/default/ntpdate (closes: #388032) * Added version number to lsb-base dependency (closes: #388561) * Put back versioned Conflicts and Replaces for ntp-simple and ntp-refclock since we now have transition packages that need to be upgraded at the same time (closes: #389113) * Added Short-Description to init script LSB header * Remove ntpdate init script installation during upgrade (closes: #389089) * Removed -u from default ntpdate options, to avoid collisions with ntpd -- Peter Eisentraut Mon, 2 Oct 2006 19:47:47 +0200 ntp (1:4.2.2+dfsg.2-2) unstable; urgency=medium [ Branden Robinson ] * Soften ntp binary package's Conflicts and Replaces relationships with ntp-{refclock,server,simple} so that they are unversioned; a versioning expression is unnecessary as none of these exist now as dummy packages (and do not need to, as all depended directly or transitively on ntp itself). State that ntp Provides the three merged packages, so that packages depending on them are not spuriously blocked from upgrading before their dependencies are manually changed. (closes: #383212) [ Peter Eisentraut ] * Updated README.Debian's and package descriptions, reflecting that ntpdate is no longer necessary when ntp is installed * npdate is no longer started from an init script but instead by ifup (closes: #56499, #245338, #312576) * Run ntpdate from ifup in the background (closes: #321759, #375280, #382543) * Cleaned out package relationships with long-obsolete packages * Updated standards version * Also parse peer lines in ntp.conf from ntpdate.default (closes: #382311) * Added pointer in ntpdate.default where to find ntp.conf (closes: #386323) * Updated logcheck rules (closes: #305864) [ Julien BLACHE ] * debian/control: + Add ntp-refclock and ntp-simple transition packages (closes: #384857). * debian/ntp.init: + Remove adduser call from initscript (closes: #383666). [ Petter Reinholdtsen ] * Fixed init script LSB header dependency information (closes: #387002) -- Peter Eisentraut Fri, 15 Sep 2006 11:24:09 +0200 ntp (1:4.2.2+dfsg.2-1) unstable; urgency=low [ Peter Eisentraut ] * Set -g as default command-line option of ntpd (closes: #168585, #319776) * Added iburst option to default server lines (closes: #319776) * Initialize ntpdate server list from ntp.conf by default (closes: #376019) (patch by martin f krafft) * Do not run ntpdate init script on package installation or removal (closes: #363513, #378480) * Dropped build dependency on binutils; now covered by build-essential * Removed support for not logging through syslog (closes: #340781) * Disable old ntp-server init script during package configuration (closes: #380233) * Added note about upgrading in README.Debian [ Kurt Roeckx ] * Newly built upstream tarball: - Removed tty_clk_STREAMS.c and global.h * Make init script use $DAEMON, add $PIDFILE and use it. * Use invoke-rc.d in the ifup script instead of directly using /etc/init.d/ntp. -- Peter Eisentraut Wed, 9 Aug 2006 13:58:26 +0200 ntp (1:4.2.2+dfsg-1) unstable; urgency=low [ Peter Eisentraut ] * Consolidated patches using quilt * Merged ntp, ntp-server, ntp-simple, ntp-refclock into single package ntp (closes: #222369, #343131, #377578) * Removed conflict of ntpdate with chrony (closes: #322503) * Improved init scripts: - Added LSB-formatted dependency information (closes: #332848) - Added status option (closes: #319392) - Added support for /etc/default/ntp (closes: #316306, #158389, #309200) - Use LSB functions for messages (closes: #219193) * Retain cap_sys_chroot capability a while longer so that chroot works (closes: #308840) * Cron jobs parse /etc/ntp.conf to fetch current values of logfile and statsdir (closes: #177341, #318824) * Support DEB_BUILD_OPTIONS=noopt * Compile with -fno-strict-aliasing (closes: #316304) * Removed inactive comaintainers * Removed local clock section in default ntp.conf (closes: #262037) * Fixed typo in ntpdate man page -u option description (closes: #272528) * Fixed typographical errors in ntpd manual page (closes: #353803) * Added missing command-line options to ntpd man page (closes: #306460) [ Kurt Roeckx ] * Make ntp and ntpdate depend on netbase because they require /etc/services (Closes: #376295) * New upstream release, merge patches. * Remove all parts of the source that don't have a license on it or otherwise didn't meet the DFSG. As a result, the following clocks are no longer supported: wharton and neoclock4x (Closes: #328200) * Update the copyright file, and add all missing copyright notices and licences to it. * Add Depends on lsb-base, since the init scripts makes use of it now and it's not essential. * Always stop call the init script to stop the daemon in the postinst on configure. Older versions upto and including 1:4.2.0a+stable-8.2 could remove ntp-simple | ntp-refclock before ntp-server, and when ntp-server then tries to stop the daemon it doesn't find the binary and the init script doesn't do anything. -- Peter Eisentraut Fri, 14 Jul 2006 22:55:36 +0200 ntp (1:4.2.0a+stable-9ubuntu2) edgy; urgency=low * Remove stop script symlinks from rc0 and rc6. -- Scott James Remnant Fri, 15 Sep 2006 17:47:40 +0100 ntp (1:4.2.0a+stable-9ubuntu1) edgy; urgency=low * Resynchronise with Debian. -- Tollef Fog Heen Fri, 30 Jun 2006 16:02:07 +0200 ntp (1:4.2.0a+stable-9) unstable; urgency=low [ Peter Eisentraut ] * New maintainer address, new uploaders * Acknowledge NMUs (closes: #327012, #312331) * Added --oknodo option in init script (closes: #302127) * Changed --exec to --startas in init script * Fixed typo in init script (closes: #308496) * Resolved circular dependency between ntp-server and ntp-simple/ntp-refclock (closes: #365950) * Use pool.ntp.org vendor zone by default (closes: #349392, #269572) * Updated public NTP server list URL (closes: #320143) * Updated pool.ntp.org URL and information (closes: #322675) * Renamed debian/NEWS.Debian to debian/NEWS, so it gets installed by dh_installchangelogs (closes: #245612) * Fixed if-up.d/ntp-server to cope with ifrename (closes: #356211) [ Kurt Roeckx ] * Remove pre-sarge upgrade parts of the maintainer scripts. The files now only have debhelper generated things in them, so they got deleted: ntpdate.preinst, ntpdate.prerm, ntp-doc.prerm, ntp-server.preinst and ntp.postinst. This also really fixes #312331 be removing the code. -- Kurt Roeckx Sun, 18 Jun 2006 14:04:57 +0000 ntp (1:4.2.0a+stable-8.2) unstable; urgency=high * NMU * Avoid killing all ntpd processes on fresh installs of ntp-server (closes: #312331) -- Peter Eisentraut Tue, 6 Jun 2006 02:27:42 +0200 ntp (1:4.2.0a+stable-8.1ubuntu6) dapper; urgency=low * Call dh_installinit with --error-handler=true, which will prevent ntp-server's prerm and postinst from bombing out on upgrades from previous broken versions. ntp-{simple,refclock} still try to restart the server in their postinst, so it won't be left dead. -- Adam Conrad Mon, 29 May 2006 10:25:43 +1000 ntp (1:4.2.0a+stable-8.1ubuntu5) dapper; urgency=low * Attempt to create the ntp user in ntp-server's postinst, as the dependency loops between ntp-server and ntp-* means we have no way of knowing which gets configured first (launchpad.net/33351) -- Adam Conrad Sun, 28 May 2006 02:20:57 +1000 ntp (1:4.2.0a+stable-8.1ubuntu4) dapper; urgency=low * Hide output from ntpdate unless ifup is run with -v. -- Scott James Remnant Wed, 17 May 2006 22:45:19 +0100 ntp (1:4.2.0a+stable-8.1ubuntu3) dapper; urgency=low * Ignore errors from ntpdate, otherwise the interface might not come fully up. -- Scott James Remnant Wed, 8 Feb 2006 15:48:19 +0000 ntp (1:4.2.0a+stable-8.1ubuntu2) dapper; urgency=low * Remove ntpdate init script, instead install a script in /etc/network/if-up.d that sets the clock whenever we bring up a network interface. -- Scott James Remnant Wed, 4 Jan 2006 15:56:23 +0000 ntp (1:4.2.0a+stable-8.1ubuntu1) dapper; urgency=low * Resynchronise with Debian. * Use ntp.ubuntu.com rather than ntp.ubuntulinux.org. -- Colin Watson Tue, 1 Nov 2005 23:06:49 -0500 ntp (1:4.2.0a+stable-8.1) unstable; urgency=low * 0-day BSP NMU. * ntp_config.c: apply patch by Theppitak Karoonboonyanan to fix FTBFS (Closes: #327012). -- Christoph Berg Fri, 28 Oct 2005 15:33:37 +0200 ntp (1:4.2.0a+stable-8ubuntu2) breezy; urgency=low * Fix error message in ntp-server init script. (Closes: #14726) -- Fabio M. Di Nitto Fri, 09 Sep 2005 06:35:08 +0200 ntp (1:4.2.0a+stable-8ubuntu1) breezy; urgency=low * Resynchronise with Debian, resolving merge conflicts brought on by Debian incorporating some of our changes upstream. -- Adam Conrad Wed, 20 Apr 2005 04:18:50 +0000 ntp (1:4.2.0a+stable-8) unstable; urgency=medium * The "Well, I certainly could have done that better" version, featuring the maintainer's slightly red face. * Stricter dependencies for the run-as-user feature. Closes: #300207 -- Matthias Urlichs Fri, 18 Mar 2005 21:44:34 +0100 ntp (1:4.2.0a+stable-7) unstable; urgency=medium * Also set the user ID when restarting. Closes: #299904, #299874 - Thanks to Pär Andersson . -- Matthias Urlichs Thu, 17 Mar 2005 09:28:38 +0100 ntp (1:4.2.0a+stable-6) unstable; urgency=medium * Broken edit for ntpdate.ignore (logcheck). Closes: #299572, #299573 * Fix the FTBFS with GCC 4.0 in a way that doesn't break with earlier compilers. :-( Closes: #299572. - Make a few include files be self-skipping and self-complete. -- Matthias Urlichs Tue, 15 Mar 2005 11:09:52 +0100 ntp (1:4.2.0a+stable-5) unstable; urgency=low * Merged ubuntu update to no-root. -- Matthias Urlichs Mon, 14 Mar 2005 15:25:03 +0100 ntp (1:4.2.0a+stable-4) unstable; urgency=low * Merged Upstream fix for ntpdate IPv4/IPv6 problems. - Closes: #293793, #294636 * Install if-up.d/ntp-server in the correct directory. - Closes: #294971 * Merged ubuntu's no-root patch. - Closes: #298059, #296595, #282941 * Don't change the date when debugging ntpdate. - Closes: #286463 * Tell the user that "/etc/initd/ntp-server reload" is not possible. - Sort-of-Closes: #276216 * Cleanup init.d script. Closes: #295574 * Fix doc typos. Closes: #298226 * Remove /var/run/ntpd.pid when stopping the server. - Closes: #295553 * Document ntpdate's exit status. Closes: #298190. * Enhance ntpdate's logcheck rule. Closes: #283386 * Built against libreadline5. -- Matthias Urlichs Sat, 12 Mar 2005 06:16:39 +0100 ntp (1:4.2.0a+stable-3) unstable; urgency=low * Re-upload due to Debian FTP archive problems. -- Matthias Urlichs Tue, 25 Jan 2005 22:18:34 +0100 ntp (1:4.2.0a+stable-2) unstable; urgency=low * -dbg packages have been disabled. -- Matthias Urlichs Sun, 9 Jan 2005 15:56:42 +0100 ntp (1:4.2.0a+stable-1) unstable; urgency=medium * Workaround for ntpdate failing on IPv6 addresses with some kernels. - Thanks to Dan Merillat for tracking this down. - Closes: #249216. * Changed the upstream version name. "+bkYYYYMMDD" isn't what the version of a released program like ntpd should look like; people have been asking. -- Matthias Urlichs Sat, 8 Jan 2005 12:05:56 +0100 ntp (1:4.2.0a+bk20040620-4) unstable; urgency=medium * Pushing to Unstable. * Note: This release is based on the _stable_ Upstream version. * Turned off OpenSSL library compatibility test, it's nonsense. - Closes:#286913. -- Matthias Urlichs Thu, 23 Dec 2004 01:47:30 +0100 ntp (1:4.2.0a+bk20040620-3) experimental; urgency=low * Depend on perl-modules (for ntptrace). Closes:#276672. * Reworded clock interval explanation. Closes:#276213. * Note that the actual NTP server is in package "ntp-server". Closes:#273865. * Document dropped startup script run order. Closes:#240516. * Fix --help in ntptrace. Closes:#242629. * Add a (disabled) restart script to if-up.d. Closes:#247656. * fixed SIGFPE in ntp-keygen. * Remove superfluous {pre,post}{inst,rm} scripts -- Matthias Urlichs Sun, 14 Nov 2004 17:09:17 +0100 ntp (1:4.2.0a+bk20040620-2) experimental; urgency=low * Merge stable Upstream changes. * Add debugging symbol packages. -- Matthias Urlichs Sat, 25 Sep 2004 11:43:37 +0200 ntp (1:4.2.0a+bk20040620-1) experimental; urgency=low * Merge current stable Upstream -- Matthias Urlichs Mon, 21 Jun 2004 10:17:28 +0200 ntp (1:4.2.0a-12) unstable; urgency=low * Doc how to use multiple servers in ntp.default. - Closes: #264569: please document format of NTPSERVERS option -- Matthias Urlichs Mon, 9 Aug 2004 19:57:58 +0200 ntp (1:4.2.0a-11ubuntu3) hoary; urgency=low * ntpd/ntpd.c: - Revert the hardcoded root dropping parameters from previous version. This is now done in init script. - Bugfix: If group was specified as name, previous versions erroneously used the uid as gid. * debian/ntp-server.init.d: - Run as user/group ntp by default (previously hardcoded in ntpd.c). - Already determine the uid/gid of 'ntp' instead of doing it in ntpd.c (for some reason this fails directly after boot). (Ubuntu #5399) - Add -e to interpreter to stop on errors. - append "/usr/bin/" to PATH setting (for getent and cut). -- Martin Pitt Mon, 14 Mar 2005 13:24:46 +0100 ntp (1:4.2.0a-11ubuntu2) hoary; urgency=low * Run ntpd as normal user (with CAP_SYS_TIME) instead of root * ntpd/ntpd.c: - activate root dropping to user and group "ntp" - add runtime check whether the kernel really supports capabilities; do not drop root privileges if not - do not set CAP_SYS_TIME as inheritable * debian/rules: - configure with --enable-linuxcaps * debian/control, packages ntp-simple/ntp-refclock: - add "adduser" dependency * debian/ntp-{simple,refclock}.postinst: - create system user and group "ntp" - chown /var/lib/ntp and /var/log/ntpstats to ntp:ntp to allow ntpd to write into them - restart the server (for the case that ntp-server's postinst ran before ntp-{simple,refclock}'s) * debian/ntp-{simple,refclock}.postrm: - remove user and group ntp on package purge -- Martin Pitt Thu, 25 Nov 2004 15:23:53 +0100 ntp (1:4.2.0a-11ubuntu1) hoary; urgency=low * Resynchronise with Debian. -- Scott James Remnant Wed, 27 Oct 2004 13:54:06 +0100 ntp (1:4.2.0a-11) unstable; urgency=low * Fix building on non-Linux Debian systems. - Closes: #257769 * Require psmisc. - Closes: #261299: uses killall but doesn't reference psmisc Thanks to Martin Michlmayr . -- Matthias Urlichs Tue, 6 Jul 2004 05:26:07 +0200 ntp (1:4.2.0a-10ubuntu2) warty; urgency=low * Use ntp.ubuntulinux.org instead of pool.ntp.org -- Matt Zimmerman Mon, 11 Oct 2004 16:10:27 -0700 ntp (1:4.2.0a-10ubuntu1) warty; urgency=low * Added versioned depend on lsb-base * debian/ntpdate.init.d,ntp-server.init.d: pretty initscripts -- Nathaniel McCallum Fri, 3 Sep 2004 15:12:27 -0400 ntp (1:4.2.0a-10) unstable; urgency=medium * Kill spuriously-running servers when updating. - Closes: #245587 * Put ntpdate's -u option into /etc/default/ntpdate, not init.d. - Closes: #250769 * Remove bashism (test ... -a ...) in ntpdate.preinst. - Closes: #253010 * ntpdate: debug flag should not not change behavior - Closes: #253571 * Updated README.Debian. - Closes: #207680 * Changed obsolete "authenticate no" in ntp.conf to "disable auth". - Closes: #255450 * Changed stratum of computer's clock from 10 to 13; added a note to use 10 on exactly *one* local server. -- Matthias Urlichs Mon, 21 Jun 2004 10:10:51 +0200 ntp (1:4.2.0a+bk20040620-1) experimental; urgency=low * Merge current stable Upstream -- Matthias Urlichs Mon, 21 Jun 2004 10:17:28 +0200 ntp (1:4.2.0a-9) unstable; urgency=low * Don't install two changelogs - Closes: #242929 -- Matthias Urlichs Tue, 20 Apr 2004 11:45:47 +0200 ntp (1:4.2.0a-8) unstable; urgency=medium * Typo in start-stop-daemon calls - Source management systems only work if you use them correctly :-/ - Closes: #242804 -- Matthias Urlichs Fri, 9 Apr 2004 06:00:31 +0200 ntp (1:4.2.0a-7) unstable; urgency=low * Manpage ntp.conf.5 ended up in man1 instead of man5. - Closes: #242433 -- Matthias Urlichs Thu, 8 Apr 2004 08:48:32 +0200 ntp (1:4.2.0a-6) unstable; urgency=low * NEWS.Debian: Document a change to the "noserve" configuration option which can adversely affect existing configurations. - Closes: #240851 * ntp.conf: .htm => .html. - Closes: #241187 (as this restores a deleted /etc/ntp.conf file) * Use --pidfile, not --exec, to stop the NTP server. - Closes: #240741 -- Matthias Urlichs Mon, 29 Mar 2004 20:33:21 +0200 ntp (1:4.2.0a-5) unstable; urgency=medium * Added stub manpage for ntp.conf (points to HTML documentation). - Closes: #240479 * Rearranged Bug close entries to no longer be right-adjusted. * ntp-server.preinst had "update", not "upgrade". Feh. - Closes: #239138 (again) -- Matthias Urlichs Sat, 27 Mar 2004 19:37:13 +0100 ntp (1:4.2.0a-4) unstable; urgency=high * The "I forgot to turn my brain on" release. - _Really_ remove old init scripts more cleanly. - Closes: #239487 -- Matthias Urlichs Tue, 23 Mar 2004 06:50:26 +0100 ntp (1:4.2.0a-3) unstable; urgency=high * Remove old init scripts more cleanly. - Closes: #239292 - this also fixes the thinko in ntp-server.postrm -- sorry . which is the reason for urgency=high . Closes: #239283 * Remove old cron.{daily,weekly} entries. - instead of purging, rename them to "OLDNAME.dpkg-old" - Closes: #239138,239294 -- Matthias Urlichs Mon, 22 Mar 2004 08:43:15 +0100 ntp (1:4.2.0a-2) unstable; urgency=medium * Build-Depend on libssl-dev for ntp-keygen - Closes: #238829 * Debian diff now generated with help from autotools 1.7 files, not 1.8 * Remove /etc/init.d/ntp-simple, ntp-refclock - Closes: #192769,239009 * Moved a few manpage stubs to the correct package -- Matthias Urlichs Sat, 20 Mar 2004 09:13:51 +0100 ntp (1:4.2.0a-1) unstable; urgency=low * Changed Distribution to Unstable. - Closes: #237248 -- Matthias Urlichs Mon, 15 Mar 2004 02:08:14 +0100 ntp (1:4.2.0a-0.1) experimental; urgency=low * Update to new Upstream version 4.2.0a. - Upstream has implemented a patch for #213629, with different flags. :-/ * Added a short blurb to ntp.conf to please participate in pool.ntp.org if possible. * Added a missing "exit 0" line to a few {pre,post}{inst,rm} calls. * Rename /etc/default/ntp-servers => ntpdate in preinst, not postinst. - plus several minor maintainer script clean-ups. * Based on suggestions from jdthood@yahoo.co.uk: - Updated the descriptions in debian/control. - init.d/ntpdate still works if default/ntpdate is deleted, as per Policy. -- Matthias Urlichs Thu, 4 Mar 2004 09:29:57 +0100 ntp (1:4.2.0-0.7) experimental; urgency=low * ntpdate.postinst: rename /etc/default/ntp-servers to .../ntpdate. -- Matthias Urlichs Sun, 15 Feb 2004 03:44:06 +0100 ntp (1:4.2.0-0.6) experimental; urgency=low * Fix document list in ntp-doc (.htm => .html). - Closes: #229575 * Rearrange files between ntp-server (code which needs to run on the host the server is running on) and ntp (ntpq, ntptime et al., which can access a remote server) - Mangled debian/control a bit, be (hopefully) more clear about this distinction. - "ntp" now only has programs that can run remotely, so no longer depend on "ntp-server". * Implemented suggestions from Jari Aalto: - move /etc/default/ntp-servers to /etc/default/ntpdate. . Closes: #230970 - allow setting additional options like "-v" there. . Closes: #230972 * Another "Oh, so that's already fixed" bug. - Closes: #230994 -- Matthias Urlichs Tue, 3 Feb 2004 17:18:40 +0100 ntp (1:4.2.0-0.5) experimental; urgency=low * Actually ship /etc/ntp.conf and /etc/default/ntp-servers files. Duh. - While we're at it, take the easy way out and create a separate package for the common server parts (init script, cronjobs, ...) . Closes: #146275 * Documented "ntpd -n". - Closes: #94975 * Ship logcheck ignore files for time adjust messages. - Closes: #192434 * Found more bugs which are closed by the 4.2.0-0.[1-4] updates. - Closes: #94667,#63794,#185324,#187065,#174012 - Also closes: #146275,#157301,#167151 * ... and some which have been closed before, but been overlooked. - Closes: #45231,#108827 -- Matthias Urlichs Wed, 21 Jan 2004 00:16:35 +0100 ntp (1:4.2.0-0.4) experimental; urgency=low * Implemented patch for -U and -R . - original NTP patch used -T for the latter, but that's now taken by upstream. - Closes: #213629 * Merged the current stable Upstream: D 1.1186 04/01/10 02:27:07-05:00 stenn@pogo.udel.edu 2179 2175 2/0/1 , which contains a few minor bug fixes, including the not-so-minor - Matthias Drochner: uninitialized memory in ntp-keygen can lead to crashes. -- Matthias Urlichs Tue, 23 Dec 2003 19:55:23 +0100 ntp (1:4.2.0-0.3) experimental; urgency=low * Added (commented-out) broadcastclient statement to ntp.conf. - Closes: #211494 -- Matthias Urlichs Tue, 23 Dec 2003 19:55:23 +0100 ntp (1:4.2.0-0.2) experimental; urgency=low * The "too many bugs closed" release. * Change /etc/ntp.conf and /etc/default/ntp-servers to be conffiles; no longer use debconf. - Closes: #201254,#185028,#188987,#192769 - Also closes: #188987,#135563,#138973,#175557,#181824 * Changed default trust parameters. - Closes: #225852 * Old bugs: - Cleanup /var/lib/ntp and /var/log/ntpstats on purge . Closes: #164761 - Bind to each interface address separately . Closes: #209054 -- Matthias Urlichs Tue, 23 Dec 2003 19:55:23 +0100 ntp (1:4.2.0-0.1) experimental; urgency=low * New stable upstream version. From the Upstream NEWS file: - IPv6 support . Closes: #200250 - Bugfixes - call-gap filtering - wwv and chu refclock improvements - OpenSSL integration * Other noteworthy Upstream fixes: - No longer links the daemon to libcurses. . Closes: #221742 - "ntptimeset" is disabled upstream (has compiler errors). . Closes: #139636 * Debian packaging: - Use separate subdirectories for building the -simple and -refclock server versions. - Added prerm scripts (debconf purge). - Switch to debhelper 4 compatibility. - Remove /var/log/ntpstats and /var/lib/ntp on purge . Closes: #164761 - Check whether /etc/default/ntp-servers actually . Closes: #185028 has an NTPSERVERS= entry before using it. - debian/rules no longer install-stamps, so "debuild -nc" works. * Other changes: - Disable IP error cache, as it never gets flushed. . Closes: #117276 -- Matthias Urlichs Wed, 12 Nov 2003 14:11:00 +0100 ntp (1:4.1.2a-2) unstable; urgency=low * bubulle@debian.org: debian/po/templates.pot was missing. - Closes: #220031 * duck@duckcorp.org: not everybody has sys/var.h -- Matthias Urlichs Tue, 11 Nov 2003 08:51:16 +0100 ntp (1:4.1.2a-1) unstable; urgency=low * Updated to current stable upstream version: 4.1.2a. * The original tarball is now created from upstream's Bitkeeper archive: Autogenerated files are added by debian/rules, in the "clean" target. * Jochen Friedrich : - configure.in: explicitly check for ntp_gettime() * Updated Standards-Version: to 3.6.1 (no changes) * Added Japanese debconf templates from Kenshi Muto . - Closes: #210734 * Converted debconf to gettext style. -- Matthias Urlichs Wed, 10 Sep 2003 02:38:28 +0200 ntp (1:4.1.2-2) unstable; urgency=low * changed maintainer to debian-ntp list with list of uploaders * better package description for ntp-doc; closes: #210118 -- Bruce Walker Wed, 1 Oct 2003 12:10:45 -0400 ntp (1:4.1.2-1) unstable; urgency=low * new upstream version * new maintainer * incorporated patch to ntp-genkeys to put the key file in a reasonable place (/var/lib/ntp), from Jochen Friedrich closes: #138887, #147544, #157332 * pruned some old diffs which no longer seem necessary -- Bruce Walker Mon, 29 Sep 2003 14:54:16 -0400 ntp (1:4.1.1b-4) unstable; urgency=low * patch to configure.in from Jochen Friedrich to fix FTBFS on alpha, closes: #191310 * fix another README.Debian typo, closes: #180941 * update ntpdate init.d so that restart and reload will slew instead of stepping the clock, which is safer after boot. closes: #180947 * move ntp-doc to section doc to match ftp admin's overrides file -- Bdale Garbee Mon, 18 Aug 2003 14:26:28 -0600 ntp (1:4.1.1b-3) unstable; urgency=low * fix up init.d references in crontabs and usage messages to reflect name changes made in -1, closes: #174646 -- Bdale Garbee Sun, 29 Dec 2002 14:13:30 -0700 ntp (1:4.1.1b-2) unstable; urgency=low * add config.sub/guess update to debian/rules clean target, closes: #174562 * a few lintian-inspired cosmetic tweaks -- Bdale Garbee Sun, 29 Dec 2002 00:53:11 -0700 ntp (1:4.1.1b-1) unstable; urgency=low * new upstream version, closes: #156456 * trim down build-depends to remove items no longer used * change template text to be more accurate, closes: #139247 * add --enable-LOCAL-CLOCK to the ntp-simple version of the daemon, and add debconf support for enabling local clock as a stratum 10 reference, closes: #147846, #150554, #173958 * add info to README.Debian documenting the use of UDP socket 123 by NTP for folks who live behind firewalls, closes: #93424 * let /etc/init.d script names match package names for ntp-simple and ntp-refclock to fix removal problem. eliminate postrm scripts for both packages, since ntp.conf can get removed at bad times. need to revisit conf handling again someday... closes: #164760, #171577 * added .preinst scripts to -simple and -refclock packages to move /etc/init.d/ntp to new naming on upgrades from old versions. * provide explicit PATH setup in init.d scripts, closes: #169951 * fix typo in README.Debian file, closes: #170757 * add --oknodo to start-stop-daemon invocation in cron.weekly scripts so (ana)cron aren't overly noisy if the daemon isn't running, closes: #165877 -- Bdale Garbee Fri, 27 Dec 2002 01:33:33 -0700 ntp (1:4.1.0-8) unstable; urgency=low * move to US main! Yippee! -- Bdale Garbee Sat, 23 Mar 2002 00:22:31 -0700 ntp (1:4.1.0-7) unstable; urgency=medium * remove inactive cruft (thanks to a typo) from the ntpdate postinst that shouldn't be there anyway, closes: #137488 * add --enable-SHM to configure for the ntp-refclock version of the daemon, to also support clocks attached through shared memory, closes: #135754 * freshen content in README.Debian to include information about the debconf support and /etc/default/ntp-servers, the URL for the public list of NTP servers, plus other updates. closes: #135159, #117287 * harden ntpdate's init.d script to deal with /etc/default/ntp-servers not existing, closes: #137130 -- Bdale Garbee Sat, 9 Mar 2002 11:26:32 -0700 ntp (1:4.1.0-6) unstable; urgency=medium * oops. fix the ntpdate postinst fix so it creates /etc/default/ntp-servers on initial installs, too. /o\ closes: #117162 -- Bdale Garbee Sun, 24 Feb 2002 10:58:21 -0700 ntp (1:4.1.0-5) unstable; urgency=medium * fix ntpdate postinst to not trash changes in /etc/default/ntp-servers, using patch from Petter Reinholdtsen , closes: #117162 * update package description to point everyone building a reference clock to the ntp-refclock package, not just radio clock owners, closes: #126412 * change ntp-simple.config and ntp-refclock.config so that dpkg-reconfigure works as expected -- Bdale Garbee Sat, 16 Feb 2002 00:46:37 -0700 ntp (1:4.1.0-4) unstable; urgency=medium * update build dependencies, closes: #115089 * apply patches for hurd-i386, closes: #115260 * incorporate german templates, closes: #114830, #114831 * recraft debconf processing to preserve manual changes made to /etc/default/ntp-servers, closes: #117162, #117607 * I can't reproduce the problem reported with dpkg-reconfigure after updating the maintainer scripts, closes: #120634 * make ntpdate's init.d be silent if no NTP servers are configured, closes: #113488, #37946, #79262, #117447 * clean out /etc/cron.*/ntp files left from prior versions, closes: #117610 * apply patch from Colm Buckley to address problem with broadcast NTP, closes: #122552, #117912, #117626 -- Bdale Garbee Thu, 13 Dec 2001 16:27:39 -0700 ntp (1:4.1.0-3) unstable; urgency=medium * fix version in ntp-simple/ntp-refclock replaces to avoid overlap errors during upgrades, closes: #111484, #111550 * update text in debconf templates to not be misleading, closes: #111552 * change non-us to non-US in control file to squelch override warnings -- Bdale Garbee Sun, 23 Sep 2001 23:38:35 -0600 ntp (1:4.1.0-2) unstable; urgency=medium * add debconf support, borrowing lightly from the Progeny implementation, and examples in other Debian packages. The list of servers to be used by ntpd and ntpdate are now shared. A side effect of debconf support is use of /etc/default/ntp-servers, which means /etc/init.d/ntpdate no longer needs to be modified by hand. The admin may optionally do it all manually. closes: #34704, #36323, #37703, #52999, #57289, #57603, #66296 closes: #66573, #67276, #83654, #86209 * change ntp-refclock to priority extra * fix epochs in control file and add replaces, closes: #109170, #109381 * fix bogus conflict between ntp and ntp-refclock left over from a previous design for the package restructuring, closes: #109247 * ntp-simple and ntp-refclock made self-sufficient with respect to config files, and suggest ntp. this allows a very small filesystem footprint if all you really want is a daemon. most users are expected to pick the ntp package, which depends on ntp-simple or ntp-refclock, with the combination providing the mix of clients and daemon older pre-split ntp packages provided. closes: #110583 * move to non-us since libssl-dev used for authentication, closes: #109127 * arrange for ntp.conf to be deleted on purge, closes: #58804 -- Bdale Garbee Fri, 31 Aug 2001 16:37:54 -0600 ntp (1:4.1.0-1) unstable; urgency=medium * new upstream version, closes: #64951, #67562, #67744, #72321 * split the package. ntp now depends on either ntp-simple or ntp-refclock to deliver the actual daemon. The simple version uses minimal memory, the refclock version includes all the drivers for radio clocks. closes: #52903, #98484, #56991 * eliminate the xntp3 package, since it existed to smooth upgrades to potato, and should no longer be needed when woody releases * change perl5 suggestion to perl * add build dependency on libssl-dev for authentication support * no longer requires oddball autoconf version, closes: #90969 * this version may build correctly on the hurd, not closing 90974 until confirmation is received, though. * config.* in this version seem fresh enough, closes: #95741 * upstream fixed various problems by not using threads on Linux, closes: #102403, #102115, #94617, #64744, #94102, #93131 * disable debugging since to reduce log file spew, closes: #100347 * prerm is now entirely debhelper glue with appropriate sanity checks, closes: #63157 * patch libntp/msyslog.c for possible buffer overflow, closes: #72965 * fix typos in ntpd.1, closes: #75681, #81054 * fix spelling errors in ntpd.1, closes: #107761 * make ntptrace report if specified host is not found, closes: #98152 * remove cleanup code from ntp-doc postinst, since it can cause problems and hasn't been relevant since 1999. Closes: #99035, #94366 * modify ntpdate init.d to run ntpdate on restart and force-reload too, closes: #75208, #55942 * add -u to ntpdate init.d to use unpriveledged port, closes: #77329 * move the ntpdate init.d invocation as early as possible in the boot sequence, closes: #80564 * working on debconf support, uploading before it's ready since so much else is fixed by this newer version! -- Bdale Garbee Thu, 16 Aug 2001 17:08:44 -0600 ntp (1:4.0.99g-3) unstable; urgency=high * apply patch from the NTP hackers list to fix buffer overflow with the potential for remote root exploits. patch will cause the daemon to log attempted exploits. * add an include of to quickly get around the changes in time header files with recent glibc's, back this out on the next upstream release? -- Bdale Garbee Wed, 4 Apr 2001 17:32:04 -0600 ntp (1:4.0.99g-2) frozen unstable; urgency=low * target frozen since these are release-critical bugs * make ntpdate replace xntp and xntp3, since it may install before or instead of ntp, resulting in a file overlap, closes: #61333 * make ntp/ntpdate/xntp3 conflict with chrony, since otherwise they fight over UDP port 53, closes: #61500 -- Bdale Garbee Wed, 5 Apr 2000 01:08:42 -0600 ntp (1:4.0.99g-1) frozen unstable; urgency=low * target frozen since the xntp3 thing is release-critical * roll the epoch, since it is the cleanest way to have the xntp3 meta package exist to help with the xntp3->ntp rename, closes: #59090 * move to a fresher upstream snapshot to get various bug fixes, no changes to functionality we use, closes: #57659, #57816, #58400, #59154, #56551 * put some information in the README.Debian about how to have a machine use its own clock as a reference for isolated machine clusters * stop having ntp-doc drop symlinks into the ntp and ntpdate doc directories, since it prevents them from being removed cleanly, closes: #59861 -- Bdale Garbee Sun, 12 Mar 2000 21:34:25 -0700 ntp (4.0.99c-1) frozen unstable; urgency=low * change the xntp3 dependencies from suggest to depend so they're useful in the context of apt, and remove the conflicts that are keeping the meta package from being useful. Target frozen since the meta package was added for potato, and is useless without this change given how apt treats suggestions. Closes: #56822 * include some information about hwclock in README.Debian, closes: #56755 * pick up 4.0.99c upstream, since all the changes relevant to us appear to be documentation fixes, and they seem worth having. Closes: #56598 * add a few touches to the rules file to keep the build process from running autoconf and friends out of timestamp confusion. -- Bdale Garbee Fri, 4 Feb 2000 00:00:24 -0700 ntp (4.0.99b-1) frozen unstable; urgency=low * new upstream release, minor bug fixes only, another release candidate, closes: #55213, #55639 * fix redirection in the cron.daily, so that ntp isn't obnoxious if the stats logging has been turned off in ntp.conf, closes: #55488, #55339 -- Bdale Garbee Wed, 19 Jan 2000 23:01:19 -0700 ntp (4.0.99-2) unstable; urgency=low * add to Build-Depends, closes: #55086 -- Bdale Garbee Fri, 14 Jan 2000 23:36:12 -0700 ntp (4.0.99-1) unstable; urgency=low * new upstream version, release candidate, closes: #54974 * improve robustness of cron.daily fragment, and comment the non-obvious things in the cron.daily file itself. Closes: #54538, #54763 * upgrade to newer ntpsweep from comp.protocols.time.ntp, closes: #55059 -- Bdale Garbee Fri, 14 Jan 2000 10:25:24 -0700 ntp (4.0.98m-2) unstable; urgency=low * fix silly dependency on sudo in cron.daily resulting from a cut'n'paste not completely thought through, closes: 54538 -- Bdale Garbee Sun, 9 Jan 2000 10:40:38 -0700 ntp (4.0.98m-1) unstable; urgency=low * new upstream source, closes: #54262 * upgrade to latest standards, add Build-Depends -- Bdale Garbee Fri, 7 Jan 2000 20:18:15 -0700 ntp (4.0.98k-1) unstable; urgency=low * new upstream source, ntpsweep now included upstream, closes: #53858, #54168 * add xntp3 meta-package to facilitate slink->potato upgrades since package names changed, closes: #53532 * the cron.weekly/ntp script deletes files in /var/log/ntpstats that are older than a week. this means that at most 2 weeks of daily stats files have been present at any given time. since deleting these old stats file does not require daemon cycling, I'm moving this to a cron.daily so only a week of files will be present. Closes: #53598 * while I'm messing with log rotation, modify cron.weekly to invert the nesting of the conditions. This way, if there is no logfile definition in /etc/ntp.conf, and ntpd is therefore using syslog(), we won't kill and restart the daemon to rotate the non-existent log file. * update configure-ntp to comment-out the logfile definition so that ntpd will use syslog, and not require cycling weekly for log file rotation. This will cause ntpd logging to end up in daemon.log, since we do not have a LOG_NTP facility at this time, forcing ntpd to use LOG_DAEMON. Wishlist bug filed against libc6-dev asking for a LOG_NTP. Leave the cron.weekly alone, and don't do anything automatic to remove the logfile entry from /etc/ntp.conf... but add a note to README.Debian explaining the choices. -- Bdale Garbee Thu, 6 Jan 2000 20:38:52 -0700 ntp (4.0.98h-2) unstable; urgency=medium * add text to ntpdate's README.Debian explaining when ntp may be a better choice * add ntpsweep Perl script from Hans Lambermont from comp.protocols.time.ntp, craft a manpage so it complies with policy -- Bdale Garbee Mon, 27 Dec 1999 10:33:57 -0700 ntp (4.0.98h-1) unstable; urgency=medium * new upstream source, fixes the "multiple servers with ntpdate" hang * patch from Zack Weinberg to reduce ntpd's memory footprint, and quiet some of the compiler warnings, closes: #52902 * the images in the documentation are much smaller now, closes: #46534 -- Bdale Garbee Mon, 20 Dec 1999 02:20:33 -0700 ntp (4.0.98g-1) unstable; urgency=low * new upstream source, closes: #52718 * apply patch for /tmp usage in refclock_true from Topi Miettinen, since upstream seems uninterested, and Topi has convinced me this is worth fixing. closes: #26062 -- Bdale Garbee Wed, 15 Dec 1999 14:09:26 -0700 ntp (4.0.98f-2) unstable; urgency=low * apply patch from Roman that may finally fix the compile problems on m68k still using glibc2.0, closes: #50433 * document in README.Debian for the ntp package the need to include support for enhanced real-time clock in the kernel build for SMP machines. * add code to ntp-doc postinst to clean up old/broken /usr/doc/ntp-doc symlinks, closes: #51024 -- Bdale Garbee Sun, 12 Dec 1999 18:14:54 -0700 ntp (4.0.98f-1) unstable; urgency=low * new upstream source, closes: #49877 * upstream maintainer uninterested in changing /tmp file usage, since there is no clear problem with what is there, so no point in our keeping the bug open... closes: #26062 * hardware clock handling is different in v4, and even more different if the nanosecond timing patches are in use in the kernel. I think what ntp is doing now is correct. closes: #12181 * I have never been able to reproduce the sigint failure during name resolution reported ages ago, even when I worked hard to get slow name service. I see no point in keeping the bug open. closes: #18723 * include ntpdate manpage from Fabrizio Polacco, closes: #50329 * include ntpd manpage from Peter Breuer, closes: #50462 * quick hack to see if we can fix the ntptimeval lossage in glibc2.0, closes: 50433 -- Bdale Garbee Sat, 20 Nov 1999 23:51:34 -0700 ntp (4.0.98d-1) unstable; urgency=low * building ntptime again, closes: #43839 * new upstream version, closes: #49102, #48944 * fix dependencies for ntpdate so that upgrading from prior version works, since ntptimeset appeared briefly in ntp before moving to ntpdate, closes: #49275 * fix paths in ntp-doc postinst symlink creation for FHS, closes: #47011 * add text to init.d on restart, closes: #47048 * man page paths were fixed in 4.0.98a-1, closes: #49230 -- Bdale Garbee Fri, 5 Nov 1999 23:50:54 -0700 ntp (4.0.98a-1) unstable; urgency=low * new upstream source, closes: #45472, #45403, #44622 * fix error in Debian-specific man page sources, closes: #43833 * FHS compliance * put ntptimeset, a "new" alternative to ntpdate from CMU that just appeared in the ntp upstream sources, into the ntpdate package. * minor tweaks to achieve a clean lintian report * remove text display from postinst to satisfy policy -- Bdale Garbee Sun, 19 Sep 1999 14:32:28 -0600 ntp (4.0.97c-1) unstable; urgency=low * new upstream source * add doc-base support to the ntp-doc package, closes: #37016 * move ntpq, ntpdc, and ntptrace from /usr/sbin to /usr/bin, closes: #43298 -- Bdale Garbee Sat, 28 Aug 1999 21:53:04 -0600 ntp (4.0.97a-1) unstable; urgency=low * new upstream version, closes: #41724, #43024, #43025, #43026, #38074, #43202, #43446 -- Bdale Garbee Wed, 25 Aug 1999 21:02:12 -0600 ntp (4.0.92f-1) unstable; urgency=low * new upstream version, closes 36227 * fix typo in ntpdate init.d, closes 36215 * fix test in ntp-doc postinst to work when ntpdate is not installed, closes 36214, 36211 -- Bdale Garbee Sun, 18 Apr 1999 14:14:58 -0600 ntp (4.0.92e-1) unstable; urgency=low * new upstream version kernel pll correctly recognized in 2.2 kernels, closes 32913 memory leak believed fixed in this version, closes 33762 * fix configure-ntp to make postinst text less confusing on initial install, closes 35869. * eliminate duplicate daemon start on initial install in postinst * fix configure-ntp to create ntp.conf with the right log file, closes 35621 * move ntp-doc symlink management from rules file to ntp-doc postinst and prerm to eliminate dangling symlinks, closes 35440 * update rules file to remove htmlprimer.htm from ntp-doc, closes 35489 -- Bdale Garbee Thu, 15 Apr 1999 23:11:30 -0600 ntp (4.0.91-3) unstable; urgency=low * trivial tweaks to the init.d scripts for ntp and ntpdate to better conform with policy, closes 32869 -- Bdale Garbee Thu, 4 Feb 1999 23:16:35 -0700 ntp (4.0.91-2) unstable; urgency=low * fix typo in ntpdate's postinst, closes 32372 * tweak ntp's weekly cron to eliminate extra mail to root, closes 32461 -- Bdale Garbee Wed, 27 Jan 1999 13:58:56 -0700 ntp (4.0.91-1) unstable; urgency=low * new upstream version - these packages replace xntp3 and xntp3-doc! * ntp-doc does not include the html primer, closes 25752 * ntp-doc has been updated substantially, 24270 appears to be fixed * packages renamed to match change in upstream source * split package to allow ntpdate usage without needing ntpd, closes 26557 * enable more types of hardware clocks, closes 30989 * create a "null" manpage for all the executables that directs users to the ntp-doc package * reworked the init.d/ntp.conf/etc stuff significantly, closes 30574, * add some text to the postinst for ntpdate, closes 21320 * fix init.d messages to comply with standard, closes 29618, 23493, 23499, 23517, 23518 * apply fix for insecure /tmp file usage in one debugging mode, which would close 26062... but I'm going to forward it upstream and wait for a reply before closing it. -- Bdale Garbee Sun, 17 Jan 1999 15:05:18 -0700 xntp3 (5.93-3) unstable; urgency=low * add dependency on awk, which is used in the postinst, closes 24821 * tweak postinst to fix problem with comments in ntp.conf breaking the ntpdate call in init.d, closes 22796 * add patch to ntp_io.c to report exceeding max number of bindable interfaces in xntpd, closes 23145 * update postinst to be more graceful if no NTP servers are specified, closes 24268 * update postrm to be more robust -- Bdale Garbee Mon, 3 Aug 1998 23:00:24 -0600 xntp3 (5.93-2) frozen unstable; urgency=low * fix prerm to gracefully handle the case of a package remove or upgrade when the daemon is not running. Closes bugs 23565, 22384. * push this into frozen since 23565 was quite rightly flagged as important, and the 5.93 bits have been in unstable and working fine for over a month with no version-specific bug reports. -- Bdale Garbee Sun, 3 May 1998 21:14:29 -0600 xntp3 (5.93-1) unstable; urgency=low * new upstream source * apply 5.93->5.93a patch, even though it's not relevant for Linux, since upstream maintainer wants my diffs for Linux relative to 5.93a. -- Bdale Garbee Sun, 3 May 1998 21:14:29 -0600 xntp3 (5.91-9) frozen unstable; urgency=low * fix a conditional in postinst that fails with older versions of shellutils, closes 21988 -- Bdale Garbee Sat, 2 May 1998 01:57:32 -0600 xntp3 (5.91-8) frozen unstable; urgency=medium * finish the changes to make /etc/init.d/xntp3 not be a 'conffile', closes 21117 and 21119. /o\ * clean up a few details in the pre and post scripts, making them a bit more paranoid and better equipped to handle unexpected conditions. * anyone running -7 really wants this version... mark it 'medium' urgency -- Bdale Garbee Tue, 14 Apr 1998 23:24:11 -0600 xntp3 (5.91-7) frozen unstable; urgency=low * add a sleep between stop and start in init fragment to avoid race where old daemon hasn't quite died yet, closes 18703 * fix a typo in the description, closes 18986 * add -9 to gzip call in rules file to close remaining lintian errors -- Bdale Garbee Fri, 10 Apr 1998 00:36:41 -0600 xntp3 (5.91-6) unstable; urgency=low * add update-rc.d call to postrm for /etc/init.d/xntp3 (lintian) * implement new required arguments to /etc/init.d/xntp3 (lintian) * fix for missing __ntp_gettime in libc6 from Herbert Xu. Closes 15362. -- Bdale Garbee Sun, 15 Feb 1998 11:03:16 -0700 xntp3 (5.91-5) unstable; urgency=low * change sequence in postinst to quiet update-rc.d. Closes 17327. -- Bdale Garbee Tue, 27 Jan 1998 14:14:32 -0700 xntp3 (5.91-4) unstable; urgency=low * with inputs from Christian Schwarz and others, do a better job of handling the package copyright policies regarding the xntp3-doc package. -- Bdale Garbee Tue, 27 Jan 1998 13:03:32 -0700 xntp3 (5.91-3) unstable; urgency=low * make xntp3-doc depend on xntp3 to conform with policy regarding copyright files -- Bdale Garbee Mon, 26 Jan 1998 21:29:29 -0700 xntp3 (5.91-2) unstable; urgency=low * clean up rules file using suggestions from Mark Eichin, fixes a small detail when building on other than i386, and moves to latest debhelper calls. Closes 16213. -- Bdale Garbee Sat, 3 Jan 1998 01:48:23 -0700 xntp3 (5.91-1) unstable; urgency=low * new upstream version -- Bdale Garbee Wed, 26 Nov 1997 23:36:22 -0700 xntp3 (5.90-12) unstable; urgency=low * update postinst and postrm to improve daemon handling. Closes bug 15273 * modified rules file to indicate need for debhelper if dh_testdir fails -- Bdale Garbee Wed, 26 Nov 1997 22:47:00 -0700 xntp3 (5.90-11) unstable; urgency=low * reconfigure rules file to use debhelper, closes some bugs * various cosmetic tweaks -- Bdale Garbee Fri, 21 Nov 1997 22:16:48 -0700 xntp3 (5.90-10) unstable; urgency=low * fix a typo in the init.d usage message, closes bug 14999 -- Bdale Garbee Tue, 18 Nov 1997 09:54:27 -0700 xntp3 (5.90-9) unstable; urgency=low * don't have -doc package depend on www-browser, closes bug 12996 -- Bdale Garbee Sun, 21 Sep 1997 17:18:40 -0600 xntp3 (5.90-8) unstable; urgency=low * only do the work in postinst if called to configure, closes bug 12633 -- Bdale Garbee Wed, 10 Sep 1997 12:47:13 -0600 xntp3 (5.90-7) unstable; urgency=low * libc6 * remove log files in postrm if purging, closes bug 12037 * remove config file in postrm if purging, closes bug 12110 * fix typo in cron.weekly that prevents log file rotation, closes bug 12131 -- Bdale Garbee Fri, 5 Sep 1997 00:56:43 -0600 xntp3 (5.90-6) stable unstable; urgency=medium * Fix a security problem in the postinst script. Closes bug 11773. * Explicitly try to stop the daemon before starting it in the postinst, just to make absolutely sure it's not already running. This may quiet the reports of lingering daemons. -- Bdale Garbee Fri, 1 Aug 1997 23:26:35 -0600 xntp3 (5.90-5) unstable; urgency=low * Ensure that needed directories exist. Closes bugs 10242 and 9979. * Ignore ECONNREFUSED from peers that don't have xntpd running. Closes bug 8490. -- Bdale Garbee Sat, 31 May 1997 16:34:47 -0600 xntp3 (5.90-4) unstable; urgency=low * Switch to using start-stop-daemon in the postinst. Fixes bug 9271. -- Bdale Garbee Mon, 12 May 1997 22:08:42 -0600 xntp3 (5.90-3) unstable; urgency=low * Create /usr/doc/xntp3-doc as a symlink to xntp3. Closes bug 6081. * Fix typo in glibc support in ntpdate. -- Bdale Garbee Sat, 26 Apr 1997 23:19:15 -0600 xntp3 (5.90-2) unstable; urgency=low * Fix problem in packaging of doc package. -- Bdale Garbee Sat, 26 Apr 1997 22:18:15 -0600 xntp3 (5.90-1) unstable; urgency=low * New upstream version. * Apply patches for libc6 from Michael Dorman. Closes bug 9078. * Make directory /var/lib/ntp. Closes bug 8783. -- Bdale Garbee Sat, 26 Apr 1997 00:40:29 -0600 xntp3 (5.89-1) unstable; urgency=low * new upstream version * changing package name from xntp to xntp3 to mirror upstream change * ntp.conf no longer treated as conffile, closes bug 2051 * only run cron.weekly fragment if /usr/sbin/xntpd exists, closes bug 5857 * substantial improvement to the postinst script, closes several bugs -- Bdale Garbee Wed, 26 Feb 1997 12:58:45 -0700 xntp (3.5f-4) frozen unstable; urgency=medium * copyright for xntp-doc installed in the wrong place. Fixes bug 5319. * create /var/lib/ntp directory. Fixes bug 5373. -- Bdale Garbee Mon, 4 Nov 1996 02:53:56 -0700 xntp (3.5f-3) unstable; urgency=low * oops. ugly typo in postinst breaks it entirely... -- Bdale Garbee Mon, 4 Nov 1996 02:53:56 -0700 xntp (3.5f-2) unstable; urgency=low * create a stub manpage explaining the xntp-doc package * postinst offers to run ntpdate before xntpd launch. Fixes bug 2982. * improve user instructions echo'd during postinst. Fixes bug 4323. * moved test out of case in init.d script. Fixes bug 4432. * only stop and start daemon in cron if it is running. Fixes bug 4876. -- Bdale Garbee Mon, 4 Nov 1996 00:53:50 -0700 xntp (3.5f-1) unstable; urgency=low * new upstream version 3.5f * xntpd built with MD5, but without DES authentication to avoid export issue. -- Bdale Garbee Sat, 2 Nov 1996 17:18:29 -0800 xntp-3.5c-1: 960328 * Upgraded to latest upsteam version. * Removed Package_Revision from control file. * Removed -m486 compiler option. * Added Architecture field to control file. * Moved documentation into xntp-doc package. * Fixed Bug#2096: xntp-3.4x-2 doesn't test for presence of /usr/sbin * Fixed Bug#2116: xntp cron bug * Fixed Bug#2129: xntp startup should call ntpdate first * Fixed Bug#2250: xntpd log file rotation * Fixed Bug#2363: xntpd fails in 1.3.x kernels xntp-3.4x-2: 951127 * Converted to ELF. * Fixed bug #1656: moved /etc/ntp.drift to /var/lib/ntp/ntp.drift * Fixed bug #1770: xntp works under 1.3.x kernels now. xntp-3.4x-1: 950928 Andrew Howell * Updated to the newest version. * Made cronjob quiet. * Postinst script will now run xntpd if you supply a NTP server. xntp-3.4s-0: * Updated to the newest version. * Fixed cronjob to delete logs older than 7 days, not just the 7th day. Oops :) xntp-3.4r-2: * Fixed permissions on cronjob xntp-3.4r-1: * Added cronjob to cleanup log files once a week. * Added postrm script to remove rcx.d links when purge option given to dpkg. * Fixed postinst script to only prompt user for NTP server once. * Removed default NTP server. xntp-3.4r-0: * added Debian GNU/Linux package maintenance system files Local variables: mode: debian-changelog End: debian/ntp.init0000644000000000000000000000343212126756215010665 0ustar #!/bin/sh ### BEGIN INIT INFO # Provides: ntp # Required-Start: $network $remote_fs $syslog # Required-Stop: $network $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 1 # Short-Description: Start NTP daemon ### END INIT INFO PATH=/sbin:/bin:/usr/sbin:/usr/bin . /lib/lsb/init-functions DAEMON=/usr/sbin/ntpd PIDFILE=/var/run/ntpd.pid test -x $DAEMON || exit 5 if [ -r /etc/default/ntp ]; then . /etc/default/ntp fi if [ -e /var/lib/ntp/ntp.conf.dhcp ]; then NTPD_OPTS="$NTPD_OPTS -c /var/lib/ntp/ntp.conf.dhcp" fi LOCKFILE=/var/lock/ntpdate lock_ntpdate() { if [ -x /usr/bin/lockfile-create ]; then lockfile-create $LOCKFILE lockfile-touch $LOCKFILE & LOCKTOUCHPID="$!" fi } unlock_ntpdate() { if [ -x /usr/bin/lockfile-create ] ; then kill $LOCKTOUCHPID lockfile-remove $LOCKFILE fi } RUNASUSER=ntp UGID=$(getent passwd $RUNASUSER | cut -f 3,4 -d:) || true if test "$(uname -s)" = "Linux"; then NTPD_OPTS="$NTPD_OPTS -u $UGID" fi case $1 in start) log_daemon_msg "Starting NTP server" "ntpd" if [ -z "$UGID" ]; then log_failure_msg "user \"$RUNASUSER\" does not exist" exit 1 fi lock_ntpdate start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $NTPD_OPTS status=$? unlock_ntpdate log_end_msg $status ;; stop) log_daemon_msg "Stopping NTP server" "ntpd" start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE log_end_msg $? rm -f $PIDFILE ;; restart|force-reload) $0 stop && sleep 2 && $0 start ;; try-restart) if $0 status >/dev/null; then $0 restart else exit 0 fi ;; reload) exit 3 ;; status) status_of_proc $DAEMON "NTP server" ;; *) echo "Usage: $0 {start|stop|restart|try-restart|force-reload|status}" exit 2 ;; esac debian/NEWS0000644000000000000000000001077510722552410007675 0ustar ntp (1:4.2.4p0+dfsg-1) unstable; urgency=low This version of ntp will periodically rescan the network interfaces to pick up new and deleted interfaces. This should supplant most or all of the various workarounds in use such as restarting the daemon in /etc/network/if-up.d/ or /etc/ppp/ip-up.d/. -- Peter Eisentraut Thu, 3 May 2007 11:32:29 +0200 ntp (1:4.2.2+dfsg.2-2) unstable; urgency=low ntpdate is no longer started from an init script but instead by ifup. The specifics can be configured in /etc/network/if-up.d/ntpdate. Installing ntp and ntpdate together is obsolete. ntp is now configured by default in such a manner that it handles the initial clock adjustment by itself. -- Peter Eisentraut Mon, 11 Sep 2006 21:23:08 +0200 ntp (1:4.2.2+dfsg-1) unstable; urgency=low The packages ntp, ntp-server, ntp-simple, and ntp-refclock have been merged into a single package ntp. Support for the following clocks have been removed because they didn't have a license on it: wharton and neoclock4x. -- Peter Eisentraut Fri, 14 Jul 2006 22:55:36 +0200 ntp (1:4.2.0a+stable-8) unstable; urgency=medium The NTP server now runs as the user "ntp". (Obviously it retains its ability to change your clock. ;-) -- Matthias Urlichs Fri, 18 Mar 2005 21:44:34 +0100 ntp (1:4.2.0a+bk20040620-3) unstable; urgency=low If your system changes ethernet addresses (e.g. a roving laptop), you need to restart ntpd. A small script to do that is in /etc/interfaces/if-up.d/ntp-server. To enable it, remove the "exit 0" line. -- Matthias Urlichs Sat, 16 Oct 2004 17:49:41 +0200 ntp (1:4.2.0a-6) unstable; urgency=low The "noserve" configuration option was buggy in versions before 1:4.2. It did not restrict everything it was documented to restrict. The impact on existing configuration files is that if you have "noserve" in your /etc/ntp.conf, and you can no longer sync to your peers, you might need to replace the "noserve" option with "noquery" or "nomodify". -- Matthias Urlichs Mon, 29 Mar 2004 20:21:30 +0200 ntp (1:4.2.0a-3) unstable; urgency=medium Downgrading the NTP package will not work automatically because the init scripts have changed significantly. The old init scripts and cron.daily/weekly files for ntp-simple and ntp-refclock have been saved+disabled by renaming them to "NAME.dpkg-old". If you have made any changes to them, you need to port these changes to the new /etc/{init.d,cron.daily,cron.weekly}/ntp-server scripts. Likewise, if you changed the startup script's run order by renaming the links in /etc/rc*.d, you need to re-do this change. -- Matthias Urlichs Sat, 20 Mar 2004 09:13:51 +0100 ntp (1:4.2.0a-0.1) experimental; urgency=low Upstream has implemented their own patch for chroot-jail and change-uid. Predictably, they use different flags (-i and -u, not -R and -U). The Debian patch introduced in version 1:4.2.0-0.4 is therefore removed; -R and -U are no longer recognized. -- Matthias Urlichs Tue, 2 Mar 2004 11:44:40 +0100 ntp (1:4.2.0-0.6) experimental; urgency=low The common parts of the "simple" and "refclock" NTP server packages have been split off into their own package "ntp-server". "ntp-server" now contains the code which needs to run on the same system as the NTP server (example: startup scripts). "ntp" consists of those programs which access an NTP server either locally or across the Internet. -- Matthias Urlichs Tue, 3 Feb 2004 17:18:40 +0100 ntp (1:4.2.0-0.3) unstable; urgency=low /etc/ntp.conf and /etc/default/ntp are no longer generated by the postinst scripts. Instead, they're now regular conffiles. You will therefore see a standard "Update?" message from dpkg. You should answer "Y" if you did not modify your NTP configuration manually. The default NTP time server is "pool.ntp.org", which resolves to a list of public stratum-1 and stratum-2 servers. One of them will be picked semi-randomly each time your NTP server starts. Note that the default configuration does NOT send broadcasts and does NOT allow any remote queries. "Remote" is defined as non-RFC1918 network addresses, i.e. anything not in 10.0.0.0/8, 172.16.0.0/12, or 192.168.0.0/16. The ntp server does not try to discover any interface addresses. This is a feature. -- Matthias Urlichs Tue, 23 Dec 2003 19:55:23 +0100 debian/ntpdate.README.Debian0000644000000000000000000000136710513200774012673 0ustar ntpdate doesn't parse the /etc/ntp.conf file. The program ntpdate-debian is provided that reads its server list from /etc/default/ntpdate or alternatively from /etc/ntp.conf. ntpdate is run whenever a network interface is brought up. To adjust this behavior, the file /etc/network/if-up.d/ntpdate should be edited. Note that ntpdate is *not* really intended to be used by hosts with good network connectivity. The "ntp" package, which provides a persistent daemon that does a better job of keeping system time than even a cron'ed invocation of ntpdate, is a better choice for systems with good network connectivity. If all you want is to set the clock to a reasonable value once in a while, a more light-weight package like "rdate" can also do the job. debian/apparmor-profile0000644000000000000000000000421712225307264012377 0ustar # vim:syntax=apparmor # Updated for Ubuntu by: Jamie Strandboge # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE # Copyright (C) 2009-2012 Canonical Ltd. # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public # License published by the Free Software Foundation. # # ------------------------------------------------------------------ #include #include /usr/sbin/ntpd { #include #include #include capability ipc_lock, capability net_bind_service, capability setgid, capability setuid, capability sys_chroot, capability sys_resource, capability sys_time, capability sys_nice, network inet dgram, network inet6 dgram, network inet stream, network inet6 stream, @{PROC}/net/if_inet6 r, @{PROC}/*/net/if_inet6 r, @{NTPD_DEVICE} rw, /{,s}bin/ r, /usr/{,s}bin/ r, /usr/sbin/ntpd rmix, /etc/ntp.conf r, /etc/ntp.conf.dhcp r, /etc/ntpd.conf r, /etc/ntpd.conf.tmp r, /var/lib/ntp/ntp.conf.dhcp r, /etc/ntp.keys r, /etc/ntp/** r, /etc/ntp.drift rwl, /etc/ntp.drift.TEMP rwl, /etc/ntp/drift* rwl, /var/lib/ntp/*drift rw, /var/lib/ntp/*drift.TEMP rw, /var/log/ntp w, /var/log/ntp.log w, /var/log/ntpd w, /var/log/ntpstats/clockstats* rwl, /var/log/ntpstats/loopstats* rwl, /var/log/ntpstats/peerstats* rwl, /var/log/ntpstats/protostats* rwl, /var/log/ntpstats/rawstats* rwl, /var/log/ntpstats/sysstats* rwl, /{,var/}run/ntpd.pid w, # samba4 ntp signing socket /{,var/}run/samba/ntp_signd/socket rw, # For use with clocks that report via shared memory (e.g. gpsd), # you may need to give ntpd access to all of shared memory, though # this can be considered dangerous. See https://launchpad.net/bugs/722815 # for details. To enable, add this to local/usr.sbin.ntpd: # capability ipc_owner, # Site-specific additions and overrides. See local/README for details. #include } debian/rules0000755000000000000000000000751712177754140010270 0ustar #!/usr/bin/make -f export DEB_BUILD_HARDENING=1 # hacks to avoid running these things during the build export ACLOCAL = : aclocal export AUTOCONF = : autoconf export AUTOMAKE = : automake export AUTOHEADER = : autoheader DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -D_GNU_SOURCE CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -fno-strict-aliasing LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed config.status: dh_testdir ifeq (hurd, $(DEB_HOST_ARCH_OS)) # hurd does not provided the system calls needed for ntpd to work. exit 1 endif cp /usr/share/misc/config.guess /usr/share/misc/config.sub . cp /usr/share/misc/config.guess /usr/share/misc/config.sub sntp/. ./configure CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \ --prefix=/usr \ --enable-all-clocks --enable-parse-clocks --enable-SHM \ --enable-debugging --sysconfdir=/var/lib/ntp \ --with-sntp=no \ --with-lineeditlibs=edit \ --without-ntpsnmpd \ --disable-local-libopts \ --enable-ntp-signd \ --disable-dependency-tracking \ --with-openssl-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) build: build-arch build-indep build-arch: build-stamp build-indep: build-stamp build-stamp: config.status dh_testdir $(MAKE) touch $@ clean: dh_testdir dh_testroot rm -f build-stamp [ ! -f Makefile ] || $(MAKE) -k distclean rm -f config.guess config.sub dh_clean install: build-stamp dh_testdir dh_testroot dh_clean -k dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/ntp # move the administrator programs from /usr/bin to /usr/sbin for file in ntpdate ntp-wait ntpd ntptime ntp-keygen; do \ mv debian/ntp/usr/bin/$$file debian/ntp/usr/sbin/$$file || exit; \ done # don't install tickadj rm debian/ntp/usr/bin/tickadj install -D -m 0755 scripts/ntpsweep debian/ntp/usr/bin/ntpsweep install -D -m 0644 debian/ntp.dhcp debian/ntp/etc/dhcp/dhclient-exit-hooks.d/ntp install -D -m 0644 debian/ntpdate.dhcp debian/ntpdate/etc/dhcp/dhclient-exit-hooks.d/ntpdate install -D -m 0755 debian/ntpdate-debian debian/ntpdate/usr/sbin/ntpdate-debian install -D -m 0644 debian/ntp.conf debian/ntp/etc/ntp.conf # remove upstream man pages, which are currently not as nice as ours / ntpsnmpd we don't want rm $(addprefix debian/ntp/usr/share/man/man1/,ntpd.1 ntpdc.1 ntp-keygen.1 ntpq.1 ntpsnmpd.1) # install apparmor profile install -D -m 0644 debian/apparmor-profile debian/ntp/etc/apparmor.d/usr.sbin.ntpd 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 # install apport hook install -D -m 644 debian/source_ntp.py debian/ntp/usr/share/apport/package-hooks/source_ntp.py dh_movefiles --sourcedir=debian/ntp binary-indep: build install dh_testdir -i dh_testroot -i dh_installdocs -i html rm -f debian/ntp-doc/usr/share/doc/ntp-doc/html/hints/solaris* dh_installexamples -i dh_installman -i dh_installcron -i dh_installlogcheck -i dh_installchangelogs -i dh_installifupdown -i dh_perl -i dh_compress -i dh_fixperms -i dh_installdeb -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i binary-arch: build install dh_testdir -a dh_testroot -a dh_installdocs -a dh_installexamples -a dh_installman -a dh_apparmor -pntp --profile-name=usr.sbin.ntpd dh_installinit -pntp --update-rcd-params="start 23 2 3 4 5 . stop 77 1 ." --error-handler=installinit_error dh_installinit -pntpdate dh_installcron -a dh_installlogcheck -a dh_installchangelogs -a dh_installifupdown -a dh_perl -a dh_strip -a dh_compress -a dh_fixperms -a dh_installdeb -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a dh_builddeb -a binary: binary-indep binary-arch .PHONY: build build-arch build-indep clean binary-indep binary-arch binary install debian/ntp.cron.daily0000644000000000000000000000212611672347507011770 0ustar #!/bin/sh # The default Debian ntp.conf enables logging of various statistics to # the /var/log/ntpstats directory. The daemon automatically changes # to a new datestamped set of files at midnight, so all we need to do # is delete old ones, and compress the ones we're keeping so disk # usage is controlled. statsdir=$(cat /etc/ntp.conf | grep -v '^#' | sed -n 's/statsdir \([^ ][^ ]*\)/\1/p') if [ -n "$statsdir" ] && [ -d "$statsdir" ]; then # only keep a week's depth of these find "$statsdir" -type f -mtime +7 -exec rm {} \; # compress whatever is left to save space cd "$statsdir" ls *stats.???????? > /dev/null 2>&1 if [ $? -eq 0 ]; then # Note that gzip won't compress the file names that # are hard links to the live/current files, so this # compresses yesterday and previous, leaving the live # log alone. We supress the warnings gzip issues # about not compressing the linked file. gzip --best --quiet *stats.???????? return=$? case $return in 2) exit 0 # squash all warnings ;; *) exit $return # but let real errors through ;; esac fi fi debian/ntpdate-debian0000644000000000000000000000112112126756215011772 0ustar #!/bin/sh set -e if [ -r /etc/default/ntpdate ]; then . /etc/default/ntpdate fi if [ "$NTPDATE_USE_NTP_CONF" = yes ]; then for f in /var/lib/ntp/ntp.conf.dhcp /etc/ntp.conf /etc/openntpd/ntpd.conf; do if [ -r "$f" ] && [ -s "$f" ]; then file=$f break fi done if [ -n "$file" ]; then NTPSERVERS=$(sed -rne 's/^(servers?|peer)[[:space:]]+(-[46][[:space:]]+)?([-_.:[:alnum:]]+).*$/\3/p' "$file" | grep -v '^127\.127\.') || [ $? -le 1 ] fi elif [ -r /var/lib/ntpdate/default.dhcp ]; then . /var/lib/ntpdate/default.dhcp fi exec /usr/sbin/ntpdate $NTPOPTIONS "$@" $NTPSERVERS debian/ntp.conf0000644000000000000000000000362012126756215010646 0ustar # /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help driftfile /var/lib/ntp/ntp.drift # Enable this if you want statistics to be logged. #statsdir /var/log/ntpstats/ statistics loopstats peerstats clockstats filegen loopstats file loopstats type day enable filegen peerstats file peerstats type day enable filegen clockstats file clockstats type day enable # Specify one or more NTP servers. # Use servers from the NTP Pool Project. Approved by Ubuntu Technical Board # on 2011-02-08 (LP: #104525). See http://www.pool.ntp.org/join.html for # more information. server 0.ubuntu.pool.ntp.org server 1.ubuntu.pool.ntp.org server 2.ubuntu.pool.ntp.org server 3.ubuntu.pool.ntp.org # Use Ubuntu's ntp server as a fallback. server ntp.ubuntu.com # Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for # details. The web page # might also be helpful. # # Note that "restrict" applies to both servers and clients, so a configuration # that might be intended to block requests from certain clients could also end # up blocking replies from your own upstream servers. # By default, exchange time with everybody, but don't allow configuration. restrict -4 default kod notrap nomodify nopeer noquery restrict -6 default kod notrap nomodify nopeer noquery # Local users may interrogate the ntp server more closely. restrict 127.0.0.1 restrict ::1 # Clients from this (example!) subnet have unlimited access, but only if # cryptographically authenticated. #restrict 192.168.123.0 mask 255.255.255.0 notrust # If you want to provide time to your local subnet, change the next line. # (Again, the address is an example only.) #broadcast 192.168.123.255 # If you want to listen to time broadcasts on your local subnet, de-comment the # next lines. Please do this only if you trust everybody on the network! #disable auth #broadcastclient debian/dfsg.sh0000644000000000000000000000115311572234353010452 0ustar #!/bin/sh # Used to create the dfsg .orig.tar from the upstream source rm -r ElectricFence rm util/ansi2knr.c rm util/ansi2knr.1 rm html/hints/solaris-dosynctodr.html rm libntp/adjtime.c rm include/adjtime.h rm include/timepps-SCO.h rm include/timepps-Solaris.h rm include/timepps-SunOS.h rm kernel/tty_chu_STREAMS.c rm kernel/tty_clk_STREAMS.c rm ports/winnt/libntp/messages.mc rm ports/winnt/include/hopf_PCI_io.h rm scripts/monitoring/lr.pl rm scripts/monitoring/ntp.pl rm scripts/monitoring/ntploopstat rm scripts/monitoring/ntploopwatch rm scripts/monitoring/ntptrap rm scripts/ntpver.in rm libparse/clk_wharton.c debian/ntp.preinst0000644000000000000000000000143512126756215011407 0ustar #!/bin/sh set -e if dpkg-maintscript-helper supports rm_conffile; then dpkg-maintscript-helper rm_conffile \ /etc/logcheck/ignore.d.server/ntp 1:4.2.6+dfsg-1 -- "$@" dpkg-maintscript-helper rm_conffile \ /etc/dhcp3/dhclient-enter-hooks.d/ntp 1:4.2.6+dfsg-1 -- "$@" dpkg-maintscript-helper rm_conffile \ /etc/network/if-up.d/ntp 1:4.2.6+dfsg-1 -- "$@" fi if dpkg-maintscript-helper supports mv_conffile; then dpkg-maintscript-helper mv_conffile \ /etc/dhcp3/dhclient-exit-hooks.d/ntp \ /etc/dhcp/dhclient-exit-hooks.d/ntp \ 1:4.2.6.p1+dfsg-1 -- "$@" fi if [ "$1" = install ] && [ -e /etc/ntp.conf ] && [ ! -s /etc/ntp.conf ]; then # Work around system-tools-backends bug that left an empty file # (https://bugs.launchpad.net/bugs/83604). rm -f /etc/ntp.conf fi #DEBHELPER# debian/patches/0000755000000000000000000000000012224516370010617 5ustar debian/patches/ntpd-linux-caps-inheritable.patch0000644000000000000000000000145411572234353017161 0ustar From: Martin Pitt Subject: do not set CAP_SYS_TIME as inheritable Bug: http://bugs.ntp.org/1432 Bug-Debian: http://bugs.debian.org/282941 Bug-Debian: http://bugs.debian.org/298059 Index: ntp-4.2.6.p3+dfsg/ntpd/ntpd.c =================================================================== --- ntp-4.2.6.p3+dfsg.orig/ntpd/ntpd.c 2011-06-03 15:26:29.000000000 +0000 +++ ntp-4.2.6.p3+dfsg/ntpd/ntpd.c 2011-06-03 15:27:00.000000000 +0000 @@ -1016,8 +1016,8 @@ */ cap_t caps; char *captext = (interface_interval) - ? "cap_sys_time,cap_net_bind_service=ipe" - : "cap_sys_time=ipe"; + ? "cap_sys_time,cap_net_bind_service=pe" + : "cap_sys_time=pe"; if( ! ( caps = cap_from_text( captext ) ) ) { msyslog( LOG_ERR, "cap_from_text() failed: %m" ); exit(-1); debian/patches/autotools.patch0000644000000000000000000056004412224516370013702 0ustar Subject: Regenerate auto* because we modified some of the auto generated files. Forwarded: not-needed Author: Peter Eisentraut Last-Update: 2012-02-22 I used the following procedure to create this patch: """ set -eux name=ntp-4.2.6.p5+dfsg svn-buildpackage --svn-export cd ../build-area cd ${name} quilt push libedit.patch # previous one cd .. cp -a ${name} ${name}.orig cd ${name} libtoolize --force autoreconf --force cd sntp libtoolize --force autoreconf --force cd ../.. diff -ru -x '*~' -x debian -x 'autom4te.cache' ${name}.orig ${name} | filterdiff --strip=1 --remove-timestamps --addoldprefix=a/ --addnewprefix=b/ --clean > autotools.patch """ There were a few complications, such as autoreconf not calling libtoolize in the right way, hence the separate call, and either of these tools not recursing properly into the sntp directory. Tweak it until it works. --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,12 +20,15 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -34,7 +38,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,19 +54,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -144,14 +150,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -191,6 +197,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -255,7 +262,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -320,10 +327,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -557,12 +567,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -729,12 +742,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -757,13 +773,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -771,13 +788,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -853,12 +870,14 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -881,13 +900,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -896,13 +915,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -924,10 +943,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) --- a/adjtimed/Makefile.in +++ b/adjtimed/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -261,9 +261,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign adjtimed/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu adjtimed/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign adjtimed/Makefile + $(AUTOMAKE) --gnu adjtimed/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -273,6 +273,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -368,7 +369,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -adjtimed$(EXEEXT): $(adjtimed_OBJECTS) $(adjtimed_DEPENDENCIES) +adjtimed$(EXEEXT): $(adjtimed_OBJECTS) $(adjtimed_DEPENDENCIES) $(EXTRA_adjtimed_DEPENDENCIES) @rm -f adjtimed$(EXEEXT) $(LINK) $(adjtimed_OBJECTS) $(adjtimed_LDADD) $(LIBS) @@ -508,10 +509,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/clockstuff/Makefile.in +++ b/clockstuff/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -266,9 +266,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign clockstuff/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu clockstuff/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign clockstuff/Makefile + $(AUTOMAKE) --gnu clockstuff/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -278,6 +278,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -296,7 +297,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -propdelay$(EXEEXT): $(propdelay_OBJECTS) $(propdelay_DEPENDENCIES) +propdelay$(EXEEXT): $(propdelay_OBJECTS) $(propdelay_DEPENDENCIES) $(EXTRA_propdelay_DEPENDENCIES) @rm -f propdelay$(EXEEXT) $(LINK) $(propdelay_OBJECTS) $(propdelay_LDADD) $(LIBS) @@ -435,10 +436,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/config.h.in +++ b/config.h.in @@ -150,9 +150,6 @@ /* VARITEXT clock */ #undef CLOCK_VARITEXT -/* WHARTON 400A Series clock */ -#undef CLOCK_WHARTON_400A - /* WWV audio driver */ #undef CLOCK_WWV --- a/configure +++ b/configure @@ -692,6 +692,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -848,7 +849,6 @@ enable_SCHMID enable_TRIMTAIP enable_TRIMTSIP -enable_WHARTON enable_VARITEXT with_openssl_libdir with_openssl_incdir @@ -1576,7 +1576,6 @@ --enable-SCHMID s Schmid DCF77 clock --enable-TRIMTAIP s Trimble GPS receiver/TAIP protocol --enable-TRIMTSIP s Trimble GPS receiver/TSIP protocol - --enable-WHARTON s WHARTON 400A Series clock --enable-VARITEXT s VARITEXT clock --enable-kmem s read /dev/kmem for tick and/or tickadj --enable-accurate-adjtime @@ -1608,7 +1607,7 @@ --with-binsubdir bin ={bin,sbin} --with-arlib - deprecated, arlib not distributed --without-rpath s Disable auto-added -R linker paths - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -3328,11 +3327,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3475,6 +3474,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -4288,6 +4288,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4347,7 +4348,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -5451,6 +5452,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5510,7 +5512,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -8010,8 +8012,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -8655,6 +8657,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -8694,7 +8701,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -9123,12 +9130,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -9763,13 +9770,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -9916,6 +9923,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -10304,7 +10312,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -10315,7 +10323,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -10955,7 +10976,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -10966,6 +10993,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -10998,6 +11026,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -11019,7 +11048,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -11127,7 +11158,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -11205,6 +11251,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -11664,7 +11714,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -11755,18 +11807,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -12128,7 +12195,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -12172,6 +12238,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -12378,8 +12447,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -12394,7 +12462,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -12571,6 +12639,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -12758,6 +12827,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -12803,6 +12873,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -12831,10 +12902,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -12847,7 +12914,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -12886,7 +12953,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -13027,7 +13093,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -13510,11 +13576,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -13604,7 +13665,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -13613,7 +13674,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -13678,7 +13739,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -13817,7 +13878,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -13825,10 +13886,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -13836,7 +13893,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -13854,7 +13911,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -13874,17 +13931,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -13945,7 +14003,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -13961,7 +14019,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -13998,9 +14056,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -14063,6 +14121,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -14082,7 +14152,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -14151,7 +14221,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -14176,7 +14246,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -14200,7 +14270,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -14231,7 +14301,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -14241,7 +14311,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15023,6 +15093,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -22756,29 +22828,6 @@ as_fn_error $? "That's a parse clock and this system doesn't support it!" "$LINENO" 5 esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking WHARTON 400A Series clock" >&5 -$as_echo_n "checking WHARTON 400A Series clock... " >&6; } -# Check whether --enable-WHARTON was given. -if test "${enable_WHARTON+set}" = set; then : - enableval=$enable_WHARTON; ntp_ok=$enableval -else - ntp_ok=$ntp_eapc - -fi - -if test "$ntp_ok" = "yes"; then - ntp_libparse=yes - ntp_refclock=yes - -$as_echo "#define CLOCK_WHARTON_400A 1" >>confdefs.h - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -$as_echo "$ntp_ok" >&6; } -case "$ntp_ok$ntp_canparse" in - yesno) - as_fn_error $? "That's a parse clock and this system doesn't support it!" "$LINENO" 5 -esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking VARITEXT clock" >&5 $as_echo_n "checking VARITEXT clock... " >&6; } @@ -22915,10 +22964,10 @@ case "$ans" in no) ;; - *) # look for openssl/opensslconf.h: + *) # look for openssl/opensslv.h: for i in $ans no do - test -f $i/openssl/opensslconf.h && break + test -f $i/openssl/opensslv.h && break done case "$i" in no) @@ -25112,8 +25161,6 @@ ac_config_files="$ac_config_files Makefile" -ac_config_files="$ac_config_files ElectricFence/Makefile" - ac_config_files="$ac_config_files adjtimed/Makefile" ac_config_files="$ac_config_files clockstuff/Makefile" @@ -25162,8 +25209,6 @@ ac_config_files="$ac_config_files scripts/ntptrace" -ac_config_files="$ac_config_files scripts/ntpver" - ac_config_files="$ac_config_files scripts/plot_summary" ac_config_files="$ac_config_files scripts/summary" @@ -25942,6 +25987,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -26024,7 +26070,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -26080,6 +26125,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -26130,7 +26176,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -26215,7 +26260,6 @@ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "ElectricFence/Makefile") CONFIG_FILES="$CONFIG_FILES ElectricFence/Makefile" ;; "adjtimed/Makefile") CONFIG_FILES="$CONFIG_FILES adjtimed/Makefile" ;; "clockstuff/Makefile") CONFIG_FILES="$CONFIG_FILES clockstuff/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; @@ -26240,7 +26284,6 @@ "scripts/ntp-wait") CONFIG_FILES="$CONFIG_FILES scripts/ntp-wait" ;; "scripts/ntpsweep") CONFIG_FILES="$CONFIG_FILES scripts/ntpsweep" ;; "scripts/ntptrace") CONFIG_FILES="$CONFIG_FILES scripts/ntptrace" ;; - "scripts/ntpver") CONFIG_FILES="$CONFIG_FILES scripts/ntpver" ;; "scripts/plot_summary") CONFIG_FILES="$CONFIG_FILES scripts/plot_summary" ;; "scripts/summary") CONFIG_FILES="$CONFIG_FILES scripts/summary" ;; "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; @@ -26955,8 +26998,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -27010,6 +27053,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -27311,10 +27357,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -27574,7 +27616,6 @@ "scripts/ntp-wait":F) chmod +x scripts/ntp-wait ;; "scripts/ntpsweep":F) chmod +x scripts/ntpsweep ;; "scripts/ntptrace":F) chmod +x scripts/ntptrace ;; - "scripts/ntpver":F) chmod +x scripts/ntpver ;; "scripts/plot_summary":F) chmod +x scripts/plot_summary ;; "scripts/summary":F) chmod +x scripts/summary ;; --- a/include/isc/Makefile.in +++ b/include/isc/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -235,9 +235,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/isc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/isc/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign include/isc/Makefile + $(AUTOMAKE) --gnu include/isc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -359,10 +359,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -260,7 +260,6 @@ EXTRA_DIST = autogen-version.def copyright.def debug-opt.def homerc.def version.def version.texi SUBDIRS = isc noinst_HEADERS = \ - adjtime.h \ audio.h \ ascii.h \ audio.h \ @@ -318,9 +317,6 @@ recvbuff.h \ refclock_atom.h \ ssl_applink.c \ - timepps-SCO.h \ - timepps-Solaris.h \ - timepps-SunOS.h \ trimble.h \ $(NULL) @@ -336,9 +332,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign include/Makefile + $(AUTOMAKE) --gnu include/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -572,10 +568,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/kernel/Makefile.in +++ b/kernel/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -269,9 +269,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kernel/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kernel/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign kernel/Makefile + $(AUTOMAKE) --gnu kernel/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -505,10 +505,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/kernel/sys/Makefile.in +++ b/kernel/sys/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -238,9 +238,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kernel/sys/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kernel/sys/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign kernel/sys/Makefile + $(AUTOMAKE) --gnu kernel/sys/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -362,10 +362,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/libntp/Makefile.in +++ b/libntp/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -60,12 +60,11 @@ libntp_a_AR = $(AR) $(ARFLAGS) libntp_a_LIBADD = am__objects_1 = -am__objects_2 = a_md5encrypt.$(OBJEXT) adjtime.$(OBJEXT) \ - atoint.$(OBJEXT) atolfp.$(OBJEXT) atouint.$(OBJEXT) \ - audio.$(OBJEXT) authkeys.$(OBJEXT) authreadkeys.$(OBJEXT) \ - authusekey.$(OBJEXT) bsd_strerror.$(OBJEXT) \ - buftvtots.$(OBJEXT) caljulian.$(OBJEXT) caltontp.$(OBJEXT) \ - calyearstart.$(OBJEXT) clocktime.$(OBJEXT) \ +am__objects_2 = a_md5encrypt.$(OBJEXT) atoint.$(OBJEXT) \ + atolfp.$(OBJEXT) atouint.$(OBJEXT) audio.$(OBJEXT) \ + authkeys.$(OBJEXT) authreadkeys.$(OBJEXT) authusekey.$(OBJEXT) \ + bsd_strerror.$(OBJEXT) buftvtots.$(OBJEXT) caljulian.$(OBJEXT) \ + caltontp.$(OBJEXT) calyearstart.$(OBJEXT) clocktime.$(OBJEXT) \ clocktypes.$(OBJEXT) decodenetnum.$(OBJEXT) dofptoa.$(OBJEXT) \ dolfptoa.$(OBJEXT) emalloc.$(OBJEXT) findconfig.$(OBJEXT) \ fptoa.$(OBJEXT) fptoms.$(OBJEXT) getopt.$(OBJEXT) \ @@ -282,7 +281,6 @@ EXTRA_LIBRARIES = libntpsim.a libntp_a_SRCS = \ a_md5encrypt.c \ - adjtime.c \ atoint.c \ atolfp.c \ atouint.c \ @@ -399,9 +397,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libntp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libntp/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign libntp/Makefile + $(AUTOMAKE) --gnu libntp/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -411,6 +409,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -423,11 +422,11 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libntp.a: $(libntp_a_OBJECTS) $(libntp_a_DEPENDENCIES) +libntp.a: $(libntp_a_OBJECTS) $(libntp_a_DEPENDENCIES) $(EXTRA_libntp_a_DEPENDENCIES) -rm -f libntp.a $(libntp_a_AR) libntp.a $(libntp_a_OBJECTS) $(libntp_a_LIBADD) $(RANLIB) libntp.a -libntpsim.a: $(libntpsim_a_OBJECTS) $(libntpsim_a_DEPENDENCIES) +libntpsim.a: $(libntpsim_a_OBJECTS) $(libntpsim_a_DEPENDENCIES) $(EXTRA_libntpsim_a_DEPENDENCIES) -rm -f libntpsim.a $(libntpsim_a_AR) libntpsim.a $(libntpsim_a_OBJECTS) $(libntpsim_a_LIBADD) $(RANLIB) libntpsim.a @@ -439,7 +438,6 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a_md5encrypt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adjtime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adjtimex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assertions.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atoint.Po@am__quote@ @@ -1052,10 +1050,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/libparse/Makefile.in +++ b/libparse/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,20 +67,18 @@ clk_rawdcf.$(OBJEXT) clk_trimtsip.$(OBJEXT) \ clk_dcf7000.$(OBJEXT) clk_trimtaip.$(OBJEXT) \ clk_rcc8000.$(OBJEXT) clk_hopf6021.$(OBJEXT) \ - clk_computime.$(OBJEXT) clk_wharton.$(OBJEXT) \ - clk_varitext.$(OBJEXT) data_mbg.$(OBJEXT) \ - info_trimble.$(OBJEXT) trim_info.$(OBJEXT) binio.$(OBJEXT) \ - ieee754io.$(OBJEXT) mfp_mul.$(OBJEXT) gpstolfp.$(OBJEXT) \ - $(am__objects_1) + clk_computime.$(OBJEXT) clk_varitext.$(OBJEXT) \ + data_mbg.$(OBJEXT) info_trimble.$(OBJEXT) trim_info.$(OBJEXT) \ + binio.$(OBJEXT) ieee754io.$(OBJEXT) mfp_mul.$(OBJEXT) \ + gpstolfp.$(OBJEXT) $(am__objects_1) libparse_a_OBJECTS = $(am_libparse_a_OBJECTS) libparse_kernel_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = libparse_kernel_a_DEPENDENCIES = kparse.o kparse_conf.o \ kclk_computime.o kclk_dcf7000.o kclk_hopf6021.o \ kclk_meinberg.o kclk_rawdcf.o kclk_rcc8000.o kclk_schmid.o \ - kclk_trimtaip.o kclk_trimtsip.o kclk_varitext.o kclk_wharton.o \ - kbinio.o kieee754io.o kmfp_mul.o kgpstolfp.o \ - $(am__DEPENDENCIES_1) + kclk_trimtaip.o kclk_trimtsip.o kclk_varitext.o kbinio.o \ + kieee754io.o kmfp_mul.o kgpstolfp.o $(am__DEPENDENCIES_1) am_libparse_kernel_a_OBJECTS = libparse_kernel_a_OBJECTS = $(am_libparse_kernel_a_OBJECTS) PROGRAMS = $(noinst_PROGRAMS) @@ -285,7 +283,6 @@ clk_rcc8000.c \ clk_hopf6021.c \ clk_computime.c \ - clk_wharton.c \ clk_varitext.c \ data_mbg.c \ info_trimble.c \ @@ -310,7 +307,6 @@ kclk_trimtaip.o \ kclk_trimtsip.o \ kclk_varitext.o \ - kclk_wharton.o \ kbinio.o \ kieee754io.o \ kmfp_mul.o \ @@ -337,9 +333,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libparse/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libparse/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign libparse/Makefile + $(AUTOMAKE) --gnu libparse/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -349,6 +345,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -361,11 +358,11 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libparse.a: $(libparse_a_OBJECTS) $(libparse_a_DEPENDENCIES) +libparse.a: $(libparse_a_OBJECTS) $(libparse_a_DEPENDENCIES) $(EXTRA_libparse_a_DEPENDENCIES) -rm -f libparse.a $(libparse_a_AR) libparse.a $(libparse_a_OBJECTS) $(libparse_a_LIBADD) $(RANLIB) libparse.a -libparse_kernel.a: $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_DEPENDENCIES) +libparse_kernel.a: $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_DEPENDENCIES) $(EXTRA_libparse_kernel_a_DEPENDENCIES) -rm -f libparse_kernel.a $(libparse_kernel_a_AR) libparse_kernel.a $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_LIBADD) $(RANLIB) libparse_kernel.a @@ -378,10 +375,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -parsesolaris$(EXEEXT): $(parsesolaris_OBJECTS) $(parsesolaris_DEPENDENCIES) +parsesolaris$(EXEEXT): $(parsesolaris_OBJECTS) $(parsesolaris_DEPENDENCIES) $(EXTRA_parsesolaris_DEPENDENCIES) @rm -f parsesolaris$(EXEEXT) $(LINK) $(parsesolaris_OBJECTS) $(parsesolaris_LDADD) $(LIBS) -parsestreams$(EXEEXT): $(parsestreams_OBJECTS) $(parsestreams_DEPENDENCIES) +parsestreams$(EXEEXT): $(parsestreams_OBJECTS) $(parsestreams_DEPENDENCIES) $(EXTRA_parsestreams_DEPENDENCIES) @rm -f parsestreams$(EXEEXT) $(LINK) $(parsestreams_OBJECTS) $(parsestreams_LDADD) $(LIBS) @@ -402,7 +399,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_trimtaip.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_trimtsip.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_varitext.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_wharton.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_mbg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpstolfp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ieee754io.Po@am__quote@ @@ -539,10 +535,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/ltmain.sh +++ b/ltmain.sh @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION="2.4.2 Debian-2.4.2-1" TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6111,7 +6124,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6147,7 +6163,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6430,19 +6447,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -6831,7 +6848,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7333,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7334,6 +7352,9 @@ revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) @@ -7432,7 +7453,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8041,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8076,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8084,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9174,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9285,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1330,14 +1374,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1639,7 +1701,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2398,7 +2460,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2417,7 +2475,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,17 +2513,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2526,7 +2585,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2542,7 +2601,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2579,9 +2638,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2625,6 +2684,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -2644,7 +2715,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2713,7 +2784,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2738,7 +2809,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2762,7 +2833,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2793,7 +2864,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2803,7 +2874,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3225,12 +3296,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3645,6 +3716,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4041,7 +4113,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4229,7 +4301,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4321,18 +4395,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4492,13 +4581,18 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4517,7 +4611,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4562,6 +4655,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4768,8 +4864,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -4784,7 +4879,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -4961,6 +5056,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5064,6 +5160,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5110,10 +5207,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5126,7 +5219,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5165,7 +5258,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5269,7 +5361,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -5607,9 +5699,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5767,7 +5856,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6137,7 +6225,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6898,12 +6986,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7100,7 +7194,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7233,7 +7326,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7420,6 +7512,77 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7489,6 +7652,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -326,9 +326,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -79,9 +79,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -110,6 +112,8 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -269,13 +273,11 @@ AUTOMAKE_OPTIONS = foreign 1.10 ACLOCAL_AMFLAGS = -I m4 -I sntp/libopts/m4 NULL = -SUBDIRS = scripts include ElectricFence libntp sntp libparse ntpd \ - ntpdate ntpdc ntpq ntpsnmpd parseutil adjtimed clockstuff \ - kernel util $(NULL) +SUBDIRS = scripts include libntp sntp libparse ntpd ntpdate ntpdc ntpq \ + ntpsnmpd parseutil adjtimed clockstuff kernel util $(NULL) DIST_SUBDIRS = \ scripts \ include \ - ElectricFence \ libntp \ libparse \ sntp \ @@ -356,7 +358,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -392,10 +394,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -627,7 +627,11 @@ $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir @@ -635,7 +639,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -666,6 +670,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -685,6 +691,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -713,8 +720,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -747,10 +762,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -842,18 +862,19 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am $(srcdir)/COPYRIGHT: $(srcdir)/html/copyright.html --- a/ntpd/Makefile.in +++ b/ntpd/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -144,9 +144,9 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) +YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS) LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS) + --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS) YLWRAP = $(top_srcdir)/ylwrap SOURCES = $(libntpd_a_SOURCES) check_y2k.c keyword-gen.c \ $(ntpd_SOURCES) $(ntpdsim_SOURCES) @@ -173,6 +173,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -515,9 +521,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ntpd/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ntpd/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign ntpd/Makefile + $(AUTOMAKE) --gnu ntpd/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -527,6 +533,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -539,7 +546,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libntpd.a: $(libntpd_a_OBJECTS) $(libntpd_a_DEPENDENCIES) +libntpd.a: $(libntpd_a_OBJECTS) $(libntpd_a_DEPENDENCIES) $(EXTRA_libntpd_a_DEPENDENCIES) -rm -f libntpd.a $(libntpd_a_AR) libntpd.a $(libntpd_a_OBJECTS) $(libntpd_a_LIBADD) $(RANLIB) libntpd.a @@ -638,21 +645,19 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -check_y2k$(EXEEXT): $(check_y2k_OBJECTS) $(check_y2k_DEPENDENCIES) +check_y2k$(EXEEXT): $(check_y2k_OBJECTS) $(check_y2k_DEPENDENCIES) $(EXTRA_check_y2k_DEPENDENCIES) @rm -f check_y2k$(EXEEXT) $(LINK) $(check_y2k_OBJECTS) $(check_y2k_LDADD) $(LIBS) -keyword-gen$(EXEEXT): $(keyword_gen_OBJECTS) $(keyword_gen_DEPENDENCIES) +keyword-gen$(EXEEXT): $(keyword_gen_OBJECTS) $(keyword_gen_DEPENDENCIES) $(EXTRA_keyword_gen_DEPENDENCIES) @rm -f keyword-gen$(EXEEXT) $(LINK) $(keyword_gen_OBJECTS) $(keyword_gen_LDADD) $(LIBS) ntp_parser.h: ntp_parser.c - @if test ! -f $@; then \ - rm -f ntp_parser.c; \ - $(MAKE) $(AM_MAKEFLAGS) ntp_parser.c; \ - else :; fi -ntpd$(EXEEXT): $(ntpd_OBJECTS) $(ntpd_DEPENDENCIES) + @if test ! -f $@; then rm -f ntp_parser.c; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) ntp_parser.c; else :; fi +ntpd$(EXEEXT): $(ntpd_OBJECTS) $(ntpd_DEPENDENCIES) $(EXTRA_ntpd_DEPENDENCIES) @rm -f ntpd$(EXEEXT) $(LINK) $(ntpd_OBJECTS) $(ntpd_LDADD) $(LIBS) -ntpdsim$(EXEEXT): $(ntpdsim_OBJECTS) $(ntpdsim_DEPENDENCIES) +ntpdsim$(EXEEXT): $(ntpdsim_OBJECTS) $(ntpdsim_DEPENDENCIES) $(EXTRA_ntpdsim_DEPENDENCIES) @rm -f ntpdsim$(EXEEXT) $(ntpdsim_LINK) $(ntpdsim_OBJECTS) $(ntpdsim_LDADD) $(LIBS) @@ -925,9 +930,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -1045,10 +1048,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/ntpdate/Makefile.in +++ b/ntpdate/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -277,9 +277,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ntpdate/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ntpdate/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign ntpdate/Makefile + $(AUTOMAKE) --gnu ntpdate/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -289,6 +289,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -384,10 +385,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ntpdate$(EXEEXT): $(ntpdate_OBJECTS) $(ntpdate_DEPENDENCIES) +ntpdate$(EXEEXT): $(ntpdate_OBJECTS) $(ntpdate_DEPENDENCIES) $(EXTRA_ntpdate_DEPENDENCIES) @rm -f ntpdate$(EXEEXT) $(LINK) $(ntpdate_OBJECTS) $(ntpdate_LDADD) $(LIBS) -ntptimeset$(EXEEXT): $(ntptimeset_OBJECTS) $(ntptimeset_DEPENDENCIES) +ntptimeset$(EXEEXT): $(ntptimeset_OBJECTS) $(ntptimeset_DEPENDENCIES) $(EXTRA_ntptimeset_DEPENDENCIES) @rm -f ntptimeset$(EXEEXT) $(LINK) $(ntptimeset_OBJECTS) $(ntptimeset_LDADD) $(LIBS) @@ -529,10 +530,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/ntpdc/Makefile.in +++ b/ntpdc/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -113,6 +113,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -324,9 +330,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ntpdc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ntpdc/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign ntpdc/Makefile + $(AUTOMAKE) --gnu ntpdc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -336,6 +342,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -433,10 +440,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ntpdc$(EXEEXT): $(ntpdc_OBJECTS) $(ntpdc_DEPENDENCIES) +ntpdc$(EXEEXT): $(ntpdc_OBJECTS) $(ntpdc_DEPENDENCIES) $(EXTRA_ntpdc_DEPENDENCIES) @rm -f ntpdc$(EXEEXT) $(LINK) $(ntpdc_OBJECTS) $(ntpdc_LDADD) $(LIBS) -ntpdc-layout$(EXEEXT): $(ntpdc_layout_OBJECTS) $(ntpdc_layout_DEPENDENCIES) +ntpdc-layout$(EXEEXT): $(ntpdc_layout_OBJECTS) $(ntpdc_layout_DEPENDENCIES) $(EXTRA_ntpdc_layout_DEPENDENCIES) @rm -f ntpdc-layout$(EXEEXT) $(LINK) $(ntpdc_layout_OBJECTS) $(ntpdc_layout_LDADD) $(LIBS) @@ -512,9 +519,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -630,10 +635,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/ntpq/Makefile.in +++ b/ntpq/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -116,6 +116,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -325,9 +331,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ntpq/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ntpq/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign ntpq/Makefile + $(AUTOMAKE) --gnu ntpq/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -337,6 +343,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -349,7 +356,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libntpq.a: $(libntpq_a_OBJECTS) $(libntpq_a_DEPENDENCIES) +libntpq.a: $(libntpq_a_OBJECTS) $(libntpq_a_DEPENDENCIES) $(EXTRA_libntpq_a_DEPENDENCIES) -rm -f libntpq.a $(libntpq_a_AR) libntpq.a $(libntpq_a_OBJECTS) $(libntpq_a_LIBADD) $(RANLIB) libntpq.a @@ -439,7 +446,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ntpq$(EXEEXT): $(ntpq_OBJECTS) $(ntpq_DEPENDENCIES) +ntpq$(EXEEXT): $(ntpq_OBJECTS) $(ntpq_DEPENDENCIES) $(EXTRA_ntpq_DEPENDENCIES) @rm -f ntpq$(EXEEXT) $(LINK) $(ntpq_OBJECTS) $(ntpq_LDADD) $(LIBS) @@ -544,9 +551,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -662,10 +667,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/ntpsnmpd/Makefile.in +++ b/ntpsnmpd/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -107,6 +107,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -317,9 +323,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ntpsnmpd/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ntpsnmpd/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign ntpsnmpd/Makefile + $(AUTOMAKE) --gnu ntpsnmpd/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -329,6 +335,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -424,7 +431,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -ntpsnmpd$(EXEEXT): $(ntpsnmpd_OBJECTS) $(ntpsnmpd_DEPENDENCIES) +ntpsnmpd$(EXEEXT): $(ntpsnmpd_OBJECTS) $(ntpsnmpd_DEPENDENCIES) $(EXTRA_ntpsnmpd_DEPENDENCIES) @rm -f ntpsnmpd$(EXEEXT) $(LINK) $(ntpsnmpd_OBJECTS) $(ntpsnmpd_LDADD) $(LIBS) @@ -500,9 +507,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -618,10 +623,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/parseutil/Makefile.in +++ b/parseutil/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -262,9 +262,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign parseutil/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu parseutil/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign parseutil/Makefile + $(AUTOMAKE) --gnu parseutil/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -274,6 +274,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -292,10 +293,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -dcfd$(EXEEXT): $(dcfd_OBJECTS) $(dcfd_DEPENDENCIES) +dcfd$(EXEEXT): $(dcfd_OBJECTS) $(dcfd_DEPENDENCIES) $(EXTRA_dcfd_DEPENDENCIES) @rm -f dcfd$(EXEEXT) $(LINK) $(dcfd_OBJECTS) $(dcfd_LDADD) $(LIBS) -testdcf$(EXEEXT): $(testdcf_OBJECTS) $(testdcf_DEPENDENCIES) +testdcf$(EXEEXT): $(testdcf_OBJECTS) $(testdcf_DEPENDENCIES) $(EXTRA_testdcf_DEPENDENCIES) @rm -f testdcf$(EXEEXT) $(LINK) $(testdcf_OBJECTS) $(testdcf_LDADD) $(LIBS) @@ -434,10 +435,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,8 +39,8 @@ $(srcdir)/calc_tickadj.in $(srcdir)/checktime.in \ $(srcdir)/freq_adj.in $(srcdir)/html2man.in $(srcdir)/mkver.in \ $(srcdir)/ntp-wait.in $(srcdir)/ntpsweep.in \ - $(srcdir)/ntptrace.in $(srcdir)/ntpver.in \ - $(srcdir)/plot_summary.in $(srcdir)/summary.in + $(srcdir)/ntptrace.in $(srcdir)/plot_summary.in \ + $(srcdir)/summary.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/m4/define_dir.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -58,7 +58,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = calc_tickadj checktime freq_adj html2man mkver \ - ntp-wait ntpsweep ntptrace ntpver plot_summary summary + ntp-wait ntpsweep ntptrace plot_summary summary CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -81,6 +81,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS) $(sbin_SCRIPTS) SOURCES = @@ -251,7 +257,6 @@ html2man \ mkver \ ntpsweep \ - ntpver \ plot_summary \ summary \ $(NULL) @@ -288,9 +293,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign scripts/Makefile + $(AUTOMAKE) --gnu scripts/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -325,8 +330,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ntptrace: $(top_builddir)/config.status $(srcdir)/ntptrace.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -ntpver: $(top_builddir)/config.status $(srcdir)/ntpver.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ plot_summary: $(top_builddir)/config.status $(srcdir)/plot_summary.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ summary: $(top_builddir)/config.status $(srcdir)/summary.in @@ -362,9 +365,7 @@ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) install-sbinSCRIPTS: $(sbin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @@ -396,9 +397,7 @@ @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(sbindir)" && rm -f $$files + dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -459,10 +458,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/sntp/aclocal.m4 +++ b/sntp/aclocal.m4 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,12 +20,15 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -34,7 +38,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,19 +54,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -144,14 +150,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -191,6 +197,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -255,7 +262,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -320,10 +327,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -545,12 +555,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -717,12 +730,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -745,13 +761,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -759,13 +776,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -841,12 +858,14 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -869,13 +888,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -884,13 +903,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -912,10 +931,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) --- a/sntp/configure +++ b/sntp/configure @@ -654,6 +654,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -1413,7 +1414,7 @@ --with-libregex libregex installation prefix --with-libregex-cflags libregex compile flags --with-libregex-libs libregex link command arguments - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -3067,11 +3068,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3209,6 +3210,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -4022,6 +4024,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4081,7 +4084,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -6703,8 +6706,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -7348,6 +7351,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -7387,7 +7395,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -7816,12 +7824,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -8456,13 +8464,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -8609,6 +8617,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -8997,7 +9006,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -9008,7 +9017,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -9648,7 +9670,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -9659,6 +9687,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -9691,6 +9720,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -9712,7 +9742,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -9820,7 +9852,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -9898,6 +9945,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -10357,7 +10408,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -10448,18 +10501,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -10821,7 +10889,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -10865,6 +10932,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -11071,8 +11141,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -11087,7 +11156,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -11264,6 +11333,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -11451,6 +11521,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -11496,6 +11567,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -11524,10 +11596,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -11540,7 +11608,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -11579,7 +11647,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -11720,7 +11787,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -12203,11 +12270,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -12297,7 +12359,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -12306,7 +12368,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -12371,7 +12433,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -12510,7 +12572,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -12518,10 +12580,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -12529,7 +12587,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -12547,7 +12605,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -12567,17 +12625,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -12638,7 +12697,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -12654,7 +12713,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -12691,9 +12750,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12756,6 +12815,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -12775,7 +12846,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -12844,7 +12915,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12869,7 +12940,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -12893,7 +12964,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -12924,7 +12995,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12934,7 +13005,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -13716,6 +13787,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -14857,10 +14930,10 @@ case "$ans" in no) ;; - *) # look for openssl/opensslconf.h: + *) # look for openssl/opensslv.h: for i in $ans no do - test -f $i/openssl/opensslconf.h && break + test -f $i/openssl/opensslv.h && break done case "$i" in no) @@ -16881,6 +16954,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -16963,7 +17037,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -17019,6 +17092,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -17069,7 +17143,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -17866,8 +17939,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -17921,6 +17994,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -18222,10 +18298,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator --- a/sntp/libopts/Makefile.in +++ b/sntp/libopts/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -75,6 +75,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) libopts_la_LIBADD = @@ -265,9 +271,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libopts/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libopts/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign libopts/Makefile + $(AUTOMAKE) --gnu libopts/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -326,7 +332,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libopts.la: $(libopts_la_OBJECTS) $(libopts_la_DEPENDENCIES) +libopts.la: $(libopts_la_OBJECTS) $(libopts_la_DEPENDENCIES) $(EXTRA_libopts_la_DEPENDENCIES) $(libopts_la_LINK) $(am_libopts_la_rpath) $(libopts_la_OBJECTS) $(libopts_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -470,10 +476,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: --- a/sntp/ltmain.sh +++ b/sntp/ltmain.sh @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION="2.4.2 Debian-2.4.2-1" TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6111,7 +6124,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6147,7 +6163,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6430,19 +6447,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -6831,7 +6848,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7333,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7334,6 +7352,9 @@ revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) @@ -7432,7 +7453,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8041,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8076,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8084,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9174,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9285,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" --- a/sntp/Makefile.in +++ b/sntp/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -126,6 +126,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -142,9 +148,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -173,6 +181,8 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -372,7 +382,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf $(am__configure_deps) @for dep in $?; do \ @@ -397,6 +407,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -408,10 +419,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -509,7 +518,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -sntp$(EXEEXT): $(sntp_OBJECTS) $(sntp_DEPENDENCIES) +sntp$(EXEEXT): $(sntp_OBJECTS) $(sntp_DEPENDENCIES) $(EXTRA_sntp_DEPENDENCIES) @rm -f sntp$(EXEEXT) $(LINK) $(sntp_OBJECTS) $(sntp_LDADD) $(LIBS) @@ -592,9 +601,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -816,7 +823,11 @@ $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir @@ -824,7 +835,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -855,6 +866,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -874,6 +887,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -902,8 +916,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -939,10 +961,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1041,9 +1068,9 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-binPROGRAMS \ clean-generic clean-libtool clean-sbinPROGRAMS ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \ - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-hdr \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzip \ + dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ --- a/util/Makefile.in +++ b/util/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -51,8 +51,7 @@ sht$(EXEEXT) testrs6000$(EXEEXT) tg$(EXEEXT) tickadj$(EXEEXT) \ timetrim$(EXEEXT) DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf ansi2knr.1 \ - ansi2knr.c + $(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf subdir = util ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ @@ -175,6 +174,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -382,9 +387,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu util/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign util/Makefile + $(AUTOMAKE) --gnu util/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -394,6 +399,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/bincheck.mf $(top_srcdir)/depsver.mf: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -489,49 +495,49 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -audio-pcm$(EXEEXT): $(audio_pcm_OBJECTS) $(audio_pcm_DEPENDENCIES) +audio-pcm$(EXEEXT): $(audio_pcm_OBJECTS) $(audio_pcm_DEPENDENCIES) $(EXTRA_audio_pcm_DEPENDENCIES) @rm -f audio-pcm$(EXEEXT) $(LINK) $(audio_pcm_OBJECTS) $(audio_pcm_LDADD) $(LIBS) -byteorder$(EXEEXT): $(byteorder_OBJECTS) $(byteorder_DEPENDENCIES) +byteorder$(EXEEXT): $(byteorder_OBJECTS) $(byteorder_DEPENDENCIES) $(EXTRA_byteorder_DEPENDENCIES) @rm -f byteorder$(EXEEXT) $(LINK) $(byteorder_OBJECTS) $(byteorder_LDADD) $(LIBS) -hist$(EXEEXT): $(hist_OBJECTS) $(hist_DEPENDENCIES) +hist$(EXEEXT): $(hist_OBJECTS) $(hist_DEPENDENCIES) $(EXTRA_hist_DEPENDENCIES) @rm -f hist$(EXEEXT) $(LINK) $(hist_OBJECTS) $(hist_LDADD) $(LIBS) -jitter$(EXEEXT): $(jitter_OBJECTS) $(jitter_DEPENDENCIES) +jitter$(EXEEXT): $(jitter_OBJECTS) $(jitter_DEPENDENCIES) $(EXTRA_jitter_DEPENDENCIES) @rm -f jitter$(EXEEXT) $(LINK) $(jitter_OBJECTS) $(jitter_LDADD) $(LIBS) -kern$(EXEEXT): $(kern_OBJECTS) $(kern_DEPENDENCIES) +kern$(EXEEXT): $(kern_OBJECTS) $(kern_DEPENDENCIES) $(EXTRA_kern_DEPENDENCIES) @rm -f kern$(EXEEXT) $(LINK) $(kern_OBJECTS) $(kern_LDADD) $(LIBS) -longsize$(EXEEXT): $(longsize_OBJECTS) $(longsize_DEPENDENCIES) +longsize$(EXEEXT): $(longsize_OBJECTS) $(longsize_DEPENDENCIES) $(EXTRA_longsize_DEPENDENCIES) @rm -f longsize$(EXEEXT) $(LINK) $(longsize_OBJECTS) $(longsize_LDADD) $(LIBS) -ntp-keygen$(EXEEXT): $(ntp_keygen_OBJECTS) $(ntp_keygen_DEPENDENCIES) +ntp-keygen$(EXEEXT): $(ntp_keygen_OBJECTS) $(ntp_keygen_DEPENDENCIES) $(EXTRA_ntp_keygen_DEPENDENCIES) @rm -f ntp-keygen$(EXEEXT) $(LINK) $(ntp_keygen_OBJECTS) $(ntp_keygen_LDADD) $(LIBS) -ntptime$(EXEEXT): $(ntptime_OBJECTS) $(ntptime_DEPENDENCIES) +ntptime$(EXEEXT): $(ntptime_OBJECTS) $(ntptime_DEPENDENCIES) $(EXTRA_ntptime_DEPENDENCIES) @rm -f ntptime$(EXEEXT) $(LINK) $(ntptime_OBJECTS) $(ntptime_LDADD) $(LIBS) -pps-api$(EXEEXT): $(pps_api_OBJECTS) $(pps_api_DEPENDENCIES) +pps-api$(EXEEXT): $(pps_api_OBJECTS) $(pps_api_DEPENDENCIES) $(EXTRA_pps_api_DEPENDENCIES) @rm -f pps-api$(EXEEXT) $(LINK) $(pps_api_OBJECTS) $(pps_api_LDADD) $(LIBS) -precision$(EXEEXT): $(precision_OBJECTS) $(precision_DEPENDENCIES) +precision$(EXEEXT): $(precision_OBJECTS) $(precision_DEPENDENCIES) $(EXTRA_precision_DEPENDENCIES) @rm -f precision$(EXEEXT) $(LINK) $(precision_OBJECTS) $(precision_LDADD) $(LIBS) -sht$(EXEEXT): $(sht_OBJECTS) $(sht_DEPENDENCIES) +sht$(EXEEXT): $(sht_OBJECTS) $(sht_DEPENDENCIES) $(EXTRA_sht_DEPENDENCIES) @rm -f sht$(EXEEXT) $(LINK) $(sht_OBJECTS) $(sht_LDADD) $(LIBS) -testrs6000$(EXEEXT): $(testrs6000_OBJECTS) $(testrs6000_DEPENDENCIES) +testrs6000$(EXEEXT): $(testrs6000_OBJECTS) $(testrs6000_DEPENDENCIES) $(EXTRA_testrs6000_DEPENDENCIES) @rm -f testrs6000$(EXEEXT) $(LINK) $(testrs6000_OBJECTS) $(testrs6000_LDADD) $(LIBS) -tg$(EXEEXT): $(tg_OBJECTS) $(tg_DEPENDENCIES) +tg$(EXEEXT): $(tg_OBJECTS) $(tg_DEPENDENCIES) $(EXTRA_tg_DEPENDENCIES) @rm -f tg$(EXEEXT) $(LINK) $(tg_OBJECTS) $(tg_LDADD) $(LIBS) -tickadj$(EXEEXT): $(tickadj_OBJECTS) $(tickadj_DEPENDENCIES) +tickadj$(EXEEXT): $(tickadj_OBJECTS) $(tickadj_DEPENDENCIES) $(EXTRA_tickadj_DEPENDENCIES) @rm -f tickadj$(EXEEXT) $(LINK) $(tickadj_OBJECTS) $(tickadj_LDADD) $(LIBS) -timetrim$(EXEEXT): $(timetrim_OBJECTS) $(timetrim_DEPENDENCIES) +timetrim$(EXEEXT): $(timetrim_OBJECTS) $(timetrim_DEPENDENCIES) $(EXTRA_timetrim_DEPENDENCIES) @rm -f timetrim$(EXEEXT) $(LINK) $(timetrim_OBJECTS) $(timetrim_LDADD) $(LIBS) @@ -619,9 +625,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -737,10 +741,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: debian/patches/dfsg.patch0000644000000000000000000001225511572234353012573 0ustar From: Kurt Roeckx Subject: Make the package compile with non dfsg compatible parts removed. Forwarded: not-needed Bug-Debian: http://bugs.debian.org/328200 Index: ntp-4.2.6.p3+dfsg/adjtimed/adjtimed.c =================================================================== --- ntp-4.2.6.p3+dfsg.orig/adjtimed/adjtimed.c 2004-02-25 05:57:37.000000000 +0000 +++ ntp-4.2.6.p3+dfsg/adjtimed/adjtimed.c 2011-06-03 14:54:38.000000000 +0000 @@ -41,8 +41,6 @@ #include "ntp_syslog.h" #include "ntp_stdlib.h" -#include "adjtime.h" - double atof (const char *); int InitClockRate (void); Index: ntp-4.2.6.p3+dfsg/libntp/Makefile.am =================================================================== --- ntp-4.2.6.p3+dfsg.orig/libntp/Makefile.am 2010-12-25 09:40:36.000000000 +0000 +++ ntp-4.2.6.p3+dfsg/libntp/Makefile.am 2011-06-03 14:54:38.000000000 +0000 @@ -7,7 +7,6 @@ EXTRA_LIBRARIES = libntpsim.a libntp_a_SRCS = \ a_md5encrypt.c \ - adjtime.c \ atoint.c \ atolfp.c \ atouint.c \ Index: ntp-4.2.6.p3+dfsg/include/Makefile.am =================================================================== --- ntp-4.2.6.p3+dfsg.orig/include/Makefile.am 2010-12-25 09:40:36.000000000 +0000 +++ ntp-4.2.6.p3+dfsg/include/Makefile.am 2011-06-03 14:54:38.000000000 +0000 @@ -6,7 +6,6 @@ SUBDIRS = isc noinst_HEADERS = \ - adjtime.h \ audio.h \ ascii.h \ audio.h \ @@ -64,9 +63,6 @@ recvbuff.h \ refclock_atom.h \ ssl_applink.c \ - timepps-SCO.h \ - timepps-Solaris.h \ - timepps-SunOS.h \ trimble.h \ $(NULL) Index: ntp-4.2.6.p3+dfsg/Makefile.am =================================================================== --- ntp-4.2.6.p3+dfsg.orig/Makefile.am 2010-12-25 09:40:35.000000000 +0000 +++ ntp-4.2.6.p3+dfsg/Makefile.am 2011-06-03 14:55:06.000000000 +0000 @@ -8,7 +8,6 @@ SUBDIRS += \ scripts \ include \ - ElectricFence \ libntp \ sntp \ libparse \ @@ -27,7 +26,6 @@ DIST_SUBDIRS = \ scripts \ include \ - ElectricFence \ libntp \ libparse \ sntp \ Index: ntp-4.2.6.p3+dfsg/configure.ac =================================================================== --- ntp-4.2.6.p3+dfsg.orig/configure.ac 2011-01-04 01:57:27.000000000 +0000 +++ ntp-4.2.6.p3+dfsg/configure.ac 2011-06-03 14:58:40.000000000 +0000 @@ -3964,26 +3964,26 @@ AC_MSG_ERROR([That's a parse clock and this system doesn't support it!]) esac -AC_MSG_CHECKING([WHARTON 400A Series clock]) -AC_ARG_ENABLE( - [WHARTON], - [AS_HELP_STRING( - [--enable-WHARTON], - [s WHARTON 400A Series clock] - )], - [ntp_ok=$enableval], - [ntp_ok=$ntp_eapc] -) -if test "$ntp_ok" = "yes"; then - ntp_libparse=yes - ntp_refclock=yes - AC_DEFINE([CLOCK_WHARTON_400A], [1], [WHARTON 400A Series clock]) -fi -AC_MSG_RESULT([$ntp_ok]) -case "$ntp_ok$ntp_canparse" in - yesno) - AC_MSG_ERROR([That's a parse clock and this system doesn't support it!]) -esac +dnl AC_MSG_CHECKING([WHARTON 400A Series clock]) +dnl AC_ARG_ENABLE( +dnl [WHARTON], +dnl [AS_HELP_STRING( +dnl [--enable-WHARTON], +dnl [s WHARTON 400A Series clock] +dnl )], +dnl [ntp_ok=$enableval], +dnl [ntp_ok=$ntp_eapc] +dnl ) +dnl if test "$ntp_ok" = "yes"; then +dnl ntp_libparse=yes +dnl ntp_refclock=yes +dnl AC_DEFINE([CLOCK_WHARTON_400A], [1], [WHARTON 400A Series clock]) +dnl fi +dnl AC_MSG_RESULT([$ntp_ok]) +dnl case "$ntp_ok$ntp_canparse" in +dnl yesno) +dnl AC_MSG_ERROR([That's a parse clock and this system doesn't support it!]) +dnl esac AC_MSG_CHECKING([VARITEXT clock]) AC_ARG_ENABLE( @@ -5595,7 +5595,6 @@ [Default location of crypto key info]) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([ElectricFence/Makefile]) AC_CONFIG_FILES([adjtimed/Makefile]) AC_CONFIG_FILES([clockstuff/Makefile]) AC_CONFIG_FILES([include/Makefile]) @@ -5620,7 +5619,6 @@ AC_CONFIG_FILES([scripts/ntp-wait], [chmod +x scripts/ntp-wait]) AC_CONFIG_FILES([scripts/ntpsweep], [chmod +x scripts/ntpsweep]) AC_CONFIG_FILES([scripts/ntptrace], [chmod +x scripts/ntptrace]) -AC_CONFIG_FILES([scripts/ntpver], [chmod +x scripts/ntpver]) AC_CONFIG_FILES([scripts/plot_summary], [chmod +x scripts/plot_summary]) AC_CONFIG_FILES([scripts/summary], [chmod +x scripts/summary]) AC_CONFIG_FILES([util/Makefile]) Index: ntp-4.2.6.p3+dfsg/scripts/Makefile.am =================================================================== --- ntp-4.2.6.p3+dfsg.orig/scripts/Makefile.am 2011-01-04 01:57:27.000000000 +0000 +++ ntp-4.2.6.p3+dfsg/scripts/Makefile.am 2011-06-03 14:54:38.000000000 +0000 @@ -13,7 +13,6 @@ html2man \ mkver \ ntpsweep \ - ntpver \ plot_summary \ summary \ $(NULL) Index: ntp-4.2.6.p3+dfsg/libparse/Makefile.am =================================================================== --- ntp-4.2.6.p3+dfsg.orig/libparse/Makefile.am 2009-12-20 05:21:43.000000000 +0000 +++ ntp-4.2.6.p3+dfsg/libparse/Makefile.am 2011-06-03 14:54:38.000000000 +0000 @@ -21,7 +21,6 @@ clk_rcc8000.c \ clk_hopf6021.c \ clk_computime.c \ - clk_wharton.c \ clk_varitext.c \ data_mbg.c \ info_trimble.c \ @@ -46,7 +45,6 @@ kclk_trimtaip.o \ kclk_trimtsip.o \ kclk_varitext.o \ - kclk_wharton.o \ kbinio.o \ kieee754io.o \ kmfp_mul.o \ debian/patches/sntp-manpage.patch0000644000000000000000000000221311664507304014234 0ustar Description: Fix errors in sntp man page W: ntp: manpage-has-errors-from-man usr/share/man/man1/sntp.1.gz 44: warning: macro `1996-10-15' not defined I: ntp: hyphen-used-as-minus-sign usr/share/man/man1/sntp.1.gz:133 Author: Peter Eisentraut --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -40,8 +40,7 @@ and the .B "'+4.567 +/- 0.089 secs'" indicates the local clock is 4.567 seconds behind the correct time (so 4.567 seconds must be added to the local clock to get it to be correct), -and the time of -'1996-10-15 20:17:25.123' +and the time of '1996-10-15 20:17:25.123' is believed to be correct to within +/- 0.089 seconds. @@ -130,7 +129,7 @@ This option takes an integer number as i .sp This option enables authentication using the key specified in this option's argument. The argument of this option is the keyid, a number specified in the keyfile as this -key's identifier. See the keyfile option (-k) for more details. +key's identifier. See the keyfile option (\-k) for more details. .TP .BR \-k " \fIfile-name\fP, " \--keyfile "=" \fIfile-name\fP Specify a keyfile. SNTP will look in this file for the key specified with \-a. debian/patches/openssl-disable-check.patch0000644000000000000000000000155111314512165015776 0ustar * Don't second-guess the Debian dependencies by erroring out when a different version of OpenSSL is found. -- Steve Langasek Sun, 21 Oct 2007 00:58:07 -0700 unchanged: Index: ntp-4.2.6+dfsg/libntp/ssl_init.c =================================================================== --- ntp-4.2.6+dfsg.orig/libntp/ssl_init.c 2009-12-23 20:53:30.000000000 +0000 +++ ntp-4.2.6+dfsg/libntp/ssl_init.c 2009-12-23 20:54:51.000000000 +0000 @@ -35,15 +35,6 @@ void ssl_check_version(void) { - if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) { - msyslog(LOG_WARNING, - "OpenSSL version mismatch. Built against %lx, you have %lx", - OPENSSL_VERSION_NUMBER, SSLeay()); - fprintf(stderr, - "OpenSSL version mismatch. Built against %lx, you have %lx\n", - OPENSSL_VERSION_NUMBER, SSLeay()); - } - INIT_SSL(); } #endif /* OPENSSL */ debian/patches/ntpd-linux-caps-runtime.patch0000644000000000000000000000363411572234353016360 0ustar From: Martin Pitt Subject: runtime check for capabilities Bug: http://bugs.ntp.org/1433 Bug-Debian: http://bugs.debian.org/282941 Bug-Debian: http://bugs.debian.org/298059 add runtime check whether the kernel really supports capabilities; do not drop root privileges if not Index: ntp-4.2.6.p3+dfsg/ntpd/ntpd.c =================================================================== --- ntp-4.2.6.p3+dfsg.orig/ntpd/ntpd.c 2011-06-03 15:26:02.000000000 +0000 +++ ntp-4.2.6.p3+dfsg/ntpd/ntpd.c 2011-06-03 15:26:29.000000000 +0000 @@ -175,6 +175,8 @@ int droproot = 0; char *user = NULL; /* User to switch to */ char *group = NULL; /* group to switch to */ +int have_caps = 0; /* runtime check whether capabilities work, + leave at 0 here */ const char *chrootdir = NULL; /* directory to chroot to */ int sw_uid; int sw_gid; @@ -865,8 +867,29 @@ loop_config(LOOP_DRIFTCOMP, old_drift); initializing = 0; +#ifdef HAVE_LINUX_CAPABILITIES + { + /* Check that setting capabilities actually works; we might be + * run on a kernel with disabled capabilities. We must not + * drop privileges in this case. + */ + cap_t caps; + if( ! ( caps = cap_from_text( "cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe" ) ) ) { + msyslog( LOG_ERR, "cap_from_text() failed: %m" ); + exit(-1); + } + if( cap_set_proc( caps ) == 0 ) + have_caps = 1; + cap_free( caps ); + } +#endif /* HAVE_LINUX_CAPABILITIES */ + #ifdef HAVE_DROPROOT +#ifdef HAVE_LINUX_CAPABILITIES + if( droproot && have_caps ) { +#else if( droproot ) { +#endif /* Drop super-user privileges and chroot now if the OS supports this */ #ifdef HAVE_LINUX_CAPABILITIES debian/patches/includes.patch0000644000000000000000000000206411314512165013445 0ustar - Make a few include files be self-skipping and self-complete. -- Matthias Urlichs Tue, 15 Mar 2005 11:09:52 +0100 Index: ntp-4.2.6+dfsg/include/ntp_control.h =================================================================== --- ntp-4.2.6+dfsg.orig/include/ntp_control.h 2009-12-09 07:36:36.000000000 +0000 +++ ntp-4.2.6+dfsg/include/ntp_control.h 2009-12-23 21:28:40.000000000 +0000 @@ -1,3 +1,5 @@ +#ifndef NTP_CONTROL +#define NTP_CONTROL /* * ntp_control.h - definitions related to NTP mode 6 control messages */ @@ -289,3 +291,5 @@ #define TYPE_SYS 1 #define TYPE_PEER 2 #define TYPE_CLOCK 3 + +#endif /* NTP_CONTROL */ Index: ntp-4.2.6+dfsg/include/ntpd.h =================================================================== --- ntp-4.2.6+dfsg.orig/include/ntpd.h 2009-12-09 07:36:35.000000000 +0000 +++ ntp-4.2.6+dfsg/include/ntpd.h 2009-12-23 21:28:40.000000000 +0000 @@ -9,6 +9,7 @@ #include "ntp_select.h" #include "ntp_malloc.h" #include "ntp_refclock.h" +#include "ntp_control.h" #include "recvbuff.h" /* ntp_config.c */ debian/patches/libedit.patch0000644000000000000000000000121511376460751013263 0ustar fixes to be able to use libedit instead of readline; see also bug #448408 Index: ntp-4.2.6p1+dfsg/libntp/ntp_lineedit.c =================================================================== --- ntp-4.2.6p1+dfsg.orig/libntp/ntp_lineedit.c 2010-02-09 10:01:25.000000000 +0000 +++ ntp-4.2.6p1+dfsg/libntp/ntp_lineedit.c 2010-05-24 10:27:56.000000000 +0000 @@ -16,8 +16,8 @@ # undef HAVE_READLINE_HISTORY #endif #if defined(HAVE_READLINE_HISTORY) -# include -# include +# include +# include # define LE_READLINE #elif defined(HAVE_HISTEDIT_H) # include debian/patches/openssl-headers.patch0000644000000000000000000000116712224516370014741 0ustar Description: Make OpenSSL header detection more reliable is architecture-dependent and so may reside in a different location on multiarch-capable systems. Check for instead. Author: Colin Watson Forwarded: no Last-Update: 2012-12-20 --- a/m4/ntp_openssl.m4 +++ b/m4/ntp_openssl.m4 @@ -86,10 +86,10 @@ case "$ans" in no) ;; - *) # look for openssl/opensslconf.h: + *) # look for openssl/opensslv.h: for i in $ans no do - test -f $i/openssl/opensslconf.h && break + test -f $i/openssl/opensslv.h && break done case "$i" in no) debian/patches/format-security.patch0000644000000000000000000000635111701357716015010 0ustar Description: Fix build failures with -Werror=format-security The change to ntp_config.c is merely pacifying GCC, since signd_warning is a constant string containing no '%' characters. In the other cases, it is much more difficult to prove that the format string cannot contain any '%' characters. Author: Colin Watson Author: Steven Chamberlain Author: Peter Eisentraut Bug: http://bugs.ntp.org/2106 Bug-Debian: http://bugs.debian.org/627403 Bug-Debian: http://bugs.debian.org/653771 Last-Update: 2012-01-05 --- a/lib/isc/unix/ifiter_ioctl.c +++ b/lib/isc/unix/ifiter_ioctl.c @@ -159,7 +159,7 @@ getbuf4(isc_interfaceiter_t *iter) { break; } if (iter->bufsize >= IFCONF_BUFSIZE_MAX) { - UNEXPECTED_ERROR(__FILE__, __LINE__, + UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_IFITERIOCTL, ISC_MSG_BUFFERMAX, @@ -260,7 +260,7 @@ getbuf6(isc_interfaceiter_t *iter) { break; } if (iter->bufsize6 >= IFCONF_BUFSIZE_MAX) { - UNEXPECTED_ERROR(__FILE__, __LINE__, + UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_IFITERIOCTL, ISC_MSG_BUFFERMAX, --- a/ntpd/ntp_config.c +++ b/ntpd/ntp_config.c @@ -2326,7 +2326,7 @@ config_access( if ((RES_MSSNTP & flags) && !warned_signd) { warned_signd = 1; fprintf(stderr, "%s\n", signd_warning); - msyslog(LOG_WARNING, signd_warning); + msyslog(LOG_WARNING, "%s", signd_warning); } } } --- a/ntpd/ntp_control.c +++ b/ntpd/ntp_control.c @@ -2948,7 +2948,7 @@ report_event( " %s", str); } NLOG(NLOG_SYSEVENT) - msyslog(LOG_INFO, statstr); + msyslog(LOG_INFO, "%s", statstr); } else { /* @@ -2980,7 +2980,7 @@ report_event( " %s", str); } NLOG(NLOG_PEEREVENT) - msyslog(LOG_INFO, statstr); + msyslog(LOG_INFO, "%s", statstr); } record_proto_stats(statstr); #if DEBUG --- a/ntpd/ntpd.c +++ b/ntpd/ntpd.c @@ -1284,7 +1284,7 @@ library_fatal_error(const char *file, in msyslog(LOG_ERR, "%s:%d: fatal error:", file, line); vsnprintf(errbuf, sizeof(errbuf), format, args); - msyslog(LOG_ERR, errbuf); + msyslog(LOG_ERR, "%s", errbuf); msyslog(LOG_ERR, "exiting (due to fatal error in library)"); abort(); @@ -1306,7 +1306,7 @@ library_unexpected_error(const char *fil msyslog(LOG_ERR, "%s:%d: unexpected error:", file, line); vsnprintf(errbuf, sizeof(errbuf), format, args); - msyslog(LOG_ERR, errbuf); + msyslog(LOG_ERR, "%s", errbuf); if (++unexpected_error_cnt == MAX_UNEXPECTED_ERRORS) { --- a/ntpd/refclock_oncore.c +++ b/ntpd/refclock_oncore.c @@ -4058,7 +4058,7 @@ oncore_log ( snprintf(Msg, sizeof(Msg), "ONCORE[%d]: %s", instance->unit, msg); - syslog(log_level, Msg); + syslog(log_level, "%s", Msg); i = strlen(msg); --- a/lib/isc/include/isc/msgcat.h +++ b/lib/isc/include/isc/msgcat.h @@ -110,7 +110,7 @@ isc_msgcat_close(isc_msgcat_t **msgcatp) const char * isc_msgcat_get(isc_msgcat_t *msgcat, int set, int message, - const char *default_text); + const char *default_text) __attribute__((format_arg(4))); /*%< * Get message 'message' from message set 'set' in 'msgcat'. If it * is not available, use 'default_text'. debian/patches/series0000644000000000000000000000037412224516370012040 0ustar dfsg.patch includes.patch ntpdate-ipv6.patch ntpd-linux-caps-runtime.patch ntpd-linux-caps-inheritable.patch ntpd-ni-maxhost.patch openssl-disable-check.patch libedit.patch format-security.patch sntp-manpage.patch openssl-headers.patch autotools.patch debian/patches/ntpd-ni-maxhost.patch0000644000000000000000000000240611572234353014677 0ustar Compilation fix for systems without MAXHOSTNAMELEN (e.g., Hurd); but the use of MAXHOSTNAMELEN is incorrect here anyway. (bug #387665, http://bugs.ntp.org/978) Index: ntp-4.2.6.p3+dfsg/ntpd/ntp_intres.c =================================================================== --- ntp-4.2.6.p3+dfsg.orig/ntpd/ntp_intres.c 2011-06-03 15:26:01.000000000 +0000 +++ ntp-4.2.6.p3+dfsg/ntpd/ntp_intres.c 2011-06-03 15:27:15.000000000 +0000 @@ -186,11 +186,11 @@ struct ntp_res_t_pkt { /* Tagged packet: */ void *tag; /* For the caller */ u_int32 paddr; /* IP to look up, or 0 */ - char name[MAXHOSTNAMELEN]; /* Name to look up (if 1st byte is not 0) */ + char *name; /* Name to look up (if 1st byte is not 0) */ }; struct ntp_res_c_pkt { /* Control packet: */ - char name[MAXHOSTNAMELEN]; + char *name; u_int32 paddr; int mode; int version; @@ -583,10 +583,10 @@ DPRINTF(2, ("findhostaddr: Resolving <%s>\n", stoa(&entry->peer_store))); - entry->ce_name = emalloc(MAXHOSTNAMELEN); + entry->ce_name = emalloc(NI_MAXHOST); error = getnameinfo((const struct sockaddr *)&entry->peer_store, SOCKLEN(&entry->peer_store), - (char *)&entry->ce_name, MAXHOSTNAMELEN, + (char *)&entry->ce_name, NI_MAXHOST, NULL, 0, 0); } debian/patches/ntpdate-ipv6.patch0000644000000000000000000000107411572234353014166 0ustar bug #249216 Index: ntp-4.2.6.p3+dfsg/ntpdate/ntpdate.c =================================================================== --- ntp-4.2.6.p3+dfsg.orig/ntpdate/ntpdate.c 2011-06-03 15:26:03.000000000 +0000 +++ ntp-4.2.6.p3+dfsg/ntpdate/ntpdate.c 2011-06-03 15:26:10.000000000 +0000 @@ -1742,8 +1742,7 @@ if (res->ai_family == AF_INET6) if (setsockopt(fd[nbsock], IPPROTO_IPV6, IPV6_V6ONLY, (void*) &optval, sizeof(optval)) < 0) { msyslog(LOG_ERR, "setsockopt() IPV6_V6ONLY failed: %m"); - exit(1); - /*NOTREACHED*/ + /* exit(1); */ } #endif debian/ntp.prerm0000644000000000000000000000024210511664107011035 0ustar #!/bin/sh set -e installinit_error() { status=$? start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/ntpd.pid && exit 0 exit $status } #DEBHELPER# debian/ntp.dirs0000644000000000000000000000017312126756215010662 0ustar usr/sbin var/lib/ntp var/log/ntpstats etc/apparmor.d/force-complain etc/apparmor.d/tunables usr/share/apport/package-hooks debian/ntp.postinst0000644000000000000000000000143311667456030011605 0ustar #!/bin/sh set -e if dpkg-maintscript-helper supports rm_conffile; then dpkg-maintscript-helper rm_conffile \ /etc/logcheck/ignore.d.server/ntp 1:4.2.6+dfsg-1 -- "$@" dpkg-maintscript-helper rm_conffile \ /etc/dhcp3/dhclient-enter-hooks.d/ntp 1:4.2.6+dfsg-1 -- "$@" dpkg-maintscript-helper rm_conffile \ /etc/network/if-up.d/ntp 1:4.2.6+dfsg-1 -- "$@" fi if dpkg-maintscript-helper supports mv_conffile; then dpkg-maintscript-helper mv_conffile \ /etc/dhcp3/dhclient-exit-hooks.d/ntp \ /etc/dhcp/dhclient-exit-hooks.d/ntp \ 1:4.2.6.p1+dfsg-1 -- "$@" fi if [ "$1" = "configure" ]; then addgroup --system --quiet ntp adduser --system --quiet --ingroup ntp --no-create-home ntp chown -R ntp:ntp /var/lib/ntp /var/log/ntpstats fi installinit_error() { exit $? } #DEBHELPER# debian/copyright0000644000000000000000000005302011146231110011107 0ustar This package is maintained for Debian by: Bruce Walker Bdale Garbee Matthias Urlichs Peter Eisentraut Kurt Roeckx The upstream source is available from http://www.ntp.org General copyright and license: The following copyright notice applies to all files collectively called the Network Time Protocol Version 4 Distribution. Unless specifically declared otherwise in an individual file, this notice applies as if the text was explicitly included in the file. *********************************************************************** * * * Copyright (c) David L. Mills 1992-2009 * * * * Permission to use, copy, modify, and distribute this software and * * its documentation for any purpose with or without fee is hereby * * granted, provided that the above copyright notice appears in all * * copies and that both the copyright notice and this permission * * notice appear in supporting documentation, and that the name * * University of Delaware not be used in advertising or publicity * * pertaining to distribution of the software without specific, * * written prior permission. The University of Delaware makes no * * representations about the suitability this software for any * * purpose. It is provided "as is" without express or implied * * warranty. * * * *********************************************************************** The following individuals contributed in part to the Network Time Protocol Distribution Version 4 and are acknowledged as authors of this work. 1. Mark Andrews Leitch atomic clock controller 2. Bernd Altmeier hopf Elektronik serial line and PCI-bus devices 3. Viraj Bais and Clayton Kirkwood port to WindowsNT 3.5 4. Michael Barone GPSVME fixes 5. Jean-Francois Boudreault IPv6 support 6. Karl Berry syslog to file option 7. Greg Brackley Major rework of WINNT port. Clean up recvbuf and iosignal code into separate modules. 8. Marc Brett Magnavox GPS clock driver 9. Piete Brooks MSF clock driver, Trimble PARSE support 10. Reg Clemens Oncore driver (Current maintainer) 11. Steve Clift OMEGA clock driver 12. Casey Crellin vxWorks (Tornado) port and help with target configuration 13. Sven Dietrich Palisade reference clock driver, NT adj. residuals, integrated Greg's Winnt port. 14. John A. Dundas III Apple A/UX port 15. Torsten Duwe Linux port 16. Dennis Ferguson foundation code for NTP Version 2 as specified in RFC-1119 17. John Hay IPv6 support and testing 18. Glenn Hollinger GOES clock driver 19. Mike Iglesias DEC Alpha port 20. Jim Jagielski A/UX port 21. Jeff Johnson massive prototyping overhaul 22. Hans Lambermont or ntpsweep 23. Poul-Henning Kamp Oncore driver (Original author) 24. Frank Kardel PARSE driver (>14 reference clocks), STREAMS modules for PARSE, support scripts, syslog cleanup, dynamic interface handling 25. William L. Jones RS/6000 AIX modifications, HPUX modifications 26. Dave Katz RS/6000 AIX port 27. Craig Leres 4.4BSD port, ppsclock, Magnavox GPS clock driver 28. George Lindholm SunOS 5.1 port 29. Louis A. Mamakos MD5-based authentication 30. Lars H. Mathiesen adaptation of foundation code for Version 3 as specified in RFC-1305 31. Danny Mayer Network I/O, Windows Port, Code Maintenance 32. David L. Mills Version 4 foundation: clock discipline, authentication, precision kernel; clock drivers: Spectracom, Austron, Arbiter, Heath, ATOM, ACTS, KSI/Odetics; audio clock drivers: CHU, WWV/H, IRIG 33. Wolfgang Moeller VMS port 34. Jeffrey Mogul ntptrace utility 35. Tom Moore i386 svr4 port 36. Kamal A Mostafa SCO OpenServer port 37. Derek Mulcahy and Damon Hart-Davis ARCRON MSF clock driver 38. Rainer Pruy monitoring/trap scripts, statistics file handling 39. Dirce Richards Digital UNIX V4.0 port 40. Wilfredo Sánchez added support for NetInfo 41. Nick Sayer SunOS streams modules 42. Jack Sasportas Saved a Lot of space on the stuff in the html/pic/ subdirectory 43. Ray Schnitzler Unixware1 port 44. Michael Shields USNO clock driver 45. Jeff Steinman Datum PTS clock driver 46. Harlan Stenn GNU automake/autoconfigure makeover, various other bits (see the ChangeLog) 47. Kenneth Stone HP-UX port 48. Ajit Thyagarajan IP multicast/anycast support 49. Tomoaki TSURUOKA TRAK clock driver 50. Paul A Vixie TrueTime GPS driver, generic TrueTime clock driver 51. Ulrich Windl corrected and validated HTML documents according to the HTML DTD Copyright and licenses for other files: A lot of the other files are: * Copyright (c) 1995-2006 by Frank Kardel ntp.org> * Copyright (c) 1989-1994 by Frank Kardel, Friedrich-Alexander Universität Erlangen-Nürnberg, Germany * Copyright (c) 1997 by Meinberg Funkuhren (www.meinberg.de) With the following license: * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the author nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. Some files are: * Copyright (C) 1996-2003 Internet Software Consortium. With the following copyright notice: * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Some files are: * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") With the license: * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. Some files are: * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. With as license: * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the project nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. Some files are: * Copyright (c) 1982-2003 * The Regents of the University of California. All rights reserved. With as license: * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. Some files are: /* Copyright (c) 1995 Vixie Enterprises With as license: * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies, and that * the name of Vixie Enterprises not be used in advertising or publicity * pertaining to distribution of the document or software without specific, * written prior permission. * * THE SOFTWARE IS PROVIDED "AS IS" AND VIXIE ENTERPRISES DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL VIXIE ENTERPRISES * BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. adjtime.c: /* (c) Copyright Tai Jin, 1988. All Rights Reserved. */ /* Hewlett-Packard Laboratories. */ /* */ /* Permission is hereby granted for unlimited modification, use, and */ /* distribution. This software is made available with no warranty of */ /* any kind, express or implied. This copyright notice must remain */ /* intact in all versions of this software. */ /* */ /* The author would appreciate it if any bug fixes and enhancements were */ /* to be sent back to him for incorporation into future versions of this */ /* software. Please send changes to tai@iag.hp.com or ken@sdd.hp.com. */ ntp_filegen.c/h: * Copyright (C) 1992, 1996 by Rainer Pruy * Friedrich-Alexander Universität Erlangen-Nürnberg, Germany * * This code may be modified and used freely * provided the credits remain intact. inet_aton.c: * Portions Copyright (c) 1993 by Digital Equipment Corporation. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. strstr.c: * Copyright (c) 1991-1998 University of Maryland at College Park * All Rights Reserved. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting * documentation, and that the name of U.M. not be used in advertising or * publicity pertaining to distribution of the software without specific, * written prior permission. U.M. makes no representations about the * suitability of this software for any purpose. It is provided "as is" * without express or implied warranty. * * U.M. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL U.M. * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OU refclock_jjy: /* Copyright (C) 2001-2004, Takao Abe. All rights reserved. */ /* */ /* Permission to use, copy, modify, and distribute this software */ /* and its documentation for any purpose is hereby granted */ /* without fee, provided that the following conditions are met: */ /* */ /* One retains the entire copyright notice properly, and both the */ /* copyright notice and this license. in the documentation and/or */ /* other materials provided with the distribution. */ /* */ /* This software and the name of the author must not be used to */ /* endorse or promote products derived from this software without */ /* prior written permission. */ /* */ /* THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT EXPRESSED OR IMPLIED */ /* WARRANTIES OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, THE */ /* IMPLIED WARRANTIES OF MERCHANTABLILITY AND FITNESS FOR A */ /* PARTICULAR PURPOSE. */ /* IN NO EVENT SHALL THE AUTHOR TAKAO ABE BE LIABLE FOR ANY DIRECT, */ /* INDIRECT, GENERAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES */ /* ( INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE */ /* GOODS OR SERVICES; LOSS OF USE, DATA OR PROFITS; OR BUSINESS */ /* INTERRUPTION ) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, */ /* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ( INCLUDING */ /* NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE OF */ /* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ refclock_palisade.c: * Copyright (c) 1997, 1998, 1999, 2000 Trimble Navigation Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Trimble Navigation, Ltd. * 4. The name of Trimble Navigation Ltd. may not be used to endorse or * promote products derived from this software without specific prior * written permission. * * THIS SOFTWARE IS PROVIDED BY TRIMBLE NAVIGATION LTD. ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL TRIMBLE NAVIGATION LTD. BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. ntpsweep: # Copyright (C) 1999,2000 Hans Lambermont and Origin B.V. # # Permission to use, copy, modify and distribute this software and its # documentation for any purpose and without fee is hereby granted, # provided that the above copyright notice appears in all copies and # that both the copyright notice and this permission notice appear in # supporting documentation. This software is supported as is and without # any express or implied warranties, including, without limitation, the # implied warranties of merchantability and fitness for a particular # purpose. The name Origin B.V. must not be used to endorse or promote # products derived from this software without prior written permission. debian/README.Debian0000644000000000000000000001050411174104311011220 0ustar Potentially useful things to know about the Debian NTP packages ... Configuration ------------- The default ntp.conf file is set up for an NTP "client" that synchronizes to high-stratum NTP servers on the Internet. This should be sufficient for most installations on well-connected hosts that simply want to keep their clocks accurate. The default time servers are servers from a pool.ntp.org vendor zone assigned to Debian. Consider replacing this if you have local time servers in your organization or network. A list of public NTP time servers is available on the web at http://ntp.isc.org/bin/view/Servers/WebHome Extra configuration work will be necessary to offer time service to other hosts, to use hardware time receivers, or to synchronize the clocks on networks that are not connected to the Internet. The documentation in the package ntp-doc will assist with these tasks. DHCP ---- If DHCP is used to configure the host, and the DHCP server sends information about NTP servers, then this information will be used automatically. This is done by making a copy of /etc/ntp.conf at /var/lib/ntp/ntp.conf.dhcp, replacing the server entries with the information provided by the DHCP server, and restarting the NTP server. In order for this to work, the "ntp-servers" option must be mentioned in the "request" statement in /etc/dhcp3/dhclient.conf. This is not the case in a default installation. A complete configuration might look like this, for example: request subnet-mask, broadcast-address, time-offset, routers, domain-name, domain-name-servers, host-name, netbios-name-servers, netbios-scope, interface-mtu, ntp-servers; If you don't like using the NTP servers sent by the DHCP server, this is also the right place to turn off this behavior. To make the DHCP server in the Debian package dhcp3-server send NTP server information, add a line like the following at an appropriate place: option ntp-servers ntp1.foo.bar, ntp2.foo.bar; SMP Systems ----------- Several people have reported that ntpd fails on SMP boxes unless the "Enhanced Real-Time Clock" support is enabled in the kernel. This is known to be essential on SMP Alpha systems, and is believed to also be necessary on SMP Intel systems. Logging ------- By default, ntpd will log via syslog. The daemon will use the LOG_DAEMON facility, leading to ntpd log entries going to /var/log/daemon.log. If you define a logfile location in /etc/ntp.conf, the daemon will do direct file system writes to the specified file, avoiding syslog. Previous Debian packages did this, with the side effect that they had to ship a weekly cron job that stopped the daemon, rotated the log, then restarted the daemon. This is moderately evil for high-stratum NTP servers, where ntpd should be allowed to run more or less forever. This mode of logging is not recommended and no longer supported by the Debian packages. NTP and hwclock Issues ---------------------- hwclock (from the util-linux package) is normally called on startup and shutdown. You should ensure that hwclock --adjust is never called (make sure it is disabled in /etc/init.d/hwclock.sh; this is the default in new Debian installations). You should allow hwclock --systohc to be called on shutdown unless you are running the NANO kernel patch, because the kernel does not fully update the RTC time, and it could be off by a multiple of 30 minutes in the next boot if hwclock --systohc is never called by the shutdown sequence. See the hwclock README files in the util-linux documentation for more information. Firewalls --------- If your system is behind a firewall, the port you need to open up to allow the NTP protocol to work (for either ntpdate or ntpd) is UDP port 123. Server-to-server NTP packets usually use this for both source and destination: for extra security, a stateful firewall should block "new" packets with source, but not destination, port 123 from entering your network. Keys ---- ntp-genkeys now generates an MD5 ntp.keys file in /var/lib/ntp. Use of these keys has not yet been tested; please report success or failure in using them to the maintainer. PPSkit ------ If you're serious about building a high-quality stratum 1 timekeeper, please take a look at Ulrich Windl's PPSkit patchset for the Linux kernel, available from the kernel.org mirror network in pub/linux/daemons/ntp. debian/ntpdate.postinst0000644000000000000000000000063211413656502012436 0ustar #!/bin/sh set -e if dpkg-maintscript-helper supports rm_conffile; then dpkg-maintscript-helper rm_conffile \ /etc/dhcp3/dhclient-enter-hooks.d/ntpdate 1:4.2.6+dfsg-1 -- "$@" fi if dpkg-maintscript-helper supports mv_conffile; then dpkg-maintscript-helper mv_conffile \ /etc/dhcp3/dhclient-exit-hooks.d/ntpdate \ /etc/dhcp/dhclient-exit-hooks.d/ntpdate \ 1:4.2.6.p1+dfsg-1 -- "$@" fi #DEBHELPER# debian/ntp.dhcp0000644000000000000000000000236212126756215010641 0ustar NTP_CONF=/etc/ntp.conf NTP_DHCP_CONF=/var/lib/ntp/ntp.conf.dhcp ntp_server_restart() { invoke-rc.d ntp try-restart } ntp_servers_setup_remove() { if [ ! -e $NTP_DHCP_CONF ]; then return fi rm -f $NTP_DHCP_CONF ntp_server_restart } ntp_servers_setup_add() { if [ -e $NTP_DHCP_CONF ] && [ "$new_ntp_servers" = "$old_ntp_servers" ]; then return fi if [ -z "$new_ntp_servers" ]; then ntp_servers_setup_remove return fi tmp=$(mktemp "$NTP_DHCP_CONF.XXXXXX") || return chmod --reference=$NTP_CONF $tmp chown --reference=$NTP_CONF $tmp ( echo "# This file was copied from $NTP_CONF with the server options changed" echo "# to reflect the information sent by the DHCP server. Any changes made" echo "# here will be lost at the next DHCP event. Edit $NTP_CONF instead." echo echo "# NTP server entries received from DHCP server" for server in $new_ntp_servers; do echo "server $server iburst" done echo sed -r -e '/^ *(server *[^1][^2][^7]\.|peer).*$/d' $NTP_CONF ) >>$tmp mv $tmp $NTP_DHCP_CONF ntp_server_restart } ntp_servers_setup() { case $reason in BOUND|RENEW|REBIND|REBOOT) ntp_servers_setup_add ;; EXPIRE|FAIL|RELEASE|STOP) ntp_servers_setup_remove ;; esac } ntp_servers_setup