Browse Source

chrony 3.2-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11717 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 5 years ago
parent
commit
c207198a8f
1 changed files with 14 additions and 4 deletions
  1. 14 4
      c/chrony/chrony-vl.spec

+ 14 - 4
c/chrony/chrony-vl.spec

@@ -1,5 +1,5 @@
 Name:           chrony
-Version:        3.0
+Version:        3.2
 Release:        1%{?_dist_release}
 Summary:        An NTP client/server
 
@@ -12,8 +12,8 @@ Source2:        chrony.dhclient
 Source3:        chronyd.sysconfig
 Source4:        chronyd.init
 Source5:        chrony.logrotate
-# Debian's patches
-Patch101:       fix_time_smoothing_in_interleaved_mode.patch
+# Fedora's patches
+Patch102:       chrony-select-timeout.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,7 +24,9 @@ Requires(post): chkconfig
 Requires(preun): chkconfig initscripts
 Requires(postun): initscripts
 
+%if "%{?_dist_release}" == "vl7"
 Obsoletes:      ntp < 4.2.6p5
+%endif
 Obsoletes: networkmanager-dispatcher-chrony
 
 Vendor: Project Vine
@@ -40,7 +42,7 @@ clocks, system real-time clock or manual input as time references.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
-%patch101 -p1
+%patch102 -p1
 
 echo '# Keys used by chronyd for command and NTP authentication' > chrony.keys
 
@@ -135,6 +137,14 @@ fi
 %dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony
 
 %changelog
+* Sat Jun  9 2018 IWAI, Masaharu <iwaim.sub@gmail.com> 3.2-1
+- update to 3.2
+- drop Patch101; upstream merged
+- add Fedora's patch (Patch102)
+ * Tue Dec 05 2017 Miroslav Lichvar <mlichvar@redhat.com> 3.2-2
+ - fix chronyc getting stuck in infinite loop after clock step (#1520884)
+- restrict obsoleting 'ntp' package to VineSeed; for Vine Linux 6
+
 * Thu May 18 2017 IWAI, Masaharu <iwaim.sub@gmail.com> 3.0-1
 - update to 3.0
 - add patch to fix time smoothing in interleaved mode (Patch101); from Debian 3.0-4