From 179756f647c2a2e63b3bbcc53e7c0ff3c5df4e39 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Fri, 19 Feb 2021 23:12:20 +0100 Subject: net-tools: update to 2.10 Removed upstreamed patches. Added new package configs. Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie --- ...g_443075-ifconfig.c-pointtopoint_spelling.patch | 26 ----- .../Bug_541172-netstat.c-exit-codes.patch | 22 ---- .../net-tools/net-tools_1.60-20181103.bb | 122 --------------------- meta/recipes-extended/net-tools/net-tools_2.10.bb | 121 ++++++++++++++++++++ 4 files changed, 121 insertions(+), 170 deletions(-) delete mode 100644 meta/recipes-extended/net-tools/net-tools/Bug_443075-ifconfig.c-pointtopoint_spelling.patch delete mode 100644 meta/recipes-extended/net-tools/net-tools/Bug_541172-netstat.c-exit-codes.patch delete mode 100644 meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb create mode 100644 meta/recipes-extended/net-tools/net-tools_2.10.bb 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 - -Upstream-Status: Pending -Signed-off-by: Martin Jansa - ---- 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 - ---- 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_1.60-20181103.bb deleted file mode 100644 index e163a6948a..0000000000 --- a/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb +++ /dev/null @@ -1,122 +0,0 @@ -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+" -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 \ - 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" - -inherit gettext - -# The Makefile is lame, no parallel build -PARALLEL_MAKE = "" - -PACKAGECONFIG ??= "hostname arp serial plip" -PACKAGECONFIG[hostname] = "" -PACKAGECONFIG[arp] = "" -PACKAGECONFIG[serial] = "" -PACKAGECONFIG[plip] = "" - -do_configure() { - # net-tools has its own config mechanism requiring "make config" - # we pre-generate desired options and copy to source directory instead - cp ${WORKDIR}/net-tools-config.h ${S}/config.h - cp ${WORKDIR}/net-tools-config.make ${S}/config.make - - if [ "${USE_NLS}" = "no" ]; then - sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make - fi - - if ${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'true', 'false', d)} ; then - echo "#define HAVE_HOSTNAME_TOOLS 1" >> ${S}/config.h - echo "#define HAVE_HOSTNAME_SYMLINKS 1" >> ${S}/config.h - echo "HAVE_HOSTNAME_TOOLS=1" >> ${S}/config.make - echo "HAVE_HOSTNAME_SYMLINKS=1" >> ${S}/config.make - fi - if ${@bb.utils.contains('PACKAGECONFIG', 'arp', 'true', 'false', d)} ; then - echo "#define HAVE_ARP_TOOLS 1" >> ${S}/config.h - echo "HAVE_ARP_TOOLS=1" >> ${S}/config.make - fi - if ${@bb.utils.contains('PACKAGECONFIG', 'serial', 'true', 'false', d)} ; then - echo "#define HAVE_SERIAL_TOOLS 1" >> ${S}/config.h - echo "HAVE_SERIAL_TOOLS=1" >> ${S}/config.make - fi - if ${@bb.utils.contains('PACKAGECONFIG', 'plip', 'true', 'false', d)} ; then - echo "#define HAVE_PLIP_TOOLS 1" >> ${S}/config.h - echo "HAVE_PLIP_TOOLS=1" >> ${S}/config.make - fi -} - -do_compile() { - # net-tools use COPTS/LOPTS to allow adding custom options - oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS" -} - -do_install() { - # We don't need COPTS or LOPTS, but let's be consistent. - oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS" BASEDIR=${D} INSTALLNLSDIR=${D}${datadir}/locale mandir=${mandir} install - - if [ "${base_bindir}" != "/bin" ]; then - mkdir -p ${D}/${base_bindir} - mv ${D}/bin/* ${D}/${base_bindir}/ - rmdir ${D}/bin - fi - if [ "${base_sbindir}" != "/sbin" ]; then - mkdir ${D}/${base_sbindir} - mv ${D}/sbin/* ${D}/${base_sbindir}/ - rmdir ${D}/sbin - fi -} - -inherit update-alternatives - -base_sbindir_progs = "ipmaddr iptunnel mii-tool nameif \ - ${@bb.utils.contains('PACKAGECONFIG', 'arp', 'arp rarp', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'plip', 'plipconfig', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'serial', 'slattach', '', d)} \ -" -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_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" -ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" -ALTERNATIVE_PRIORITY[hostname.1] = "10" - -python __anonymous() { - for prog in d.getVar('base_sbindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) - for prog in d.getVar('base_bindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) -} -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" \ No newline at end of file diff --git a/meta/recipes-extended/net-tools/net-tools_2.10.bb b/meta/recipes-extended/net-tools/net-tools_2.10.bb new file mode 100644 index 0000000000..de4a715971 --- /dev/null +++ b/meta/recipes-extended/net-tools/net-tools_2.10.bb @@ -0,0 +1,121 @@ +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+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba" + +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 \ +" + +S = "${WORKDIR}/git" + +inherit gettext + +# The Makefile is lame, no parallel build +PARALLEL_MAKE = "" + +PACKAGECONFIG ??= "hostname arp serial plip" +PACKAGECONFIG[hostname] = "" +PACKAGECONFIG[arp] = "" +PACKAGECONFIG[serial] = "" +PACKAGECONFIG[plip] = "" +PACKAGECONFIG[slattach] = "" +PACKAGECONFIG[plipconfig] = "" + +do_configure() { + # net-tools has its own config mechanism requiring "make config" + # we pre-generate desired options and copy to source directory instead + cp ${WORKDIR}/net-tools-config.h ${S}/config.h + cp ${WORKDIR}/net-tools-config.make ${S}/config.make + + if [ "${USE_NLS}" = "no" ]; then + sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make + fi + + if ${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'true', 'false', d)} ; then + echo "#define HAVE_HOSTNAME_TOOLS 1" >> ${S}/config.h + echo "#define HAVE_HOSTNAME_SYMLINKS 1" >> ${S}/config.h + echo "HAVE_HOSTNAME_TOOLS=1" >> ${S}/config.make + echo "HAVE_HOSTNAME_SYMLINKS=1" >> ${S}/config.make + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'arp', 'true', 'false', d)} ; then + echo "#define HAVE_ARP_TOOLS 1" >> ${S}/config.h + echo "HAVE_ARP_TOOLS=1" >> ${S}/config.make + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'serial', 'true', 'false', d)} ; then + echo "#define HAVE_SERIAL_TOOLS 1" >> ${S}/config.h + echo "HAVE_SERIAL_TOOLS=1" >> ${S}/config.make + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'plip', 'true', 'false', d)} ; then + echo "#define HAVE_PLIP_TOOLS 1" >> ${S}/config.h + echo "HAVE_PLIP_TOOLS=1" >> ${S}/config.make + fi +} + +do_compile() { + # net-tools use COPTS/LOPTS to allow adding custom options + oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS" +} + +do_install() { + # We don't need COPTS or LOPTS, but let's be consistent. + oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS" BASEDIR=${D} INSTALLNLSDIR=${D}${datadir}/locale mandir=${mandir} install + + if [ "${base_bindir}" != "/bin" ]; then + mkdir -p ${D}/${base_bindir} + mv ${D}/bin/* ${D}/${base_bindir}/ + rmdir ${D}/bin + fi + if [ "${base_sbindir}" != "/sbin" ]; then + mkdir ${D}/${base_sbindir} + mv ${D}/sbin/* ${D}/${base_sbindir}/ + rmdir ${D}/sbin + fi +} + +inherit update-alternatives + +base_sbindir_progs = "ipmaddr iptunnel mii-tool nameif \ + ${@bb.utils.contains('PACKAGECONFIG', 'arp', 'arp rarp', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'plip', 'plipconfig', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'serial', 'slattach', '', d)} \ +" +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_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" +ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" +ALTERNATIVE_PRIORITY[hostname.1] = "10" + +python __anonymous() { + for prog in d.getVar('base_sbindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) + for prog in d.getVar('base_bindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) +} +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" -- cgit 1.2.3-korg