pool/chrony
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 627295 from network:time

Browse Source 
- Update clknetsim to revision 42b693b
  * Drop not needed chrony-fix-open.patch
- Build tests with optflags as well
- Do not run tests on i586
- Enable signd

- Mention all sources as such in spec file
- Fix formatting of changelog
- Drop reference to change is not present

- Update to version 3.3
  * Enhancements:
    + Add burst option to server/pool directive
    + Add stratum and tai options to refclock directive
    + Add support for Nettle crypto library
    + Add workaround for missing kernel receive timestamps on Linux
    + Wait for late hardware transmit timestamps
    + Improve source selection with unreachable sources
    + Improve protection against replay attacks on symmetric mode
    + Allow PHC refclock to use socket in /var/run/chrony
    + Add shutdown command to stop chronyd
    + Simplify format of response to manual list command
    + Improve handling of unknown responses in chronyc
  * Bug fixes:
    + Respond to NTPv1 client requests with zero mode
    + Fix -x option to not require CAP_SYS_TIME under non-root user
    + Fix acquisitionport directive to work with privilege separation
    + Fix handling of socket errors on Linux to avoid high CPU usage
    + Fix chronyc to not get stuck in infinite loop after clock step

OBS-URL: https://build.opensuse.org/request/show/627295
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/chrony?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2018-08-07 08:50:06 +00:00 committed by Git OBS Bridge
commit ffa7808c90
9 changed files with 98 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chrony-3.2.tar.gz
View File

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

3
chrony-3.3.tar.gz Normal file
View File

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

6
chrony-3.3.tar.gz.sig Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iEYEABECAAYFAlrEnuoACgkQX/BvKboeATuMFQCfdu4xtf+APWbPOs3xGi0hSiaH
okQAnA/in5HE5qsRQoZQ8yi4MhOX4++X
=OZtM
-----END PGP SIGNATURE-----

22
chrony-fix-open.patch
View File

@ -1,22 +0,0 @@
Index: chrony-3.2/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c
===================================================================
--- chrony-3.2.orig/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c
+++ chrony-3.2/clknetsim-71dbbc509eee05cb29e33468be93d5ba52b79429/client.c
@@ -1008,6 +1008,8 @@ int open(const char *pathname, int flags
else if (!strcmp(pathname, "/dev/ptp1"))
return SYSCLK_FD;
+ if (!_open)
+ _open = (int (*)(const char *pathname, int flags))dlsym(RTLD_NEXT, "open");
r = _open(pathname, flags);
assert(r < 0 || (r < BASE_SOCKET_FD && r < BASE_TIMER_FD));
@@ -1026,6 +1028,8 @@ int close(int fd) {
return 0;
}
+ if (!_close)
+ _close = (int (*)(int fd))dlsym(RTLD_NEXT, "close");
return _close(fd);
}

39
chrony.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Fri Aug 3 07:56:06 UTC 2018 - mpluskal@suse.com
- Update clknetsim to revision 42b693b
* Drop not needed chrony-fix-open.patch
- Build tests with optflags as well
- Do not run tests on i586
- Enable signd
-------------------------------------------------------------------
Thu Aug 2 07:52:58 UTC 2018 - mpluskal@suse.com
- Mention all sources as such in spec file
- Fix formatting of changelog
- Drop reference to change is not present
-------------------------------------------------------------------
Wed Aug 1 16:36:17 UTC 2018 - bwiedemann@suse.com
- Update to version 3.3
* Enhancements:
+ Add burst option to server/pool directive
+ Add stratum and tai options to refclock directive
+ Add support for Nettle crypto library
+ Add workaround for missing kernel receive timestamps on Linux
+ Wait for late hardware transmit timestamps
+ Improve source selection with unreachable sources
+ Improve protection against replay attacks on symmetric mode
+ Allow PHC refclock to use socket in /var/run/chrony
+ Add shutdown command to stop chronyd
+ Simplify format of response to manual list command
+ Improve handling of unknown responses in chronyc
* Bug fixes:
+ Respond to NTPv1 client requests with zero mode
+ Fix -x option to not require CAP_SYS_TIME under non-root user
+ Fix acquisitionport directive to work with privilege separation
+ Fix handling of socket errors on Linux to avoid high CPU usage
+ Fix chronyc to not get stuck in infinite loop after clock step
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 18 02:55:54 UTC 2018 - mpost@suse.com Wed Apr 18 02:55:54 UTC 2018 - mpost@suse.com

29
chrony.keyring Normal file
View File

@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQGiBEYLz1cRBADYNM9gn8g1Bw8t2Zj+HT9hbSHVs9ofSdxqdLEVAbNySeLftOlZ
ba+4CU+lIfC/6XHZ0r+UvTBVK+r/KLjFxWz5cWGGFVUrXOSjo2PDXDqWrs9VALtT
zH8sr0/7qJCByF9fnryPO1fmMKlh9R0+X5cF7vZjlWbM+BV/yxARi4lb4wCgpf9M
7uo9hJUcMyy2zJSdzjUPkcMEAMVyDpw7kwTjnWzwaOHnPlT/x31OkGAO2sZgzRGu
VE1zGN4Ruv36GS7hNPndtpTGZuPtmLrE2wJS2exer4kTYANfiGj/JDTiuGQYF2jp
9cN3zJL7e7Bik004TZVUGg3HzpuWWc/uiTXgrZxIDz4uPxjy5kdDfbhUziNsy9Uj
igOZBADQ9T6XYQBTfRmGUkl7hEeAeu+WfEGDVlHP+EpMtk/uANUqYef5xUG4RomE
EyjRlrEXwG7Ly2HhH3UADBuPjkP68AGN8WslbCNx5Na+nZr6r1sT1+Z3OdUDprpY
PQxCu5WWYsYgzroO/JEA2d3pYgaaHEAhyZxau1UtW4hpAn8svbQmTWlyb3NsYXYg
TGljaHZhciA8bWxpY2h2YXJAcmVkaGF0LmNvbT6IZgQTEQIAJgIbAwYLCQgHAwIE
FQIIAwQWAgMBAh4BAheABQJWlM11BQkWLJibAAoJEF/wbym6HgE7UTsAmwbZUuT0
OVgRwWRvgpwzpRbdQBP5AKCXLqK/+vB/9d5pJUXch2v7lqyy87kCDQRGC89XEAgA
medsNk8FIYdzJYyP2eaIYKMTpSCFgTKE1EHdiRaX5n3oo9o26+vfA1NfIwKM8G54
3Ddr1yl2PRmQermHMQahMMsXcehQXjsJoZXTglJq6kw5Xb1V1K6SyXQv/sLmWGxw
T91T+0I+9g+UqMeqR8B2hj950BbfWn6Pu5CRk2voTsYEU2ecejKOWOOrbUnD/5wy
mkSD/1g+T7bgGOHMrSgYWH3Fk7dWNKpGBtQn3cL7fKy+cn4koDW1L3ebxg4zWpFo
l51m3u8DXc9lqUjg9AoqJH1bc9eQPQvJKxd5syU2pkgtHhT2rlSqpRtsKsgRNfBC
qBbK9gtEM3DRUD+EbbEZgwADBQf8CTSksVEUs5svpQlldZERwViUwwVb4TMszKKq
nEti6zu6oMkIDreGzSISDsrWq1WxzUv9IYumwanzkgTpVVfFPxK7samtol8Lol5V
r3Zbil3Q0IGJ9thhitMHRSU3ClhVRZF5QF/MhSzD1j0cXK4Ls0np5DePT3H4tItZ
+OcEhZcDb8k2DMcJW/REuiisWOElwIDM0o0kZyQiy+5QRfE2xancu3n8+wGtwc0N
2Yp/elmIigreu0xuK7HaFOiScUYv00BJa/ZEO2aOkRuiKkdp3oxtz3MIdDYyGbI6
mL4h+X8079i95yu+L2tUJGHeN5u+X0Hsg9sE6TpVEggQEI30YYhPBBgRAgAPAhsM
BQJWlM2TBQkWLJi3AAoJEF/wbym6HgE7G9sAnA3EsHwEZ+CcOmKFBJRbkj3Dxagp
AJ962OOivxERsKPk/hXIN1oUXY54Aw==
=Vbe3
-----END PGP PUBLIC KEY BLOCK-----

32
chrony.spec
View File

@ -17,24 +17,26 @@
%define vendorzone opensuse. %define vendorzone opensuse.
%global clknetsim_ver 71dbbc5 %global clknetsim_ver 42b693b
#Compat macro for new _fillupdir macro introduced in Nov 2017 #Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif %endif
Name: chrony Name: chrony
Version: 3.2 Version: 3.3
Release: 0 Release: 0
Summary: System Clock Synchronization Client and Server Summary: System Clock Synchronization Client and Server
License: GPL-2.0-only License: GPL-2.0-only
Group: Productivity/Networking/Other Group: Productivity/Networking/Other
Url: http://chrony.tuxfamily.org/ URL: https://chrony.tuxfamily.org/
Source: http://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz Source: https://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz
Source2: chrony.sysconfig Source2: chrony.sysconfig
Source3: chrony.dhclient Source3: chrony.dhclient
Source4: chrony.helper Source4: chrony.helper
Source5: chrony-dnssrv@.service Source5: chrony-dnssrv@.service
Source6: chrony-dnssrv@.timer Source6: chrony-dnssrv@.timer
Source7: https://download.tuxfamily.org/chrony/chrony-3.3-tar-gz-asc.txt#/chrony-%{version}.tar.gz.sig
Source8: chrony.keyring
# Simulator for test suite # Simulator for test suite
Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
@ -42,7 +44,6 @@ Patch0: chrony-config.patch
# Add NTP servers from DHCP when starting service # Add NTP servers from DHCP when starting service
Patch1: chrony-service-helper.patch Patch1: chrony-service-helper.patch
Patch2: chrony-logrotate.patch Patch2: chrony-logrotate.patch
Patch5: chrony-fix-open.patch
BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-devel
BuildRequires: bison BuildRequires: bison
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -93,7 +94,6 @@ or a different computer.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch5 -p1
# If this is an openSUSE build, use our vendor zone # If this is an openSUSE build, use our vendor zone
# (2.*pool.ntp.org names include IPv6 addresses). If not # (2.*pool.ntp.org names include IPv6 addresses). If not
@ -109,7 +109,7 @@ sed -e 's|^\pool|! pool|' \
cat << EOF >> chrony.conf cat << EOF >> chrony.conf
# Also include any directives found in configuration files in /etc/chrony.d # Also include any directives found in configuration files in /etc/chrony.d
include /etc/chrony.d/*.conf include %{_sysconfdir}/chrony.d/*.conf
EOF EOF
touch -r examples/chrony.conf.example2 chrony.conf touch -r examples/chrony.conf.example2 chrony.conf
@ -130,7 +130,8 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now"
%endif %endif
--with-user=chrony \ --with-user=chrony \
--with-hwclockfile=%{_sysconfdir}/adjtime \ --with-hwclockfile=%{_sysconfdir}/adjtime \
--with-sendmail=%{_sbindir}/sendmail --with-sendmail=%{_sbindir}/sendmail \
--enable-ntp-signd
make %{?_smp_mflags} all docs make %{?_smp_mflags} all docs
%install %install
@ -159,9 +160,9 @@ install -d %{buildroot}%{sbindir}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchronyd ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchronyd
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchrony-wait ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchrony-wait
install -d %{buildroot}%{_prefix}/lib/systemd/ntp-units.d install -d %{buildroot}%{_libexecdir}/systemd/ntp-units.d
echo 'chronyd.service' > \ echo 'chronyd.service' > \
%{buildroot}%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list %{buildroot}%{_libexecdir}/systemd/ntp-units.d/50-chronyd.list
install -Dpm 0644 %{SOURCE2} \ install -Dpm 0644 %{SOURCE2} \
%{buildroot}%{_fillupdir}/sysconfig.chrony %{buildroot}%{_fillupdir}/sysconfig.chrony
@ -171,11 +172,14 @@ install -Dpm 755 %{SOURCE4} \
install -d %{buildroot}%{_localstatedir}/log/chrony install -d %{buildroot}%{_localstatedir}/log/chrony
touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc} touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc}
%ifnarch %ix86
%check %check
# Set random seed to get deterministic results # Set random seed to get deterministic results
export CLKNETSIM_RANDOM_SEED=24501 export CLKNETSIM_RANDOM_SEED=24501
export CFLAGS="%{optflags}"
make %{?_smp_mflags} -C test/simulation/clknetsim make %{?_smp_mflags} -C test/simulation/clknetsim
make %{?_smp_mflags} check make %{?_smp_mflags} check
%endif
%pre %pre
getent group %{name} >/dev/null || groupadd -r %{name} getent group %{name} >/dev/null || groupadd -r %{name}
@ -207,10 +211,10 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/
%{_bindir}/chronyc %{_bindir}/chronyc
%{_sbindir}/chronyd %{_sbindir}/chronyd
%{_datadir}/chrony-helper %{_datadir}/chrony-helper
%{_mandir}/man1/chronyc.1%{ext_man} %{_mandir}/man1/chronyc.1%{?ext_man}
%{_mandir}/man5/chrony.conf.5%{ext_man} %{_mandir}/man5/chrony.conf.5%{?ext_man}
%{_mandir}/man8/chronyd.8%{ext_man} %{_mandir}/man8/chronyd.8%{?ext_man}
%{_prefix}/lib/systemd/ntp-units.d/*.list %{_libexecdir}/systemd/ntp-units.d/*.list
%{_unitdir}/chrony*.service %{_unitdir}/chrony*.service
%{_unitdir}/chrony*.timer %{_unitdir}/chrony*.timer
%{_sbindir}/rcchrony* %{_sbindir}/rcchrony*

3
clknetsim-42b693b.tar.gz Normal file
View File

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

3
clknetsim-71dbbc5.tar.gz
View File

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