starlingx
/
integ
Code Issues Proposed changes

Add new ntp package to build 

This is required to fix a bug with ntpq and IPV6 addresses. The ntpq
command truncates the remote addresses to 15 characters. This is not
long enough for IPV6 addresses. This has been fixed in version 4.2.8
which is not yet released by Centos. Patch
Fix-ntpq-truncates-IPV6-addresses.patch provides a subset of the fix.

aeb3ee65bc
https://bugs.ntp.org/show_bug.cgi?id=1128

Depends-On: https://review.opendev.org/680105
Partial-Bug: 1840687

Change-Id: If9d07acf913ebebead5505d44129f0644511b748
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
This commit is contained in:
Kristine Bujold 2019-09-04 13:46:57 -04:00
parent e80813bb81
commit 588e39fe64
7 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base/ntp/centos/build_srpm.data Normal file
View File

@ -0,0 +1 @@
TIS_PATCH_VER=1

37
base/ntp/centos/meta_patches/Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch Normal file
View File

@ -0,0 +1,37 @@
From 44c7f5aa4df30c2ac8eae5a956dc503d7e62e1fd Mon Sep 17 00:00:00 2001
From: Kristine Bujold <kristine.bujold@windriver.com>
Date: Tue, 3 Sep 2019 16:18:58 -0400
Subject: [PATCH] Include patch Fix-ntpq-truncates-IPV6-addresses.patch.
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
---
SPECS/ntp.spec | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
index a9ebf30..330d5b0 100644
--- a/SPECS/ntp.spec
+++ b/SPECS/ntp.spec
@@ -207,6 +207,9 @@ Patch104: ntpstat-0.2-errorbit.patch
# improve man page
Patch105: ntpstat-0.2-manual.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
@@ -366,6 +369,9 @@ This package contains NTP documentation in HTML format.
%patch104 -p1 -b .errorbit
%patch105 -p1 -b .manual
+%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

2
base/ntp/centos/meta_patches/PATCH_ORDER Normal file
View File

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

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

@ -0,0 +1,26 @@
From b7992d01d3ce4ccb51f73e7c1c4e3f4cb9e8e454 Mon Sep 17 00:00:00 2001
From: Kristine Bujold <kristine.bujold@windriver.com>
Date: Tue, 3 Sep 2019 16:08:25 -0400
Subject: [PATCH] Update-package-versioning-for-TIS-format
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
---
SPECS/ntp.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
index 52ad9aa..a9ebf30 100644
--- a/SPECS/ntp.spec
+++ b/SPECS/ntp.spec
@@ -1,7 +1,7 @@
Summary: The NTP daemon and utilities
Name: ntp
Version: 4.2.6p5
-Release: 28%{?dist}
+Release: 28.el7.centos%{?_tis_dist}.%{tis_patch_ver}
# primary license (COPYRIGHT) : MIT
# ElectricFence/ (not used) : GPLv2
# kernel/sys/ppsclock.h (not used) : BSD with advertising
--
1.8.3.1

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

@ -0,0 +1,26 @@
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

1
base/ntp/centos/srpm_path Normal file
View File

@ -0,0 +1 @@
mirror:Source/ntp-4.2.6p5-28.el7.centos.src.rpm

1
centos_pkg_dirs
View File

@ -78,6 +78,7 @@ base/cgcs-users
base/cluster-resource-agents
base/libfdt
base/haproxy
base/ntp
ldap/ldapscripts
networking/net-tools
filesystem/drbd/drbd-tools