starlingx/integ
Code Issues Proposed changes

Merge "CentOS 8: Upgrade ntp to version 4.2.8p13-2" into f/centos8

Browse Source
This commit is contained in:
Zuul 2020-06-03 23:45:55 +00:00 committed by Gerrit Code Review
commit ca71aaa31a
5 changed files with 8 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
base/ntp/centos/meta_patches/Fix-ntpq-truncates-IPV6-addresses.patch
View File

@ -1,41 +0,0 @@
From fbfbbc827d080370f71a76284dde4dc3dd1d16da Mon Sep 17 00:00:00 2001
Message-Id: <fbfbbc827d080370f71a76284dde4dc3dd1d16da.1574708120.git.Jim.Somerville@windriver.com>
In-Reply-To: <536afc9500d65768db35f6ca07c21c490b19bda7.1574708120.git.Jim.Somerville@windriver.com>
References: <536afc9500d65768db35f6ca07c21c490b19bda7.1574708120.git.Jim.Somerville@windriver.com>
From: Kristine Bujold <kristine.bujold@windriver.com>
Date: Tue, 3 Sep 2019 16:18:58 -0400
Subject: [PATCH 2/2] Fix ntpq truncates IPV6 addresses
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/ntp.spec | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
index 84aa1ac..4d32d8c 100644
--- a/SPECS/ntp.spec
+++ b/SPECS/ntp.spec
@@ -204,6 +204,9 @@ Patch78: ntp-4.2.6p5-netlinknobuf.patch
# add bugs for compatibility with original EL7 ntpstat
Patch100: ntpstat-compat.patch
+# STX IPV6 ntpq patch
+Patch500: Fix-ntpq-truncates-IPV6-addresses.patch
+
URL: http://www.ntp.org
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -361,6 +364,9 @@ This package contains NTP documentation in HTML format.
%patch100 -p1 -b .compat
+%patch500 -p1 -b .ntpq-truncates-IPV6-addresses
+
+
# set default path to sntp KoD database
sed -i 's|/var/db/ntp-kod|%{_localstatedir}/lib/sntp/kod|' sntp/{sntp.1,main.c}
--
1.8.3.1

1
base/ntp/centos/meta_patches/PATCH_ORDER
View File

@ -1,2 +1 @@
Update-package-versioning-for-TIS-format.patch
Fix-ntpq-truncates-IPV6-addresses.patch

13
base/ntp/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
View File

@ -6,6 +6,7 @@ Subject: [PATCH 1/2] Update package versioning for TIS format
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
---
SPECS/ntp.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@ -14,15 +15,15 @@ diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
index 178a961..84aa1ac 100644
--- a/SPECS/ntp.spec
+++ b/SPECS/ntp.spec
@@ -1,7 +1,7 @@
@@ -3,7 +3,7 @@
Summary: The NTP daemon and utilities
Name: ntp
Version: 4.2.6p5
-Release: 29%{?dist}
+Release: 29.el7.centos%{?_tis_dist}.%{tis_patch_ver}
Version: 4.2.8p13
-Release: 2%{?dist}
+Release: 2.el8.centos%{?_tis_dist}.%{tis_patch_ver}
# primary license (COPYRIGHT) : MIT
# ElectricFence/ (not used) : GPLv2
# kernel/sys/ppsclock.h (not used) : BSD with advertising
# include/ntif.h (not used) : BSD
--
1.8.3.1
2.7.4

26
base/ntp/centos/patches/Fix-ntpq-truncates-IPV6-addresses.patch
View File

@ -1,26 +0,0 @@
From c135c30f1196b081619e1f4164840748b7815f24 Mon Sep 17 00:00:00 2001
From: Kristine Bujold <kristine.bujold@windriver.com>
Date: Tue, 3 Sep 2019 16:58:39 -0400
Subject: [PATCH] ntpq truncates "remote" host information when system is IPV6
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
---
ntpq/ntpq-subs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index c834ce6..0ed8933 100644
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -1614,7 +1614,7 @@ doprintpeers(
}
if (AF_UNSPEC == af || AF(&srcadr) == af) {
strncpy(clock_name, nntohost(&srcadr), sizeof(clock_name));
- fprintf(fp, "%c%-15.15s ", c, clock_name);
+ fprintf(fp, "%c%s\n ", c, clock_name);
drlen = strlen(dstadr_refid);
makeascii(drlen, dstadr_refid, fp);
while (drlen++ < 15)
--
1.8.3.1

2
base/ntp/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/ntp-4.2.6p5-29.el7.centos.src.rpm
mirror:Source/ntp-4.2.8p13-2.el8.src.rpm