From 9d60767e32ab937be2e7d1beaf86c8651dd2ac5a Mon Sep 17 00:00:00 2001
From: Li Zhou
Date: Wed, 31 Mar 2021 23:32:19 -0400
Subject: [PATCH] ntp: fix CVE-2020-13817
Update ntp source package to:
ntp-4.2.6p5-29.el7.centos.2.src.rpm
In fact it is version ntp-4.2.6p5-29.el7_8.2.
(Refer to https://git.centos.org/rpms/ntp/c/
e9ba41e9edf8efad8f090aad24845b8f4db0668d?branch=c7)
Story: 2008532
Task: 41691
Signed-off-by: Li Zhou
Change-Id: If5db6b15b9c01a20a614bb160bba575c6b578d3e
---
.../Update-package-versioning-for-TIS-format.patch | 4 ++--
base/ntp/centos/srpm_path | 2 +-
centos_srpms_centos.lst | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/base/ntp/centos/meta_patches/Update-package-versioning-for-TIS-format.patch b/base/ntp/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
index 69d8524a9..ddcfdb507 100644
--- a/base/ntp/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
+++ b/base/ntp/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
@@ -18,8 +18,8 @@ index 178a961..84aa1ac 100644
Summary: The NTP daemon and utilities
Name: ntp
Version: 4.2.6p5
--Release: 29%{?dist}
-+Release: 29.el7.centos%{?_tis_dist}.%{tis_patch_ver}
+-Release: 29%{?dist}.2
++Release: 29.el7.centos.2%{?_tis_dist}.%{tis_patch_ver}
# primary license (COPYRIGHT) : MIT
# ElectricFence/ (not used) : GPLv2
# kernel/sys/ppsclock.h (not used) : BSD with advertising
diff --git a/base/ntp/centos/srpm_path b/base/ntp/centos/srpm_path
index 4d0761b8b..4dfc9ca7f 100644
--- a/base/ntp/centos/srpm_path
+++ b/base/ntp/centos/srpm_path
@@ -1 +1 @@
-mirror:Source/ntp-4.2.6p5-29.el7.centos.src.rpm
+mirror:Source/ntp-4.2.6p5-29.el7.centos.2.src.rpm
diff --git a/centos_srpms_centos.lst b/centos_srpms_centos.lst
index 4e8850f17..a6b51feb4 100644
--- a/centos_srpms_centos.lst
+++ b/centos_srpms_centos.lst
@@ -11,7 +11,7 @@ libevent-2.0.21-4.el7.src.rpm
lighttpd-1.4.54-1.el7.src.rpm
logrotate-3.8.6-17.el7.src.rpm
net-tools-2.0-0.24.20131004git.el7.src.rpm
-ntp-4.2.6p5-29.el7.centos.src.rpm
+ntp-4.2.6p5-29.el7.centos.2.src.rpm
openldap-2.4.44-20.el7.src.rpm
openssh-7.4p1-21.el7.src.rpm
parted-3.1-29.el7.src.rpm