update to 4.2.8p15

This commit is contained in:
yu_boyun 2020-07-25 13:40:51 +08:00
parent ee35d3a785
commit d0c84f5cf6
4 changed files with 9 additions and 29 deletions

Binary file not shown.

BIN
ntp-4.2.8p15.tar.gz Normal file

Binary file not shown.

View File

@ -1,24 +0,0 @@
diff -up ntp-4.2.8p14/include/ntp_config.h.psl ntp-4.2.8p14/include/ntp_config.h
--- ntp-4.2.8p14/include/ntp_config.h.psl 2020-03-04 00:41:29.000000000 +0100
+++ ntp-4.2.8p14/include/ntp_config.h 2020-03-10 15:12:48.516539212 +0100
@@ -280,7 +280,7 @@ typedef struct settrap_parms_tag {
* Poll Skew List
*/
-psl_item psl[17-3+1]; /* values for polls 3-17 */
+extern psl_item psl[17-3+1]; /* values for polls 3-17 */
/* To simplify the runtime code we */
/* don't want to have to special-case */
/* dealing with a default */
diff -up ntp-4.2.8p14/ntpd/ntp_config.c.psl ntp-4.2.8p14/ntpd/ntp_config.c
--- ntp-4.2.8p14/ntpd/ntp_config.c.psl 2020-03-10 15:13:42.575669789 +0100
+++ ntp-4.2.8p14/ntpd/ntp_config.c 2020-03-10 15:13:23.028622574 +0100
@@ -202,6 +202,8 @@ int cryptosw; /* crypto command called
extern char *stats_drift_file; /* name of the driftfile */
+psl_item psl[17-3+1]; /* values for polls 3-17 */
+
#ifdef BC_LIST_FRAMEWORK_NOT_YET_USED
/*
* backwards compatibility flags

View File

@ -1,7 +1,7 @@
%global _hardened_build 1 %global _hardened_build 1
Name: ntp Name: ntp
Version: 4.2.8p14 Version: 4.2.8p15
Release: 1 Release: 1
Summary: A protocol designed to synchronize the clocks of computers over a network Summary: A protocol designed to synchronize the clocks of computers over a network
License: MIT and BSD and BSD with advertising License: MIT and BSD and BSD with advertising
@ -21,10 +21,8 @@ Source14: ntp-wait.service
Source15: sntp.service Source15: sntp.service
Source16: sntp.sysconfig Source16: sntp.sysconfig
Patch1: ntp-ssl-libs.patch Patch1: ntp-ssl-libs.patch
Patch2: ntp-psl-def.patch Patch2: bugfix-fix-bind-port-in-debug-mode.patch
Patch3: bugfix-fix-ifindex-length.patch
Patch9000: bugfix-fix-bind-port-in-debug-mode.patch
Patch9001: bugfix-fix-ifindex-length.patch
BuildRequires: libcap-devel openssl-devel libedit-devel libevent-devel pps-tools-devel BuildRequires: libcap-devel openssl-devel libedit-devel libevent-devel pps-tools-devel
BuildRequires: autogen autogen-libopts-devel systemd gcc perl-generators perl-HTML-Parser BuildRequires: autogen autogen-libopts-devel systemd gcc perl-generators perl-HTML-Parser
@ -207,6 +205,12 @@ make check
%{_mandir}/man8/*.8* %{_mandir}/man8/*.8*
%changelog %changelog
* Fri Jul 24 2020 yuboyun<yuboyun@huawei.com> - 4.2.8p15-1
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: update to 4.2.8p15
* Tue Jun 30 2020 yuboyun<yuboyun@huawei.com> - 4.2.8p14-1 * Tue Jun 30 2020 yuboyun<yuboyun@huawei.com> - 4.2.8p14-1
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA