commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2020-10-30 11:45:54
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new.3463 (New)
Package is "ntp"
Fri Oct 30 11:45:54 2020 rev:125 rq:844219 version:4.2.8p15
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2020-06-27 23:21:36.469630450
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new.3463/ntp.changes2020-10-30
11:45:59.705618456 +0100
@@ -1,0 +2,6 @@
+Tue Oct 13 09:59:28 UTC 2020 - Jan Engelhardt
+
+- Replace old specfile constructs. Do not suppress errors from
+ useradd.
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.dNrvxH/_old 2020-10-30 11:46:00.721619356 +0100
+++ /var/tmp/diff_new_pack.dNrvxH/_new 2020-10-30 11:46:00.725619360 +0100
@@ -28,7 +28,7 @@
Summary:Network Time Protocol daemon (version 4)
License:(MIT AND BSD-3-Clause AND BSD-4-Clause) AND GPL-2.0-only
Group: Productivity/Networking/Other
-Url:http://www.ntp.org/
+URL:http://www.ntp.org/
# main source
Source0:
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz
# configuration
@@ -82,7 +82,6 @@
Obsoletes: xntp < %{version}
Obsoletes: xntp3 < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%{?systemd_requires}
Conflicts: openntpd
%description
@@ -114,7 +113,7 @@
Ulrich Windl and David Dalton.
%prep
-%setup -q -n ntp-%{version}
+%setup -q
# unpack ntp-faq
tar -x -C html -j -f %{SOURCE10}
%patch1
@@ -169,7 +168,7 @@
%make_build
%install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
# Change permissions
chmod 644 html/pic/neoclock4x.gif
%fdupes -s html
@@ -191,7 +190,7 @@
install -m 0644 -D %{SOURCE9} %{buildroot}/%{_unitdir}/ntp-wait.service
install -d %{buildroot}%{_prefix}/sbin
install -m 755 -D %{SOURCE8} %{buildroot}%{_sbindir}/start-ntpd
-%__install -d %{buildroot}%{_libexecdir}/initscripts/legacy-actions/ntpd
+install -d %{buildroot}/%{_libexecdir}/initscripts/legacy-actions/ntpd
for f in ntptimeset addserver; do
F=%{buildroot}%{_libexecdir}/initscripts/legacy-actions/ntpd/$f
cat >$F <<-EOF
@@ -230,8 +229,9 @@
install -m 644 /dev/null %{buildroot}/var/lib/ntp/kod
%pre
-%{_sbindir}/groupadd -r ntp 2> /dev/null || :
-%{_sbindir}/useradd -r -o -g ntp -u 74 -s /bin/false -c "NTP daemon" -d
%{_localstatedir}/lib/ntp ntp 2> /dev/null || :
+getent group ntp >/dev/null || %{_sbindir}/groupadd -r ntp
+getent passwd ntp >/dev/null || %{_sbindir}/useradd -r -o -g ntp -u 74 \
+ -s /bin/false -c "NTP daemon" -d %{_localstatedir}/lib/ntp ntp
%{_sbindir}/usermod -g ntp ntp 2>/dev/null || :
test -L %{_localstatedir}/run/ntp || rm -rf %{_localstatedir}/run/ntp && :
%service_add_pre ntp.service ntpd.service
@@ -360,8 +360,8 @@
%service_del_postun ntp-wait.service
%files
-%defattr(-,root,root)
-%doc COPYRIGHT ChangeLog NEWS README* TODO WHERE-TO-START conf
+%license COPYRIGHT
+%doc ChangeLog NEWS README* TODO WHERE-TO-START conf
%attr(0640,root,ntp) %config(noreplace) %{_sysconfdir}/ntp.conf
%dir %{_sysconfdir}/slp.reg.d
%{_unitdir}/ntpd.service
@@ -391,7 +391,6 @@
/var/lib/ntp
%files doc
-%defattr(-,root,root)
%doc %{_docdir}/ntp-doc
%changelog
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2020-06-27 23:21:33
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new.3060 (New)
Package is "ntp"
Sat Jun 27 23:21:33 2020 rev:124 rq:817085 version:4.2.8p15
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2020-01-30 09:39:11.593419221
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new.3060/ntp.changes2020-06-27
23:21:36.469630450 +0200
@@ -1,0 +2,75 @@
+Thu Jun 25 13:56:55 UTC 2020 - Reinhard Max
+
+- Update to 4.2.8p15
+- Fixed security issues:
+ * bsc#1169740, CVE-2020-11868:
+DoS on client ntpd using server mode packet
+ * bsc#1171355, CVE-2018-8956: remote attackers may prevent a
+broadcast client from synchronizing its clock with a broadcast
+NTP server via spoofed mode 3 and mode 5 packets.
+ * bsc#1172651, CVE-2020-13817: vulnerable to off-path attack
+ * bsc#1173334, CVE-2020-15025: Remote DoS when CMAC key is used
+- Bugfixes in 4.2.8p15 and 4.2.8p14 include:
+ * [Bug 3667] decodenetnum fails with numeric port
+ * [Bug 3666] avoid unlimited receive buffer allocation
+ * [Bug 3660] Manycast orphan mode startup discovery problem.
+ * [Bug 3655] ntpdc memstats hash counts
+ * [Bug 3653] Refclock jitter RMS calculation
+ * [Bug 3646] Avoid sync with unsync orphan
+ * [Bug 3644] Unsynchronized server [...] selected as candidate
+ * [Bug 3636] NMEA: combine time/date from multiple sentences
+ * [Bug 3635] Make leapsecond file hash check optional
+ * [Bug 3628] raw DCF decoding - improve robustness
+ * [Bug 3620] memory leak in ntpq sysinfo
+ * [Bug 3619] Honour drefid setting in cooked mode and sysinfo
+ * [Bug 3617] Add support for ACE III and Copernicus II receivers
+ * [Bug 3615] accelerate refclock startup
+ * [Bug 3613] Propagate noselect to mobilized pool servers
+ * [Bug 3612] Use-of-uninitialized-value in receive function
+ * [Bug 3611] NMEA time interpreted incorrectly
+ * [Bug 3609] Fixing wrong falseticker in case of non-statistic jitter
+ * [Bug 3604] Wrong param byte order passing into
+record_raw_stats() in ntp_io.c
+ * [Bug 3594] ntpd discards messages coming through nmead
+ * [Bug 3593] ntpd discards silently nmea messages after the 5th string
+ * [Bug 3590] Update refclock_oncore.c to the new GPS date API
+ * [Bug 3583] synchronization error - set clock to base date
+if system time is before that limit
+ * [Bug 3582] gpsdjson refclock fudgetime1 adjustment is doubled
+ * [Bug 3580] Possible bug ntpq-subs (NULL dereference in dogetassoc)
+ * [Bug 3577] Update refclock_zyfer.c to the new GPS date API
+ * [Bug 3576] New GPS date function API
+ * [Bug 3573] nptdate: missleading error message
+ * [Bug 3569] cleanup MOD_NANO/STA_NANO handling for 'ntpadjtimex()'
+ * [Bug 3550] Reproducible build: Respect SOURCE_DATE_EPOCH
+ * [Bug 3542] ntpdc monlist parameters cannot be set
+ * [Bug 3533] ntpdc peer_info ipv6 issues
+ * [Bug 3531] make check: test-decodenetnum fails
+ * [Bug 3515] Refactor ntpdmain() dispatcher loop and group
+common code
+ * [Bug 3491] Signed values of LFP datatypes should always
+display a sign
+ * [Bug 3490] Patch to support Trimble Resolution Receivers
+ * [Bug 3473] RefID of refclocks should always be text format
+ * [Bug 3094] ntpd trying to listen for broadcasts on a
+completely ipv6 network
+ * [Bug 2420] ntpd doesn't run and exits with retval 0 when
+invalid user is specified with -u
+ * [Bug 1433] runtime check whether the kernel really supports
+capabilities
+ * Provide more detail on unrecognized config file parser tokens.
+ * Startup log improvements.
+- Obsoleted patches:
+ * ntp-4.2.6p2-ntpq-speedup-782060.patch
+ * ntp-daemonize.patch
+ * ntp-reproducible.patch
+- Silence an OpenSSL version warning (bsc#992038,
+ ntp-openssl-version.patch).
+
+---
+Wed Jun 17 08:26:47 UTC 2020 - Dominique Leuenberger
+
+- Properly use %{_libexecdir} to package the legacy initscript
+ action scripts.
+
+---
Old:
ntp-4.2.6p2-ntpq-speedup-782060.patch
ntp-4.2.8p13.tar.gz
ntp-daemonize.patch
ntp-reproducible.patch
New:
ntp-4.2.8p15.tar.gz
ntp-openssl-version.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.Rdy1jv/_old 2020-06-27 23:21:37.849634987 +0200
+++ /var/tmp/diff_new_pack.Rdy1jv/_new 2020-06-27 23:21:37.849634987 +0200
@@ -23,7 +23,7 @@
%define ntpfaqversion 3.4
Name: ntp
-Version:4.2.8p13
+Version:4.2.8p15
Release:0
Summary:Network Time Protocol daemon
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2020-01-30 09:38:37
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new.26092 (New)
Package is "ntp"
Thu Jan 30 09:38:37 2020 rev:123 rq:768084 version:4.2.8p13
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2019-08-07 13:54:19.280857551
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new.26092/ntp.changes 2020-01-30
09:39:11.593419221 +0100
@@ -1,0 +2,5 @@
+Tue Jan 28 15:25:58 UTC 2020 - Thorsten Kukuk
+
+- Remove not used Pre/Post requires
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.zJE4k8/_old 2020-01-30 09:39:13.841420424 +0100
+++ /var/tmp/diff_new_pack.zJE4k8/_new 2020-01-30 09:39:13.841420424 +0100
@@ -74,10 +74,7 @@
Requires: /bin/logger
Requires: timezone
Requires(pre): %fillup_prereq
-Requires(pre): %{_bindir}/chkconfig
-Requires(pre): %{_bindir}/diff
-Requires(pre): %{_bindir}/grep
-Requires(pre): pwdutils
+Requires(pre): shadow
Requires(post): /usr/bin/base64
Requires(post): /usr/bin/gawk
Suggests: logrotate
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2019-08-07 13:54:17
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new.9556 (New)
Package is "ntp"
Wed Aug 7 13:54:17 2019 rev:122 rq:720097 version:4.2.8p13
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2019-07-29 17:24:29.298344479
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new.9556/ntp.changes2019-08-07
13:54:19.280857551 +0200
@@ -1,0 +2,8 @@
+Wed Jul 24 13:13:56 UTC 2019 - matthias.gerst...@suse.com
+
+- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
+ firewalld, see [1].
+
+ [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
+---
Old:
ntp.firewall
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.Ma8Lft/_old 2019-08-07 13:54:20.984857533 +0200
+++ /var/tmp/diff_new_pack.Ma8Lft/_new 2019-08-07 13:54:20.988857533 +0200
@@ -38,7 +38,6 @@
Source4:conf.sysconfig.ntp
Source5:conf.sysconfig.syslog-ntp
Source6:conf.ntp.reg
-Source7:%{name}.firewall
Source8:conf.start-ntpd
Source9:conf.ntp-wait.service
# documentation
@@ -226,11 +225,6 @@
#
install -m 644 %{S:13} %{buildroot}/%{_mandir}/man8
#
-# firewall
-#
-install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
-install -m 644 %{SOURCE7}
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
-#
# Logfile
#
install -d %{buildroot}%{_localstatedir}/log/
@@ -381,7 +375,6 @@
%{_unitdir}/ntp-wait.service
%config(noreplace) %{_sysconfdir}/slp.reg.d/ntp.reg
%config %{_sysconfdir}/logrotate.d/ntp
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp
# own /etc/NetworkManager so we don't have to BuildDepend on NM
%dir %{_sysconfdir}/NetworkManager
%dir %{_sysconfdir}/NetworkManager/dispatcher.d
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2019-07-29 17:24:29
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new.4126 (New)
Package is "ntp"
Mon Jul 29 17:24:29 2019 rev:121 rq:715673 version:4.2.8p13
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2019-06-24 21:47:43.835844148
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new.4126/ntp.changes2019-07-29
17:24:29.298344479 +0200
@@ -1,0 +2,7 @@
+Fri Jul 12 11:09:37 UTC 2019 - Martin Liška
+
+- Update ntp-4.2.6p2-seed_file.patch in order to not return
+ 0 from in a void function.
+- Use %make_build in order to provide verbose output.
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.YeI1Hm/_old 2019-07-29 17:24:30.698343961 +0200
+++ /var/tmp/diff_new_pack.YeI1Hm/_new 2019-07-29 17:24:30.702343960 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ntp
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -26,7 +26,7 @@
Version:4.2.8p13
Release:0
Summary:Network Time Protocol daemon (version 4)
-License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
+License:(MIT AND BSD-3-Clause AND BSD-4-Clause) AND GPL-2.0-only
Group: Productivity/Networking/Other
Url:http://www.ntp.org/
# main source
@@ -127,7 +127,7 @@
# copy README.SUSE
cp %{SOURCE12} .
%patch10 -p1
-%patch11
+%patch11 -p1
%patch15
%patch16
%patch18
@@ -174,7 +174,7 @@
--enable-leap-smear \
--enable-ntp-signd
-make %{?_smp_mflags}
+%make_build
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
++ ntp-4.2.6p2-seed_file.patch ++
--- /var/tmp/diff_new_pack.YeI1Hm/_old 2019-07-29 17:24:30.902343886 +0200
+++ /var/tmp/diff_new_pack.YeI1Hm/_new 2019-07-29 17:24:30.902343886 +0200
@@ -1,8 +1,8 @@
-Index: ntpd/ntp_crypto.c
-===
ntpd/ntp_crypto.c.orig
-+++ ntpd/ntp_crypto.c
-@@ -3698,10 +3698,12 @@ crypto_setup(void)
+diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
+index 2f82c4c..061218e 100644
+--- a/ntpd/ntp_crypto.c
b/ntpd/ntp_crypto.c
+@@ -3930,10 +3930,12 @@ crypto_setup(void)
randfile = rand_file;
if ((bytes = RAND_load_file(randfile, -1)) == 0) {
@@ -13,7 +13,7 @@
randfile);
- exit (-1);
+ crypto_setup();
-+ return ( 0 );
++ return;
}
get_systime();
RAND_seed(, sizeof(l_fp));
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2019-06-24 21:47:42
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new.4615 (New)
Package is "ntp"
Mon Jun 24 21:47:42 2019 rev:120 rq:709068 version:4.2.8p13
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2019-05-03 22:26:49.824264214
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new.4615/ntp.changes2019-06-24
21:47:43.835844148 +0200
@@ -1,0 +2,6 @@
+Thu Jun 6 09:29:34 UTC 2019 - Tomáš Chvátal
+
+- Drop the omc config fate#301838:
+ * it is obsolete since SLE11
+
+---
Old:
ntp.xml
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.P7zSuT/_old 2019-06-24 21:47:44.827844915 +0200
+++ /var/tmp/diff_new_pack.P7zSuT/_new 2019-06-24 21:47:44.831844917 +0200
@@ -45,7 +45,6 @@
Source10: NTP-FAQ-%{ntpfaqversion}.tar.bz2
Source12: README.SUSE
Source13: ntptime.8.gz
-Source14: ntp.xml
Source16: ntp.NetworkManager
Patch1: ntp-segfault_on_invalid_device.patch
Patch10:ntp-strcat.patch
@@ -239,8 +238,6 @@
#
# service xml
#
-install -d %{buildroot}%{_datadir}/omc/svcinfo.d/
-install -m 644 %{SOURCE14} %{buildroot}%{_datadir}/omc/svcinfo.d/
install -m 755 scripts/ntp-wait/ntp-wait %{buildroot}%{_sbindir}/
install -d %{buildroot}/var/lib/ntp
install -m 644 /dev/null %{buildroot}/var/lib/ntp/kod
@@ -405,7 +402,6 @@
%{_fillupdir}/*
%attr(0755,ntp,root) %{_localstatedir}/lib/ntp%{_localstatedir}/run/ntp
%ghost %config(noreplace) %{_localstatedir}/log/ntp
-%{_datadir}/omc/svcinfo.d/ntp.xml
/var/lib/ntp
%files doc
commit ntp for openSUSE:Factory
Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2019-05-03 22:26:48 Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new.5148 (New) Package is "ntp" Fri May 3 22:26:48 2019 rev:119 rq:700033 version:4.2.8p13 Changes: --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2019-03-13 09:08:43.403427033 +0100 +++ /work/SRC/openSUSE:Factory/.ntp.new.5148/ntp.changes2019-05-03 22:26:49.824264214 +0200 @@ -1,0 +2,5 @@ +Wed Apr 17 11:19:18 CEST 2019 - ku...@suse.de + +- Don't source /etc/rc.status if we don't use it. + +--- Other differences: -- ++ ntp.NetworkManager ++ --- /var/tmp/diff_new_pack.PWcTAZ/_old 2019-05-03 22:26:50.584265772 +0200 +++ /var/tmp/diff_new_pack.PWcTAZ/_new 2019-05-03 22:26:50.584265772 +0200 @@ -4,7 +4,6 @@ # # Dominique Leuenberger # -. /etc/rc.status case "$2" in up)
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2019-03-13 09:08:37
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new.28833 (New)
Package is "ntp"
Wed Mar 13 09:08:37 2019 rev:118 rq:684184 version:4.2.8p13
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2018-12-27 00:23:17.963961677
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new.28833/ntp.changes 2019-03-13
09:08:43.403427033 +0100
@@ -1,0 +2,26 @@
+Mon Mar 11 10:01:27 UTC 2019 - Reinhard Max
+
+- Update ro 4.2.8p13
+ * CVE-2019-8936, bsc#1128525: Crafted null dereference attack in
+authenticated mode 6 packet.
+ * Fix several bugs in the BANCOMM reclock driver.
+ * Fix ntp_loopfilter.c snprintf compilation warnings.
+ * Fix spurious initgroups() error message.
+ * Fix STA_NANO struct timex units.
+ * Fix GPS week rollover in libparse.
+ * Fix incorrect poll interval in packet.
+ * Add a missing check for ENABLE_CMAC.
+
+---
+Thu Feb 21 18:19:40 UTC 2019 - Franck Bui
+
+- Drop use of $FIRST_ARG in ntp.spec
+
+ The use of $FIRST_ARG was probably required because of the
+ %service_* rpm macros were playing tricks on the shell positional
+ parameters. This is bad practice and error prones so let's assume
+ that no macros should do that anymore and hence it's safe to assume
+ that positional parameters remains unchanged after any rpm macro
+ call.
+
+---
Old:
ntp-4.2.8p12.tar.gz
New:
ntp-4.2.8p13.tar.gz
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.pqjP34/_old 2019-03-13 09:08:45.531426814 +0100
+++ /var/tmp/diff_new_pack.pqjP34/_new 2019-03-13 09:08:45.535426813 +0100
@@ -23,7 +23,7 @@
%define ntpfaqversion 3.4
Name: ntp
-Version:4.2.8p12
+Version:4.2.8p13
Release:0
Summary:Network Time Protocol daemon (version 4)
License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
@@ -252,7 +252,7 @@
test -L %{_localstatedir}/run/ntp || rm -rf %{_localstatedir}/run/ntp && :
%service_add_pre ntp.service ntpd.service
%service_add_pre ntp-wait.service
-if [ $FIRST_ARG -ne 1 -a ! -e "%{_localstatedir}/lib/systemd/migrated/ntpd" -a
-e %{_localstatedir}/lib/systemd/sysv-convert/database ]; then
+if [ $1 -ne 1 -a ! -e "%{_localstatedir}/lib/systemd/migrated/ntpd" -a -e
%{_localstatedir}/lib/systemd/sysv-convert/database ]; then
sed -i -e 's,ntp\t,ntpd\t,g'
%{_localstatedir}/lib/systemd/sysv-convert/database
fi
@@ -261,7 +261,7 @@
%service_del_preun ntp-wait.service
# no update? Then remove these files that aren't owned by the package
-if [ ${FIRST_ARG:-0} -eq 0 ]; then
+if [ $1 -eq 0 ]; then
test -e %{_localstatedir}/lib/ntp/drift/ntp.drift && rm -f
%{_localstatedir}/lib/ntp/drift/ntp.drift
rm -f %{_localstatedir}/lib/ntp%{_sysconfdir}/* 2>/dev/null
test -e %{_localstatedir}/log/ntp && rm -f %{_localstatedir}/log/ntp
++ ntp-4.2.8p12.tar.gz -> ntp-4.2.8p13.tar.gz ++
/work/SRC/openSUSE:Factory/ntp/ntp-4.2.8p12.tar.gz
/work/SRC/openSUSE:Factory/.ntp.new.28833/ntp-4.2.8p13.tar.gz differ: char 5,
line 1
++ ntp-sntp-libevent.patch ++
--- /var/tmp/diff_new_pack.pqjP34/_old 2019-03-13 09:08:45.659426801 +0100
+++ /var/tmp/diff_new_pack.pqjP34/_new 2019-03-13 09:08:45.663426800 +0100
@@ -153,5 +153,5 @@
-}
-
/* Dummy function to satisfy libntp/work_fork.c */
- int
- set_user_group_ids(
+ extern int set_user_group_ids(void);
+ int set_user_group_ids(void)
commit ntp for openSUSE:Factory
Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2018-12-27 00:23:16 Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new.28833 (New) Package is "ntp" Thu Dec 27 00:23:16 2018 rev:117 rq:657615 version:4.2.8p12 Changes: --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2018-10-22 11:01:55.200348628 +0200 +++ /work/SRC/openSUSE:Factory/.ntp.new.28833/ntp.changes 2018-12-27 00:23:17.963961677 +0100 @@ -1,0 +2,6 @@ +Mon Dec 10 10:03:56 UTC 2018 - Franck Bui + +- No more rely on /etc/insserv.conf for adding dependencies in + ntpd.service against time-sync.target (boo#1118375) + +--- Other differences: -- ++ conf.ntpd.service ++ --- /var/tmp/diff_new_pack.3QPJLV/_old 2018-12-27 00:23:18.771961019 +0100 +++ /var/tmp/diff_new_pack.3QPJLV/_new 2018-12-27 00:23:18.771961019 +0100 @@ -5,6 +5,8 @@ Conflicts=systemd-timesyncd.service Wants=network.target After=network.target +Wants=time-sync.target +Before=time-sync.target ConditionVirtualization=!container ConditionCapability=CAP_SYS_TIME
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2018-10-22 11:01:34
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Mon Oct 22 11:01:34 2018 rev:116 rq:640670 version:4.2.8p12
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2018-04-30 22:52:22.670824669
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2018-10-22
11:01:55.200348628 +0200
@@ -1,0 +2,12 @@
+Tue Sep 11 12:24:52 UTC 2018 - m...@suse.com
+
+- Update to 4.2.8p12
+ * CVE-2018-12327, bsc#1098531: fixed stack buffer overflow in
+the openhost() command-line call of NTPQ/NTPDC.
+ * Add further tweaks to improve the fix for CVE-2018-7170,
+bsc#1083424.
+ * ntp-usrgrp-resolver.patch was integrated upstream.
+- Don't run autoreconf anymore and remove all related hacks and
+ BuildRequires.
+
+---
Old:
ntp-4.2.8p11.tar.gz
ntp-usrgrp-resolver.patch
New:
ntp-4.2.8p12.tar.gz
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.AIDGTy/_old 2018-10-22 11:02:03.212341662 +0200
+++ /var/tmp/diff_new_pack.AIDGTy/_new 2018-10-22 11:02:03.216341659 +0200
@@ -23,7 +23,7 @@
%define ntpfaqversion 3.4
Name: ntp
-Version:4.2.8p11
+Version:4.2.8p12
Release:0
Summary:Network Time Protocol daemon (version 4)
License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
@@ -57,19 +57,16 @@
Patch20:ntp-sntp-dst.patch
Patch21:ntp-4.2.6p2-ntpq-speedup-782060.patch
Patch24:ntp-daemonize.patch
-Patch25:ntp-usrgrp-resolver.patch
Patch27:ntp-netlink.patch
Patch29:ntp-pathfind.patch
Patch30:ntp-move-kod-file.patch
Patch32:ntp-reproducible.patch
Patch33:ntp-sntp-libevent.patch
-BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
BuildRequires: fdupes
BuildRequires: libcap-devel
BuildRequires: libevent-devel
-BuildRequires: libtool
BuildRequires: openssl-devel
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200
BuildRequires: pps-tools-devel
@@ -139,7 +136,6 @@
%patch20 -p1
%patch21
%patch24
-%patch25
%patch27
%patch29
%patch30
@@ -148,11 +144,8 @@
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
-# new automake 1.13 has removed old macro
-sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
%build
-autoreconf -fvi
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -W -DOPENSSL_LOAD_CONF -Wall
-Wstrict-prototypes -Wpointer-arith -Wno-unused-parameter -fno-strict-aliasing
-fstack-protector"
%ifarch alpha s390x
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0"
++ ntp-4.2.8p11.tar.gz -> ntp-4.2.8p12.tar.gz ++
/work/SRC/openSUSE:Factory/ntp/ntp-4.2.8p11.tar.gz
/work/SRC/openSUSE:Factory/.ntp.new/ntp-4.2.8p12.tar.gz differ: char 5, line 1
++ ntp-daemonize.patch ++
--- /var/tmp/diff_new_pack.AIDGTy/_old 2018-10-22 11:02:03.356341537 +0200
+++ /var/tmp/diff_new_pack.AIDGTy/_new 2018-10-22 11:02:03.360341534 +0200
@@ -1,8 +1,6 @@
-Index: ntpd/ntpd.c
-===
--- ntpd/ntpd.c.orig
+++ ntpd/ntpd.c
-@@ -690,16 +690,17 @@ ntpdmain(
+@@ -913,16 +913,17 @@ ntpdmain(
/* make sure the FDs are initialised */
pipe_fds[0] = -1;
pipe_fds[1] = -1;
@@ -27,7 +25,7 @@
if (pipe(pipe_fds)) {
exit_code = (errno) ? errno : -1;
msyslog(LOG_ERR,
-@@ -707,7 +708,7 @@ ntpdmain(
+@@ -930,7 +931,7 @@ ntpdmain(
exit(exit_code);
}
waitsync_fd_to_close = pipe_fds[1];
@@ -36,9 +34,9 @@
# endif /* HAVE_WORKING_FORK */
init_lib();
-@@ -1240,6 +1241,20 @@ int scmp_sc[] = {
- }
- #endif /* LIBSECCOMP and KERN_SECCOMP */
+@@ -1351,6 +1352,20 @@ int scmp_sc[] = {
+ ntservice_isup();
+ #endif
+#ifdef HAVE_WORKING_FORK
+ if (!nofork && wait_sync == 0 && waitsync_fd_to_close != -1) {
@@ -57,7 +55,7 @@
# ifdef HAVE_IO_COMPLETION_PORT
for (;;) {
-@@ -1436,11 +1451,17 @@ wait_child_sync_if(
+@@ -1547,11 +1562,17 @@ wait_child_sync_if(
fd_set readset;
struct timeval wtimeout;
++ ntp-sntp-libevent.patch ++
--- /var/tmp/diff_new_pack.AIDGTy/_old 2018-10-22 11:02:03.376341520 +0200
+++ /var/tmp/diff_new_pack.AIDGTy/_new 2018-10-22 11:02:03.376341520 +0200
@@ -53,7 +53,7 @@
p_SNTP_PRETEND_TIME = getenv("SNTP_PRETEND_TIME");
if (p_SNTP_PRETEND_TIME) {
-@@ -1513,98 +1512,3 @@
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2018-04-30 22:52:21
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Mon Apr 30 22:52:21 2018 rev:115 rq:601632 version:4.2.8p11
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2018-04-01 17:25:25.009929455
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2018-04-30
22:52:22.670824669 +0200
@@ -1,0 +2,7 @@
+Tue Apr 24 10:19:39 UTC 2018 - m...@suse.com
+
+- Refactor the key handling in %post so that it does not overwrite
+ user settings (bsc#1036505) and is more robust against ignored
+ SIGPIPE (bsc#1090564).
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.sK2oza/_old 2018-04-30 22:52:23.574791686 +0200
+++ /var/tmp/diff_new_pack.sK2oza/_new 2018-04-30 22:52:23.578791540 +0200
@@ -83,6 +83,8 @@
Requires(pre): %{_bindir}/diff
Requires(pre): %{_bindir}/grep
Requires(pre): pwdutils
+Requires(post): /usr/bin/base64
+Requires(post): /usr/bin/gawk
Suggests: logrotate
Provides: ntp-daemon
Provides: xntp = %{version}
@@ -273,38 +275,87 @@
fi
%post
-# Create ntp.keys file
-if [ ! -f /etc/ntp.keys ]; then
+
+getntpconf() {
+ # Get the value of a single-value ntp.conf directive, first match wins.
+ awk 'NF >= 2 && $1 == option { print $2; exit } ' "option=$1" $NTPCONF
+}
+
+keyexists() {
+ # Check whether a key with the given ID exists in the ntp keys file.
+ awk '$1 == keyno {found = 1} END {exit !found}' "keyno=$1" $KEYSFILE
+}
+
+add_trustedkey() {
+ # Merge the given key ID into the trustedkey directive.
+ # Add the directive if it does not yet exist.
+ FILE=$(mktemp -p /etc)
+ gawk '
+NF >= 2 && $1 == "trustedkey" {
+ n = split($0, a)
+ for (i = 1; i <= n; i++) {
+if (a[i] == newkey) newkey = "";
+if (a[i] ~ /^#/ && newkey) {
+ $(++j) = newkey; newkey = ""
+}
+$(++j) = a[i];
+ }
+ if (newkey) { $(++j) = newkey; newkey = "" }
+}
+{ print }
+ENDFILE {
+ if (newkey) { print "trustedkey", newkey }
+}
+ ' "newkey=$1" $NTPCONF > $FILE
+ if ! cmp --quiet $FILE $NTPCONF; then
+ cat $FILE > $NTPCONF
+ fi
+ rm $FILE
+}
+
+NTPCONF=/etc/ntp.conf
+KEYSFILE=$(getntpconf keys)
+if test -z "$KEYSFILE"; then
+ KEYSFILE=/etc/ntp.keys
+ echo "keys $KEYSFILE" >> $NTPCONF
+fi
+
+if [ ! -f $KEYSFILE ]; then
FILE=$(mktemp -p /etc)
chmod 0640 $FILE
chown root:ntp $FILE
- mv $FILE /etc/ntp.keys
+ mv $FILE $KEYSFILE
fi
-# Make sure we have a key with ID 1, because it is needed
-# by the startup scripts.
-if awk '$1 == "1" {exit 1}' /etc/ntp.keys; then
- KEY=$(tr -dc '[:alnum:]' < /dev/urandom | head -c 20)
- echo "1 SHA1 $KEY" >> /etc/ntp.keys
-fi
-# Are we in update mode?
-if [ -f /etc/sysconfig/ntp ]; then
-grep -q '^keys /etc/ntp.keys' /etc/ntp.conf || {
-echo "#
-# Authentication stuff
-#
-keys /etc/ntp.keys # path for keys file
-trustedkey 1# define trusted keys
-requestkey 1# key (7) for accessing server variables
-" >> /etc/ntp.conf
-}
+
+CONTROLKEY=$(getntpconf controlkey)
+REQUESTKEY=$(getntpconf requestkey)
+
+if test -z "$CONTROLKEY"; then
+ if -n "$REQUESTKEY"; then
+CONTROLKEY=$REQUESTKEY
+ else
+for (( CONTROLKEY = 1; CONTROLKEY < 65535; CONTROLKEY++ )); do
+ keyexists $CONTROLKEY || break
+done
+ fi
+ echo "controlkey $CONTROLKEY" >> $NTPCONF
fi
-if [ -f /etc/sysconfig/ntp ]; then
-grep -q '^controlkey ' /etc/ntp.conf || {
-echo "#
-controlkey 1# key (6) for accessing server variables
- " >> /etc/ntp.conf
-}
+
+if test -z "$REQUESTKEY"; then
+ REQUESTKEY=$CONTROLKEY;
+ echo "requestkey $REQUESTKEY" >> $NTPCONF
fi
+
+for KEYNO in $REQUESTKEY $CONTROLKEY; do
+ if ! keyexists $KEYNO; then
+KEY=$(head -c 15 /dev/urandom | base64)
+echo "$KEYNO SHA1 $KEY" >> $KEYSFILE
+ fi
+done
+
+add_trustedkey $REQUESTKEY
+add_trustedkey $CONTROLKEY
+
# update from previous permissions
if [ -f %{_sysconfdir}/ntp.conf ]; then
chown root:ntp %{_sysconfdir}/ntp.conf
commit ntp for openSUSE:Factory
Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2018-04-01 17:25:23 Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) Package is "ntp" Sun Apr 1 17:25:23 2018 rev:114 rq:592537 version:4.2.8p11 Changes: --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2018-03-19 23:31:10.908929735 +0100 +++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2018-04-01 17:25:25.009929455 +0200 @@ -1,0 +2,6 @@ +Sun Mar 18 20:18:40 UTC 2018 - suse-b...@cboltz.de + +- change example statsdir in ntp.conf to /var/log/ntpstats/ to match + the AppArmor profile (boo#1076247) + +--- Other differences: -- ++ conf.ntp.conf ++ --- /var/tmp/diff_new_pack.S4CgBR/_old 2018-04-01 17:25:26.021892826 +0200 +++ /var/tmp/diff_new_pack.S4CgBR/_new 2018-04-01 17:25:26.021892826 +0200 @@ -73,7 +73,7 @@ # logconfig =syncstatus + sysevents # logconfig =all -# statsdir /tmp/ # directory for statistics files +# statsdir /var/log/ntpstats/ # directory for statistics files # filegen peerstats file peerstats type day enable # filegen loopstats file loopstats type day enable # filegen clockstats file clockstats type day enable
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2018-03-19 23:31:09
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Mon Mar 19 23:31:09 2018 rev:113 rq:586702 version:4.2.8p11
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2018-01-16 09:24:09.124839692
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2018-03-19
23:31:10.908929735 +0100
@@ -1,0 +2,22 @@
+Wed Feb 28 09:47:40 UTC 2018 - m...@suse.com
+
+- Update to 4.2.8p11 (bsc#1082210):
+ * CVE-2016-1549: Sybil vulnerability: ephemeral association
+attack. While fixed in ntp-4.2.8p7, there are significant
+additional protections for this issue in 4.2.8p11.
+ * CVE-2018-7182, bsc#1083426: ctl_getitem(): buffer read overrun
+leads to undefined behavior and information leak.
+ * CVE-2018-7170, bsc#1083424: Multiple authenticated ephemeral
+associations.
+ * CVE-2018-7184, bsc#1083422: Interleaved symmetric mode cannot
+recover from bad state.
+ * CVE-2018-7185, bsc#1083420: Unauthenticated packet can reset
+authenticated interleaved association.
+ * CVE-2018-7183, bsc#1083417: ntpq:decodearr() can write beyond
+its buffer limit.
+ * Obsoletes these patches: ntp-sntp-a.patch, ntp-warnings.patch
+- Remove dead code from conf.start-ntpd (bsc#1082063).
+- Don't use libevent's cached time stamps in sntp.
+ (bsc#1077445, ntp-sntp-libevent.patch)
+
+---
Old:
ntp-4.2.8p10.tar.gz
ntp-sntp-a.patch
ntp-warnings.patch
New:
ntp-4.2.8p11.tar.gz
ntp-sntp-libevent.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.0v3ama/_old 2018-03-19 23:31:11.936892651 +0100
+++ /var/tmp/diff_new_pack.0v3ama/_new 2018-03-19 23:31:11.940892507 +0100
@@ -23,7 +23,7 @@
%define ntpfaqversion 3.4
Name: ntp
-Version:4.2.8p10
+Version:4.2.8p11
Release:0
Summary:Network Time Protocol daemon (version 4)
License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
@@ -58,12 +58,11 @@
Patch21:ntp-4.2.6p2-ntpq-speedup-782060.patch
Patch24:ntp-daemonize.patch
Patch25:ntp-usrgrp-resolver.patch
-Patch26:ntp-sntp-a.patch
Patch27:ntp-netlink.patch
Patch29:ntp-pathfind.patch
Patch30:ntp-move-kod-file.patch
-Patch31:ntp-warnings.patch
Patch32:ntp-reproducible.patch
+Patch33:ntp-sntp-libevent.patch
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
@@ -139,12 +138,11 @@
%patch21
%patch24
%patch25
-%patch26
%patch27
%patch29
%patch30
-%patch31
%patch32 -p1
+%patch33
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
++ conf.start-ntpd ++
--- /var/tmp/diff_new_pack.0v3ama/_old 2018-03-19 23:31:12.392876201 +0100
+++ /var/tmp/diff_new_pack.0v3ama/_new 2018-03-19 23:31:12.396876057 +0100
@@ -60,28 +60,6 @@
/sbin/hwclock --systohc $HWCLOCK
return $?
fi
- if test -z "$(/sbin/modprobe -l rtc_cmos)" ; then
- /sbin/hwclock --systohc $HWCLOCK
- return $?
- fi
- local temprules=/dev/.udev/rules.d
- local uevseqnum=/sys/kernel/uevent_seqnum
- local rule=$temprules/95-rtc-cmos.rules
- local -i start=0 end=0
- /bin/mkdir -m 0755 -p $temprules
- echo ACTION==\"add\", KERNEL==\"rtc0\", RUN=\"/sbin/hwclock --systohc
$HWCLOCK --rtc=\$env{DEVNAME}\" > $rule
- test -e $uevseqnum && read -t 1 start < $uevseqnum
- if /sbin/modprobe -q rtc_cmos ; then
- test -e $uevseqnum && read -t 1 end < $uevseqnum
- if test $start -lt $end ; then
- /sbin/udevadm settle --quiet --seq-start=$start --seq-end=$end
- else
- /sbin/udevadm settle --quiet
- fi
- else
- rm -f $rule
-/sbin/hwclock --systohc $HWCLOCK
- fi
}
fi
fi
++ ntp-4.2.8p10.tar.gz -> ntp-4.2.8p11.tar.gz ++
/work/SRC/openSUSE:Factory/ntp/ntp-4.2.8p10.tar.gz
/work/SRC/openSUSE:Factory/.ntp.new/ntp-4.2.8p11.tar.gz differ: char 5, line 1
++ ntp-sntp-libevent.patch ++
--- sntp/main.c.orig
+++ sntp/main.c
@@ -118,7 +118,6 @@ void set_li_vn_mode(struct pkt *spkt, ch
int set_time(double offset);
void dec_pending_ntp(const char *, sockaddr_u *);
int libevent_version_ok(void);
-int gettimeofday_cached(struct event_base *b, struct timeval *tv);
/*
@@ -271,7 +270,7 @@ sntp_main (
for (i = 0; i < argc; ++i)
handle_lookup(argv[i], CTX_UCST);
- gettimeofday_cached(base, _tv);
+ gettimeofday(_tv, NULL);
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2018-01-16 09:24:07
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Tue Jan 16 09:24:07 2018 rev:112 rq:561845 version:4.2.8p10
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2017-11-30 12:41:14.370975513
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2018-01-16
09:24:09.124839692 +0100
@@ -1,0 +2,12 @@
+Thu Dec 21 13:55:11 UTC 2017 - bwiedem...@suse.com
+
+- Add ntp-reproducible.patch to make build reproducible (boo#1047218)
+
+---
+Tue Dec 19 15:26:04 UTC 2017 - m...@suse.com
+
+- Restart nptd if failed or aborted (FATE#315133).
+- Do not try to set the HW clock when adding a server at runtime
+ to avoid blocking systemd.
+
+---
New:
ntp-reproducible.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.O1AebD/_old 2018-01-16 09:24:10.760763155 +0100
+++ /var/tmp/diff_new_pack.O1AebD/_new 2018-01-16 09:24:10.768762781 +0100
@@ -63,6 +63,7 @@
Patch29:ntp-pathfind.patch
Patch30:ntp-move-kod-file.patch
Patch31:ntp-warnings.patch
+Patch32:ntp-reproducible.patch
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
@@ -143,6 +144,7 @@
%patch29
%patch30
%patch31
+%patch32 -p1
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
++ conf.ntpd.service ++
--- /var/tmp/diff_new_pack.O1AebD/_old 2018-01-16 09:24:10.904756419 +0100
+++ /var/tmp/diff_new_pack.O1AebD/_new 2018-01-16 09:24:10.904756419 +0100
@@ -12,6 +12,7 @@
Type=forking
PIDFile=/var/run/ntp/ntpd.pid
ExecStart=/usr/sbin/start-ntpd start
+RestartSec=11min
Restart=always
PrivateTmp=true
++ conf.start-ntpd ++
--- /var/tmp/diff_new_pack.O1AebD/_old 2018-01-16 09:24:10.920755671 +0100
+++ /var/tmp/diff_new_pack.O1AebD/_new 2018-01-16 09:24:10.924755483 +0100
@@ -141,7 +141,6 @@
}
function add_runtime_server() {
- [ "$NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP" = "yes" ] && /usr/sbin/sntp -S -c $@
NTPC_CMD="keytype $NTP_KEYTYPE\nkeyid $NTP_KEYID\npasswd
$NTP_PASSWD\n:config server $@\n"
NTPQ_LOG=$(echo -e "${NTPC_CMD}quit" | $NTPQ_BIN)
logger -t $0 "runtime configuration: server $@"
++ ntp-reproducible.patch ++
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828989
From: Reiner Herrmann
Subject: ntp: please make the build reproducible
Date: Wed, 29 Jun 2016 16:43:31 +0200
While working on the "reproducible builds" effort [1], we have noticed
that ntp could not be built reproducibly.
It embeds the build time into the version string.
The attached patch removes this, so that it can be built reproducibly.
Index: ntp-4.2.8p10/scripts/build/mkver.in
===
--- ntp-4.2.8p10.orig/scripts/build/mkver.in
+++ ntp-4.2.8p10/scripts/build/mkver.in
@@ -15,8 +15,6 @@ case "@VER_SUFFIX@" in
*) ConfStr="${ConfStr}-@VER_SUFFIX@" ;;
esac
-ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`"
-
if [ ! -f .version ]; then
echo 0 > .version
fi
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2017-11-30 12:41:12
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Thu Nov 30 12:41:12 2017 rev:111 rq:545184 version:4.2.8p10
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2017-04-11 12:40:09.964958070
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2017-11-30
12:41:14.370975513 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:47:08 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.LmPJsU/_old 2017-11-30 12:41:15.798923595 +0100
+++ /var/tmp/diff_new_pack.LmPJsU/_new 2017-11-30 12:41:15.802923450 +0100
@@ -16,6 +16,11 @@
#
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
%define ntpfaqversion 3.4
Name: ntp
Version:4.2.8p10
@@ -212,8 +217,8 @@
#
# fillup sysconfig.ntp
#
-install -m 644 -D %{SOURCE4}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.ntp
-install -m 644 -D %{SOURCE5}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-ntp
+install -m 644 -D %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.ntp
+install -m 644 -D %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.syslog-ntp
#
# install SLP reg file
#
@@ -353,7 +358,7 @@
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_mandir}/man8/*
-%{_localstatedir}/adm/fillup-templates/*
+%{_fillupdir}/*
%attr(0755,ntp,root) %{_localstatedir}/lib/ntp%{_localstatedir}/run/ntp
%ghost %config(noreplace) %{_localstatedir}/log/ntp
%{_datadir}/omc/svcinfo.d/ntp.xml
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2017-04-11 12:40:07
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Tue Apr 11 12:40:07 2017 rev:110 rq:486156 version:4.2.8p10
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2017-03-21 22:45:05.424603377
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2017-04-11
12:40:09.964958070 +0200
@@ -1,0 +2,53 @@
+Thu Apr 6 13:55:57 UTC 2017 - m...@suse.com
+
+- Enable experimental leap smearing (fate#321003).
+ See /usr/share/doc/packages/ntp/README.leapsmear for details.
+
+---
+Thu Apr 6 13:26:34 UTC 2017 - a...@ajaissle.de
+
+- Fix spelling and default values in conf.sysconfig.ntp
+
+---
+Wed Mar 22 15:57:48 UTC 2017 - m...@suse.com
+
+- Update to 4.2.8p10 (bsc#1030050):
+ * Sec 3389 / CVE-2017-6464 / VU#325339: NTP-01-016 NTP:
+Denial of Service via Malformed Config
+ * Sec 3388 / CVE-2017-6462 / VU#325339: NTP-01-014 NTP:
+Buffer Overflow in DPTS Clock
+ * Sec 3387 / CVE-2017-6463 / VU#325339: NTP-01-012 NTP:
+Authenticated DoS via Malicious Config Option
+ * Sec 3386: NTP-01-011 NTP:
+ntpq_stripquotes() returns incorrect Value
+ * Sec 3385: NTP-01-010 NTP:
+ereallocarray()/eallocarray() underused
+ * Sec 3381: NTP-01-006 NTP: Copious amounts of Unused Code
+ * Sec 3380: NTP-01-005 NTP: Off-by-one in Oncore GPS Receiver
+ * Sec 3379 / CVE-2017-6458 / VU#325339: NTP-01-004 NTP:
+Potential Overflows in ctl_put() functions
+ * Sec 3378 / CVE-2017-6451 / VU#325339: NTP-01-003
+Improper use of snprintf() in mx4200_send()
+ * Sec 3377 / CVE-2017-6460 / VU#325339: NTP-01-002
+Buffer Overflow in ntpq when fetching reslist
+ * Sec 3376: NTP-01-001 Makefile does not enforce Security Flags
+ * Sec 3361 / CVE-2016-9042 / VU#325339: 0rigin (zero origin) DoS.
+ * [Bug 3393] clang scan-build findings
+ * [Bug 3363] Support for openssl-1.1.0 without compatibility modes
+ * [Bug 3356] Bugfix 3072 breaks multicastclient
+ * [Bug 3173] forking async worker: interrupted pipe I/O
+ * [Bug 3139] (...) time_pps_create: Exec format error
+ * [Bug 3107] Incorrect Logic for Peer Event Limiting
+ * [Bug 3062] Change the process name of forked DNS worker
+ * [Bug 2923] Trap Configuration Fail
+ * [Bug 2896] Nothing happens if minsane < maxclock < minclock
+ * [Bug 2851] allow -4/-6 on restrict line with mask
+ * [Bug 2645] out-of-bound pointers in ctl_putsys and decode_bitflags
+- Removed patches:
+ * ntp-openssl-version.patch: fixed upstream
+ * ntp-processname.patch: accepted upstream
+ * ntp-trap.patch: accepted upstream
+ * ntp-unbreak-multicast.patch: fixed upstream
+- Remove spurious log messages (bsc#1014172, ntp-warnings.patch).
+
+---
@@ -10 +63 @@
-- Move ntp-kod to /var/lib/ntp/db, because /var/db is not a
+- Move ntp-kod to /var/lib/ntp, because /var/db is not a
Old:
ntp-4.2.8p9.tar.gz
ntp-openssl-version.patch
ntp-processname.patch
ntp-trap.patch
ntp-unbreak-multicast.patch
New:
ntp-4.2.8p10.tar.gz
ntp-warnings.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.d1VIVV/_old 2017-04-11 12:40:12.620582843 +0200
+++ /var/tmp/diff_new_pack.d1VIVV/_new 2017-04-11 12:40:12.620582843 +0200
@@ -18,7 +18,7 @@
%define ntpfaqversion 3.4
Name: ntp
-Version:4.2.8p9
+Version:4.2.8p10
Release:0
Summary:Network Time Protocol daemon (version 4)
License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
@@ -51,16 +51,13 @@
Patch19:ntp-ENOBUFS.patch
Patch20:ntp-sntp-dst.patch
Patch21:ntp-4.2.6p2-ntpq-speedup-782060.patch
-Patch22:ntp-openssl-version.patch
-Patch23:ntp-processname.patch
Patch24:ntp-daemonize.patch
Patch25:ntp-usrgrp-resolver.patch
Patch26:ntp-sntp-a.patch
Patch27:ntp-netlink.patch
-Patch28:ntp-trap.patch
Patch29:ntp-pathfind.patch
Patch30: ntp-move-kod-file.patch
-Patch31:ntp-unbreak-multicast.patch
+Patch31:ntp-warnings.patch
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
@@ -134,16 +131,13 @@
%patch19 -p1
%patch20 -p1
%patch21
-%patch22
-%patch23
%patch24
-%patch25 -p1
+%patch25
%patch26
%patch27
-%patch28
%patch29
%patch30
-%patch31 -p1
+%patch31
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
@@ -178,6 +172,7 @@
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2017-03-21 22:45:04
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Tue Mar 21 22:45:04 2017 rev:109 rq:480781 version:4.2.8p9
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2017-03-11 15:17:34.609046096
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2017-03-21
22:45:05.424603377 +0100
@@ -1,0 +2,6 @@
+Fri Mar 10 08:38:18 UTC 2017 - m...@suse.com
+
+- Fix a problem with multicast clients.
+ (bsc#1018940, ntp-unbreak-multicast.patch)
+
+---
New:
ntp-unbreak-multicast.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.VPfFC2/_old 2017-03-21 22:45:07.068370988 +0100
+++ /var/tmp/diff_new_pack.VPfFC2/_new 2017-03-21 22:45:07.072370423 +0100
@@ -60,6 +60,7 @@
Patch28:ntp-trap.patch
Patch29:ntp-pathfind.patch
Patch30: ntp-move-kod-file.patch
+Patch31:ntp-unbreak-multicast.patch
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
@@ -142,6 +143,7 @@
%patch28
%patch29
%patch30
+%patch31 -p1
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
++ ntp-unbreak-multicast.patch ++
--- a/ntpd/ntp_peer.c 2016-12-30 10:40:02.629459001 +0100
+++ a/ntpd/ntp_peer.c 2016-12-30 10:40:02.629459001 +0100
@@ -309,7 +309,8 @@
for (p = peer_hash[hash]; p != NULL; p = p->adr_link) {
/* [Bug 3072] ensure interface of peer matches */
- if (p->dstadr != rbufp->dstadr)
+ /* [Bug 3356] ... if NOT a broadcast peer! */
+ if (p->hmode != MODE_BCLIENT && p->dstadr != rbufp->dstadr)
continue;
/* ensure peer source address matches */
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2017-03-11 15:17:30
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Sat Mar 11 15:17:30 2017 rev:108 rq:461929 version:4.2.8p9
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2016-11-25 12:02:26.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2017-03-11
15:17:34.609046096 +0100
@@ -1,0 +2,19 @@
+Tue Feb 21 11:08:46 CET 2017 - ku...@suse.de
+
+- Move ntp-kod to /var/lib/ntp/db, because /var/db is not a
+ standard directory and causes problems for transactional updates
+ (ntp-move-kod-file.patch)
+
+---
+Tue Jan 17 11:22:21 UTC 2017 - m...@suse.com
+
+- Remove 50-ntp.list (bsc#1011919).
+- Use system-wide libevent instead of local copy.
+
+---
+Mon Nov 28 15:05:09 UTC 2016 - m...@suse.com
+
+- Simplify ntpd's search for its own executable to prevent AppArmor
+ warnings (bsc#956365, ntp-pathfind.patch).
+
+---
New:
ntp-move-kod-file.patch
ntp-pathfind.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.0YQ8c3/_old 2017-03-11 15:17:35.684893852 +0100
+++ /var/tmp/diff_new_pack.0YQ8c3/_new 2017-03-11 15:17:35.688893286 +0100
@@ -17,9 +17,6 @@
%define ntpfaqversion 3.4
-%if %{undefined _ntpunitsdir}
-%global _ntpunitsdir %{_libexecdir}/systemd/ntp-units.d
-%endif
Name: ntp
Version:4.2.8p9
Release:0
@@ -61,11 +58,14 @@
Patch26:ntp-sntp-a.patch
Patch27:ntp-netlink.patch
Patch28:ntp-trap.patch
+Patch29:ntp-pathfind.patch
+Patch30: ntp-move-kod-file.patch
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
BuildRequires: fdupes
BuildRequires: libcap-devel
+BuildRequires: libevent-devel
BuildRequires: libtool
BuildRequires: openssl-devel
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200
@@ -140,6 +140,8 @@
%patch26
%patch27
%patch28
+%patch29
+%patch30
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
@@ -243,13 +245,8 @@
install -d %{buildroot}%{_datadir}/omc/svcinfo.d/
install -m 644 %{SOURCE14} %{buildroot}%{_datadir}/omc/svcinfo.d/
install -m 755 scripts/ntp-wait/ntp-wait %{buildroot}%{_sbindir}/
-install -d %{buildroot}/var/db
-install -m 644 /dev/null %{buildroot}/var/db/ntp-kod
-
-%if %{defined _ntpunitsdir}
-install -d %{buildroot}%{_ntpunitsdir}
-echo ntpd.service > %{buildroot}%{_ntpunitsdir}/50-ntp.list
-%endif
+install -d %{buildroot}/var/lib/ntp/db
+install -m 644 /dev/null %{buildroot}/var/lib/ntp/db/ntp-kod
%pre
%{_sbindir}/groupadd -r ntp 2> /dev/null || :
@@ -339,9 +336,6 @@
%dir %{_sysconfdir}/slp.reg.d
%{_unitdir}/ntpd.service
%{_unitdir}/ntp-wait.service
-%if %{defined _ntpunitsdir}
-%{_ntpunitsdir}/50-ntp.list
-%endif
%config(noreplace) %{_sysconfdir}/slp.reg.d/ntp.reg
%config %{_sysconfdir}/logrotate.d/ntp
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp
@@ -366,7 +360,7 @@
%attr(0755,ntp,root) %{_localstatedir}/lib/ntp%{_localstatedir}/run/ntp
%ghost %config(noreplace) %{_localstatedir}/log/ntp
%{_datadir}/omc/svcinfo.d/ntp.xml
-/var/db
+/var/lib/ntp/db
%files doc
%defattr(-,root,root)
++ ntp-move-kod-file.patch ++
--- html/sntp.html
+++ html/sntp.html 2017/02/16 16:49:54
@@ -47,7 +47,7 @@
-g delay, --gap delay
Specify the delay in milliseconds between outgoing queries,
defaulting to 50. sntp sends queries to all provided
hostnames/addresses in short succession, and by default terminates once the
first valid response is received. With multiple time sources provided, all but
one will not be used. To limit the number of queries whose responses will not
be used, each query is separated from the preceding one by delay
milliseconds, to allow time for responses to earlier queries to be received. A
larger delay reduces the query load on the time sources, increasing the
time to receive a valid response if the first source attempted is slow or
unreachable.
-K kodfile, --kod kodfile
- Specifies the filename kodfile to be used for the persistent
history of KoD (Kiss Of Death, or rate-limiting) responses received from
servers. The default is /var/db/ntp-kod. If the file does not exist,
a warning message will be displayed. The file will not be created. Note that
the short option is -K, an uppercase letter K.
+ Specifies the filename kodfile to be used for the persistent
history of KoD (Kiss Of Death, or
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2016-11-25 12:02:25
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2016-10-14 09:27:46.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2016-11-25
12:02:26.0 +0100
@@ -1,0 +2,25 @@
+Mon Nov 21 16:14:17 UTC 2016 - m...@suse.com
+
+- Update to 4.2.8p9:
+ * CVE-2016-9311: Trap crash.
+ * CVE-2016-9310: Mode 6 unauthenticated trap information
+disclosure and DDoS vector.
+ * CVE-2016-7427: Broadcast Mode Replay Prevention DoS.
+ * CVE-2016-7428: Broadcast Mode Poll Interval Enforcement DoS.
+ * CVE-2016-7431: Regression: 010-origin: Zero Origin Timestamp
+Bypass.
+ * CVE-2016-7434: Null pointer dereference in
+_IO_str_init_static_internal().
+ * CVE-2016-7429: Interface selection attack.
+ * CVE-2016-7426: Client rate limiting and server responses.
+ * CVE-2016-7433: Reboot sync calculation problem.
+ * Fix a spurious error message (obsoletes ntp-sigchld.patch).
+ * Other bugfixes, see /usr/share/doc/packages/ntp/ChangeLog.
+- Fix a regression in "trap" (bsc#981252, ntp-trap.patch).
+- Reduce the number of netlink groups to listen on for changes to
+ the local network setup (bsc#992606, ntp-netlink.patch).
+- Fix segfault in "sntp -a" (bnc#1009434, ntp-sntp-a.patch).
+- Silence an OpenSSL version warning (bsc#992038,
+ ntp-openssl-version.patch).
+
+---
Old:
ntp-4.2.8p8.tar.gz
ntp-sigchld.patch
New:
ntp-4.2.8p9.tar.gz
ntp-netlink.patch
ntp-openssl-version.patch
ntp-sntp-a.patch
ntp-trap.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.oMGpDa/_old 2016-11-25 12:02:28.0 +0100
+++ /var/tmp/diff_new_pack.oMGpDa/_new 2016-11-25 12:02:28.0 +0100
@@ -21,7 +21,7 @@
%global _ntpunitsdir %{_libexecdir}/systemd/ntp-units.d
%endif
Name: ntp
-Version:4.2.8p8
+Version:4.2.8p9
Release:0
Summary:Network Time Protocol daemon (version 4)
License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
@@ -54,10 +54,13 @@
Patch19:ntp-ENOBUFS.patch
Patch20:ntp-sntp-dst.patch
Patch21:ntp-4.2.6p2-ntpq-speedup-782060.patch
-Patch22:ntp-sigchld.patch
+Patch22:ntp-openssl-version.patch
Patch23:ntp-processname.patch
Patch24:ntp-daemonize.patch
Patch25:ntp-usrgrp-resolver.patch
+Patch26:ntp-sntp-a.patch
+Patch27:ntp-netlink.patch
+Patch28:ntp-trap.patch
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
@@ -130,10 +133,13 @@
%patch19 -p1
%patch20 -p1
%patch21
-%patch22 -p1
+%patch22
%patch23
%patch24
%patch25 -p1
+%patch26
+%patch27
+%patch28
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
++ ntp-4.2.8p8.tar.gz -> ntp-4.2.8p9.tar.gz ++
/work/SRC/openSUSE:Factory/ntp/ntp-4.2.8p8.tar.gz
/work/SRC/openSUSE:Factory/.ntp.new/ntp-4.2.8p9.tar.gz differ: char 5, line 1
++ ntp-netlink.patch ++
--- ntpd/ntp_io.c
+++ ntpd/ntp_io.c
@@ -4765,9 +4765,7 @@ init_async_notifications()
ZERO(sa);
sa.nl_family = PF_NETLINK;
sa.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR
- | RTMGRP_IPV6_IFADDR | RTMGRP_IPV4_ROUTE
- | RTMGRP_IPV4_MROUTE | RTMGRP_IPV6_ROUTE
- | RTMGRP_IPV6_MROUTE;
+ | RTMGRP_IPV6_IFADDR | RTMGRP_IPV4_ROUTE;
if (bind(fd, (struct sockaddr *), sizeof(sa)) < 0) {
msyslog(LOG_ERR,
"bind failed on routing socket (%m) - using polled
interface update");
++ ntp-openssl-version.patch ++
--- libntp/ssl_init.c.orig
+++ libntp/ssl_init.c
@@ -52,15 +52,6 @@ atexit_ssl_cleanup(void)
void
ssl_check_version(void)
{
- if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) {
- msyslog(LOG_WARNING,
- "OpenSSL version mismatch. Built against %lx, you have %lx",
- (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
- fprintf(stderr,
- "OpenSSL version mismatch. Built against %lx, you have
%lx\n",
- (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
- }
-
INIT_SSL();
}
++ ntp-sntp-a.patch ++
--- sntp/main.c.orig
+++ sntp/main.c
@@ -379,7 +379,6 @@ handle_lookup(
{
struct addrinfo hints; /* Local copy is OK */
struct dns_ctx *ctx;
- longl;
char *
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2016-10-14 09:27:45
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2016-09-30 15:26:58.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2016-10-14
09:27:46.0 +0200
@@ -1,0 +2,5 @@
+Wed Oct 5 13:13:16 UTC 2016 - guilla...@opensuse.org
+
+- Depend on pps-tools-devel only for openSUSE > 13.2
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.4bjgtN/_old 2016-10-14 09:27:47.0 +0200
+++ /var/tmp/diff_new_pack.4bjgtN/_new 2016-10-14 09:27:47.0 +0200
@@ -65,7 +65,9 @@
BuildRequires: libcap-devel
BuildRequires: libtool
BuildRequires: openssl-devel
+%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200
BuildRequires: pps-tools-devel
+%endif
BuildRequires: readline-devel
BuildRequires: pkgconfig(systemd)
Requires: /bin/logger
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2016-09-30 15:25:33
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2016-09-08 21:55:35.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2016-09-30
15:26:58.0 +0200
@@ -1,0 +2,6 @@
+Thu Aug 25 07:22:49 UTC 2016 - josef.moell...@suse.com
+
+- Make the resolver task change user and group IDs to the same
+ values as the main task. (bnc#988028, ntp-usrgrp-resolver.patch)
+
+---
New:
ntp-usrgrp-resolver.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.16ven8/_old 2016-09-30 15:27:00.0 +0200
+++ /var/tmp/diff_new_pack.16ven8/_new 2016-09-30 15:27:00.0 +0200
@@ -57,6 +57,7 @@
Patch22:ntp-sigchld.patch
Patch23:ntp-processname.patch
Patch24:ntp-daemonize.patch
+Patch25:ntp-usrgrp-resolver.patch
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
@@ -130,6 +131,7 @@
%patch22 -p1
%patch23
%patch24
+%patch25 -p1
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
++ ntp-daemonize.patch ++
--- /var/tmp/diff_new_pack.16ven8/_old 2016-09-30 15:27:00.0 +0200
+++ /var/tmp/diff_new_pack.16ven8/_new 2016-09-30 15:27:00.0 +0200
@@ -1,3 +1,5 @@
+Index: ntpd/ntpd.c
+===
--- ntpd/ntpd.c.orig
+++ ntpd/ntpd.c
@@ -690,16 +690,17 @@ ntpdmain(
++ ntp-usrgrp-resolver.patch ++
Index: ntp-4.2.8p8/ntpd/ntpd.c
===
--- ntp-4.2.8p8.orig/ntpd/ntpd.c
+++ ntp-4.2.8p8/ntpd/ntpd.c
@@ -182,7 +182,6 @@ char *group;/* group to switch to */
const char *chrootdir; /* directory to chroot to */
uid_t sw_uid;
gid_t sw_gid;
-char *endp;
struct group *gr;
struct passwd *pw;
#endif /* HAVE_DROPROOT */
@@ -518,6 +517,217 @@ set_process_priority(void)
}
#endif /* !SIM */
+#ifndef SIM
+/*
+ * Detach from terminal (much like daemon())
+ * Nothe that this function calls exit()
+ */
+static void
+detach_from_terminal(
+ int pipe_fds[2],
+ long wait_sync,
+ const char *logfilename
+ )
+{
+ int rc;
+ int exit_code;
+# if !defined(HAVE_SETSID) && !defined (HAVE_SETPGID) && defined(TIOCNOTTY)
+ int fid;
+# endif
+# ifdef _AIX
+ struct sigaction sa;
+# endif
+
+ rc = fork();
+ if (-1 == rc) {
+ exit_code = (errno) ? errno : -1;
+ msyslog(LOG_ERR, "fork: %m");
+ exit(exit_code);
+ }
+ if (rc > 0) {
+ /* parent */
+ exit_code = wait_child_sync_if(pipe_fds[0],
+ wait_sync);
+ exit(exit_code);
+ }
+
+ /*
+* child/daemon
+* close all open files excepting waitsync_fd_to_close.
+* msyslog() unreliable until after init_logging().
+*/
+ closelog();
+ if (syslog_file != NULL) {
+ fclose(syslog_file);
+ syslog_file = NULL;
+ syslogit = TRUE;
+ }
+ close_all_except(waitsync_fd_to_close);
+ INSIST(0 == open("/dev/null", 0) && 1 == dup2(0, 1) \
+ && 2 == dup2(0, 2));
+
+ init_logging(progname, 0, TRUE);
+ /* we lost our logfile (if any) daemonizing */
+ setup_logfile(logfilename);
+
+# ifdef SYS_DOMAINOS
+ {
+ uid_$t puid;
+ status_$t st;
+
+ proc2_$who_am_i();
+ proc2_$make_server(, );
+ }
+# endif /* SYS_DOMAINOS */
+# ifdef HAVE_SETSID
+ if (setsid() == (pid_t)-1)
+ msyslog(LOG_ERR, "setsid(): %m");
+# elif defined(HAVE_SETPGID)
+ if (setpgid(0, 0) == -1)
+ msyslog(LOG_ERR, "setpgid(): %m");
+# else/* !HAVE_SETSID && !HAVE_SETPGID follows */
+# ifdef TIOCNOTTY
+ fid = open("/dev/tty", 2);
+ if (fid >= 0) {
+ ioctl(fid, (u_long)TIOCNOTTY, NULL);
+ close(fid);
+ }
+# endif /* TIOCNOTTY */
+ ntp_setpgrp(0, getpid());
+# endif /* !HAVE_SETSID && !HAVE_SETPGID */
+# ifdef _AIX
+ /* Don't get killed by low-on-memory signal. */
+ sa.sa_handler = catch_danger;
+ sigemptyset(_mask);
+ sa.sa_flags = SA_RESTART;
+ sigaction(SIGDANGER, , NULL);
+# endif /* _AIX */
+
+ return;
+}
+
+/*
+ * Map
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2016-09-08 21:55:34
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2016-09-05 21:13:34.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2016-09-08
21:55:35.0 +0200
@@ -2,6 +1,0 @@
-Thu Aug 25 07:22:49 UTC 2016 - josef.moell...@suse.com
-
-- Make the resolver task change user and group IDs to the same
- values as the main task. (bnc#988028, ntp-usrgrp-resolver.patch)
-
Old:
ntp-usrgrp-resolver.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.BtxH4A/_old 2016-09-08 21:55:36.0 +0200
+++ /var/tmp/diff_new_pack.BtxH4A/_new 2016-09-08 21:55:36.0 +0200
@@ -57,7 +57,6 @@
Patch22:ntp-sigchld.patch
Patch23:ntp-processname.patch
Patch24:ntp-daemonize.patch
-Patch25:ntp-usrgrp-resolver.patch
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
@@ -131,7 +130,6 @@
%patch22 -p1
%patch23
%patch24
-%patch25 -p1
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2016-09-05 21:13:32
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2016-06-13 21:54:46.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2016-09-05
21:13:34.0 +0200
@@ -1,0 +2,6 @@
+Thu Aug 25 07:22:49 UTC 2016 - josef.moell...@suse.com
+
+- Make the resolver task change user and group IDs to the same
+ values as the main task. (bnc#988028, ntp-usrgrp-resolver.patch)
+
+---
New:
ntp-usrgrp-resolver.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.ZmuaBz/_old 2016-09-05 21:13:36.0 +0200
+++ /var/tmp/diff_new_pack.ZmuaBz/_new 2016-09-05 21:13:36.0 +0200
@@ -57,6 +57,7 @@
Patch22:ntp-sigchld.patch
Patch23:ntp-processname.patch
Patch24:ntp-daemonize.patch
+Patch25:ntp-usrgrp-resolver.patch
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
@@ -130,6 +131,7 @@
%patch22 -p1
%patch23
%patch24
+%patch25 -p1
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
++ ntp-usrgrp-resolver.patch ++
Index: ntp-4.2.8p8/libntp/work_fork.c
===
--- ntp-4.2.8p8.orig/libntp/work_fork.c
+++ ntp-4.2.8p8/libntp/work_fork.c
@@ -33,6 +33,9 @@ staticRETSIGTYPE worker_sighup(int);
static voidsend_worker_home_atexit(void);
static voidcleanup_after_child(blocking_child *);
+# pragma weak set_user_group_ids
+void set_user_group_ids(void);
+
/* === functions === */
/*
* exit_worker()
@@ -494,6 +497,8 @@ fork_blocking_child(
c->pid = getpid();
worker_process = TRUE;
+ if (NULL != _user_group_ids)
+ set_user_group_ids();
/*
* Change the process name of the child to avoid confusion
* about ntpd trunning twice.
Index: ntp-4.2.8p8/ntpd/ntpd.c
===
--- ntp-4.2.8p8.orig/ntpd/ntpd.c
+++ ntp-4.2.8p8/ntpd/ntpd.c
@@ -518,6 +518,211 @@ set_process_priority(void)
}
#endif /* !SIM */
+#ifndef SIM
+static int
+detach_from_terminal(
+ int pipe_fds[2],
+ long wait_sync,
+ const char *logfilename
+ )
+{
+# ifndef HAVE_WORKING_FORK
+ return 0;
+# else
+ int rc;
+ int exit_code;
+# if !defined(HAVE_SETSID) && !defined(HAVE_SETPGID) && defined(TIOCNOTTY)
+ int fid;
+# endif /* TIOCNOTTY */
+# ifdef _AIX
+ struct sigaction sa;
+# endif
+
+ rc = fork();
+ if (-1 == rc) {
+ exit_code = (errno) ? errno : -1;
+ msyslog(LOG_ERR, "fork: %m");
+ return exit_code;
+ }
+ if (rc > 0) {
+ /* parent */
+ exit_code = wait_child_sync_if(pipe_fds[0],
+ wait_sync);
+ return exit_code;
+ }
+
+ /*
+* child/daemon
+* close all open files excepting waitsync_fd_to_close.
+* msyslog() unreliable until after init_logging().
+*/
+ closelog();
+ if (syslog_file != NULL) {
+ fclose(syslog_file);
+ syslog_file = NULL;
+ syslogit = TRUE;
+ }
+ close_all_except(waitsync_fd_to_close);
+ INSIST(0 == open("/dev/null", 0) && 1 == dup2(0, 1) \
+ && 2 == dup2(0, 2));
+
+ init_logging(progname, 0, TRUE);
+ /* we lost our logfile (if any) daemonizing */
+ setup_logfile(logfilename);
+
+# ifdef SYS_DOMAINOS
+ {
+ uid_$t puid;
+ status_$t st;
+
+ proc2_$who_am_i();
+ proc2_$make_server(, );
+ }
+# endif /* SYS_DOMAINOS */
+# ifdef HAVE_SETSID
+ if (setsid() == (pid_t)-1)
+ msyslog(LOG_ERR, "setsid(): %m");
+# elif defined(HAVE_SETPGID)
+ if (setpgid(0, 0) == -1)
+ msyslog(LOG_ERR, "setpgid(): %m");
+# else/* !HAVE_SETSID && !HAVE_SETPGID follows */
+# ifdef TIOCNOTTY
+ fid = open("/dev/tty", 2);
+ if (fid >= 0) {
+ ioctl(fid, (u_long)TIOCNOTTY, NULL);
+ close(fid);
+ }
+# endif /* TIOCNOTTY */
+ ntp_setpgrp(0, getpid());
+# endif /* !HAVE_SETSID && !HAVE_SETPGID */
+# ifdef _AIX
+ /* Don't get killed by low-on-memory signal. */
+
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2016-06-13 21:54:39
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2016-03-18 21:28:53.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2016-06-13
21:54:46.0 +0200
@@ -1,0 +2,60 @@
+Tue Jun 7 07:42:00 UTC 2016 - m...@suse.com
+
+- Keep the parent process alive until the daemon has finished
+ initialisation, to make sure that the PID file exists when the
+ parent returns (ntp-daemonize.patch).
+- Update to 4.2.8p8 (bsc#982056):
+ * CVE-2016-4953, bsc#982065: Bad authentication demobilizes
+ephemeral associations.
+ * CVE-2016-4954, bsc#982066: Processing spoofed server packets.
+ * CVE-2016-4955, bsc#982067: Autokey association reset.
+ * CVE-2016-4956, bsc#982068: Broadcast interleave.
+ * CVE-2016-4957, bsc#982064: CRYPTO_NAK crash.
+- Change the process name of the forking DNS worker process to
+ avoid the impression that ntpd is started twice.
+ (bsc#979302, ntp-processname.patch).
+- Don't ignore SIGCHILD because it breaks wait()
+ (boo#981422, ntp-sigchld.patch).
+- ntp-wait does not accept fractional seconds, so use 1 instead of
+ 0.2 in ntp-wait.service (boo#979981).
+- Separate the creation of ntp.keys and key #1 in it to avoid
+ problems when upgrading installations that have the file, but
+ no key #1, which is needed e.g. by "rcntp addserver".
+- Fix the TZ offset output of sntp during DST.
+ (bsc#951559, ntp-sntp-dst.patch)
+- Add /var/db/ntp-kod (bsc#916617).
+- Add ntp-ENOBUFS.patch to limit a warning that might happen
+ quite a lot on loaded systems (bsc#956773).
+- Don't wait for 11 minutes to restart ntpd when it has died
+ (boo#894031).
+
+---
+Wed May 4 15:08:05 UTC 2016 - m...@suse.com
+
+- Update to 4.2.8p7 (bsc#977446):
+ * CVE-2016-1547, bsc#977459:
+Validate crypto-NAKs, AKA: CRYPTO-NAK DoS.
+ * CVE-2016-1548, bsc#977461: Interleave-pivot
+ * CVE-2016-1549, bsc#977451:
+Sybil vulnerability: ephemeral association attack.
+ * CVE-2016-1550, bsc#977464: Improve NTP security against buffer
+comparison timing attacks.
+ * CVE-2016-1551, bsc#977450:
+Refclock impersonation vulnerability
+ * CVE-2016-2516, bsc#977452: Duplicate IPs on unconfig
+directives will cause an assertion botch in ntpd.
+ * CVE-2016-2517, bsc#977455: remote configuration trustedkey/
+requestkey/controlkey values are not properly validated.
+ * CVE-2016-2518, bsc#977457: Crafted addpeer with hmode > 7
+causes array wraparound with MATCH_ASSOC.
+ * CVE-2016-2519, bsc#977458: ctl_getitem() return value not
+always checked.
+ * integrate ntp-fork.patch
+ * Improve the fixes for:
+CVE-2015-7704, CVE-2015-7705, CVE-2015-7974
+- Restrict the parser in the startup script to the first
+ occurrance of "keys" and "controlkey" in ntp.conf (boo#957226).
+- Depend on pps-tools-devel to provide timepps.h header to enable
+ Linux PPSAPI support to make GPS devices usefull. (boo#977563)
+
+---
Old:
ntp-4.2.8p6.tar.gz
New:
ntp-4.2.8p8.tar.gz
ntp-ENOBUFS.patch
ntp-daemonize.patch
ntp-processname.patch
ntp-sigchld.patch
ntp-sntp-dst.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.svQzwD/_old 2016-06-13 21:54:48.0 +0200
+++ /var/tmp/diff_new_pack.svQzwD/_new 2016-06-13 21:54:48.0 +0200
@@ -21,7 +21,7 @@
%global _ntpunitsdir %{_libexecdir}/systemd/ntp-units.d
%endif
Name: ntp
-Version:4.2.8p6
+Version:4.2.8p8
Release:0
Summary:Network Time Protocol daemon (version 4)
License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
@@ -51,13 +51,20 @@
Patch15:bnc#506908.diff
Patch16:MOD_NANO.diff
Patch18:bnc#574885.diff
-Patch19:ntp-4.2.6p2-ntpq-speedup-782060.patch
+Patch19:ntp-ENOBUFS.patch
+Patch20:ntp-sntp-dst.patch
+Patch21:ntp-4.2.6p2-ntpq-speedup-782060.patch
+Patch22:ntp-sigchld.patch
+Patch23:ntp-processname.patch
+Patch24:ntp-daemonize.patch
+
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
BuildRequires: fdupes
BuildRequires: libcap-devel
BuildRequires: libtool
BuildRequires: openssl-devel
+BuildRequires: pps-tools-devel
BuildRequires: readline-devel
BuildRequires: pkgconfig(systemd)
Requires: /bin/logger
@@ -117,7 +124,12 @@
%patch15
%patch16
%patch18
-%patch19
+%patch19 -p1
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2016-03-18 21:28:52
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2016-01-23 01:03:46.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2016-03-18
21:28:53.0 +0100
@@ -1,0 +2,32 @@
+Fri Mar 11 11:06:17 UTC 2016 - m...@suse.com
+
+- CVE-2015-8158, bsc#962966: potential infinite loop in ntpq
+- CVE-2015-8138, bsc#963002: Zero Origin Timestamp Bypass
+- CVE-2015-7978, bsc#963000: Stack exhaustion in recursive
+ traversal of restriction list.
+- CVE-2015-7979, bsc#962784: off-path denial of service on
+ authenticated broadcast mode
+- CVE-2015-7977, bsc#962970: restriction list NULL pointer
+ dereference
+- CVE-2015-7976, bsc#962802: 'ntpq saveconfig' command allows
+ dangerous characters in filenames
+- CVE-2015-7975, bsc#962988: nextvar() missing length check in ntpq
+- CVE-2015-7974, bsc#962960: Missing key check allows impersonation
+ between authenticated peers
+- CVE-2015-7973, bsc#962995: replay attack on authenticated
+ broadcast mode
+- CVE-2015-5300, bsc#951629: MITM attacker can force ntpd to make
+ a step larger than the panic threshold
+
+---
+Mon Mar 7 13:50:03 UTC 2016 - h...@imb-jena.de
+
+- update to 4.2.8p6
+ * fixes low- and medium-severity vulnerabilities
+4.2.8p6: CVE-2015-8158 CVE-2015-8138 CVE-2015-7978
+CVE-2015-7979 CVE-2015-7977 CVE-2015-7976 CVE-2015-7975
+CVE-2015-7974 CVE-2015-7973
+4.2.8p5: CVE-2015-5300
+ * bug fixes
+
+---
Old:
ntp-4.2.8p4.tar.gz
New:
ntp-4.2.8p6.tar.gz
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.XfwcCe/_old 2016-03-18 21:28:56.0 +0100
+++ /var/tmp/diff_new_pack.XfwcCe/_new 2016-03-18 21:28:56.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ntp
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%global _ntpunitsdir %{_libexecdir}/systemd/ntp-units.d
%endif
Name: ntp
-Version:4.2.8p4
+Version:4.2.8p6
Release:0
Summary:Network Time Protocol daemon (version 4)
License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
++ ntp-4.2.8p4.tar.gz -> ntp-4.2.8p6.tar.gz ++
/work/SRC/openSUSE:Factory/ntp/ntp-4.2.8p4.tar.gz
/work/SRC/openSUSE:Factory/.ntp.new/ntp-4.2.8p6.tar.gz differ: char 5, line 1
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2016-01-23 01:03:45
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2015-11-18 22:32:48.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2016-01-23
01:03:46.0 +0100
@@ -1,0 +2,7 @@
+Mon Jan 18 13:08:09 UTC 2016 - wba...@tmo.at
+
+- Explicitely run /usr/sbin/sntp to synchronize in start-ntpd. When
+ run as cron job, /usr/sbin/ is not in the path, which caused the
+ synchronization to fail. (boo#962318)
+
+---
Other differences:
--
++ conf.start-ntpd ++
--- /var/tmp/diff_new_pack.KWcEln/_old 2016-01-23 01:03:47.0 +0100
+++ /var/tmp/diff_new_pack.KWcEln/_new 2016-01-23 01:03:47.0 +0100
@@ -217,7 +217,7 @@
test -n "$NTP_PROTO" -a "NTPD_PROTO" != "$proto" && continue
# ignore hardware clock drivers
test "${srv#127.127.}" != "$srv" && continue
-if sntp -S -c $args &> /dev/null
+if /usr/sbin/sntp -S -c $args &> /dev/null
then
SYNCHRONISED=$srv
break
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2015-11-18 22:32:45
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2015-09-16 10:37:14.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2015-11-18
22:32:48.0 +0100
@@ -1,0 +2,43 @@
+Fri Nov 6 09:40:55 UTC 2015 - m...@suse.com
+
+- Fix ntp-4.2.6p2-ntpq-speedup-782060.patch to not pick arbitraty
+ port numbers (bsc#782060).
+
+---
+Thu Oct 29 12:54:06 UTC 2015 - m...@suse.com
+
+- Update to 4.2.8p4 to fix several security issues (bsc#951608):
+ * CVE-2015-7871: NAK to the Future: Symmetric association
+authentication bypass via crypto-NAK
+ * CVE-2015-7855: decodenetnum() will ASSERT botch instead of
+returning FAIL on some bogus values
+ * CVE-2015-7854: Password Length Memory Corruption Vulnerability
+ * CVE-2015-7853: Invalid length data provided by a custom
+refclock driver could cause a buffer overflow
+ * CVE-2015-7852 ntpq atoascii() Memory Corruption Vulnerability
+ * CVE-2015-7851 saveconfig Directory Traversal Vulnerability
+ * CVE-2015-7850 remote config logfile-keyfile
+ * CVE-2015-7849 trusted key use-after-free
+ * CVE-2015-7848 mode 7 loop counter underrun
+ * CVE-2015-7701 Slow memory leak in CRYPTO_ASSOC
+ * CVE-2015-7703 configuration directives "pidfile" and
+"driftfile" should only be allowed locally
+ * CVE-2015-7704, CVE-2015-7705 Clients that receive a KoD should
+validate the origin timestamp field
+ * CVE-2015-7691, CVE-2015-7692, CVE-2015-7702 Incomplete autokey
+data packet length checks
+ * obsoletes ntp-memlock.patch.
+- Add a controlkey line to /etc/ntp.conf if one does not already
+ exist, to allow runtime configuration via ntpq.
+- Use SHA1 instead of MD5 for symmetric keys (bsc#905885).
+- Improve runtime configuration:
+ * Read keytype from ntp.conf
+ * Don't write ntp keys to syslog.
+- Fix legacy action scripts to pass on command line arguments.
+- Remove ntp.1.gz, it wasn't installed anymore.
+- Remove ntp-4.2.7-rh-manpages.tar.gz and only keep ntptime.8.gz.
+ The rest is partially irrelevant, partially redundant and
+ potentially outdated (bsc#942587).
+- Remove "kod" from the restrict line in ntp.conf (bsc#944300).
+
+---
Old:
ntp-4.2.7-rh-manpages.tar.gz
ntp-4.2.8p3.tar.gz
ntp.1.gz
New:
ntp-4.2.8p4.tar.gz
ntptime.8.gz
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.1SxiaM/_old 2015-11-18 22:32:50.0 +0100
+++ /var/tmp/diff_new_pack.1SxiaM/_new 2015-11-18 22:32:50.0 +0100
@@ -21,7 +21,7 @@
%global _ntpunitsdir %{_libexecdir}/systemd/ntp-units.d
%endif
Name: ntp
-Version:4.2.8p3
+Version:4.2.8p4
Release:0
Summary:Network Time Protocol daemon (version 4)
License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
@@ -41,9 +41,8 @@
Source9:conf.ntp-wait.service
# documentation
Source10: NTP-FAQ-%{ntpfaqversion}.tar.bz2
-Source11: ntp.1.gz
Source12: README.SUSE
-Source13: ntp-4.2.7-rh-manpages.tar.gz
+Source13: ntptime.8.gz
Source14: ntp.xml
Source16: ntp.NetworkManager
Patch1: ntp-segfault_on_invalid_device.patch
@@ -113,7 +112,6 @@
%patch1
# copy README.SUSE
cp %{SOURCE12} .
-tar xzf %{SOURCE13}
%patch10 -p1
%patch11
%patch15
@@ -184,7 +182,7 @@
F=%{buildroot}/usr/lib/initscripts/legacy-actions/ntpd/$f
cat >$F <<-EOF
#!/bin/bash
- exec /usr/sbin/start-ntpd $f
+ exec /usr/sbin/start-ntpd $f "\$@"
EOF
chmod 755 $F
done
@@ -204,9 +202,7 @@
#
# man pages
#
-install -d %{buildroot}/%{_mandir}/{man5,man8}
-install -m 644 man/man5/* %{buildroot}/%{_mandir}/man5
-install -m 644 man/man8/* %{buildroot}/%{_mandir}/man8
+install -m 644 %{S:13} %{buildroot}/%{_mandir}/man8
#
# firewall
#
@@ -253,12 +249,13 @@
%post
# Create ntp.keys file
-if [ ! -f %{_sysconfdir}/ntp.keys ]; then
- tmp=$(dd if=/dev/urandom count=1 2>/dev/null | md5sum)
- tmp=${tmp:0:7} > %{_sysconfdir}/ntp.keys
- echo "1 M $tmp" > %{_sysconfdir}/ntp.keys
- chown root:ntp %{_sysconfdir}/ntp.keys
- chmod 0640 %{_sysconfdir}/ntp.keys
+if [ ! -f /etc/ntp.keys ]; then
+ FILE=$(mktemp -p /etc)
+ chmod 0640 $FILE
+ chown root:ntp $FILE
+ KEY=$(tr -dc '[:alnum:]' < /dev/urandom | head -c 20)
+ echo "1 SHA1 $KEY" > $FILE
+ mv $FILE /etc/ntp.keys
fi
# Are we in update mode?
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2015-09-16 10:37:13
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is "ntp"
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2015-08-25 07:17:13.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2015-09-16
10:37:14.0 +0200
@@ -1,0 +2,6 @@
+Fri Sep 4 09:24:55 UTC 2015 - m...@suse.com
+
+- Add "addserver" as a new legacy action.
+- Fix the comment regarding addserver in ntp.conf (bnc#910063).
+
+---
Old:
conf.ntptimeset
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.REt5tw/_old 2015-09-16 10:37:15.0 +0200
+++ /var/tmp/diff_new_pack.REt5tw/_new 2015-09-16 10:37:15.0 +0200
@@ -45,7 +45,6 @@
Source12: README.SUSE
Source13: ntp-4.2.7-rh-manpages.tar.gz
Source14: ntp.xml
-Source15: conf.ntptimeset
Source16: ntp.NetworkManager
Patch1: ntp-segfault_on_invalid_device.patch
Patch10:ntp-strcat.patch
@@ -180,7 +179,15 @@
install -m 0644 -D %{SOURCE9} %{buildroot}/%{_unitdir}/ntp-wait.service
install -d %{buildroot}%{_prefix}/sbin
install -m 755 -D %{SOURCE8} %{buildroot}%{_sbindir}/start-ntpd
-install -m 755 -D %{SOURCE15}
%{buildroot}/usr/lib/initscripts/legacy-actions/ntpd/ntptimeset
+%__install -d %{buildroot}/usr/lib/initscripts/legacy-actions/ntpd
+for f in ntptimeset addserver; do
+ F=%{buildroot}/usr/lib/initscripts/legacy-actions/ntpd/$f
+ cat >$F <<-EOF
+ #!/bin/bash
+ exec /usr/sbin/start-ntpd $f
+ EOF
+ chmod 755 $F
+done
#
# fillup sysconfig.ntp
#
++ conf.ntp.conf ++
--- /var/tmp/diff_new_pack.REt5tw/_old 2015-09-16 10:37:15.0 +0200
+++ /var/tmp/diff_new_pack.REt5tw/_new 2015-09-16 10:37:15.0 +0200
@@ -38,7 +38,7 @@
##
## Add external Servers using
-## # rcntp addserver
+## # rcntpd addserver
## The servers will only be added to the currently running instance, not
## to /etc/ntp.conf.
##
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2015-08-25 07:17:11
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2015-07-25 07:43:47.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2015-08-25
07:17:13.0 +0200
@@ -1,0 +2,8 @@
+Thu Aug 13 15:46:29 UTC 2015 - m...@suse.com
+
+- Use ntpq instead of deprecated ntpdc in start-ntpd (bnc#936327).
+- Add a controlkey to ntp.conf to make the above work.
+- Don't let keysdir lines in ntp.conf trigger the keys parser.
+- Disable mode 7 (ntpdc) again, now that we don't use it anymore.
+
+---
Other differences:
--
++ conf.ntp.conf ++
--- /var/tmp/diff_new_pack.dowXl9/_old 2015-08-25 07:17:14.0 +0200
+++ /var/tmp/diff_new_pack.dowXl9/_new 2015-08-25 07:17:14.0 +0200
@@ -59,9 +59,6 @@
restrict 127.0.0.1
restrict ::1
-# Allow ntpdc
-enable mode7
-
# Clients from this (example!) subnet have unlimited access, but only if
# cryptographically authenticated.
#restrict 192.168.123.0 mask 255.255.255.0 notrust
@@ -87,5 +84,4 @@
keys /etc/ntp.keys # path for keys file
trustedkey 1 # define trusted keys
requestkey 1 # key (7) for accessing server variables
-# controlkey 15# key (6) for accessing server variables
-
+controlkey 1 # key (6) for accessing server variables
++ conf.start-ntpd ++
--- /var/tmp/diff_new_pack.dowXl9/_old 2015-08-25 07:17:14.0 +0200
+++ /var/tmp/diff_new_pack.dowXl9/_new 2015-08-25 07:17:14.0 +0200
@@ -20,9 +20,9 @@
NTPD_OPTIONS=-g -u ntp:ntp
NTPD_RUN_CHROOTED=yes
-NTPDC_BIN=/usr/sbin/ntpdc
+NTPQ_BIN=/usr/sbin/ntpq
-NTP_KEYS=$(awk '/^keys/ { print $2 }' $NTP_CONF)
+NTP_KEYS=$(awk '/^keys[[:blank:]]/ { print $2 }' $NTP_CONF)
NTP_KEYID=$(awk '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF)
NTP_PASSWD=$(test -n $NTP_KEYS -a -n $NTP_KEYID -a -r $NTP_KEYS awk
'$0 ~ key { print $3 }' key=^[[:blank:]]*$NTP_KEYID[[:blank:]] $NTP_KEYS)
@@ -139,15 +139,9 @@
function add_runtime_server() {
[ $NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP = yes ] /usr/sbin/sntp -S -c $@
- NTPC_CMD=keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $@\n
- NTPDC_LOG=$(echo -e ${NTPC_CMD}quit | $NTPDC_BIN)
- logger -t $0 runtime configuration: $NTPDC_LOG
-}
-
-function reloaddevices {
- NTPC_CMD=keyid $NTP_KEYID\npasswd $NTP_PASSWD\nifreload\n
- NTPDC_LOG=$(echo -e ${NTPC_CMD}quit | $NTPDC_BIN)
- logger -t $0 runtime configuration: $NTPDC_LOG
+ NTPC_CMD=keyid $NTP_KEYID\npasswd $NTP_PASSWD\n:config server $@\n
+ NTPQ_LOG=$(echo -e ${NTPC_CMD}quit | $NTPQ_BIN)
+ logger -t $0 runtime configuration: $NTPQ_LOG
}
function get_ntpd_ip_proto() {
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2015-07-25 07:43:46
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2015-04-22 01:16:27.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2015-07-25
07:43:47.0 +0200
@@ -1,0 +2,10 @@
+Thu Jul 16 12:30:16 UTC 2015 - m...@suse.com
+
+- Update to version 4.2.8p3 which incorporates all security fixes
+ and most other patches we have so far (fate#319040).
+ More information on:
+ http://archive.ntp.org/ntp4/ChangeLog-stable
+- Disable chroot by default (bnc#926510).
+- Enable ntpdc for backwards compatibility (bnc#920238).
+
+---
Old:
ntp-4.2.8p2.tar.gz
New:
ntp-4.2.8p3.tar.gz
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.sfNPyz/_old 2015-07-25 07:43:48.0 +0200
+++ /var/tmp/diff_new_pack.sfNPyz/_new 2015-07-25 07:43:48.0 +0200
@@ -21,7 +21,7 @@
%global _ntpunitsdir %{_libexecdir}/systemd/ntp-units.d
%endif
Name: ntp
-Version:4.2.8p2
+Version:4.2.8p3
Release:0
Summary:Network Time Protocol daemon (version 4)
License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
++ conf.ntp.conf ++
--- /var/tmp/diff_new_pack.sfNPyz/_old 2015-07-25 07:43:49.0 +0200
+++ /var/tmp/diff_new_pack.sfNPyz/_new 2015-07-25 07:43:49.0 +0200
@@ -59,6 +59,9 @@
restrict 127.0.0.1
restrict ::1
+# Allow ntpdc
+enable mode7
+
# Clients from this (example!) subnet have unlimited access, but only if
# cryptographically authenticated.
#restrict 192.168.123.0 mask 255.255.255.0 notrust
++ conf.start-ntpd ++
--- /var/tmp/diff_new_pack.sfNPyz/_old 2015-07-25 07:43:49.0 +0200
+++ /var/tmp/diff_new_pack.sfNPyz/_new 2015-07-25 07:43:49.0 +0200
@@ -138,7 +138,7 @@
}
function add_runtime_server() {
- [ $NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP = yes ] /usr/sbin/sntp -s $@
+ [ $NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP = yes ] /usr/sbin/sntp -S -c $@
NTPC_CMD=keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $@\n
NTPDC_LOG=$(echo -e ${NTPC_CMD}quit | $NTPDC_BIN)
logger -t $0 runtime configuration: $NTPDC_LOG
@@ -203,24 +203,29 @@
;;
ntptimeset)
NTPD_PROTO=$( get_ntpd_ip_proto )
-for i in $(gawk '/^server/ { if( $2 !~ ^127.127. ) print $2,$3 }'
$NTP_CONF)
-do
-IFS=',' read -ra SERVER $i
-if [ ${SERVER[0]} = -4 ] || [ ${SERVER[0]} = -6 ]
+while read arg1 arg2 arg3 dummy
+do
+test $arg1 = server || continue
+if [ $arg2 = -4 -o $arg2 = -6 ]
then
-if [ -z ${NTPD_PROTO} ] || [ ${NTPD_PROTO} = ${SERVER[0]} ]
-then
-SNTP_OPT=${SERVER[0]} ${SERVER[1]}
-else
-# ignore servers with conflicting proto
-continue
-fi
+srv=$arg3
+ proto=$arg2
+args=$arg2 $arg3
else
-# here the usual case with empty NTPD_PROTO (default/yast config)
-SNTP_OPT=$NTPD_PROTO ${SERVER[0]}
+srv=$arg2
+ proto=
+args=$arg2
fi
-/usr/sbin/sntp -t 2 -l /dev/null -s $SNTP_OPT 2 /dev/null {
SYNCHRONISED=$SNTP_OPT; break; };
-done
+ # ignore servers with conflicting IP version
+ test -n $NTP_PROTO -a NTPD_PROTO != $proto continue
+ # ignore hardware clock drivers
+test ${srv#127.127.} != $srv continue
+if sntp -S -c $args /dev/null
+then
+SYNCHRONISED=$srv
+break
+fi
+done /etc/ntp.conf
if [ $SYNCHRONISED ]
then
echo Time synchronized with $SYNCHRONISED
++ conf.sysconfig.ntp ++
--- /var/tmp/diff_new_pack.sfNPyz/_old 2015-07-25 07:43:49.0 +0200
+++ /var/tmp/diff_new_pack.sfNPyz/_new 2015-07-25 07:43:49.0 +0200
@@ -20,7 +20,7 @@
#
# The pid file will be in /var/lib/ntp/var/run/ntpd.pid.
#
-NTPD_RUN_CHROOTED=yes
+NTPD_RUN_CHROOTED=no
## Type: string
## Default:
++ ntp-4.2.8p2.tar.gz - ntp-4.2.8p3.tar.gz ++
/work/SRC/openSUSE:Factory/ntp/ntp-4.2.8p2.tar.gz
/work/SRC/openSUSE:Factory/.ntp.new/ntp-4.2.8p3.tar.gz differ: char 5, line 1
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2015-04-22 01:16:24
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2015-04-07 09:28:13.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2015-04-22
01:16:27.0 +0200
@@ -1,0 +2,9 @@
+Tue Apr 7 10:50:00 UTC 2015 - h...@imb-jena.de
+
+- update to 4.2.8p2
+ * fixes CVE-2015-1798, CVE-2015-1799 (medium-severity
+vulnerabilities involving private key authentication)
+ * bug fixes and enhancements
+ * New script: update-leap
+
+---
@@ -4,0 +14,22 @@
+
+---
+Mon Mar 16 16:50:03 UTC 2015 - h...@imb-jena.de
+
+- update to 4.2.8p1
+ * fixes CVE-2014-9297, CVE-2014-9298
+ * over 30 bugfixes and improvements
+- update to 4.2.8
+ * fixes CVE-2014-9293, CVE-2014-9294, CVE-2014-9295, CVE-2014-9296
+ * changed Internal NTP Era counters
+ * ntpdc responses disabled by default
+ * over 1100 issues resolved between the 4.2.6 branch and 4.2.8
+- adjusted patches to fit 4.2.8p1:
+ ntp-segfault_on_invalid_device.patch bnc#506908.diff MOD_NANO.diff
+- removed obsolete / now-in-upstream patches:
+ ntpd-maxmonmen.patch ntp-code-cleanup.patch ntp-sntp-recverr.patch
+ bnc#817893.patch ntp-CVE-2014-9295.patch ntp-CVE-2014-9296.patch
+- changes to spec file:
+ * added --datadir (for private perl module needed by ntp scripts)
+and --html-dir (html docs now get installed by make install)
+to configure options
+ * script ntp-wait has moved in source tree
Old:
bnc#817893.patch
ntp-4.2.6p5.tar.bz2
ntp-CVE-2014-9295.patch
ntp-CVE-2014-9296.patch
ntp-code-cleanup.patch
ntp-sntp-recverr.patch
ntpd-maxmonmen.patch
New:
ntp-4.2.8p2.tar.gz
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.bxTiu0/_old 2015-04-22 01:16:28.0 +0200
+++ /var/tmp/diff_new_pack.bxTiu0/_new 2015-04-22 01:16:28.0 +0200
@@ -21,14 +21,14 @@
%global _ntpunitsdir %{_libexecdir}/systemd/ntp-units.d
%endif
Name: ntp
-Version:4.2.6p5
+Version:4.2.8p2
Release:0
Summary:Network Time Protocol daemon (version 4)
License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
Group: Productivity/Networking/Other
Url:http://www.ntp.org/
# main source
-Source0:
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2
+Source0:
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz
# configuration
Source1:conf.logrotate.ntp
Source2:conf.ntp.conf
@@ -48,18 +48,12 @@
Source15: conf.ntptimeset
Source16: ntp.NetworkManager
Patch1: ntp-segfault_on_invalid_device.patch
-Patch4: ntpd-maxmonmen.patch
Patch10:ntp-strcat.patch
Patch11:ntp-4.2.6p2-seed_file.patch
-Patch13:ntp-code-cleanup.patch
Patch15:bnc#506908.diff
Patch16:MOD_NANO.diff
Patch18:bnc#574885.diff
Patch19:ntp-4.2.6p2-ntpq-speedup-782060.patch
-Patch20:ntp-sntp-recverr.patch
-Patch21:bnc#817893.patch
-Patch22:ntp-CVE-2014-9295.patch
-Patch23:ntp-CVE-2014-9296.patch
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
BuildRequires: fdupes
@@ -118,21 +112,15 @@
# unpack ntp-faq
tar -x -C html -j -f %{SOURCE10}
%patch1
-%patch4 -p1
# copy README.SUSE
cp %{SOURCE12} .
tar xzf %{SOURCE13}
%patch10 -p1
%patch11
-%patch13
%patch15
%patch16
%patch18
%patch19
-%patch20
-%patch21
-%patch22 -p1
-%patch23 -p1
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
@@ -153,6 +141,8 @@
--bindir=%{_sbindir} \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
+--datadir=%{_datadir} \
+--htmldir=%{_docdir}/ntp-doc \
--enable-parse-clocks \
--enable-all-clocks \
--enable-linuxcaps \
@@ -225,7 +215,7 @@
#
install -d %{buildroot}%{_datadir}/omc/svcinfo.d/
install -m 644 %{SOURCE14} %{buildroot}%{_datadir}/omc/svcinfo.d/
-install -m 755 scripts/ntp-wait %{buildroot}%{_sbindir}/
+install -m 755 scripts/ntp-wait/ntp-wait %{buildroot}%{_sbindir}/
%if %{defined _ntpunitsdir}
install -d %{buildroot}%{_ntpunitsdir}
@@ -320,6 +310,7 @@
%dir %{_sysconfdir}/NetworkManager/dispatcher.d
%config %{_sysconfdir}/NetworkManager/dispatcher.d/ntp
%{_sbindir}/*
+%{_datadir}/ntp
%if 0%{?suse_version} 1310
/usr/lib/initscripts/legacy-actions/ntpd
%else
@@ -338,6
commit ntp for openSUSE:Factory
Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2015-04-07 09:28:03 Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) Package is ntp Changes: --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2015-03-30 19:30:40.0 +0200 +++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2015-04-07 09:28:13.0 +0200 @@ -6,0 +7,7 @@ +Mon Mar 16 01:41:26 UTC 2015 - crrodrig...@opensuse.org + +- *.service: Do not start ntpd when running on containers + or when CAP_SYS_TIME was dropped from the default capability + set ( see SYSTEMD-SYSTEM.CONF(5) for details) + +--- @@ -49,0 +57,5 @@ + +--- +Tue Sep 9 02:28:20 UTC 2014 - crrodrig...@opensuse.org + +- conf.ntpd.service: Must run with PrivateTmp set to true Other differences: -- ++ conf.ntp-wait.service ++ --- /var/tmp/diff_new_pack.wpfjoy/_old 2015-04-07 09:28:14.0 +0200 +++ /var/tmp/diff_new_pack.wpfjoy/_new 2015-04-07 09:28:14.0 +0200 @@ -5,6 +5,8 @@ Conflicts=systemd-timesyncd.service Wants=time-sync.target Before=time-sync.target +ConditionVirtualization=!container +ConditionCapability=CAP_SYS_TIME [Service] Type=oneshot ++ conf.ntpd.service ++ --- /var/tmp/diff_new_pack.wpfjoy/_old 2015-04-07 09:28:14.0 +0200 +++ /var/tmp/diff_new_pack.wpfjoy/_new 2015-04-07 09:28:14.0 +0200 @@ -5,6 +5,8 @@ Conflicts=systemd-timesyncd.service Wants=network.target After=network.target +ConditionVirtualization=!container +ConditionCapability=CAP_SYS_TIME [Service] Type=forking @@ -12,6 +14,7 @@ ExecStart=/usr/sbin/start-ntpd start RestartSec=11min Restart=always +PrivateTmp=true [Install] WantedBy=multi-user.target
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2015-03-30 19:30:39
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2015-03-12 16:36:29.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2015-03-30
19:30:40.0 +0200
@@ -1,0 +2,5 @@
+Fri Mar 27 09:11:58 UTC 2015 - m...@suse.com
+
+- /bin/logger is needed for runtime configuration (bnc#924451).
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.tVfM8e/_old 2015-03-30 19:30:41.0 +0200
+++ /var/tmp/diff_new_pack.tVfM8e/_new 2015-03-30 19:30:41.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ntp
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -68,6 +68,7 @@
BuildRequires: openssl-devel
BuildRequires: readline-devel
BuildRequires: pkgconfig(systemd)
+Requires: /bin/logger
Requires: timezone
Requires(pre): %fillup_prereq
Requires(pre): %{_bindir}/chkconfig
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2015-03-12 16:36:28
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2015-02-01 12:29:15.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2015-03-12
16:36:29.0 +0100
@@ -1,0 +2,7 @@
+Sun Mar 8 10:45:54 UTC 2015 - wba...@tmo.at
+
+- Explicitely run /usr/sbin/sntp to synchronize in start-ntpd. When
+ run as cron job, /usr/sbin/ is not in the path, which caused the
+ synchronization to fail. (boo#901751)
+
+---
Other differences:
--
++ conf.start-ntpd ++
--- /var/tmp/diff_new_pack.zailmf/_old 2015-03-12 16:36:31.0 +0100
+++ /var/tmp/diff_new_pack.zailmf/_new 2015-03-12 16:36:31.0 +0100
@@ -219,7 +219,7 @@
# here the usual case with empty NTPD_PROTO (default/yast config)
SNTP_OPT=$NTPD_PROTO ${SERVER[0]}
fi
-sntp -t 2 -l /dev/null -s $SNTP_OPT 2 /dev/null {
SYNCHRONISED=$SNTP_OPT; break; };
+/usr/sbin/sntp -t 2 -l /dev/null -s $SNTP_OPT 2 /dev/null {
SYNCHRONISED=$SNTP_OPT; break; };
done
if [ $SYNCHRONISED ]
then
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2015-02-01 12:29:13
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2015-01-15 16:01:02.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2015-02-01
12:29:15.0 +0100
@@ -1,0 +2,7 @@
+Wed Jan 21 10:23:55 UTC 2015 - dims...@opensuse.org
+
+- Add ntp.NetworkManager: install NetworkManager dipatcher hook:
+ if the DHCP Server delivers NTP Servers, accept those and
+ configure NTP using the information (boo#900982).
+
+---
New:
ntp.NetworkManager
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.wGFHET/_old 2015-02-01 12:29:16.0 +0100
+++ /var/tmp/diff_new_pack.wGFHET/_new 2015-02-01 12:29:16.0 +0100
@@ -46,6 +46,7 @@
Source13: ntp-4.2.7-rh-manpages.tar.gz
Source14: ntp.xml
Source15: conf.ntptimeset
+Source16: ntp.NetworkManager
Patch1: ntp-segfault_on_invalid_device.patch
Patch4: ntpd-maxmonmen.patch
Patch10:ntp-strcat.patch
@@ -199,6 +200,10 @@
#
install -m 644 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/slp.reg.d/ntp.reg
#
+# Install NetworkManager hook
+#
+install -m 755 -D %{SOURCE16}
%{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/ntp
+#
# man pages
#
install -d %{buildroot}/%{_mandir}/{man5,man8}
@@ -309,6 +314,10 @@
%config(noreplace) %{_sysconfdir}/slp.reg.d/ntp.reg
%config %{_sysconfdir}/logrotate.d/ntp
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp
+# own /etc/NetworkManager so we don't have to BuildDepend on NM
+%dir %{_sysconfdir}/NetworkManager
+%dir %{_sysconfdir}/NetworkManager/dispatcher.d
+%config %{_sysconfdir}/NetworkManager/dispatcher.d/ntp
%{_sbindir}/*
%if 0%{?suse_version} 1310
/usr/lib/initscripts/legacy-actions/ntpd
++ ntp.NetworkManager ++
#! /bin/sh
#
# ntp dispatcher script for NetworkManager
#
# Dominique Leuenberger dims...@suse.de
#
. /etc/rc.status
case $2 in
up)
# Call netconfig in to reconfigure NTPd with the current time servers
netconfig modify -s NetworkManager -m ntp -EOT
NTPSERVERS='$DHCP4_NTP_SERVERS'
EOT
;;
*)
exit 0
;;
esac
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2015-01-15 16:01:00 Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) Package is ntp Changes: --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2014-12-25 23:20:37.0 +0100 +++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2015-01-15 16:01:02.0 +0100 @@ -1,0 +2,5 @@ +Sun Jan 4 14:31:14 UTC 2015 - mplus...@suse.com + +- Enable avahi support + +--- Other differences: -- ++ ntp.spec ++ --- /var/tmp/diff_new_pack.WUHVdZ/_old 2015-01-15 16:01:02.0 +0100 +++ /var/tmp/diff_new_pack.WUHVdZ/_new 2015-01-15 16:01:02.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package ntp # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -60,6 +60,7 @@ Patch22:ntp-CVE-2014-9295.patch Patch23:ntp-CVE-2014-9296.patch BuildRequires: autoconf +BuildRequires: avahi-compat-mDNSResponder-devel BuildRequires: fdupes BuildRequires: libcap-devel BuildRequires: libtool -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2014-12-25 23:21:41
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2014-12-22 12:52:43.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2014-12-25
23:20:37.0 +0100
@@ -16,0 +17,6 @@
+Tue Dec 2 08:28:25 UTC 2014 - o...@botter.cc
+
+- fix typo in version check regarding
+ /usr/lib/initscripts/legacy-actions to fix build for = 13.1
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.bGgGql/_old 2014-12-25 23:20:39.0 +0100
+++ /var/tmp/diff_new_pack.bGgGql/_new 2014-12-25 23:20:39.0 +0100
@@ -309,7 +309,7 @@
%config %{_sysconfdir}/logrotate.d/ntp
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp
%{_sbindir}/*
-%if 0%{?suse_version} 1301
+%if 0%{?suse_version} 1310
/usr/lib/initscripts/legacy-actions/ntpd
%else
/usr/lib/initscripts
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2014-12-22 12:54:08
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2014-10-14 08:59:18.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2014-12-22
12:52:43.0 +0100
@@ -1,0 +2,15 @@
+Fri Dec 19 17:48:56 UTC 2014 - m...@suse.com
+
+- bnc#910764: VU#852879 ntp security fixes
+ * A potential remote code execution problem was found inside
+ntpd. The functions crypto_recv() (when using autokey
+authentication), ctl_putdata(), and configure() where updated
+to avoid buffer overflows that could be
+exploited. (CVE-2014-9295)
+ * Furthermore a problem inside the ntpd error handling was found
+that is missing a return statement. This could also lead to a
+potentially attack vector. (CVE-2014-9296)
+- ntp-CVE-2014-9295.patch and ntp-CVE-2014-9296.patch will be
+ obsoleted by the upcoming update to version 4.2.8.
+
+---
New:
ntp-CVE-2014-9295.patch
ntp-CVE-2014-9296.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.WNBFfa/_old 2014-12-22 12:52:45.0 +0100
+++ /var/tmp/diff_new_pack.WNBFfa/_new 2014-12-22 12:52:45.0 +0100
@@ -57,6 +57,8 @@
Patch19:ntp-4.2.6p2-ntpq-speedup-782060.patch
Patch20:ntp-sntp-recverr.patch
Patch21:bnc#817893.patch
+Patch22:ntp-CVE-2014-9295.patch
+Patch23:ntp-CVE-2014-9296.patch
BuildRequires: autoconf
BuildRequires: fdupes
BuildRequires: libcap-devel
@@ -126,6 +128,8 @@
%patch19
%patch20
%patch21
+%patch22 -p1
+%patch23 -p1
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
++ conf.start-ntpd ++
--- /var/tmp/diff_new_pack.WNBFfa/_old 2014-12-22 12:52:45.0 +0100
+++ /var/tmp/diff_new_pack.WNBFfa/_new 2014-12-22 12:52:45.0 +0100
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
# Copyright (c) 1995-2014 SuSE Linux AG, Nuernberg, Germany.
# All rights reserved.
#
@@ -138,7 +138,7 @@
}
function add_runtime_server() {
- /usr/sbin/sntp -s $@
+ [ $NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP = yes ] /usr/sbin/sntp -s $@
NTPC_CMD=keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $@\n
NTPDC_LOG=$(echo -e ${NTPC_CMD}quit | $NTPDC_BIN)
logger -t $0 runtime configuration: $NTPDC_LOG
++ ntp-CVE-2014-9295.patch ++
diff -ru ntp-4.2.6p5.orig/ntpd/ntp_control.c ntp-4.2.6p5/ntpd/ntp_control.c
--- ntp-4.2.6p5.orig/ntpd/ntp_control.c 2011-12-09 03:00:53.0 +0100
+++ ntp-4.2.6p5/ntpd/ntp_control.c 2014-12-19 17:55:21.065282610 +0100
@@ -486,6 +486,10 @@
static char *reqpt;
static char *reqend;
+#ifndef MIN
+#define MIN(a, b) (((a) = (b)) ? (a) : (b))
+#endif
+
/*
* init_control - initialize request data
*/
@@ -995,6 +999,7 @@
)
{
int overhead;
+ unsigned int currentlen;
overhead = 0;
if (!bin) {
@@ -1018,12 +1023,22 @@
/*
* Save room for trailing junk
*/
- if (dlen + overhead + datapt dataend) {
+ while (dlen + overhead + datapt dataend) {
/*
* Not enough room in this one, flush it out.
*/
+ currentlen = MIN(dlen, dataend - datapt);
+
+ memcpy(datapt, dp, currentlen);
+
+ datapt += currentlen;
+ dp += currentlen;
+ dlen -= currentlen;
+ datalinelen += currentlen;
+
ctl_flushpkt(CTL_MORE);
}
+
memmove((char *)datapt, dp, (unsigned)dlen);
datapt += dlen;
datalinelen += dlen;
@@ -2492,6 +2507,20 @@
/* Initialize the remote config buffer */
data_count = reqend - reqpt;
+
+ if (data_count sizeof(remote_config.buffer) - 2) {
+ snprintf(remote_config.err_msg,
+sizeof(remote_config.err_msg),
+runtime configuration failed: request too long);
+ ctl_putdata(remote_config.err_msg,
+ strlen(remote_config.err_msg), 0);
+ ctl_flushpkt(0);
+ msyslog(LOG_NOTICE,
+ runtime config from %s rejected: request too long,
+ stoa(rbufp-recv_srcadr));
+ return;
+ }
+
memcpy(remote_config.buffer, reqpt, data_count);
if (data_count 0
'\n' != remote_config.buffer[data_count - 1])
Only in ntp-4.2.6p5/ntpd: ntp_control.c.orig
diff -ru ntp-4.2.6p5.orig/ntpd/ntp_crypto.c
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2014-10-14 08:59:07
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2014-07-28 06:31:15.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2014-10-14
08:59:18.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 26 12:55:35 UTC 2014 - m...@suse.com
+
+- Re-enable the ntptimeset legacy init script action (bnc#893406).
+
+---
New:
conf.ntptimeset
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.pFhMBv/_old 2014-10-14 08:59:20.0 +0200
+++ /var/tmp/diff_new_pack.pFhMBv/_new 2014-10-14 08:59:20.0 +0200
@@ -45,6 +45,7 @@
Source12: README.SUSE
Source13: ntp-4.2.7-rh-manpages.tar.gz
Source14: ntp.xml
+Source15: conf.ntptimeset
Patch1: ntp-segfault_on_invalid_device.patch
Patch4: ntpd-maxmonmen.patch
Patch10:ntp-strcat.patch
@@ -182,6 +183,7 @@
install -m 0644 -D %{SOURCE9} %{buildroot}/%{_unitdir}/ntp-wait.service
install -d %{buildroot}%{_prefix}/sbin
install -m 755 -D %{SOURCE8} %{buildroot}%{_sbindir}/start-ntpd
+install -m 755 -D %{SOURCE15}
%{buildroot}/usr/lib/initscripts/legacy-actions/ntpd/ntptimeset
#
# fillup sysconfig.ntp
#
@@ -303,6 +305,11 @@
%config %{_sysconfdir}/logrotate.d/ntp
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp
%{_sbindir}/*
+%if 0%{?suse_version} 1301
+/usr/lib/initscripts/legacy-actions/ntpd
+%else
+/usr/lib/initscripts
+%endif
%{_localstatedir}/lib/ntp
%attr(0640,root,ntp) %config(noreplace)
%{_localstatedir}/lib/ntp%{_sysconfdir}/ntp.conf.iburst
%attr(0755,ntp,ntp) %dir %{_localstatedir}/lib/ntp/drift
++ conf.ntptimeset ++
#!/bin/bash
exec /usr/sbin/start-ntpd ntptimeset
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2014-07-28 06:31:13 Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) Package is ntp Changes: --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2014-06-25 15:24:19.0 +0200 +++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2014-07-28 06:31:15.0 +0200 @@ -1,0 +2,6 @@ +Tue Jul 15 18:50:47 UTC 2014 - crrodrig...@opensuse.org + +- Ensure systemd services conflict with systemd-timesyncd.service + present in upcoming systemd releases. + +--- Other differences: -- ++ conf.ntp-wait.service ++ --- /var/tmp/diff_new_pack.hdUJ25/_old 2014-07-28 06:31:17.0 +0200 +++ /var/tmp/diff_new_pack.hdUJ25/_new 2014-07-28 06:31:17.0 +0200 @@ -2,7 +2,7 @@ Description=Wait for ntpd to synchronize system clock Requires=ntpd.service After=ntpd.service - +Conflicts=systemd-timesyncd.service Wants=time-sync.target Before=time-sync.target ++ conf.ntpd.service ++ --- /var/tmp/diff_new_pack.hdUJ25/_old 2014-07-28 06:31:17.0 +0200 +++ /var/tmp/diff_new_pack.hdUJ25/_new 2014-07-28 06:31:17.0 +0200 @@ -2,7 +2,7 @@ Description=NTP Server Daemon Documentation=man:ntpd(1) After=nss-lookup.target - +Conflicts=systemd-timesyncd.service Wants=network.target After=network.target -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2014-06-25 15:24:08
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2014-05-10 08:31:54.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2014-06-25
15:24:19.0 +0200
@@ -1,0 +2,20 @@
+Wed Jun 18 09:04:59 UTC 2014 - tchva...@suse.com
+
+- Try to fix broken migration from openSUSE-13.1
+
+---
+Thu Jun 12 15:36:51 UTC 2014 - m...@suse.com
+
+- Forward-port some bugs that got fixed for SLE11 (bnc#831311):
+ * bnc#817893
+ * bnc#482349
+ * bnc#817893.patch
+
+---
+Thu Jun 5 13:54:02 UTC 2014 - tchva...@suse.com
+
+- Cleanup with spec cleaner for better readability
+- Remove conditionals for 12.2 distros as it does not work on
+ them anyway.
+
+---
New:
bnc#817893.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.j6NuCy/_old 2014-06-25 15:24:21.0 +0200
+++ /var/tmp/diff_new_pack.j6NuCy/_new 2014-06-25 15:24:21.0 +0200
@@ -16,32 +16,17 @@
#
-Name: ntp
-%if 0%{?suse_version} 1010
-BuildRequires: autoconf
-BuildRequires: fdupes
-%endif
-BuildRequires: libcap-devel
-BuildRequires: libtool
-BuildRequires: openssl-devel
-BuildRequires: readline-devel
-# to allow the postinst script to succeed
-BuildRequires: pwdutils
-%if 0%{?suse_version} = 1140
-BuildRequires: pkgconfig(systemd)
-%{?systemd_requires}
+%define ntpfaqversion 3.4
%if %{undefined _ntpunitsdir}
-%global _ntpunitsdir /usr/lib/systemd/ntp-units.d
+%global _ntpunitsdir %{_libexecdir}/systemd/ntp-units.d
%endif
-%endif
-
-%define ntpfaqversion 3.4
-Url:http://www.ntp.org/
+Name: ntp
Version:4.2.6p5
Release:0
Summary:Network Time Protocol daemon (version 4)
License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
Group: Productivity/Networking/Other
+Url:http://www.ntp.org/
# main source
Source0:
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2
# configuration
@@ -51,7 +36,7 @@
Source4:conf.sysconfig.ntp
Source5:conf.sysconfig.syslog-ntp
Source6:conf.ntp.reg
-Source7:%name.firewall
+Source7:%{name}.firewall
Source8:conf.start-ntpd
Source9:conf.ntp-wait.service
# documentation
@@ -70,16 +55,29 @@
Patch18:bnc#574885.diff
Patch19:ntp-4.2.6p2-ntpq-speedup-782060.patch
Patch20:ntp-sntp-recverr.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Patch21:bnc#817893.patch
+BuildRequires: autoconf
+BuildRequires: fdupes
+BuildRequires: libcap-devel
+BuildRequires: libtool
+BuildRequires: openssl-devel
+BuildRequires: readline-devel
+BuildRequires: pkgconfig(systemd)
+Requires: timezone
+Requires(pre): %fillup_prereq
+Requires(pre): %{_bindir}/chkconfig
+Requires(pre): %{_bindir}/diff
+Requires(pre): %{_bindir}/grep
+Requires(pre): pwdutils
+Suggests: logrotate
Provides: ntp-daemon
-Provides: xntp = %version
-Provides: xntp3 = %version
-Obsoletes: xntp %version
-Obsoletes: xntp3 %version
+Provides: xntp = %{version}
+Provides: xntp3 = %{version}
+Obsoletes: xntp %{version}
+Obsoletes: xntp3 %{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
Conflicts: openntpd
-PreReq: pwdutils %fillup_prereq /usr/bin/diff /usr/bin/grep
/sbin/chkconfig
-Suggests: logrotate
-Requires: timezone
%description
The Network Time Protocol (NTP) is used to synchronize the time of a
@@ -89,59 +87,15 @@
Ntpd is an operating system daemon that sets and maintains the system
time-of-day synchronized with Internet standard time servers.
-
-
-Authors:
-
-Mark Andrews ma...@syd.dms.csiro.au
-Viraj Bais vb...@mailman1.intel.com
-Clayton Kirkwood kirkw...@striderfm.intel.com
-Karl Berry k...@owl.hq.ileaf.com
-Piete Brooks piete.bro...@cl.cam.ac.uk
-Steve Clift cl...@ml.csiro.au
-Casey Crellin ca...@csc.co.za
-Torsten Duwe d...@immd4.informatik.uni-erlangen.de
-John A. Dundas III dun...@salt.jpl.nasa.gov
-Dennis Ferguson den...@mrbill.canet.ca
-Glenn Hollinger gl...@herald.usask.ca
-Mike Iglesias igles...@uci.edu
-Jim Jagielski j...@jagubox.gsfc.nasa.gov
-Jeff Johnson j...@chatham.usdesign.com
-
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2014-05-02 20:52:27
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2014-04-05 14:43:05.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2014-05-02
20:52:28.0 +0200
@@ -1,0 +2,14 @@
+Tue Apr 29 13:24:32 UTC 2014 - m...@suse.com
+
+- Remove /var/run/ntp from the package:
+ http://lists.opensuse.org/opensuse-packaging/2014-04/msg00046.html
+- Fix Provides/Obsoletes of package aliases.
+- Add /usr/sbin/rc* links.
+- Stay enabled across sysv to systemd migrations (bnc#875490).
+
+---
+Sat Apr 19 17:16:36 UTC 2014 - seife+...@b1-systems.com
+
+- fix start-ntp addserver: start-ntp has no status method
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.1j3K1U/_old 2014-05-02 20:52:29.0 +0200
+++ /var/tmp/diff_new_pack.1j3K1U/_new 2014-05-02 20:52:29.0 +0200
@@ -72,10 +72,10 @@
Patch20:ntp-sntp-recverr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ntp-daemon
-Provides: xntp = 4.2.4p6
-Provides: xntp3
-Obsoletes: xntp = 4.2.4p5
-Obsoletes: xntp3
+Provides: xntp = %version
+Provides: xntp3 = %version
+Obsoletes: xntp %version
+Obsoletes: xntp3 %version
Conflicts: openntpd
PreReq: pwdutils %fillup_prereq /usr/bin/diff /usr/bin/grep
/sbin/chkconfig
Suggests: logrotate
@@ -134,12 +134,12 @@
Ulrich Windl ulrich.wi...@rz.uni-regensburg.de
%package doc
-Provides: ntpdoc
-Provides: xntp-doc = 4.2.4
-Provides: xntpdoc
-Obsoletes: ntpdoc
-Obsoletes: xntp-doc = 4.2.4
-Obsoletes: xntpdoc
+Provides: ntpdoc = %version
+Provides: xntp-doc = %version
+Provides: xntpdoc = %version
+Obsoletes: ntpdoc %version
+Obsoletes: xntp-doc %version
+Obsoletes: xntpdoc %version
Summary:Additional Package Documentation for ntp
Group: Documentation/Other
@@ -266,7 +266,8 @@
%__install -d %{buildroot}/var/lib/ntp/{drift,etc,var/{lib,run/ntp},dev}
%__install -d %{buildroot}/var/run
ln -s ../.. %{buildroot}/var/lib/ntp/var/lib/ntp
-ln -s ../lib/ntp/var/run/ntp %{buildroot}/var/run
+ln -s /usr/sbin/service %buildroot/usr/sbin/rcntpd
+ln -s /usr/sbin/service %buildroot/usr/sbin/rcntp-wait
%__install -m 644 -D %{S:1} %{buildroot}/etc/logrotate.d/ntp
%__install -m 600 -D %{S:2} %{buildroot}/etc/ntp.conf
%__install -m 600 -D %{S:2} %{buildroot}/var/lib/ntp/etc/ntp.conf.iburst
@@ -322,8 +323,11 @@
/usr/sbin/useradd -r -o -g ntp -u 74 -s /bin/false -c NTP daemon -d
/var/lib/ntp ntp 2 /dev/null || :
/usr/sbin/usermod -g ntp ntp 2/dev/null || :
test -L /var/run/ntp || rm -rf /var/run/ntp :
-%service_add_pre ntpd.service
+%service_add_pre ntp.service ntpd.service
%service_add_pre ntp-wait.service
+if [ $FIRST_ARG -ne 1 -a ! -e /var/lib/systemd/migrated/ntpd ]; then
+ sed -i -e 's,ntp\t,ntpd\t,g' /var/lib/systemd/sysv-convert/database
+fi
%preun
%service_del_preun ntpd.service
@@ -376,6 +380,9 @@
fi
%service_add_post ntpd.service
%service_add_post ntp-wait.service
+if [ ! -e /var/lib/systemd/migrated/ntpd ]; then
+ touch /var/lib/systemd/migrated/ntpd
+fi
%postun
%service_del_postun ntpd.service
@@ -403,7 +410,6 @@
%{_mandir}/man8/*
/var/adm/fillup-templates/*
%attr(0755,ntp,root) /var/lib/ntp/var/run/ntp
-%ghost /var/run/ntp
%ghost %config(noreplace) /var/log/ntp
/usr/share/omc/svcinfo.d/ntp.xml
++ conf.start-ntpd ++
--- /var/tmp/diff_new_pack.1j3K1U/_old 2014-05-02 20:52:29.0 +0200
+++ /var/tmp/diff_new_pack.1j3K1U/_new 2014-05-02 20:52:29.0 +0200
@@ -95,7 +95,7 @@
test -e /var/run/ntp || ln -s /var/lib/ntp/var/run/ntp /var/run
function ntpd_is_running() {
- $0 status /dev/null
+ service ntp status /dev/null
}
function parse_symlink() {
@@ -195,7 +195,7 @@
fi
shift
-$0 status 21 /dev/null
+service ntp status 21 /dev/null
if test $? = 0;
then
add_runtime_server $@
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2014-04-05 14:43:04
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2014-02-15 17:17:28.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2014-04-05
14:43:05.0 +0200
@@ -1,0 +2,33 @@
+Thu Apr 3 07:05:40 UTC 2014 - wer...@suse.de
+
+- Remove empty insserv call whic hhad only caused an error message
+- Correct 50-ntp.list to include ntpd.service
+
+---
+Mon Mar 31 13:32:26 UTC 2014 - wer...@suse.de
+
+- Restart nptd if failed or aborted (FATE#315133)
+
+---
+Thu Mar 27 18:07:16 UTC 2014 - wer...@suse.de
+
+- Service unit files are no executables
+
+---
+Thu Mar 27 17:44:48 UTC 2014 - wer...@suse.de
+
+- Use correct ntp-wait script from source tar ball (bnc#864193)
+- Implement new ntp-wait.service to provide time-sync.target
+- A few cleanups on the new start script of ntpd
+
+---
+Thu Mar 27 10:38:23 CET 2014 - ku...@suse.de
+
+- Add missing systemd %pre macro
+
+---
+Tue Mar 4 10:57:57 UTC 2014 - vark...@suse.com
+
+- Add systemd configuration and start script
+
+---
Old:
conf.ntp.init
ntp-wait
New:
conf.ntp-wait.service
conf.ntpd.service
conf.start-ntpd
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.HHcs2y/_old 2014-04-05 14:43:06.0 +0200
+++ /var/tmp/diff_new_pack.HHcs2y/_new 2014-04-05 14:43:06.0 +0200
@@ -27,6 +27,14 @@
BuildRequires: readline-devel
# to allow the postinst script to succeed
BuildRequires: pwdutils
+%if 0%{?suse_version} = 1140
+BuildRequires: pkgconfig(systemd)
+%{?systemd_requires}
+%if %{undefined _ntpunitsdir}
+%global _ntpunitsdir /usr/lib/systemd/ntp-units.d
+%endif
+%endif
+
%define ntpfaqversion 3.4
Url:http://www.ntp.org/
Version:4.2.6p5
@@ -39,18 +47,19 @@
# configuration
Source1:conf.logrotate.ntp
Source2:conf.ntp.conf
-Source3:conf.ntp.init
+Source3:conf.ntpd.service
Source4:conf.sysconfig.ntp
Source5:conf.sysconfig.syslog-ntp
Source6:conf.ntp.reg
Source7:%name.firewall
+Source8:conf.start-ntpd
+Source9:conf.ntp-wait.service
# documentation
Source10: NTP-FAQ-%{ntpfaqversion}.tar.bz2
Source11: ntp.1.gz
Source12: README.SUSE
Source13: ntp-4.2.7-rh-manpages.tar.gz
Source14: ntp.xml
-Source16: ntp-wait
Patch1: ntp-segfault_on_invalid_device.patch
Patch4: ntpd-maxmonmen.patch
Patch10:ntp-strcat.patch
@@ -68,7 +77,7 @@
Obsoletes: xntp = 4.2.4p5
Obsoletes: xntp3
Conflicts: openntpd
-PreReq: pwdutils %insserv_prereq %fillup_prereq /usr/bin/diff
/usr/bin/grep /sbin/chkconfig
+PreReq: pwdutils %fillup_prereq /usr/bin/diff /usr/bin/grep
/sbin/chkconfig
Suggests: logrotate
Requires: timezone
@@ -264,9 +273,10 @@
#
# boot scripts
#
-%__install -D %{S:3} %{buildroot}/etc/init.d/ntp
+%__install -m 0644 -D %{S:3} %{buildroot}/%{_unitdir}/ntpd.service
+%__install -m 0644 -D %{S:9} %{buildroot}/%{_unitdir}/ntp-wait.service
%__install -d %{buildroot}/usr/sbin
-ln -s ../../etc/init.d/ntp %{buildroot}/usr/sbin/rcntp
+%__install -m 755 -D %{S:8} %{buildroot}/usr/sbin/start-ntpd
#
# fillup sysconfig.ntp
#
@@ -297,7 +307,12 @@
#
install -d %{buildroot}/usr/share/omc/svcinfo.d/
install -m 644 %{S:14} %{buildroot}/usr/share/omc/svcinfo.d/
-install -m 755 %{S:16} %{buildroot}/usr/sbin/
+install -m 755 scripts/ntp-wait %{buildroot}/usr/sbin/
+
+%if %{defined _ntpunitsdir}
+%__install -d %{buildroot}%{_ntpunitsdir}
+echo ntpd.service %{buildroot}%{_ntpunitsdir}/50-ntp.list
+%endif
%clean
%__rm -rf %{buildroot}
@@ -307,9 +322,13 @@
/usr/sbin/useradd -r -o -g ntp -u 74 -s /bin/false -c NTP daemon -d
/var/lib/ntp ntp 2 /dev/null || :
/usr/sbin/usermod -g ntp ntp 2/dev/null || :
test -L /var/run/ntp || rm -rf /var/run/ntp :
+%service_add_pre ntpd.service
+%service_add_pre ntp-wait.service
%preun
-%stop_on_removal ntp
+%service_del_preun ntpd.service
+%service_del_preun ntp-wait.service
+
# no update? Then remove these files that aren't owned by the package
if [ ${FIRST_ARG:-0} -eq 0 ]; then
test -e
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2014-02-15 17:17:27
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2014-01-23 15:50:08.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2014-02-15
17:17:28.0 +0100
@@ -1,0 +2,12 @@
+Fri Feb 14 10:53:14 UTC 2014 - m...@suse.com
+
+- bnc#863815, ntp-sntp-recverr.patch: Get sntp to recognize socket
+ errors, so that it skips unreachable destinations immediately
+ instead of trying to reach them for more than five minutes
+ before finally timing out.
+
+ This patch will probably be obsoleted by the next major upgrade,
+ because the current development release takes a different
+ approach to get a quick answer from one of the specified servers.
+
+---
New:
ntp-sntp-recverr.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.ddJp77/_old 2014-02-15 17:17:29.0 +0100
+++ /var/tmp/diff_new_pack.ddJp77/_new 2014-02-15 17:17:29.0 +0100
@@ -60,6 +60,7 @@
Patch16:MOD_NANO.diff
Patch18:bnc#574885.diff
Patch19:ntp-4.2.6p2-ntpq-speedup-782060.patch
+Patch20:ntp-sntp-recverr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ntp-daemon
Provides: xntp = 4.2.4p6
@@ -203,6 +204,7 @@
%patch16
%patch18
%patch19
+%patch20
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
++ ntp-sntp-recverr.patch ++
Index: sntp/networking.c
===
--- sntp/networking.c.orig 2010-11-28 05:31:26.0 +0100
+++ sntp/networking.c 2014-02-14 12:33:07.844985648 +0100
@@ -85,6 +85,17 @@
if (-1 == *rsock ENABLED_OPT(NORMALVERBOSE))
printf(Failed to create UDP socket with family %d\n,
AF(dest));
+#ifdef IP_RECVERR
+ else {
+ int btrue = 1;
+#ifdef IP6_RECVERR
+ if (AF(dest) == AF_INET6)
+ setsockopt(*rsock, IPPROTO_IPV6, IPV6_RECVERR, btrue,
sizeof(btrue));
+ else
+#endif
+ setsockopt(*rsock, IPPROTO_IP, IP_RECVERR, btrue,
sizeof(btrue));
+ }
+#endif
}
/* Send a packet */
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2014-01-21 12:29:44 Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) Package is ntp Changes: --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2013-10-23 10:10:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2014-01-23 15:50:08.0 +0100 @@ -1,0 +2,7 @@ +Mon Jan 20 16:41:52 UTC 2014 - m...@suse.com + +- CVE-2013-5211, bnc#857195: restrict query, configuration, + modification access from world by default. Avoids that ntp can + be used as a DDoS amplifier. + +--- Other differences: -- ++ ntp.spec ++ --- /var/tmp/diff_new_pack.Rcpumq/_old 2014-01-23 15:50:08.0 +0100 +++ /var/tmp/diff_new_pack.Rcpumq/_new 2014-01-23 15:50:08.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package ntp # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ conf.ntp.conf ++ --- /var/tmp/diff_new_pack.Rcpumq/_old 2014-01-23 15:50:09.0 +0100 +++ /var/tmp/diff_new_pack.Rcpumq/_new 2014-01-23 15:50:09.0 +0100 @@ -41,6 +41,26 @@ ## # rcntp addserver yourserver ## +# Access control configuration; see /usr/share/doc/packages/ntp/html/accopt.html for +# details. The web page http://support.ntp.org/bin/view/Support/AccessRestrictions +# 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 + ## ## Miscellaneous stuff ## -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2013-10-23 10:10:51
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2013-08-27 20:53:29.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2013-10-23
10:10:52.0 +0200
@@ -1,0 +2,5 @@
+Tue Oct 22 14:49:25 UTC 2013 - vark...@suse.com
+
+- bnc#838458 ntp start script does not update /var/lib/ntp/etc/localtime file
if /etc/localtime is symlink
+
+---
Other differences:
--
++ conf.ntp.init ++
--- /var/tmp/diff_new_pack.GYPx2U/_old 2013-10-23 10:10:54.0 +0200
+++ /var/tmp/diff_new_pack.GYPx2U/_new 2013-10-23 10:10:54.0 +0200
@@ -147,7 +147,7 @@
test -d ${CHROOT_PREFIX}${configfile%/*} || mkdir -p
${CHROOT_PREFIX}${configfile%/*}
if [ -r ${configfile} ]
then
- cp -auL ${configfile} ${CHROOT_PREFIX}${configfile%/*}
+ cp -aL ${configfile} ${CHROOT_PREFIX}${configfile%/*}
else
echo
echo Warning: ${configfile} not found or not readable
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2013-08-27 20:53:28
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2013-03-11 07:25:39.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2013-08-27
20:53:29.0 +0200
@@ -1,0 +2,6 @@
+Mon Aug 19 22:58:44 UTC 2013 - crrodrig...@opensuse.org
+
+- Build with -DOPENSSL_LOAD_CONF , ntp must respect and use
+ the system's openssl configuration.
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.VGxCBM/_old 2013-08-27 20:53:30.0 +0200
+++ /var/tmp/diff_new_pack.VGxCBM/_new 2013-08-27 20:53:30.0 +0200
@@ -216,7 +216,7 @@
%if 0%{?suse_version} 1010
autoreconf -fi
%endif
-export RPM_OPT_FLAGS=$RPM_OPT_FLAGS -W -Wall -Wstrict-prototypes
-Wpointer-arith -Wno-unused-parameter -fno-strict-aliasing -fstack-protector
+export RPM_OPT_FLAGS=$RPM_OPT_FLAGS -W -DOPENSSL_LOAD_CONF -Wall
-Wstrict-prototypes -Wpointer-arith -Wno-unused-parameter -fno-strict-aliasing
-fstack-protector
%ifarch alpha s390x
export RPM_OPT_FLAGS=$RPM_OPT_FLAGS -O0
%endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2013-03-11 07:25:38
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp, Maintainer is vark...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2013-03-01 12:26:22.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2013-03-11
07:25:39.0 +0100
@@ -1,0 +2,5 @@
+Sat Mar 9 13:34:16 UTC 2013 - seife+...@b1-systems.com
+
+- fix build with automake-1.13
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.ArCCPa/_old 2013-03-11 07:25:41.0 +0100
+++ /var/tmp/diff_new_pack.ArCCPa/_new 2013-03-11 07:25:41.0 +0100
@@ -206,6 +206,8 @@
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
+# new automake 1.13 has removed old macro
+sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
%build
%if 0%{?suse_version} 0%{?suse_version} 1141
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2013-03-01 12:26:20
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp, Maintainer is vark...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2013-02-25 20:39:24.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2013-03-01
12:26:22.0 +0100
@@ -1,0 +2,11 @@
+Thu Feb 28 07:52:03 UTC 2013 - vark...@suse.com
+
+- bnc#797351 - ntpd listen-on directive support is missing/broken;
+ unable to restrict/secure listening IPs
+
+---
+Tue Feb 26 14:58:38 UTC 2013 - vark...@suse.com
+
+- bnc#793012 - NTP default to 'sync time on startup' conflicts with
NetworkManager
+
+---
Old:
ntp-4.2.0-rh-manpages.tar.gz
New:
ntp-4.2.7-rh-manpages.tar.gz
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.KO0vZJ/_old 2013-03-01 12:26:28.0 +0100
+++ /var/tmp/diff_new_pack.KO0vZJ/_new 2013-03-01 12:26:28.0 +0100
@@ -48,7 +48,7 @@
Source10: NTP-FAQ-%{ntpfaqversion}.tar.bz2
Source11: ntp.1.gz
Source12: README.SUSE
-Source13: ntp-4.2.0-rh-manpages.tar.gz
+Source13: ntp-4.2.7-rh-manpages.tar.gz
Source14: ntp.xml
Source16: ntp-wait
Patch1: ntp-segfault_on_invalid_device.patch
@@ -275,8 +275,9 @@
#
# man pages
#
-%__install -d %{buildroot}/%{_mandir}/man1
-%__install -m 644 man/* %{buildroot}/%{_mandir}/man1
+%__install -d %{buildroot}/%{_mandir}/{man5,man8}
+%__install -m 644 man/man5/* %{buildroot}/%{_mandir}/man5
+%__install -m 644 man/man8/* %{buildroot}/%{_mandir}/man8
#
# firewall
#
@@ -372,6 +373,8 @@
%attr(0640,root,ntp) %config(noreplace) /var/lib/ntp/etc/ntp.conf.iburst
%attr(0755,ntp,ntp) %dir /var/lib/ntp/drift
%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
/var/adm/fillup-templates/*
%attr(0755,ntp,root) /var/lib/ntp/var/run/ntp
%ghost /var/run/ntp
++ conf.sysconfig.ntp ++
--- /var/tmp/diff_new_pack.KO0vZJ/_old 2013-03-01 12:26:28.0 +0100
+++ /var/tmp/diff_new_pack.KO0vZJ/_new 2013-03-01 12:26:28.0 +0100
@@ -59,7 +59,7 @@
#
# Force time synchronization befor start ntpd
#
-NTPD_FORCE_SYNC_ON_STARTUP=yes
+NTPD_FORCE_SYNC_ON_STARTUP=no
## Type: boolean
## Default:no
++ ntp-4.2.0-rh-manpages.tar.gz - ntp-4.2.7-rh-manpages.tar.gz ++
2196 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2013-02-25 20:39:23 Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) Package is ntp, Maintainer is vark...@suse.com Changes: --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2013-01-20 12:58:23.0 +0100 +++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2013-02-25 20:39:24.0 +0100 @@ -1,0 +2,5 @@ +Fri Feb 22 09:19:08 CET 2013 - mhruse...@suse.cz + +- disable Undisciplined Local Clock in default conf file (bnc#784760) + +--- Other differences: -- ++ conf.ntp.conf ++ --- /var/tmp/diff_new_pack.xtVDjF/_old 2013-02-25 20:39:26.0 +0100 +++ /var/tmp/diff_new_pack.xtVDjF/_new 2013-02-25 20:39:26.0 +0100 @@ -33,8 +33,8 @@ ## Undisciplined Local Clock. This is a fake driver intended for backup ## and when no outside source of synchronized time is available. ## -server 127.127.1.0 # local clock (LCL) -fudge 127.127.1.0 stratum 10 # LCL is unsynchronized +# server 127.127.1.0 # local clock (LCL) +# fudge 127.127.1.0 stratum 10# LCL is unsynchronized ## ## Add external Servers using -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2013-01-20 12:58:21
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp, Maintainer is vark...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2012-10-25 12:11:26.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2013-01-20
12:58:23.0 +0100
@@ -1,0 +2,19 @@
+Fri Jan 18 14:18:09 UTC 2013 - bwiedem...@suse.com
+
+- Speedup ntpq (bnc#782060)
+ +ntp-4.2.6p2-ntpq-speedup-782060.patch
+
+---
+Thu Jan 17 17:37:35 UTC 2013 - vark...@suse.com
+
+- bnc#450196 - ext3 - recovering journal on / on first boot on new
kernel/fresh system updates
+- bnc#774553 - ntp initscript: hwclock: With --noadjfile, you must specify
either --utc or --localtime
+
+---
+Fri Dec 14 10:14:41 UTC 2012 - lnus...@suse.de
+
+- logrotate is not strictly required for operation of ntp so change
+ it to Suggested. That way the minimal installation doesn't draw in
+ cron and postfix.
+
+---
New:
ntp-4.2.6p2-ntpq-speedup-782060.patch
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.bdK8pC/_old 2013-01-20 12:58:25.0 +0100
+++ /var/tmp/diff_new_pack.bdK8pC/_new 2013-01-20 12:58:25.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ntp
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -59,6 +59,7 @@
Patch15:bnc#506908.diff
Patch16:MOD_NANO.diff
Patch18:bnc#574885.diff
+Patch19:ntp-4.2.6p2-ntpq-speedup-782060.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ntp-daemon
Provides: xntp = 4.2.4p6
@@ -67,7 +68,7 @@
Obsoletes: xntp3
Conflicts: openntpd
PreReq: pwdutils %insserv_prereq %fillup_prereq /usr/bin/diff
/usr/bin/grep /sbin/chkconfig
-Requires: logrotate
+Suggests: logrotate
Requires: timezone
%description
@@ -201,6 +202,7 @@
%patch15
%patch16
%patch18
+%patch19
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
++ conf.ntp.init ++
--- /var/tmp/diff_new_pack.bdK8pC/_old 2013-01-20 12:58:25.0 +0100
+++ /var/tmp/diff_new_pack.bdK8pC/_new 2013-01-20 12:58:25.0 +0100
@@ -90,11 +90,11 @@
if [ $NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP = yes ] ; then
function update_cmos() {
if test -e /dev/rtc ; then
- /sbin/hwclock --systohc $HWCLOCK --noadjfile
+ /sbin/hwclock --systohc $HWCLOCK
return $?
fi
if test -z $(/sbin/modprobe -l rtc_cmos) ; then
- /sbin/hwclock --systohc $HWCLOCK --noadjfile
+ /sbin/hwclock --systohc $HWCLOCK
return $?
fi
local temprules=/dev/.udev/rules.d
@@ -102,7 +102,7 @@
local rule=$temprules/95-rtc-cmos.rules
local -i start=0 end=0
/bin/mkdir -m 0755 -p $temprules
- echo ACTION==\add\, KERNEL==\rtc0\, RUN=\/sbin/hwclock --systohc
$HWCLOCK --noadjfile --rtc=\$env{DEVNAME}\ $rule
+ echo ACTION==\add\, KERNEL==\rtc0\, RUN=\/sbin/hwclock --systohc
$HWCLOCK --rtc=\$env{DEVNAME}\ $rule
test -e $uevseqnum read -t 1 start $uevseqnum
if /sbin/modprobe -q rtc_cmos ; then
test -e $uevseqnum read -t 1 end $uevseqnum
@@ -113,7 +113,7 @@
fi
else
rm -f $rule
-/sbin/hwclock --systohc $HWCLOCK --noadjfile
+/sbin/hwclock --systohc $HWCLOCK
fi
}
fi
@@ -153,6 +153,7 @@
echo Warning: ${configfile} not found or not readable
fi
done
+ mkdir -p ${CHROOT_PREFIX}/var/log
mkdir -p ${CHROOT_PREFIX}/proc
mount -t proc none -o ro,nosuid,nodev ${CHROOT_PREFIX}/proc 2/dev/null
NTPD_OPTIONS=${NTPD_OPTIONS} -i ${CHROOT_PREFIX}
++ ntp-4.2.6p2-ntpq-speedup-782060.patch ++
From: Bernhard M. Wiedemann bwiedemann suse de
do not ask for ntp service in all protocols
which is very slow (bnc#782060)
--- libntp/decodenetnum.c.orig 2012-11-12 15:12:02.0 +0100
+++ libntp/decodenetnum.c 2012-11-12 15:13:18.0 +0100
@@ -70,7 +70,7 @@
}
ZERO(hints);
hints.ai_flags = Z_AI_NUMERICHOST;
- err = getaddrinfo(cp, ntp, hints, ai);
+ err = getaddrinfo(cp, NULL, hints, ai);
if (err != 0)
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2012-10-25 12:11:25
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp, Maintainer is vark...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2012-07-24 22:43:04.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2012-10-25
12:11:26.0 +0200
@@ -1,0 +2,5 @@
+Thu Aug 2 13:17:57 UTC 2012 - rmila...@suse.com
+
+- Created the correct link to /run/ntp
+
+---
Other differences:
--
++ conf.ntp.init ++
--- /var/tmp/diff_new_pack.fMAaf6/_old 2012-10-25 12:11:27.0 +0200
+++ /var/tmp/diff_new_pack.fMAaf6/_new 2012-10-25 12:11:27.0 +0200
@@ -128,7 +128,7 @@
NTPD_PID=${CHROOT_PREFIX}/var/run/ntp/ntpd.pid
# Create if /var/run is on tmpfs
-test -e /var/run/ntp || ln -s ../lib/ntp/var/run/ntp /var/run
+test -e /var/run/ntp || ln -s /var/lib/ntp/var/run/ntp /var/run
function ntpd_is_running() {
$0 status /dev/null
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2012-07-24 22:43:02
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp, Maintainer is vark...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2012-07-09 09:57:24.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2012-07-24
22:43:04.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul 19 04:47:46 UTC 2012 - crrodrig...@opensuse.org
+
+- Openssl wanted but not properly detected, fixed.
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.oMGjfj/_old 2012-07-24 22:43:06.0 +0200
+++ /var/tmp/diff_new_pack.oMGjfj/_new 2012-07-24 22:43:06.0 +0200
@@ -130,7 +130,6 @@
Obsoletes: xntp-doc = 4.2.4
Obsoletes: xntpdoc
Summary:Additional Package Documentation for ntp
-License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
Group: Documentation/Other
%description doc
@@ -232,7 +231,11 @@
--with-sntp \
--enable-ntp-signd \
--disable-listen-read-drop \
- --with-lineeditlibs=readline
+ --with-lineeditlibs=readline \
+--with-crypto=openssl \
+--with-openssl-libdir=%{_libdir} \
+--with-openssl-incdir=%{_includedir}
+
make %{?_smp_mflags}
%install
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2012-07-09 09:57:22
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp, Maintainer is vark...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2012-05-08 06:47:12.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2012-07-09
09:57:24.0 +0200
@@ -1,0 +2,6 @@
+Wed Jul 4 13:51:57 UTC 2012 - cfarr...@suse.com
+
+- license update: (MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
+ Properly categorise licenses and sync with Fedora declaration
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.dt05Il/_old 2012-07-09 09:57:26.0 +0200
+++ /var/tmp/diff_new_pack.dt05Il/_new 2012-07-09 09:57:26.0 +0200
@@ -32,7 +32,7 @@
Version:4.2.6p5
Release:0
Summary:Network Time Protocol daemon (version 4)
-License:BSD-3-Clause
+License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
Group: Productivity/Networking/Other
# main source
Source0:
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2
@@ -130,7 +130,7 @@
Obsoletes: xntp-doc = 4.2.4
Obsoletes: xntpdoc
Summary:Additional Package Documentation for ntp
-License:MIT
+License:(MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
Group: Documentation/Other
%description doc
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2012-05-08 06:47:01
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp, Maintainer is vark...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2012-01-26 14:06:42.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2012-05-08
06:47:12.0 +0200
@@ -1,0 +2,6 @@
+Mon Apr 23 11:02:06 UTC 2012 - vark...@suse.com
+
+- bnc#758253 - L3: ntp fails if host has more than 1024 IP-addresses
+ ntp#1180 - ntpd won't start with more than 1000 interfaces
+
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.OsONt3/_old 2012-05-08 06:47:14.0 +0200
+++ /var/tmp/diff_new_pack.OsONt3/_new 2012-05-08 06:47:14.0 +0200
@@ -15,24 +15,25 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: ntp
%if 0%{?suse_version} 1010
BuildRequires: autoconf
BuildRequires: fdupes
%endif
-BuildRequires: libcap-devel libtool openssl-devel readline-devel
+BuildRequires: libcap-devel
+BuildRequires: libtool
+BuildRequires: openssl-devel
+BuildRequires: readline-devel
# to allow the postinst script to succeed
BuildRequires: pwdutils
%define ntpfaqversion 3.4
Url:http://www.ntp.org/
-License:BSD-3-Clause
-Group: Productivity/Networking/Other
Version:4.2.6p5
Release:0
Summary:Network Time Protocol daemon (version 4)
+License:BSD-3-Clause
+Group: Productivity/Networking/Other
# main source
Source0:
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2
# configuration
@@ -59,12 +60,15 @@
Patch16:MOD_NANO.diff
Patch18:bnc#574885.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-AutoReqProv:on
-Provides: ntp-daemon xntp3 xntp = 4.2.4p6
-Obsoletes: xntp3 xntp = 4.2.4p5
+Provides: ntp-daemon
+Provides: xntp = 4.2.4p6
+Provides: xntp3
+Obsoletes: xntp = 4.2.4p5
+Obsoletes: xntp3
Conflicts: openntpd
PreReq: pwdutils %insserv_prereq %fillup_prereq /usr/bin/diff
/usr/bin/grep /sbin/chkconfig
-Requires: timezone logrotate
+Requires: logrotate
+Requires: timezone
%description
The Network Time Protocol (NTP) is used to synchronize the time of a
@@ -119,12 +123,15 @@
Ulrich Windl ulrich.wi...@rz.uni-regensburg.de
%package doc
+Provides: ntpdoc
+Provides: xntp-doc = 4.2.4
+Provides: xntpdoc
+Obsoletes: ntpdoc
+Obsoletes: xntp-doc = 4.2.4
+Obsoletes: xntpdoc
+Summary:Additional Package Documentation for ntp
License:MIT
Group: Documentation/Other
-AutoReqProv:on
-Provides: ntpdoc xntpdoc xntp-doc = 4.2.4
-Obsoletes: ntpdoc xntpdoc xntp-doc = 4.2.4
-Summary:Additional Package Documentation for ntp
%description doc
The complete set of documentation for building and configuring an NTP
@@ -224,6 +231,7 @@
--enable-ipv6 \
--with-sntp \
--enable-ntp-signd \
+ --disable-listen-read-drop \
--with-lineeditlibs=readline
make %{?_smp_mflags}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2012-01-26 14:06:39
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp, Maintainer is vark...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2011-11-25 23:05:17.0
+0100
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2012-01-26
14:06:42.0 +0100
@@ -1,0 +2,74 @@
+Mon Jan 9 18:45:15 UTC 2012 - lmue...@suse.com
+
+- Remove superfluous remove of acconfig.h while build.
+- BuildRequire autoconf to avoid implicit dependency for post-11.4 systems.
+- Remove call to suse_update_config macro for post-11.4 systems.
+
+---
+Mon Jan 9 18:38:10 UTC 2012 - lmue...@suse.com
+
+- BuildRequire fdupes for post-10.1 systems.
+- Do not call autoreconf for pre-10.2 systems.
+
+---
+Mon Jan 9 18:11:27 UTC 2012 - lmue...@suse.de
+
+- Update to version 4.2.6p5.
+ - ntpd
+ * Updated nic and interface IPv6 address handling to prevent
+mismatches with localhost [::1] and wildcard [::] which resulted from
+using the address/prefix format (e.g. fe80::/64)
+ * Fix orphan mode stratum incorrectly counting to infinity
+ * Orphan parent selection metric updated to includes missing ntohl()
+ * Non-printable stratum 16 refid no longer sent to ntp
+ * Duplicate ephemeral associations suppressed for broadcastclient and
+multicastclient without broadcastdelay
+ * Exclude undetermined sys_refid from use in loopback TEST12
+ * Exclude MODE_SERVER responses from KoD rate limiting
+ * Include root delay in clock_update() sys_rootdisp calculations
+ * get_systime() updated to exclude sys_residual offset (which only
+affected bits below sys_tick, the precision threshold)
+ * sys.peer jitter weighting corrected in sys_jitter calculation
+ - ntpq
+ * -n option extended to include the billboard server column
+ * IPv6 addresses in the local column truncated to prevent overruns
+- Update to version 4.2.6p4.
+ - Build system
+ * Fix checking for struct rtattr
+ * Upgrade required version of autogen and libopts for building
+from our source code repository
+ - ntpd
+ * Back-ported several fixes for Coverity warnings from ntp-dev
+ * Fix a rare boundary condition in UNLINK_EXPR_SLIST()
+ * Allow logconfig =allall configuration directive
+ * Bind tentative IPv6 addresses on Linux
+ * Correct WWVB/Spectracom driver to timestamp CR instead of LF
+ * Improved tally bit handling to prevent incorrect ntpq peer status reports
+ * Exclude the Undisciplined Local Clock and ACTS drivers from the initial
+candidate list unless they are designated a prefer peer
+ * Prevent the consideration of Undisciplined Local Clock or ACTS drivers for
+selection during the 'tos orphanwait' period·
+ * Prefer an Orphan Mode Parent over the Undisciplined Local Clock or ACTS
+drivers
+ * Improved support of the Parse Refclock trusttime flag in Meinberg mode
+ * Back-port utility routines from ntp-dev: mprintf(), emalloc_zero()
+ * Code cleanup in libntpq
+ - ntpdc
+ * Fix timerstats reporting
+ - ntpdate
+ * Reduce time required to set clock
+ * Allow a timeout greater than 2 seconds
+ - sntp
+ * Backward incompatible command-line option change:
+-l/--filelog changed -l/--logfile (to be consistent with ntpd)
+ - Documentation
+ * Update html2man. Fix some tags in the .html files
+ * Distribute ntp-wait.html
+
+---
+Mon Jan 9 17:35:16 UTC 2012 - lmue...@suse.de
+
+- Remove superfluously used NTPD_PID_NOPREFIX from init script.
+- Refresh patches to apply with no offset.
+
+---
Old:
ntp-4.2.6p3.tar.bz2
New:
ntp-4.2.6p5.tar.bz2
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.AkErwn/_old 2012-01-26 14:06:44.0 +0100
+++ /var/tmp/diff_new_pack.AkErwn/_new 2012-01-26 14:06:44.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ntp
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,15 +19,19 @@
Name: ntp
-BuildRequires: fdupes libcap-devel libtool openssl-devel readline-devel
+%if 0%{?suse_version} 1010
+BuildRequires: autoconf
+BuildRequires: fdupes
+%endif
+BuildRequires: libcap-devel libtool
commit ntp for openSUSE:Factory
Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2011-12-06 18:32:44 Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) Package is ntp, Maintainer is vark...@suse.com Changes: Other differences: -- ++ ntp.spec ++ --- /var/tmp/diff_new_pack.7iafsL/_old 2011-12-06 18:53:47.0 +0100 +++ /var/tmp/diff_new_pack.7iafsL/_new 2011-12-06 18:53:47.0 +0100 @@ -24,7 +24,7 @@ BuildRequires: pwdutils %define ntpfaqversion 3.4 Url:http://www.ntp.org/ -License:BSD3c(or similar) +License:BSD-3-Clause Group: Productivity/Networking/Other Version:4.2.6p3 Release:1 @@ -115,7 +115,7 @@ Ulrich Windl ulrich.wi...@rz.uni-regensburg.de %package doc -License:MIT License (or similar) +License:MIT Group: Documentation/Other AutoReqProv:on Provides: ntpdoc xntpdoc xntp-doc = 4.2.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2011-11-25 23:12:16
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp, Maintainer is vark...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2011-10-27 13:57:11.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2011-11-25
23:05:17.0 +0100
@@ -1,0 +2,10 @@
+Thu Nov 24 14:56:45 UTC 2011 - vark...@suse.com
+
+- bnc#730374 - Hardware Clock does not get synchronized
+
+---
+Wed Nov 23 09:29:50 UTC 2011 - co...@suse.com
+
+- add libtool as buildrequire to avoid implicit dependency
+
+---
@@ -1261 +1271 @@
-
+---
@@ -1267 +1277 @@
-
+---
@@ -1275 +1285 @@
-
+---
@@ -1283 +1293 @@
-
+---
@@ -1288 +1298 @@
-
+---
@@ -1296 +1306 @@
-
+---
@@ -1305 +1315 @@
-
+---
@@ -1313 +1323 @@
--
+---
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.pfdfnN/_old 2011-11-25 23:05:19.0 +0100
+++ /var/tmp/diff_new_pack.pfdfnN/_new 2011-11-25 23:05:19.0 +0100
@@ -19,7 +19,7 @@
Name: ntp
-BuildRequires: fdupes libcap-devel openssl-devel readline-devel
+BuildRequires: fdupes libcap-devel libtool openssl-devel readline-devel
# to allow the postinst script to succeed
BuildRequires: pwdutils
%define ntpfaqversion 3.4
@@ -27,7 +27,7 @@
License:BSD3c(or similar)
Group: Productivity/Networking/Other
Version:4.2.6p3
-Release:14
+Release:1
Summary:Network Time Protocol daemon (version 4)
# main source
Source0:
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2
++ conf.ntp.init ++
--- /var/tmp/diff_new_pack.pfdfnN/_old 2011-11-25 23:05:19.0 +0100
+++ /var/tmp/diff_new_pack.pfdfnN/_new 2011-11-25 23:05:19.0 +0100
@@ -76,6 +76,49 @@
# Override defaults, if we have the sysconfig file
test -f /etc/sysconfig/ntp . /etc/sysconfig/ntp
+function update_cmos() { return 0; }
+# Now see if we have to fix the CMOS clock
+if [ $NTPD_FORCE_SYNC_ON_STARTUP = yes -a $1 = ntptimeset ] ; then
+ test -f /etc/sysconfig/clock . /etc/sysconfig/clock
+ if test -r /proc/xen/capabilities ; then
+read -t1 caps /proc/xen/capabilities
+test $caps = ${caps%control_d*}
NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP=no
+ fi
+ case $(uname -i) in
+ s390*) NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP=no
+ esac
+ if [ $NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP = yes ] ; then
+function update_cmos() {
+ if test -e /dev/rtc ; then
+ /sbin/hwclock --systohc $HWCLOCK --noadjfile
+ return $?
+ fi
+ if test -z $(/sbin/modprobe -l rtc_cmos) ; then
+ /sbin/hwclock --systohc $HWCLOCK --noadjfile
+ return $?
+ fi
+ local temprules=/dev/.udev/rules.d
+ local uevseqnum=/sys/kernel/uevent_seqnum
+ local rule=$temprules/95-rtc-cmos.rules
+ local -i start=0 end=0
+ /bin/mkdir -m 0755 -p $temprules
+ echo ACTION==\add\, KERNEL==\rtc0\, RUN=\/sbin/hwclock --systohc
$HWCLOCK --noadjfile --rtc=\$env{DEVNAME}\ $rule
+ test -e $uevseqnum read -t 1 start $uevseqnum
+ if /sbin/modprobe -q rtc_cmos ; then
+ test -e $uevseqnum read -t 1 end $uevseqnum
+ if test $start -lt $end ; then
+ /sbin/udevadm settle --quiet --seq-start=$start --seq-end=$end
+ else
+ /sbin/udevadm settle --quiet
+ fi
+ else
+ rm -f $rule
+
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2011-10-27 13:49:51
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
Package is ntp, Maintainer is vark...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2011-09-23 02:14:52.0
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2011-10-27
13:57:11.0 +0200
@@ -1,0 +2,5 @@
+Thu Oct 27 08:52:39 UTC 2011 - vark...@suse.com
+
+- bnc#656509 - don't use --bind on /var/lib/ntp/proc
+
+---
Other differences:
--
++ conf.ntp.init ++
--- /var/tmp/diff_new_pack.S6R5Ao/_old 2011-10-27 13:57:13.0 +0200
+++ /var/tmp/diff_new_pack.S6R5Ao/_new 2011-10-27 13:57:13.0 +0200
@@ -112,11 +112,7 @@
fi
done
mkdir -p ${CHROOT_PREFIX}/proc
- # prepare_chroot is called on every start, but we need to mount only once
- if ! grep -q ${CHROOT_PREFIX}/proc proc /proc/mounts; then
-mount -o bind /proc ${CHROOT_PREFIX}/proc 2/dev/null
-mount -o remount,ro,nosuid,nodev,bind ${CHROOT_PREFIX}/proc 2/dev/null
- fi
+ mount -t proc none -o ro,nosuid,nodev ${CHROOT_PREFIX}/proc 2/dev/null
NTPD_OPTIONS=${NTPD_OPTIONS} -i ${CHROOT_PREFIX}
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory
checked in at Fri Aug 26 12:48:52 CEST 2011.
--- ntp/ntp.changes 2011-06-01 11:18:25.0 +0200
+++ /mounts/work_src_done/STABLE/ntp/ntp.changes2011-08-26
10:12:02.0 +0200
@@ -1,0 +2,5 @@
+Fri Aug 26 08:11:33 UTC 2011 - vark...@suse.com
+
+- bnc#699724 - ntpdate was replaced with a dud script
+
+---
calling whatdependson for head-i586
Old:
ntpdate
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.ruVnbp/_old 2011-08-26 12:45:54.0 +0200
+++ /var/tmp/diff_new_pack.ruVnbp/_new 2011-08-26 12:45:54.0 +0200
@@ -27,7 +27,7 @@
License:BSD3c(or similar)
Group: Productivity/Networking/Other
Version:4.2.6p3
-Release:12
+Release:14
Summary:Network Time Protocol daemon (version 4)
# main source
Source0:
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2
@@ -45,7 +45,6 @@
Source12: README.SUSE
Source13: ntp-4.2.0-rh-manpages.tar.gz
Source14: ntp.xml
-Source15: ntpdate
Source16: ntp-wait
Patch1: ntp-segfault_on_invalid_device.patch
Patch4: ntpd-maxmonmen.patch
@@ -193,9 +192,6 @@
%patch16
%patch18
-# don't build ntpdate (replaced with %{SOURCE15} script)
-sed -i '/\tntpdate/d
-s/ntpdate //g' Makefile.in Makefile.am
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
@@ -274,7 +270,6 @@
#
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/
install -m 755 %{S:16} %{buildroot}/usr/sbin/
%clean
@@ -319,7 +314,10 @@
fi
# update from previous permissions
if [ -f /etc/ntp.conf ]; then
- chown --from=ntp:root root:ntp /etc/ntp.conf
+ chown root:ntp /etc/ntp.conf
+fi
+if [ -f /etc/ntp.keys ]; then
+ chown root:ntp /etc/ntp.keys
fi
if [ -f /var/lib/ntp/etc/ntp.conf.iburst ]; then
chown --from=ntp:root root:ntp /var/lib/ntp/etc/ntp.conf.iburst
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory
checked in at Wed Jun 1 12:38:24 CEST 2011.
--- ntp/ntp.changes 2011-04-01 16:52:05.0 +0200
+++ /mounts/work_src_done/STABLE/ntp/ntp.changes2011-06-01
11:18:25.0 +0200
@@ -1,0 +2,27 @@
+Wed Jun 1 09:07:48 UTC 2011 - vark...@suse.de
+
+- The default timeout for sntp is to long. This can stop booting
+- bnc#689070 - ntp post install script always removes /etc/sysconfig/ntp
+- bnc#688529 - (ntp) ntpq and ntpdc command history broken
+- bnc#695598 - Started sntp in /var/log/messages
+
+---
+Sun May 1 23:15:01 CEST 2011 - h...@urpla.net
+
+- fix rcntp ntptimeset
+ * never try to syncronize with local clocks (127.127.*), which led to
+ sntp blocking until timeout elapsed (and probably blocking boot
+ sequence for ~5 min per device..)
+- fix DOS line breaks in some doc files
+
+---
+Tue Apr 26 06:56:05 UTC 2011 - vark...@novell.com
+
+- fix/improve init script
+ * related to bugzilla 688132
+ * rcntp ntptimeset could not parse servers from ntp.conf when IP proto
+ was specified (server [-4|-6] hostname)
+ * rcntp ntptimeset is now using ip proto parameter (-4|-6) if it's set in
+ NTPD_OPTIONS and skip servers where the opposite proto is defined
+
+---
calling whatdependson for head-i586
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.2tXS4W/_old 2011-06-01 12:35:37.0 +0200
+++ /var/tmp/diff_new_pack.2tXS4W/_new 2011-06-01 12:35:37.0 +0200
@@ -27,7 +27,7 @@
License:BSD3c(or similar)
Group: Productivity/Networking/Other
Version:4.2.6p3
-Release:9
+Release:12
Summary:Network Time Protocol daemon (version 4)
# main source
Source0:
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2
@@ -196,6 +196,8 @@
# don't build ntpdate (replaced with %{SOURCE15} script)
sed -i '/\tntpdate/d
s/ntpdate //g' Makefile.in Makefile.am
+# fix DOS line breaks
+sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
%build
rm -rf acconfig.h
@@ -218,7 +220,8 @@
--enable-linuxcaps \
--enable-ipv6 \
--with-sntp \
---enable-ntp-signd
+ --enable-ntp-signd \
+ --with-lineeditlibs=readline
make %{?_smp_mflags}
%install
@@ -303,8 +306,6 @@
fi
# Are we in update mode?
if [ -f /etc/sysconfig/ntp ]; then
- # convert parameters and description in existing sysconfig file
-sed -i -e s@^XNTPD_@NTPD_@ -e s@\(\.*\)-U ntp\(.*\\)@\1-u ntp\2@
/etc/sysconfig/ntp
grep -q '^keys /etc/ntp.keys' /etc/ntp.conf || {
echo #
# Authentication stuff
++ conf.ntp.init ++
--- /var/tmp/diff_new_pack.2tXS4W/_old 2011-06-01 12:35:37.0 +0200
+++ /var/tmp/diff_new_pack.2tXS4W/_new 2011-06-01 12:35:37.0 +0200
@@ -147,6 +147,20 @@
logger -t $0 runtime configuration: $NTPDC_LOG
}
+function get_ntpd_ip_proto() {
+ local -a OPTS
+ read -ra OPTS $NTPD_OPTIONS
+ for i in ${OPTS[@]}; do
+if [ $i = -4 ] || [ $i = -6 ]; then
+ # first occurrence wins safely because ntpd couldn't handle more anyway
+ echo $i
+ return
+fi
+ done
+ echo
+ return
+}
+
case $1 in
start)
if [ $NTPD_FORCE_SYNC_ON_STARTUP = yes ]; then
@@ -224,9 +238,24 @@
rc_status
;;
ntptimeset)
-for i in $(gawk '/^server/ { if( $2 != 127.127.1.0 ) print $2 }'
$NTP_CONF)
+NTPD_PROTO=$( get_ntpd_ip_proto )
+for i in $(gawk '/^server/ { if( $2 !~ ^127.127. ) print $2,$3 }'
$NTP_CONF)
do
- sntp -s $i 2 /dev/null { SYNCHRONISED=$i; break; };
+IFS=',' read -ra SERVER $i
+if [ ${SERVER[0]} = -4 ] || [ ${SERVER[0]} = -6 ]
+then
+if [ -z ${NTPD_PROTO} ] || [ ${NTPD_PROTO} = ${SERVER[0]} ]
+then
+SNTP_OPT=${SERVER[0]} ${SERVER[1]}
+else
+# ignore servers with conflicting proto
+continue
+fi
+else
+# here the usual case with empty NTPD_PROTO (default/yast config)
+SNTP_OPT=$NTPD_PROTO ${SERVER[0]}
+fi
+sntp -t 2 -l /dev/null -s $SNTP_OPT 2 /dev/null {
SYNCHRONISED=$SNTP_OPT; break; };
done
if [ $SYNCHRONISED ]
then
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntp for openSUSE:Factory
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory
checked in at Thu Apr 21 13:41:53 CEST 2011.
--- ntp/ntp.changes 2011-02-03 17:15:58.0 +0100
+++ /mounts/work_src_done/STABLE/ntp/ntp.changes2011-04-01
16:52:05.0 +0200
@@ -1,0 +2,9 @@
+Fri Apr 1 16:50:21 CET 2011 - h...@urpla.net
+
+- replace remove-ntpdate.diff with sed script
+- don't effectively zap existing /etc/sysconfig/ntp
+- while at it, simplify /etc/sysconfig/ntp update
+- improve NTP_PARSE_DEVICE documentation for /etc/sysconfig/ntp
+- refresh all patches with offsets and fuzz
+
+---
calling whatdependson for head-i586
Old:
ntp-4.2.6p3.tar.gz
remove-ntpdate.diff
New:
ntp-4.2.6p3.tar.bz2
Other differences:
--
++ ntp.spec ++
--- /var/tmp/diff_new_pack.OEFb3K/_old 2011-04-21 13:40:40.0 +0200
+++ /var/tmp/diff_new_pack.OEFb3K/_new 2011-04-21 13:40:40.0 +0200
@@ -27,10 +27,10 @@
License:BSD3c(or similar)
Group: Productivity/Networking/Other
Version:4.2.6p3
-Release:8
+Release:9
Summary:Network Time Protocol daemon (version 4)
# main source
-Source0:
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz
+Source0:
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2
# configuration
Source1:conf.logrotate.ntp
Source2:conf.ntp.conf
@@ -49,7 +49,6 @@
Source16: ntp-wait
Patch1: ntp-segfault_on_invalid_device.patch
Patch4: ntpd-maxmonmen.patch
-Patch9: remove-ntpdate.diff
Patch10:ntp-strcat.patch
Patch11:ntp-4.2.6p2-seed_file.patch
Patch13:ntp-code-cleanup.patch
@@ -62,7 +61,7 @@
Obsoletes: xntp3 xntp = 4.2.4p5
Conflicts: openntpd
PreReq: pwdutils %insserv_prereq %fillup_prereq /usr/bin/diff
/usr/bin/grep /sbin/chkconfig
-Requires: timezone
+Requires: timezone logrotate
%description
The Network Time Protocol (NTP) is used to synchronize the time of a
@@ -187,7 +186,6 @@
# copy README.SUSE
cp %{S:12} .
tar xzf %{S:13}
-%patch9
%patch10 -p1
%patch11
%patch13
@@ -195,6 +193,10 @@
%patch16
%patch18
+# don't build ntpdate (replaced with %{SOURCE15} script)
+sed -i '/\tntpdate/d
+s/ntpdate //g' Makefile.in Makefile.am
+
%build
rm -rf acconfig.h
%{?suse_update_config}
@@ -302,11 +304,7 @@
# Are we in update mode?
if [ -f /etc/sysconfig/ntp ]; then
# convert parameters and description in existing sysconfig file
- cvt_tmp=/etc/sysconfig/sysconfig.ntp.$$
-sed -e s@^XNTPD_@NTPD_@ -e s@\(\.*\)-U ntp\(.*\\)@\1-u ntp\2@ \
- /etc/sysconfig/ntp $cvt_tmp \
- test -e $cvt_tmp mv $cvt_tmp /etc/sysconfig/ntp
- test -e /etc/sysconfig/ntp rm -f /etc/sysconfig/ntp
+sed -i -e s@^XNTPD_@NTPD_@ -e s@\(\.*\)-U ntp\(.*\\)@\1-u ntp\2@
/etc/sysconfig/ntp
grep -q '^keys /etc/ntp.keys' /etc/ntp.conf || {
echo #
# Authentication stuff
++ conf.sysconfig.ntp ++
--- /var/tmp/diff_new_pack.OEFb3K/_old 2011-04-21 13:40:40.0 +0200
+++ /var/tmp/diff_new_pack.OEFb3K/_new 2011-04-21 13:40:40.0 +0200
@@ -41,14 +41,17 @@
#
NTP_PARSE_LINK=
-## Type: boolean
+## Type:
string(/dev/ttyS0,/dev/ttyS1,/dev/ttyUSB0,/dev/ttyUSB1,/dev/ttyUSB2)
## Default:
## ServiceRestart: ntp
#
# Parse driver device
+#
# For more information see the ntp documentation in the package ntp-doc
# /usr/share/doc/packages/ntp-doc/drivers/driver8.html
#
+# NOTE: Adjust /etc/apparmor.d/tunables/ntpd accordingly
+#
NTP_PARSE_DEVICE=
## Type: boolean
++ ntp-4.2.6p3.tar.gz - ntp-4.2.6p3.tar.bz2 ++
++ ntp-segfault_on_invalid_device.patch ++
--- /var/tmp/diff_new_pack.OEFb3K/_old 2011-04-21 13:40:41.0 +0200
+++ /var/tmp/diff_new_pack.OEFb3K/_new 2011-04-21 13:40:41.0 +0200
@@ -1,7 +1,8 @@
-diff -ru ntpd/refclock_parse.c ntpd/refclock_parse.c
ntpd/refclock_parse.c 2007-08-18 22:24:46.0 +0200
-+++ ntpd/refclock_parse.c 2008-09-25 17:03:56.0 +0200
-@@ -3319,6 +3319,10 @@
+Index: ntpd/refclock_parse.c
+===
+--- ntpd/refclock_parse.c
ntpd/refclock_parse.c
+@@ -3315,6 +3315,10 @@ parse_control(
struct parseunit *parse = (struct parseunit *)peer-procptr-unitptr;
parsectl_t tmpctl;
@@ -12,4 +13,3 @@
static char outstatus[400]; /* status output buffer */
if (out)
-Nur in ntp-segfault_on_invalid_device/ntpd: refclock_parse.c.orig.
++ ntp-strcat.patch ++
--- /var/tmp/diff_new_pack.OEFb3K/_old 2011-04-21 13:40:41.0 +0200
+++ /var/tmp/diff_new_pack.OEFb3K/_new 2011-04-21
