Accepting request 400692 from network:time

1

OBS-URL: https://build.opensuse.org/request/show/400692
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/chrony?expand=0&rev=2

chrony-2.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58bffb523012fb0fa87cc0d94d6e36de9689fe9556519cbd0d1ba254af92ccb2
-size 355113

chrony-2.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d04e7cda2333289c2104b731d39c3c1db94816e43bae35d7ee4e7ae8af6391f
+size 390077

chrony-fix-open.patch

@@ -1,8 +1,8 @@
-Index: chrony-2.3/clknetsim-96416d5d0bb6f8c2356fa067f707f34fc650688c/client.c
+Index: chrony-2.4/clknetsim-a5949fedf7e0f78a756bd29fe93fa1e4f72cdc42/client.c
 ===================================================================
---- chrony-2.3.orig/clknetsim-96416d5d0bb6f8c2356fa067f707f34fc650688c/client.c
-+++ chrony-2.3/clknetsim-96416d5d0bb6f8c2356fa067f707f34fc650688c/client.c
-@@ -945,6 +945,8 @@ int open(const char *pathname, int flags
+--- chrony-2.4.orig/clknetsim-a5949fedf7e0f78a756bd29fe93fa1e4f72cdc42/client.c
++++ chrony-2.4/clknetsim-a5949fedf7e0f78a756bd29fe93fa1e4f72cdc42/client.c
+@@ -954,6 +954,8 @@ int open(const char *pathname, int flags
  	else if (!strcmp(pathname, "/dev/ptp1"))
  		return SYSCLK_FD;
  
@@ -11,7 +11,7 @@ Index: chrony-2.3/clknetsim-96416d5d0bb6f8c2356fa067f707f34fc650688c/client.c
  	r = _open(pathname, flags);
  	assert(r < 0 || (r < BASE_SOCKET_FD && r < BASE_TIMER_FD));
  
-@@ -963,6 +965,8 @@ int close(int fd) {
+@@ -972,6 +974,8 @@ int close(int fd) {
  		return 0;
  	}
  

chrony-include-termios.patch

@@ -1,10 +0,0 @@
---- a/sys_linux.c
-+++ b/sys_linux.c
-@@ -50,6 +50,7 @@
- #ifdef FEAT_SCFILTER
- #include <sys/prctl.h>
- #include <seccomp.h>
-+#include <termios.h>
- #ifdef FEAT_PHC
- #include <linux/ptp_clock.h>
- #endif

chrony.changes

@@ -1,3 +1,52 @@
+-------------------------------------------------------------------
+Wed Jun  8 10:02:51 UTC 2016 - mrueckert@suse.de
+
+- update to 2.4:
+  - Enhancements
+    - Add orphan option to local directive for orphan mode
+      compatible with ntpd
+    - Add distance option to local directive to set activation
+      threshold (1 second by default)
+    - Add maxdrift directive to set maximum allowed drift of system
+      clock
+    - Try to replace NTP sources exceeding maximum distance
+    - Randomise source replacement to avoid getting stuck with bad
+      sources
+    - Randomise selection of sources from pools on start
+    - Ignore reference timestamp as ntpd doesn't always set it
+      correctly
+    - Modify tracking report to use same values as seen by NTP
+      clients
+    - Add -c option to chronyc to write reports in CSV format
+    - Provide detailed manual pages
+  - Bug fixes
+    - Fix SOCK refclock to work correctly when not specified as
+      last refclock
+    - Fix initstepslew and -q/-Q options to accept time from own
+      NTP clients
+    - Fix authentication with keys using 512-bit hash functions
+    - Fix crash on exit when multiple signals are received
+    - Fix conversion of very small floating-point numbers in
+      command packets
+  - Removed features
+    - Drop documentation in Texinfo format
+- update clknetsim to a5949fe for fixing a testsuite failure:
+  - add IP_PKTINFO socket option
+  - accept environment variables in make
+  - fix building with FORTIFY_SOURCE
+  - fix compiler warning
+  - support multiple SHM refclocks
+  - fix recv functions with new glibc headers
+- refreshed chrony-fix-open.patch: to apply cleanly after clknetsim
+  update
+- drop patches:
+  - chrony-include-termios.patch
+  - make-105-ntpauth-more-reliable.patch
+- drop buildrequires for texinfo and pre requires on the install
+  info packages
+- no longer use make install-docs: it only installed 0 byte html
+  files.
+
 -------------------------------------------------------------------
 Wed Apr 13 14:23:38 UTC 2016 - mpluskal@suse.com
 

chrony.spec

@@ -23,10 +23,10 @@
 %bcond_with     systemd
 %bcond_with     syscallfilter
 %endif
-%global clknetsim_ver 96416d5
+%global clknetsim_ver a5949fe
 
 Name:           chrony
-Version:        2.3
+Version:        2.4
 Release:        0
 License:        GPL-2.0
 Summary:        System Clock Synchronization Client and Server
@@ -47,8 +47,6 @@ Patch0:         chrony-config.patch
 # Add NTP servers from DHCP when starting service
 Patch1:         chrony-service-helper.patch
 Patch2:         chrony-logrotate.patch
-Patch3:         chrony-include-termios.patch
-Patch4:         make-105-ntpauth-more-reliable.patch
 Patch5:         chrony-fix-open.patch
 #
 BuildRequires:  NetworkManager-devel
@@ -57,7 +55,6 @@ BuildRequires:  libcap-devel
 BuildRequires:  libedit-devel
 BuildRequires:  mozilla-nss-devel
 BuildRequires:  pkg-config
-BuildRequires:  texinfo
 BuildRequires:  gcc-c++
 # The timezone package is needed for the "make check" tests. It can be
 # removed if the call to make check is ever deleted.
@@ -80,7 +77,6 @@ Requires:       logrotate
 Requires(pre):  %fillup_prereq
 Requires(pre):  %{_sbindir}/groupadd
 Requires(pre):  %{_sbindir}/useradd
-Requires(pre):  %{install_info_prereq}
 Provides:       ntp-daemon
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -111,8 +107,6 @@ or a different computer.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 %patch5 -p1
 
 # use our vendor zone (2.*pool.ntp.org names include IPv6 addresses)
@@ -140,11 +134,9 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now"
   --with-sendmail=%{_sbindir}/sendmail
 
 make %{?_smp_mflags} all docs
-gzip -9 -f -n chrony.txt
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install install-docs
-rm "%{buildroot}%{_docdir}/%{name}/%{name}.html"
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 
 mkdir -p %{buildroot}%{_sysconfdir}/{sysconfig,logrotate.d}
 mkdir -p %{buildroot}%{_localstatedir}/{lib,log}/chrony
@@ -210,13 +202,11 @@ make check
 
 %post
 %fillup_only %{name}
-%install_info --info-dir="%{_infodir}" "%{_infodir}/chrony.info%{ext_info}"
 %if %{with systemd}
 %service_add_post chronyd.service chrony-wait.service
 %endif
 
 %postun
-%install_info_delete --info-dir="%{_infodir}" "%{_infodir}/chrony.info%{ext_info}"
 %if %{with systemd}
 %service_del_postun chronyd.service chrony-wait.service
 %else
@@ -226,7 +216,7 @@ make check
 
 %files
 %defattr(-,root,root)
-%doc FAQ NEWS README chrony.txt* COPYING
+%doc FAQ NEWS README COPYING
 %doc examples
 %config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir}/chrony.conf
 %config(noreplace) %attr(0640,root,%{name}) %verify(not md5 size mtime) %{_sysconfdir}/chrony.keys
@@ -241,7 +231,6 @@ make check
 %{_mandir}/man1/chronyc.1%{ext_man}
 %{_mandir}/man5/chrony.conf.5%{ext_man}
 %{_mandir}/man8/chronyd.8%{ext_man}
-%{_infodir}/chrony.info*
 %if %{with systemd}
 %{_prefix}/lib/systemd/ntp-units.d/*.list
 %{_unitdir}/chrony*.service

clknetsim-96416d5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa624416000c526948c2590510107f773b702779e99bb724d33946b366722db3
-size 40246

clknetsim-a5949fe.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad48673521b6503664a48f9dfbd8717d36adcf4dccc3330be202eac4ead6e0bb
+size 40592

make-105-ntpauth-more-reliable.patch

@@ -1,22 +0,0 @@
-From 9749a1c6fcbdbf158bef2e0b454e7044a742749a Mon Sep 17 00:00:00 2001
-From: Miroslav Lichvar <mlichvar@redhat.com>
-Date: Mon, 14 Mar 2016 17:42:49 +0100
-Subject: test: make 105-ntpauth more reliable
-
-
-diff --git a/test/simulation/105-ntpauth b/test/simulation/105-ntpauth
-index 1b9dd48..2ebcec3 100755
---- a/test/simulation/105-ntpauth
-+++ b/test/simulation/105-ntpauth
-@@ -43,7 +43,7 @@ check_packet_interval || test_fail
- client_conf="keyfile tmp/keys"
- clients=2
- peers=2
--max_sync_time=300
-+max_sync_time=500
- base_delay="$default_base_delay (* -1 (equal 0.1 from 3) (equal 0.1 to 1))"
- client_lpeer_options="key 1"
- client_rpeer_options="key 1"
--- 
-cgit v0.10.2
-