Hello community,
here is the log from the commit of package ntp
checked in at Wed Oct 8 18:27:11 CEST 2008.
--------
--- ntp/ntp.changes 2008-10-07 14:53:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/ntp/ntp.changes 2008-10-08 17:42:17.943576000 +0200
@@ -1,0 +2,6 @@
+Wed Oct 8 17:39:18 CEST 2008 - varkoly@suse.de
+
+- Remove redundand patches
+- Remove ntpdate because this is obsolete.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
conf.ntp.ifupdown
ntp-4.1.1.SuSE-Config.patch
ntp-4.2.0.ntpdate_overflow.patch
ntp-man-pages.patch
ntp-ntptrace_sbinpath.patch
ntp-offset.patch
ntp-posix_options.patch
New:
----
ntpdate
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ntp.spec ++++++
--- /var/tmp/diff_new_pack.j22592/_old 2008-10-08 18:25:50.000000000 +0200
+++ /var/tmp/diff_new_pack.j22592/_new 2008-10-08 18:25:50.000000000 +0200
@@ -27,7 +27,7 @@
License: BSD 3-Clause
Group: Productivity/Networking/Other
Version: 4.2.4p5
-Release: 6
+Release: 7
Summary: Network Time Protocol daemon (version 4)
# main source
Source0: ntp-%{version}.tar.bz
@@ -39,28 +39,22 @@
Source5: conf.sysconfig.syslog-ntp
Source6: conf.ntp.reg
Source7: %name.firewall
-Source8: conf.ntp.ifupdown
# documentation
Source10: NTP-FAQ-%{ntpfaqversion}.tar.bz2
Source11: ntp.1.gz
Source12: README.SUSE
Source13: ntp-4.2.0-rh-manpages.tar.gz
Source14: ntp.xml
-Patch0: ntp-4.1.1.SuSE-Config.patch
-Patch1: ntp-4.2.0.ntpdate_overflow.patch
-Patch2: ntp-posix_options.patch
+Source15: ntpdate
Patch3: ntp-segfault_on_invalid_device.patch
Patch4: ntp-linuxcaps.patch
Patch6: ntp-ntptrace_doc.patch
-Patch7: ntp-ntptrace_sbinpath.patch
Patch8: ntpd-maxmonmen.patch
Patch10: ntpd-using_wrong_group.patch
Patch12: ntp-lib64.patch
Patch13: ntp-stable-4.2.0a-20050816-loconly.patch
Patch14: ntp-manpages.patch
Patch15: ntp-config.patch
-Patch16: ntp-offset.patch
-Patch17: ntp-man-pages.patch
Patch18: ntp-strcat.patch
Patch20: ntp-4.2.0a-seed_file.patch
Patch21: ntp-kernel-time-sync-message.patch
@@ -190,13 +184,9 @@
%setup -q -n ntp-%{version}
# unpack ntp-faq
tar -x -C html -j -f %{S:10}
-%patch0
-%patch1
-%patch2
%patch3
%patch4
%patch6
-%patch7 -p1
%patch8 -p1
%patch10
%patch13 -p1
@@ -206,10 +196,8 @@
# copy README.SUSE
cp %{S:12} .
tar xzf %{S:13}
-%patch14
+%patch14 -p1
%patch15 -p1
-%patch16 -p1
-%patch17
%patch18 -p1
%patch20 -p1
%patch21
@@ -235,7 +223,6 @@
--enable-linuxcaps \
--enable-ipv6 \
--with-sntp
-# --sbindir=%{_sbindir} \
make
%install
@@ -284,17 +271,11 @@
%__install -d %{buildroot}/var/log/
touch %{buildroot}/var/log/ntp
#
-# NetworkManagerDispatcher and ifup/down scripts
-#
-%__install -d %{buildroot}%{_sysconfdir}/sysconfig/network/scripts/
-%__install -d %{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d/
-%__install -m 755 %{S:8} %{buildroot}%{_sysconfdir}/sysconfig/network/scripts/50-ntp
-touch %{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d/50-ntp
-#
# service xml
#
install -d %{buildroot}/usr/share/omc/svcinfo.d/
install -m 644 %{S:14} %{buildroot}/usr/share/omc/svcinfo.d/
+install -m 755 %{S:15} %{buildroot}/usr/sbin/
%clean
%__rm -rf %{buildroot}
@@ -358,11 +339,6 @@
touch /var/log/ntp
chmod 644 /var/log/ntp
fi
-# create if-{up,down}.d script links only on install
-if [ ${1:-0} -eq 1 ]; then
- ln -fs %{_sysconfdir}/sysconfig/network/scripts/50-ntp %{_sysconfdir}/sysconfig/network/if-down.d/50-ntp
- ln -fs %{_sysconfdir}/sysconfig/network/scripts/50-ntp %{_sysconfdir}/sysconfig/network/if-up.d/50-ntp
-fi
%postun
%restart_on_update ntp
@@ -386,8 +362,6 @@
%attr(0755,ntp,root)/var/lib/ntp/var/run/ntp
/var/run/ntp
%ghost %config(noreplace) /var/log/ntp
-%ghost %config %{_sysconfdir}/sysconfig/network/if-up.d/50-ntp
-%{_sysconfdir}/sysconfig/network/scripts/50-ntp
/usr/share/omc/svcinfo.d/ntp.xml
%files doc
@@ -395,6 +369,9 @@
%doc html/*
%changelog
+* Wed Oct 08 2008 varkoly@suse.de
+- Remove redundand patches
+- Remove ntpdate because this is obsolete.
* Tue Oct 07 2008 schwab@suse.de
- Don't try to umount /proc.
- Fix error handling.
++++++ conf.ntp.init ++++++
--- ntp/conf.ntp.init 2008-10-07 14:55:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/ntp/conf.ntp.init 2008-10-08 17:42:17.628729000 +0200
@@ -53,7 +53,6 @@
NTPD_OPTIONS="-g -u ntp:ntp"
NTPD_RUN_CHROOTED="yes"
-NTPDATE_BIN="/usr/sbin/ntpdate"
NTPDC_BIN="/usr/sbin/ntpdc"
NTP_KEYS=$(awk '/^keys/ { print $2 }' $NTP_CONF)
++++++ conf.sysconfig.ntp ++++++
--- ntp/conf.sysconfig.ntp 2008-10-02 11:31:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/ntp/conf.sysconfig.ntp 2008-10-08 17:42:17.633721000 +0200
@@ -1,17 +1,5 @@
## Path: Network/NTP
## Description: Network Time Protocol (NTP) server settings
-## Type: yesno
-## Default: no
-## ServiceRestart: ntp
-#
-# When ntpd is running, the kernel automatically updates CMOS every 13 minutes
-# to match the system time. However, the updates can only work when time is off
-# by less than +-15 minutes. There are machines that don't keep the time all
-# that well when turned off. If you run one of those you can have ntp set
-# the CMOS clock after setting the initial date with ntpdate
-#
-NTPD_ADJUST_CMOS_CLOCK="no"
-
## Type: string
## Default: "-g -u ntp:ntp"
#
++++++ ntp-config.patch ++++++
--- /var/tmp/diff_new_pack.j22592/_old 2008-10-08 18:25:51.000000000 +0200
+++ /var/tmp/diff_new_pack.j22592/_new 2008-10-08 18:25:51.000000000 +0200
@@ -10,6 +10,45 @@
result="#define LWRES_HAVE_SIN6_SCOPE_ID 1"],
[AC_MSG_RESULT(no)
ISC_PLATFORM_HAVESCOPEID="#undef ISC_PLATFORM_HAVESCOPEID"
+diff -N -ur ntp-stable-4.2.0a-20050816-loconly//Makefile.am ntp-config//Makefile.am
+--- ntp-stable-4.2.0a-20050816-loconly//Makefile.am 2007-01-30 12:02:36.000000000 +0100
++++ ntp-config//Makefile.am 2008-10-08 11:54:16.000000000 +0200
+@@ -16,7 +16,6 @@
+ libntp \
+ libparse \
+ ntpd \
+- ntpdate \
+ ntpdc \
+ ntpq \
+ parseutil \
+@@ -36,7 +35,6 @@
+ libopts \
+ libparse \
+ ntpd \
+- ntpdate \
+ ntpdc \
+ ntpq \
+ parseutil \
+diff -N -ur ntp-stable-4.2.0a-20050816-loconly//Makefile.in ntp-config//Makefile.in
+--- ntp-stable-4.2.0a-20050816-loconly//Makefile.in 2008-08-17 11:09:05.000000000 +0200
++++ ntp-config//Makefile.in 2008-10-08 11:54:32.000000000 +0200
+@@ -214,7 +214,7 @@
+ ACLOCAL_AMFLAGS = -I m4 -I libopts/m4
+ NULL =
+ SUBDIRS = $(am__append_1) scripts include ElectricFence @ARLIB_DIR@ \
+- libntp libparse ntpd ntpdate ntpdc ntpq parseutil adjtimed \
++ libntp libparse ntpd ntpdc ntpq parseutil adjtimed \
+ clockstuff kernel sntp util $(NULL)
+ DIST_SUBDIRS = \
+ scripts \
+@@ -225,7 +225,6 @@
+ libopts \
+ libparse \
+ ntpd \
+- ntpdate \
+ ntpdc \
+ ntpq \
+ parseutil \
diff -N -ur ntp-stable-4.2.0a-20050816-loconly//ntpd/Makefile.am ntp-config//ntpd/Makefile.am
--- ntp-stable-4.2.0a-20050816-loconly//ntpd/Makefile.am 2008-03-22 12:03:20.000000000 +0100
+++ ntp-config//ntpd/Makefile.am 2008-09-25 17:24:47.000000000 +0200
@@ -21,16 +60,6 @@
bin_PROGRAMS= ntpd @MAKE_NTPDSIM@
noinst_LIBRARIES= libntpd.a
-diff -N -ur ntp-stable-4.2.0a-20050816-loconly//ntpdate/Makefile.am ntp-config//ntpdate/Makefile.am
---- ntp-stable-4.2.0a-20050816-loconly//ntpdate/Makefile.am 2007-02-19 12:02:14.000000000 +0100
-+++ ntp-config//ntpdate/Makefile.am 2008-09-25 17:24:47.000000000 +0200
-@@ -1,6 +1,5 @@
- #AUTOMAKE_OPTIONS= ../util/ansi2knr
-
--bindir= ${exec_prefix}/${BINSUBDIR}
- #bin_PROGRAMS= ntpdate ntptimeset
- bin_PROGRAMS= ntpdate
- EXTRA_PROGRAMS= ntptimeset
diff -N -ur ntp-stable-4.2.0a-20050816-loconly//ntpdc/Makefile.am ntp-config//ntpdc/Makefile.am
--- ntp-stable-4.2.0a-20050816-loconly//ntpdc/Makefile.am 2008-03-22 12:03:23.000000000 +0100
+++ ntp-config//ntpdc/Makefile.am 2008-09-25 17:24:47.000000000 +0200
++++++ ntp-manpages.patch ++++++
--- /var/tmp/diff_new_pack.j22592/_old 2008-10-08 18:25:51.000000000 +0200
+++ /var/tmp/diff_new_pack.j22592/_new 2008-10-08 18:25:51.000000000 +0200
@@ -1,5 +1,6 @@
---- man/ntpd.1
-+++ man/ntpd.1
+diff -N -ur ntp-4.2.4p5-orig/man/ntpd.1 ntp-4.2.4p5/man/ntpd.1
+--- ntp-4.2.4p5-orig/man/ntpd.1 2004-07-22 16:05:02.000000000 +0200
++++ ntp-4.2.4p5/man/ntpd.1 2008-10-08 12:41:54.000000000 +0200
@@ -15,7 +15,7 @@
\fIstatsdir\fR ] [ -t
\fIkey\fR ] [ -v
@@ -9,6 +10,15 @@
\fIchroot_dir\fR ] [ -u
\fIserver_user\fR ] [ -x ]\fR
.SH DESCRIPTION
+@@ -37,7 +37,7 @@
+ \fBntpd\fR program operates by exchanging messages with
+ one or more configured servers at designated poll intervals. When
+ started, whether for the first or subsequent times, the program
+-requires several exahanges from the majority of these servers so
++requires several exchanges from the majority of these servers so
+ the signal processing and mitigation algorithms can accumulate and
+ groom the data and set the clock. In order to protect the network
+ from bursts, the initial poll interval for each server is delayed
@@ -384,7 +384,7 @@
\fIkey\fR \fR
Add a key number to the trusted key list.
@@ -27,19 +37,223 @@
.SH AUTHOR
David L. Mills
---- man/ntpdate.1
-+++ man/ntpdate.1
-@@ -202,7 +202,7 @@
- \fBtickadj\fR .
-
- .SH SEE ALSO
+diff -N -ur ntp-4.2.4p5-orig/man/ntpdate.1 ntp-4.2.4p5/man/ntpdate.1
+--- ntp-4.2.4p5-orig/man/ntpdate.1 2004-07-22 16:05:32.000000000 +0200
++++ ntp-4.2.4p5/man/ntpdate.1 2008-10-08 12:44:40.000000000 +0200
+@@ -1,5 +1,4 @@
+-.\" Automatically generated from HTML source. DO NOT EDIT!
+-.TH ntpdate 1 "" "ntp 4.1.1b-r5"
++.TH ntpdate 1 "" "ntp 4.2.4p5"
+ .SH NAME
+ ntpdate - set the date and time via NTP
+
+@@ -9,201 +8,5 @@
+ \fB-q\fR command line
+ option in the
+ \fBntpd\fR - Network Time
+-Protocol (NTP) daemon page. After a suitable period of
+-mourning, the
+-\fBntpdate\fR program is to be retired from this
+-distribution
+-.SH SYNOPSIS
+-
+-\fBntpdate [ -bBdoqsuv ] [ -a
+-\fIkey\fR ] [ -e
+-\fIauthdelay\fR ]
+-[ -k
+-\fIkeyfile\fR ] [ -o
+-\fIversion\fR ] [ -p
+-\fIsamples\fR ] [
+--t
+-\fItimeout\fR ] [
+--U
+-\fIuser_name\fR ]
+-\fIserver\fR [ ... ]\fR
+-.SH DESCRIPTION
+-
+-\fBntpdate\fR sets the local date and time by polling the
+-Network Time Protocol (NTP) server(s) given as the
+-\fIserver\fR arguments to determine the correct time. It must be run as root on
+-the local host. 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
+-\fBntpdate\fR depends on
+-the number of servers, the number of polls each time it is run and
+-the interval between runs.
+-
+-
+-\fBntpdate\fR 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
+-\fBntpd\fR . It is
+-also possible to run
+-\fBntpdate\fR from a
+-\fBcron\fR script.
+-However, it is important to note that
+-\fBntpdate\fR with
+-contrived
+-\fBcron\fR scripts is no substitute for the NTP
+-daemon, which uses sophisticated algorithms to maximize accuracy
+-and reliability while minimizing resource use. Finally, since
+-\fBntpdate\fR does not discipline the host clock frequency as does
+-\fBntpd\fR , the accuracy using
+-\fBntpdate\fR is limited.
+-
+-Time adjustments are made by
+-\fBntpdate\fR in one of two
+-ways. If
+-\fBntpdate\fR determines the clock is in error more
+-than 0.5 second it will simply step the time by calling the system
+-\fBsettimeofday()\fR routine. If the error is less than 0.5
+-seconds, it will slew the time by calling the system
+-\fBadjtime()\fR routine. The latter technique is less disruptive and
+-more accurate when the error is small, and works quite well when
+-\fBntpdate\fR is run by
+-\fBcron\fR every hour or two.
+-
+-
+-\fBntpdate\fR will decline to set the date if an NTP server
+-daemon (e.g.,
+-\fBntpd\fR ) is running on the same host. When
+-running
+-\fBntpdate\fR on a regular basis from
+-\fBcron\fR 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.
+-
+-If NetInfo support is compiled into
+-\fBntpdate\fR , then the
+-\fBserver\fR argument is optional if
+-\fBntpdate\fR can find a
+-time server in the NetInfo configuration for
+-\fBntpd\fR .
+-.SH COMMAND LINE OPTIONS
+-.TP 8
+-\fB-a
+-\fIkey\fR \fR
+-Enable the authentication function and specify the key
+-identifier to be used for authentication as the argument
+-\fIkey\fR
+-\fBntpdate\fR . The keys and key identifiers must match in
+-both the client and server key files. The default is to disable the
+-authentication function.
+-.TP 8
+-\fB-B\fR
+-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 8
+-\fB-b\fR
+-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 8
+-\fB-d\fR
+-Enable the debugging mode, in which
+-\fBntpdate\fR will go
+-through all the steps, but not adjust the local clock. Information
+-useful for general debugging will also be printed.
+-.TP 8
+-\fB-e
+-\fIauthdelay\fR \fR
+-Specify the processing delay to perform an authentication
+-function as the value
+-\fIauthdelay\fR , in seconds and fraction
+-(see
+-\fBntpd\fR 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 8
+-\fB-k
+-\fIkeyfile\fR \fR
+-Specify the path for the authentication key file as the string
+-\fIkeyfile\fR . The default is
+-\fB/etc/ntp.keys\fR . This file
+-should be in the format described in
+-\fBntpd\fR .
+-.TP 8
+-\fB-o
+-\fIversion\fR \fR
+-Specify the NTP version for outgoint packets as the integer
+-\fIversion\fR , which can be 1 or 2. The default is 3. This allows
+-\fBntpdate\fR to be used with older NTP versions.
+-.TP 8
+-\fB-p
+-\fIsamples\fR \fR
+-Specify the number of samples to be acquired from each server
+-as the integer
+-\fIsamples\fR , with values from 1 to 8 inclusive.
+-The default is 4.
+-.TP 8
+-\fI
+-\fB-q\fR \fR
+-Query only - don't set the clock.
+-.TP 8
+-\fB-s\fR
+-Divert logging output from the standard output (default) to the
+-system
+-\fBsyslog\fR facility. This is designed primarily for
+-convenience of
+-\fBcron\fR scripts.
+-.TP 8
+-\fB-t
+-\fItimeout\fR \fR
+-Specify the maximum time waiting for a server response as the
+-value
+-\fItimeout\fR , 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 8
+-\fB-u\fR
+-Direct
+-\fBntpdate\fR to use an unprivileged port or 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
+-.TP 8
+-\fB-U\fR
+-\fIuser_name\fR \fR
+-ntpdate process drops root privileges and changes user ID to
+-\fIuser_name\fR and group ID to the primary group of \fIserver_user\fR.
+-.TP 8
+-\fB-d\fR \fR
+-always uses unprivileged ports.
+-.TP 8
+-\fB-v\fR \fR
+-Be verbose. This option will cause
+-\fBntpdate\fR 's version
+-identification string to be logged.
+-.SH FILES
+-
+-\fB/etc/ntp/keys\fR - encryption keys used by
+-\fBntpdate\fR .
+-.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
+-\fBtick\fR and
+-\fBtickadj\fR .
+-
+-.SH SEE ALSO
-Primary source of documentation: /usr/share/doc/ntp-*/ntpdate.html
-+More documentation is available in the package xntp-doc.
-
- .SH AUTHOR
- David L. Mills
---- man/ntpdc.1
-+++ man/ntpdc.1
+-
+-.SH AUTHOR
+-David L. Mills
+-