diff options
author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2021-02-19 23:12:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-23 22:35:00 +0000 |
commit | 6c930438f148c5a329fc740e8a838a2c76813307 (patch) | |
tree | c409680c99af5c4d6d85d504f23040bc90c3dddf /meta/recipes-extended | |
parent | 34ed0d107b9d16cb791fd555a719dcd2fc0b9be0 (diff) | |
download | poky-6c930438f148c5a329fc740e8a838a2c76813307.tar.gz |
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>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/net-tools/net-tools/Bug_443075-ifconfig.c-pointtopoint_spelling.patch | 26 | ||||
-rw-r--r-- | meta/recipes-extended/net-tools/net-tools/Bug_541172-netstat.c-exit-codes.patch | 22 | ||||
-rw-r--r-- | meta/recipes-extended/net-tools/net-tools_2.10.bb (renamed from meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb) | 9 |
3 files changed, 4 insertions, 53 deletions
diff --git a/meta/recipes-extended/net-tools/net-tools/Bug_443075-ifconfig.c-pointtopoint_spelling.patch b/meta/recipes-extended/net-tools/net-tools/Bug_443075-ifconfig.c-pointtopoint_spelling.patch deleted file mode 100644 index 74d74668ce..0000000000 --- a/meta/recipes-extended/net-tools/net-tools/Bug_443075-ifconfig.c-pointtopoint_spelling.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Description: Accept "pointtopoint" as a synonym for "pointopoint" | ||
2 | Bug-Debian: https://bugs.debian.org/443075 | ||
3 | Author: Justin Pryzby <pryzbyj@libra> | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | |||
8 | --- a/ifconfig.c | ||
9 | +++ b/ifconfig.c | ||
10 | @@ -644,14 +644,14 @@ | ||
11 | spp++; | ||
12 | continue; | ||
13 | } | ||
14 | - if (!strcmp(*spp, "-pointopoint")) { | ||
15 | + if (!strcmp(*spp, "-pointopoint") || !strcmp(*spp, "-pointtopoint")) { | ||
16 | goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT); | ||
17 | spp++; | ||
18 | if (test_flag(ifr.ifr_name, IFF_POINTOPOINT) > 0) | ||
19 | fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name); | ||
20 | continue; | ||
21 | } | ||
22 | - if (!strcmp(*spp, "pointopoint")) { | ||
23 | + if (!strcmp(*spp, "pointopoint") || !strcmp(*spp, "pointtopoint")) { | ||
24 | if (*(spp + 1) != NULL) { | ||
25 | spp++; | ||
26 | safe_strncpy(host, *spp, (sizeof host)); | ||
diff --git a/meta/recipes-extended/net-tools/net-tools/Bug_541172-netstat.c-exit-codes.patch b/meta/recipes-extended/net-tools/net-tools/Bug_541172-netstat.c-exit-codes.patch deleted file mode 100644 index 782b94bc61..0000000000 --- a/meta/recipes-extended/net-tools/net-tools/Bug_541172-netstat.c-exit-codes.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | Description: Bug#541172: netstat.c exit codes | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
5 | |||
6 | --- a/netstat.c | ||
7 | +++ b/netstat.c | ||
8 | @@ -2237,12 +2237,14 @@ | ||
9 | parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp); | ||
10 | #else | ||
11 | ENOSUPP("netstat", "AF INET"); | ||
12 | + exit(1); | ||
13 | #endif | ||
14 | } else if(!strcmp(afname, "inet6")) { | ||
15 | #if HAVE_AFINET6 | ||
16 | parsesnmp6(flag_raw, flag_tcp, flag_udp); | ||
17 | #else | ||
18 | ENOSUPP("netstat", "AF INET6"); | ||
19 | + exit(1); | ||
20 | #endif | ||
21 | } else { | ||
22 | printf(_("netstat: No statistics support for specified address family: %s\n"), afname); | ||
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb b/meta/recipes-extended/net-tools/net-tools_2.10.bb index e163a6948a..de4a715971 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb +++ b/meta/recipes-extended/net-tools/net-tools_2.10.bb | |||
@@ -6,14 +6,11 @@ LICENSE = "GPLv2+" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
7 | file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba" | 7 | file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba" |
8 | 8 | ||
9 | PV = "1.60-20181103+git${SRCPV}" | 9 | SRCREV = "80d7b95067f1f22fece9537dea6dff53081f4886" |
10 | SRCREV = "0eebece8c964e3cfa8a018f42b2e7e751a7009a0" | ||
11 | SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https \ | 10 | SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https \ |
12 | file://net-tools-config.h \ | 11 | file://net-tools-config.h \ |
13 | file://net-tools-config.make \ | 12 | file://net-tools-config.make \ |
14 | file://Add_missing_headers.patch \ | 13 | file://Add_missing_headers.patch \ |
15 | file://Bug_443075-ifconfig.c-pointtopoint_spelling.patch \ | ||
16 | file://Bug_541172-netstat.c-exit-codes.patch \ | ||
17 | " | 14 | " |
18 | 15 | ||
19 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
@@ -28,6 +25,8 @@ PACKAGECONFIG[hostname] = "" | |||
28 | PACKAGECONFIG[arp] = "" | 25 | PACKAGECONFIG[arp] = "" |
29 | PACKAGECONFIG[serial] = "" | 26 | PACKAGECONFIG[serial] = "" |
30 | PACKAGECONFIG[plip] = "" | 27 | PACKAGECONFIG[plip] = "" |
28 | PACKAGECONFIG[slattach] = "" | ||
29 | PACKAGECONFIG[plipconfig] = "" | ||
31 | 30 | ||
32 | do_configure() { | 31 | do_configure() { |
33 | # net-tools has its own config mechanism requiring "make config" | 32 | # net-tools has its own config mechanism requiring "make config" |
@@ -119,4 +118,4 @@ ALTERNATIVE_${PN}-mii-tool = "mii-tool" | |||
119 | ALTERNATIVE_TARGET[mii-tool] = "${base_sbindir}/mii-tool" | 118 | ALTERNATIVE_TARGET[mii-tool] = "${base_sbindir}/mii-tool" |
120 | ALTERNATIVE_LINK_NAME[mii-tool] = "${base_sbindir}/mii-tool" | 119 | ALTERNATIVE_LINK_NAME[mii-tool] = "${base_sbindir}/mii-tool" |
121 | 120 | ||
122 | BBCLASSEXTEND = "native nativesdk" \ No newline at end of file | 121 | BBCLASSEXTEND = "native nativesdk" |