!7 update 20.03 to 2.4.8p14

Merge pull request !7 from yu_boyun/master
2020-07-24 17:20:57 +08:00 · 2020-07-24 17:20:57 +08:00 · 477057090a
commit 477057090a
parent 3a37f9872d e073071e4c
7 changed files with 41 additions and 61 deletions
--- a/bugfix-fix-autokey-condition-error.patch
+++ b/bugfix-fix-autokey-condition-error.patch
@ -1,13 +0,0 @@
-diff -Nur ntp-4.2.8p12.bak/ntpd/ntp_crypto.c ntp-4.2.8p12/ntpd/ntp_crypto.c
--- ntp-4.2.8p12.bak/ntpd/ntp_crypto.c	2019-01-22 20:41:39.485000000 -0500
-+++ ntp-4.2.8p12/ntpd/ntp_crypto.c	2019-01-22 20:42:07.748000000 -0500
-@@ -3387,9 +3387,6 @@
- 		 */
- 		peer->crypto |= CRYPTO_FLAG_CERT;
- 		peer->grpkey = yp->grpkey;
-		if (peer->ident == NULL || !(peer->crypto &
-		    CRYPTO_FLAG_MASK))
-			peer->crypto |= CRYPTO_FLAG_VRFY;
- 	}
- 
- 	/*
--- a/ntp-4.2.8p13.tar.gz
+++ b/ntp-4.2.8p13.tar.gz
--- a/ntp-4.2.8p14.tar.gz
+++ b/ntp-4.2.8p14.tar.gz
--- a/ntp-psl-def.patch
+++ b/ntp-psl-def.patch
@ -0,0 +1,24 @@
+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
--- a/ntp-sntp-sysexits.patch
+++ b/ntp-sntp-sysexits.patch
@ -1,14 +0,0 @@
-diff -up ntp-4.2.8p8/sntp/main.c.orig ntp-4.2.8p8/sntp/main.c
--- ntp-4.2.8p8/sntp/main.c.orig	2016-10-19 10:18:41.690800420 +0200
-+++ ntp-4.2.8p8/sntp/main.c	2016-10-19 10:19:31.900966925 +0200
-@@ -8,6 +8,10 @@
- # include <event2/thread.h>
- #endif
- 
-+#ifdef HAVE_SYSEXITS_H
-+#include <sysexits.h>
-+#endif
-+
- #include "main.h"
- #include "ntp_libopts.h"
- #include "kod_management.h"
--- a/ntp.spec
+++ b/ntp.spec
@ -1,8 +1,8 @@
 %global _hardened_build 1

 Name:                  ntp
-Version:               4.2.8p13
-Release:               5
+Version:               4.2.8p14
+Release:               1
 Summary:               A protocol designed to synchronize the clocks of computers over a network
 License:               MIT and BSD and BSD with advertising
 URL:                   https://www.ntp.org/
@ -20,13 +20,11 @@ Source13:              ntpdate.service
 Source14:              ntp-wait.service
 Source15:              sntp.service
 Source16:              sntp.sysconfig
-Patch1:                ntp-sntp-sysexits.patch
-Patch2:                ntp-ssl-libs.patch
+Patch1:                ntp-ssl-libs.patch
+Patch2:		       ntp-psl-def.patch

 Patch9000:             bugfix-fix-bind-port-in-debug-mode.patch
-Patch9001:             bugfix-fix-autokey-condition-error.patch
-Patch9002:             bugfix-fix-ifindex-length.patch
-Patch9003:             revert-ntpd-fix-autokey-condition-error.patch
+Patch9001:             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
@ -209,6 +207,18 @@ make check
 %{_mandir}/man8/*.8*

 %changelog
+* Tue Jun 30 2020 yuboyun<yuboyun@huawei.com> - 4.2.8p14-1
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: update to 4.2.8p14
+
+* Tue Apr 14 2020 wangli<wangli221@huawei.com> - 4.2.8p13-6
+- Type:security
+- ID:NA
+- SUG:NA
+- DESC: solve fuzz test problem 
+
 * Thu Mar 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.2.8p13-5
 - Type:bugfix
 - Id:NA
--- a/revert-ntpd-fix-autokey-condition-error.patch
+++ b/revert-ntpd-fix-autokey-condition-error.patch
@ -1,27 +0,0 @@
-From 302cec597f3ab4e522dacc3563953d10c0f7e656 Mon Sep 17 00:00:00 2001
-From: zhangyao <zhangyao65@huawei.com>
-Date: Thu, 25 Jul 2019 16:42:51 +0000
-Subject: [PATCH] revert-ntpd-fix-autokey-condition-error
-
-
---
- ntpd/ntp_crypto.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
-index 53f3253..62ea72c 100644
--- a/ntpd/ntp_crypto.c
-+++ b/ntpd/ntp_crypto.c
-@@ -3387,6 +3387,9 @@ cert_hike(
- 		 */
- 		peer->crypto |= CRYPTO_FLAG_CERT;
- 		peer->grpkey = yp->grpkey;
-+                if (peer->ident == NULL || !(peer->crypto &
-+                    CRYPTO_FLAG_MASK))
-+                        peer->crypto |= CRYPTO_FLAG_VRFY;
- 	}
- 
- 	/*
-- 
-1.8.3.1
-