diff options
Diffstat (limited to 'meta/recipes-extended/net-tools')
| -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) | 31 |
3 files changed, 21 insertions, 58 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 @@ -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)); 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 @@ -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); 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 e97731073e..33304297ec 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb +++ b/meta/recipes-extended/net-tools/net-tools_2.10.bb @@ -2,22 +2,17 @@ SUMMARY = "Basic networking tools" DESCRIPTION = "A collection of programs that form the base set of the NET-3 networking distribution for the Linux operating system" HOMEPAGE = "http://net-tools.berlios.de/" BUGTRACKER = "http://bugs.debian.org/net-tools" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba" -PV = "1.60-20181103+git${SRCPV}" -SRCREV = "0eebece8c964e3cfa8a018f42b2e7e751a7009a0" -SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https \ +SRCREV = "80d7b95067f1f22fece9537dea6dff53081f4886" +SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https;branch=master \ 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 \ " -UPSTREAM_VERSION_UNKNOWN = "1" - S = "${WORKDIR}/git" inherit gettext @@ -30,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" @@ -93,8 +90,8 @@ base_bindir_progs = "ifconfig netstat route \ ${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'dnsdomainname domainname hostname nisdomainname ypdomainname', '', d)} \ " -ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}" -ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'hostname.1 dnsdomainname.1', '', d)}" +ALTERNATIVE:${PN} = "${base_sbindir_progs} ${base_bindir_progs}" +ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'hostname.1 dnsdomainname.1', '', d)}" ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" ALTERNATIVE_PRIORITY[hostname.1] = "10" @@ -107,4 +104,18 @@ python __anonymous() { } ALTERNATIVE_PRIORITY = "100" +NETTOOLS_PACKAGES = "${PN}-mii-tool" +NETTOOLS_PACKAGES:class-native = "" + +PACKAGE_BEFORE_PN = "${NETTOOLS_PACKAGES}" +RDEPENDS:${PN} += "${NETTOOLS_PACKAGES}" + +FILES:${PN}-mii-tool = "${base_sbindir}/mii-tool" + +ALTERNATIVE:${PN}:remove = "mii-tool" + +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" |