From 3603233ceec2ae6769183481740eb58a134fdd3f Mon Sep 17 00:00:00 2001 From: chendongqi <chen.dq@neusoft.com> Date: Fri, 22 Nov 2019 16:53:31 +0800 Subject: [PATCH] CentOS 8: Upgrade net-tools to version 2.0-0.51.20160912 (1)Release Version Upgrade (2)Matching code changes with el7 to el8 Story: 2006729 Task: 37678 Depends-On: https://review.opendev.org/#/c/696481/ Depends-On: https://review.opendev.org/#/c/696050/ Change-Id: Ibd376416e0fc93d53e846c75efc88b6c89cff885 Signed-off-by: Dongqi Chen <chen.dq@neusoft.com> --- networking/net-tools/centos/build_srpm.data | 2 +- ...te-package-versioning-for-TIS-format.patch | 9 ++++---- .../spec-to-include-TiS-patches.patch | 21 ++++++++++--------- networking/net-tools/centos/srpm_path | 2 +- .../net-tools-hostname-ipv6-shortname.patch | 9 ++++---- ...t-tools-ifconfig-no-ifstate-on-flush.patch | 10 ++++----- 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/networking/net-tools/centos/build_srpm.data b/networking/net-tools/centos/build_srpm.data index 112ca54f4..2ec7ea02f 100644 --- a/networking/net-tools/centos/build_srpm.data +++ b/networking/net-tools/centos/build_srpm.data @@ -1,2 +1,2 @@ COPY_LIST="files/*" -TIS_PATCH_VER=2 +TIS_PATCH_VER=1 diff --git a/networking/net-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/networking/net-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 3b8f7792f..3e678a056 100644 --- a/networking/net-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/networking/net-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,8 +1,9 @@ From 27b9c7a5281c84da9f9029deeb31442cf17f5755 Mon Sep 17 00:00:00 2001 From: Scott Little <scott.little@windriver.com> Date: Mon, 2 Oct 2017 16:42:22 -0400 -Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch +Subject: [PATCH 2/2] 0001-Update-package-versioning-for-TIS-format.patch +Signed-off-by: Dongqi Chen <chen.dq@neusoft.com> --- SPECS/net-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -15,11 +16,11 @@ index 2f09372..c8b94cd 100644 Summary: Basic networking tools Name: net-tools Version: 2.0 --Release: 0.24.%{checkout}%{?dist} -+Release: 0.24.20131004git.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 0.51.%{checkout}%{?dist} ++Release: 0.51.20160912git.el8%{?_tis_dist}.%{tis_patch_ver} License: GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/net-tools/ -- -1.9.1 +1.8.3.1 diff --git a/networking/net-tools/centos/meta_patches/spec-to-include-TiS-patches.patch b/networking/net-tools/centos/meta_patches/spec-to-include-TiS-patches.patch index 36b766f87..b38a5b531 100644 --- a/networking/net-tools/centos/meta_patches/spec-to-include-TiS-patches.patch +++ b/networking/net-tools/centos/meta_patches/spec-to-include-TiS-patches.patch @@ -1,8 +1,9 @@ From 24d92c7a7730e71bac4182df53d5fd6f4d7d6957 Mon Sep 17 00:00:00 2001 From: Scott Little <scott.little@windriver.com> Date: Mon, 2 Oct 2017 16:42:22 -0400 -Subject: [PATCH 1/2] WRS: spec-to-include-TiS-patches.patch +Subject: [PATCH 1/2] spec-to-include-TiS-patches.patch +Signed-off-by: Dongqi Chen <chen.dq@neusoft.com> --- SPECS/net-tools.spec | 7 +++++++ 1 file changed, 7 insertions(+) @@ -11,20 +12,20 @@ diff --git a/SPECS/net-tools.spec b/SPECS/net-tools.spec index 2ee770e..2f09372 100644 --- a/SPECS/net-tools.spec +++ b/SPECS/net-tools.spec -@@ -68,6 +68,10 @@ Patch24: net-tools-netstat-sctp-man.patch - # output of interface names was restricted to 8-10 characters max - Patch25: net-tools-interface-name-len.patch +@@ -38,6 +38,10 @@ Patch22: net-tools-timer-man.patch + Patch23: net-tools-interface-name-len.patch + Patch24: net-tools-covscan.patch -+# WindRiver patches ++# patches +Patch100: net-tools-hostname-ipv6-shortname.patch +Patch101: net-tools-ifconfig-no-ifstate-on-flush.patch + + BuildRequires: bluez-libs-devel BuildRequires: gettext, libselinux BuildRequires: libselinux-devel - BuildRequires: systemd-units -@@ -107,6 +111,9 @@ cp %SOURCE8 ./man/en_US - %patch24 -p1 -b .sctp-man - %patch25 -p1 -b .interface-name-len +@@ -70,6 +74,9 @@ cp %SOURCE8 ./man/en_US + %patch23 -p1 -b .interface-name-len + %patch24 -p1 -b .covscan +%patch100 -p1 -b .hostname-ipv6 +%patch101 -p1 -b .ifconfig-no-ifstate-on-flush @@ -33,5 +34,5 @@ index 2ee770e..2f09372 100644 %build -- -1.9.1 +1.8.3.1 diff --git a/networking/net-tools/centos/srpm_path b/networking/net-tools/centos/srpm_path index 70f217433..69a0f9277 100644 --- a/networking/net-tools/centos/srpm_path +++ b/networking/net-tools/centos/srpm_path @@ -1 +1 @@ -mirror:Source/net-tools-2.0-0.24.20131004git.el7.src.rpm +mirror:Source/net-tools-2.0-0.51.20160912git.el8.src.rpm diff --git a/networking/net-tools/files/net-tools-hostname-ipv6-shortname.patch b/networking/net-tools/files/net-tools-hostname-ipv6-shortname.patch index 612e06393..b70455dec 100644 --- a/networking/net-tools/files/net-tools-hostname-ipv6-shortname.patch +++ b/networking/net-tools/files/net-tools-hostname-ipv6-shortname.patch @@ -1,17 +1,18 @@ From e1aab6b4103e7d6f625de7b2e4d842826f3a3615 Mon Sep 17 00:00:00 2001 From: Scott Little <scott.little@windriver.com> Date: Mon, 2 Oct 2017 16:42:24 -0400 -Subject: [PATCH 1/2] WRS: Patch22: net-tools-hostname-ipv6-shortname.patch +Subject: [PATCH 1/2] net-tools-hostname-ipv6-shortname.patch +Signed-off-by: Dongqi Chen <chen.dq@neusoft.com> --- - hostname.c | 7 +- + hostname.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hostname.c b/hostname.c index ae98ca6..56aeb06 100644 --- a/hostname.c +++ b/hostname.c -@@ -356,8 +356,13 @@ int main(int argc, char **argv) +@@ -344,8 +344,13 @@ int main(int argc, char **argv) break; case 'a': case 'f': @@ -27,5 +28,5 @@ index ae98ca6..56aeb06 100644 type = c; break; -- -1.9.1 +1.8.3.1 diff --git a/networking/net-tools/files/net-tools-ifconfig-no-ifstate-on-flush.patch b/networking/net-tools/files/net-tools-ifconfig-no-ifstate-on-flush.patch index 02a03a1a7..2fcf37582 100644 --- a/networking/net-tools/files/net-tools-ifconfig-no-ifstate-on-flush.patch +++ b/networking/net-tools/files/net-tools-ifconfig-no-ifstate-on-flush.patch @@ -1,18 +1,18 @@ From c8c0e58c037b4183672666be22782d96d0fc3267 Mon Sep 17 00:00:00 2001 From: Scott Little <scott.little@windriver.com> Date: Mon, 2 Oct 2017 16:42:25 -0400 -Subject: [PATCH 2/2] WRS: Patch23: - net-tools-ifconfig-no-ifstate-on-flush.patch +Subject: [PATCH 2/2] net-tools-ifconfig-no-ifstate-on-flush.patch +Signed-off-by: Dongqi Chen <chen.dq@neusoft.com> --- - ifconfig.c | 5 +++++ + ifconfig.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ifconfig.c b/ifconfig.c index df9793a..ebdc1a1 100644 --- a/ifconfig.c +++ b/ifconfig.c -@@ -982,6 +982,11 @@ int main(int argc, char **argv) +@@ -983,6 +983,11 @@ int main(int argc, char **argv) exit(1); } r = ioctl(fd, SIOCSIFADDR, &ifr); @@ -25,5 +25,5 @@ index df9793a..ebdc1a1 100644 #endif #if HAVE_AFECONET -- -1.9.1 +1.8.3.1