From 0d34b0100890a9faf016781590a5ef7b1e23aeb4 Mon Sep 17 00:00:00 2001 From: konglidong Date: Thu, 20 Oct 2022 12:10:36 +0800 Subject: [PATCH] interface: change pointopoint short flag from P to p --- ...e-pointopoint-short-flag-from-P-to-p.patch | 30 +++++++++++++++++++ net-tools.spec | 10 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 backport-interface-change-pointopoint-short-flag-from-P-to-p.patch diff --git a/backport-interface-change-pointopoint-short-flag-from-P-to-p.patch b/backport-interface-change-pointopoint-short-flag-from-P-to-p.patch new file mode 100644 index 0000000..3369a91 --- /dev/null +++ b/backport-interface-change-pointopoint-short-flag-from-P-to-p.patch @@ -0,0 +1,30 @@ +From 4030929bb6f3ee6f465c76869d7a49424df45d9e Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Sun, 12 Dec 2021 12:05:42 -0500 +Subject: [PATCH] interface: change pointopoint short flag from P to p + +The P short flag was used by IFF_POINTOPOINT and IFF_PROMISC. Change +IFF_POINTOPOINT to use p to avoid confusion, and because IFF_PROMISC +is probably more common for people to check. + +URL: https://sourceforge.net/p/net-tools/bugs/45 +--- + lib/interface.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/interface.c b/lib/interface.c +index 4c33325..ef28dec 100644 +--- a/lib/interface.c ++++ b/lib/interface.c +@@ -693,7 +693,7 @@ void ife_print_short(struct interface *ptr) + if (ptr->flags & IFF_NOARP) + printf("O"); + if (ptr->flags & IFF_POINTOPOINT) +- printf("P"); ++ printf("p"); + if (ptr->flags & IFF_SLAVE) + printf("s"); + if (ptr->flags & IFF_MASTER) +-- +2.27.0 + diff --git a/net-tools.spec b/net-tools.spec index 82db1fb..43ddc1d 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -1,6 +1,6 @@ Name: net-tools Version: 2.0 -Release: 0.54 +Release: 0.55 Summary: Important Programs for Networking License: GPLv2+ URL: https://sourceforge.net/projects/net-tools/ @@ -22,6 +22,7 @@ Patch20: ether-wake-interfaces.patch Patch21: net-tools-ifconfig-EiB.patch Patch22: net-tools-timer-man.patch Patch23: net-tools-interface-name-len.patch +Patch24: backport-interface-change-pointopoint-short-flag-from-P-to-p.patch BuildRequires: bluez-libs-devel gettext, libselinux libselinux-devel systemd gcc %{?systemd_requires} @@ -51,6 +52,7 @@ cp %SOURCE8 ./man/en_US %patch21 -p1 -b .ifconfig-EiB %patch22 -p1 -b .timer-man %patch23 -p1 -b .interface-name-len +%patch24 -p1 touch ./config.h %build @@ -111,6 +113,12 @@ touch %{buildroot}%{_unitdir}/arp-ethers.service %exclude %{_mandir}/pt/man5 %changelog +* Thu Oct 20 2022 konglidong - 2.0-0.55 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:interface: change pointopoint short flag from P to p + * Tue Dec 31 2019 openEuler Buildteam - 2.0-0.54 - Type:bugfix - ID:NA