rpms/chrony
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 3.0-pre2

Browse Source
This commit is contained in:
Miroslav Lichvar 2016-12-15 14:36:03 +01:00
parent 4b9c5317b9
commit 9306b48e32
4 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
/chrony-3.0-pre1.tar.gz /chrony-3.0-pre2.tar.gz
/clknetsim-fc9be6.tar.gz /clknetsim-6bb651.tar.gz

12
chrony-wait-service.patch
View File

@ -1,12 +0,0 @@
diff -up chrony-2.4/examples/chrony-wait.service.chrony-wait chrony-2.4/examples/chrony-wait.service
--- chrony-2.4/examples/chrony-wait.service.chrony-wait 2016-06-07 11:20:59.000000000 +0200
+++ chrony-2.4/examples/chrony-wait.service 2016-10-27 14:05:14.030882058 +0200
@@ -9,7 +9,7 @@ Wants=time-sync.target
Type=oneshot
# Wait up to ~10 minutes for chronyd to synchronize and the remaining
# clock correction to be less than 0.1 seconds
-ExecStart=/usr/bin/chronyc waitsync 600 0.1 0.0 1
+ExecStart=/usr/bin/chronyc -h 127.0.0.1,::1 waitsync 600 0.1 0.0 1
RemainAfterExit=yes
StandardOutput=null

9
chrony.spec
View File

@ -1,6 +1,6 @@
%global _hardened_build 1 %global _hardened_build 1
%global prerelease -pre1 %global prerelease -pre2
%global clknetsim_ver fc9be6 %global clknetsim_ver 6bb651
%bcond_without debug %bcond_without debug
Name: chrony Name: chrony
@ -22,8 +22,6 @@ Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/c
# 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
# avoid AVC denials in chrony-wait service (#1350815)
Patch2: chrony-wait-service.patch
BuildRequires: libcap-devel libedit-devel nss-devel pps-tools-devel BuildRequires: libcap-devel libedit-devel nss-devel pps-tools-devel
%ifarch %{ix86} x86_64 %{arm} aarch64 %ifarch %{ix86} x86_64 %{arm} aarch64
@ -61,7 +59,6 @@ clocks, system real-time clock or manual input as time references.
%setup -q -n %{name}-%{version}%{?prerelease} -a 10 %setup -q -n %{name}-%{version}%{?prerelease} -a 10
%{?gitpatch:%patch0 -p1} %{?gitpatch:%patch0 -p1}
%patch1 -p1 -b .service-helper %patch1 -p1 -b .service-helper
%patch2 -p1 -b .wait-service
%{?gitpatch: echo %{version}-%{gitpatch} > version.txt} %{?gitpatch: echo %{version}-%{gitpatch} > version.txt}
@ -137,7 +134,7 @@ echo 'chronyd.service' > \
%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=24502
make %{?_smp_mflags} -C test/simulation/clknetsim make %{?_smp_mflags} -C test/simulation/clknetsim
make check make check

4
sources
View File

@ -1,2 +1,2 @@
936287211eb111c5155f8ec0717207f7 chrony-3.0-pre1.tar.gz SHA512 (chrony-3.0-pre2.tar.gz) = ffa729c7574c3ae5efea5eba70336e0c7cab8ff7fbef8588f016be91cfcf4413fec2515c874d672ebc6ed191fa15ae7c2f4ecef3a96e426b21f50cd782abbdeb
3e1d8d5ba715e9cf71b406a06a32714b clknetsim-fc9be6.tar.gz SHA512 (clknetsim-6bb651.tar.gz) = 1cbe69be0fd57e36f013c9bc514bab89011362c105bae946ad6178b448da0991ccd9f6c56c700dce23519da9b92de13b5199e61065abe5a7ea25eff4c67a0081