diff --git a/base/ntp/centos/build_srpm.data b/base/ntp/centos/build_srpm.data new file mode 100644 index 000000000..8aeb55368 --- /dev/null +++ b/base/ntp/centos/build_srpm.data @@ -0,0 +1 @@ +TIS_PATCH_VER=1 diff --git a/base/ntp/centos/meta_patches/Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch b/base/ntp/centos/meta_patches/Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch new file mode 100644 index 000000000..cec15ee70 --- /dev/null +++ b/base/ntp/centos/meta_patches/Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch @@ -0,0 +1,37 @@ +From 44c7f5aa4df30c2ac8eae5a956dc503d7e62e1fd Mon Sep 17 00:00:00 2001 +From: Kristine Bujold +Date: Tue, 3 Sep 2019 16:18:58 -0400 +Subject: [PATCH] Include patch Fix-ntpq-truncates-IPV6-addresses.patch. + +Signed-off-by: Kristine Bujold +--- + 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 + diff --git a/base/ntp/centos/meta_patches/PATCH_ORDER b/base/ntp/centos/meta_patches/PATCH_ORDER new file mode 100644 index 000000000..0bfdab01e --- /dev/null +++ b/base/ntp/centos/meta_patches/PATCH_ORDER @@ -0,0 +1,2 @@ +Update-package-versioning-for-TIS-format.patch +Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch 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 new file mode 100644 index 000000000..7b56ad4e4 --- /dev/null +++ b/base/ntp/centos/meta_patches/Update-package-versioning-for-TIS-format.patch @@ -0,0 +1,26 @@ +From b7992d01d3ce4ccb51f73e7c1c4e3f4cb9e8e454 Mon Sep 17 00:00:00 2001 +From: Kristine Bujold +Date: Tue, 3 Sep 2019 16:08:25 -0400 +Subject: [PATCH] Update-package-versioning-for-TIS-format + +Signed-off-by: Kristine Bujold +--- + 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 + diff --git a/base/ntp/centos/patches/Fix-ntpq-truncates-IPV6-addresses.patch b/base/ntp/centos/patches/Fix-ntpq-truncates-IPV6-addresses.patch new file mode 100644 index 000000000..961d69d22 --- /dev/null +++ b/base/ntp/centos/patches/Fix-ntpq-truncates-IPV6-addresses.patch @@ -0,0 +1,26 @@ +From c135c30f1196b081619e1f4164840748b7815f24 Mon Sep 17 00:00:00 2001 +From: Kristine Bujold +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 +--- + 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 + diff --git a/base/ntp/centos/srpm_path b/base/ntp/centos/srpm_path new file mode 100644 index 000000000..b5e385938 --- /dev/null +++ b/base/ntp/centos/srpm_path @@ -0,0 +1 @@ +mirror:Source/ntp-4.2.6p5-28.el7.centos.src.rpm diff --git a/centos_pkg_dirs b/centos_pkg_dirs index bd56c0722..602cc3ce4 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -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