Relocate net-tools to stx-integ/networking/net-tools

Move content from stx-gplv2 into stx-integ

Packages will be relocated to

stx-integ:
    base/
        bash
        cgcs-users
        cluster-resource-agents
        dpkg
        haproxy
        libfdt
        netpbm
        rpm

    database/
        mariadb

    filesystem/
        iscsi-initiator-utils

    filesystem/drbd/
        drbd-tools

    kernel/kernel-modules/
        drbd
        integrity
        intel-e1000e
        intel-i40e
        intel-i40evf
        intel-ixgbe
        intel-ixgbevf
        qat17
        tpmdd

    ldap/
        ldapscripts

    networking/
        iptables
        net-tools

Change-Id: I9072501bc8f4a577da66d2f09e0c8ec8d4beabd8
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little 2018-08-01 14:22:44 -04:00
parent 8c1837205d
commit 59457eb9f6
8 changed files with 132 additions and 0 deletions

View File

@ -135,3 +135,4 @@ base/haproxy
base/netpbm
filesystem/iscsi-initiator-utils
ldap/ldapscripts
networking/net-tools

View File

@ -0,0 +1,2 @@
COPY_LIST="files/*"
TIS_PATCH_VER=2

View File

@ -0,0 +1,27 @@
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
Conflicts:
SPECS/net-tools.spec
---
SPECS/net-tools.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/net-tools.spec b/SPECS/net-tools.spec
index 2f09372..c8b94cd 100644
--- a/SPECS/net-tools.spec
+++ b/SPECS/net-tools.spec
@@ -3,7 +3,7 @@
Summary: Basic networking tools
Name: net-tools
Version: 2.0
-Release: 0.22.%{checkout}%{?dist}
+Release: 0.22.20131004git.el7%{?_tis_dist}.%{tis_patch_ver}
License: GPLv2+
Group: System Environment/Base
URL: http://sourceforge.net/projects/net-tools/
--
1.9.1

View File

@ -0,0 +1,2 @@
spec-to-include-TiS-patches.patch
0001-Update-package-versioning-for-TIS-format.patch

View File

@ -0,0 +1,39 @@
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
Conflicts:
SPECS/net-tools.spec
---
SPECS/net-tools.spec | 7 +++++++
1 file changed, 7 insertions(+)
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
@@ -65,6 +65,10 @@ Patch23: net-tools-ifconfig-EiB.patch
# sctp was not documented in help and manpage
Patch24: net-tools-netstat-sctp-man.patch
+# WindRiver patches
+Patch100: net-tools-hostname-ipv6-shortname.patch
+Patch101: net-tools-ifconfig-no-ifstate-on-flush.patch
+
BuildRequires: gettext, libselinux
BuildRequires: libselinux-devel
BuildRequires: systemd-units
@@ -103,6 +107,9 @@ cp %SOURCE8 ./man/en_US
%patch23 -p1 -b .round-EiB
%patch24 -p1 -b .sctp-man
+%patch100 -p1 -b .hostname-ipv6
+%patch101 -p1 -b .ifconfig-no-ifstate-on-flush
+
touch ./config.h
%build
--
1.9.1

View File

@ -0,0 +1 @@
mirror:Source/net-tools-2.0-0.22.20131004git.el7.src.rpm

View File

@ -0,0 +1,31 @@
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
---
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)
break;
case 'a':
case 'f':
- case 'i':
case 's':
+ /*
+ * These are not supported for IPv6 so just consume the option
+ * and return the default hostname value
+ */
+ break;
+ case 'i':
what = 1;
type = c;
break;
--
1.9.1

View File

@ -0,0 +1,29 @@
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
---
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)
exit(1);
}
r = ioctl(fd, SIOCSIFADDR, &ifr);
+ if (((struct sockaddr_in*)&sa)->sin_addr.s_addr == INADDR_ANY) {
+ /* do not continue to change interface state if only flushing addresses */
+ spp++;
+ continue;
+ }
break;
#endif
#if HAVE_AFECONET
--
1.9.1