net-tools: update to 2.10

Removed upstreamed patches.

Added new package configs.

(From OE-Core rev: 179756f647c2a2e63b3bbcc53e7c0ff3c5df4e39)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Oleksandr Kravchuk
2021-02-19 23:12:20 +01:00
committed by Richard Purdie
parent 34ed0d107b
commit 6c930438f1
3 changed files with 4 additions and 53 deletions

View File

@@ -1,26 +0,0 @@
Description: Accept "pointtopoint" as a synonym for "pointopoint"
Bug-Debian: https://bugs.debian.org/443075
Author: Justin Pryzby <pryzbyj@libra>
Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
--- a/ifconfig.c
+++ b/ifconfig.c
@@ -644,14 +644,14 @@
spp++;
continue;
}
- if (!strcmp(*spp, "-pointopoint")) {
+ if (!strcmp(*spp, "-pointopoint") || !strcmp(*spp, "-pointtopoint")) {
goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT);
spp++;
if (test_flag(ifr.ifr_name, IFF_POINTOPOINT) > 0)
fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name);
continue;
}
- if (!strcmp(*spp, "pointopoint")) {
+ if (!strcmp(*spp, "pointopoint") || !strcmp(*spp, "pointtopoint")) {
if (*(spp + 1) != NULL) {
spp++;
safe_strncpy(host, *spp, (sizeof host));

View File

@@ -1,22 +0,0 @@
Description: Bug#541172: netstat.c exit codes
Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
--- a/netstat.c
+++ b/netstat.c
@@ -2237,12 +2237,14 @@
parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp);
#else
ENOSUPP("netstat", "AF INET");
+ exit(1);
#endif
} else if(!strcmp(afname, "inet6")) {
#if HAVE_AFINET6
parsesnmp6(flag_raw, flag_tcp, flag_udp);
#else
ENOSUPP("netstat", "AF INET6");
+ exit(1);
#endif
} else {
printf(_("netstat: No statistics support for specified address family: %s\n"), afname);

View File

@@ -6,14 +6,11 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba"
PV = "1.60-20181103+git${SRCPV}"
SRCREV = "0eebece8c964e3cfa8a018f42b2e7e751a7009a0"
SRCREV = "80d7b95067f1f22fece9537dea6dff53081f4886"
SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https \
file://net-tools-config.h \
file://net-tools-config.make \
file://Add_missing_headers.patch \
file://Bug_443075-ifconfig.c-pointtopoint_spelling.patch \
file://Bug_541172-netstat.c-exit-codes.patch \
"
S = "${WORKDIR}/git"
@@ -28,6 +25,8 @@ PACKAGECONFIG[hostname] = ""
PACKAGECONFIG[arp] = ""
PACKAGECONFIG[serial] = ""
PACKAGECONFIG[plip] = ""
PACKAGECONFIG[slattach] = ""
PACKAGECONFIG[plipconfig] = ""
do_configure() {
# net-tools has its own config mechanism requiring "make config"
@@ -119,4 +118,4 @@ ALTERNATIVE_${PN}-mii-tool = "mii-tool"
ALTERNATIVE_TARGET[mii-tool] = "${base_sbindir}/mii-tool"
ALTERNATIVE_LINK_NAME[mii-tool] = "${base_sbindir}/mii-tool"
BBCLASSEXTEND = "native nativesdk"
BBCLASSEXTEND = "native nativesdk"