diff --git a/ntp-4.2.8p14.tar.gz b/ntp-4.2.8p15.tar.gz similarity index 48% rename from ntp-4.2.8p14.tar.gz rename to ntp-4.2.8p15.tar.gz index a8dcf8fbfce5218d1e94e5fe7b5b7588df4c4bb4..92b5d91c98a5c94483efb6db20c3714357a7fe17 100644 Binary files a/ntp-4.2.8p14.tar.gz and b/ntp-4.2.8p15.tar.gz differ diff --git a/ntp-psl-def.patch b/ntp-psl-def.patch deleted file mode 100644 index b775265ff4595c7b45756c1416d27ca6e169860b..0000000000000000000000000000000000000000 --- a/ntp-psl-def.patch +++ /dev/null @@ -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 diff --git a/ntp.spec b/ntp.spec index da3b6af2ece00ea56ac1733837ad3b0c08fa4466..7d04bfc657fda11fdcd1147412c2255515ab3b2b 100644 --- a/ntp.spec +++ b/ntp.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: ntp -Version: 4.2.8p14 +Version: 4.2.8p15 Release: 1 Summary: A protocol designed to synchronize the clocks of computers over a network License: MIT and BSD and BSD with advertising @@ -21,10 +21,8 @@ Source14: ntp-wait.service Source15: sntp.service Source16: sntp.sysconfig Patch1: ntp-ssl-libs.patch -Patch2: ntp-psl-def.patch - -Patch9000: bugfix-fix-bind-port-in-debug-mode.patch -Patch9001: bugfix-fix-ifindex-length.patch +Patch2: bugfix-fix-bind-port-in-debug-mode.patch +Patch3: bugfix-fix-ifindex-length.patch BuildRequires: libcap-devel openssl-devel libedit-devel libevent-devel pps-tools-devel BuildRequires: autogen autogen-libopts-devel systemd gcc perl-generators perl-HTML-Parser @@ -207,6 +205,12 @@ make check %{_mandir}/man8/*.8* %changelog +* Fri Jul 24 2020 yuboyun - 4.2.8p15-1 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: update to 4.2.8p15 + * Tue Jun 30 2020 yuboyun - 4.2.8p14-1 - Type:bugfix - ID:NA