From 44d773044f0be14d8d520c7a644b171c222577e8 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 20 Jul 2022 09:01:47 +0800 Subject: ndisc6: upgrade 1.0.5 -> 1.0.6 Changelog: ========== # ndisc6: print NAT64 prefix if present. # rdnssd: fix timeout calculation. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit c77bc200813dec8a1317ea6651d0f398a3fa5d65) Signed-off-by: Armin Kuster --- .../recipes-support/ndisc6/ndisc6_1.0.6.bb | 72 +++++++++++++++++++++ .../recipes-support/ndisc6/ndisc6_git.bb | 73 ---------------------- 2 files changed, 72 insertions(+), 73 deletions(-) create mode 100644 meta-networking/recipes-support/ndisc6/ndisc6_1.0.6.bb delete mode 100644 meta-networking/recipes-support/ndisc6/ndisc6_git.bb diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.6.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.6.bb new file mode 100644 index 0000000000..6861314a0a --- /dev/null +++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.6.bb @@ -0,0 +1,72 @@ +DESCRIPTION = "This package includes some useful diagnostics tools for \ +IPv6 networks, including ndisc6, rdisc6, tcptraceroute6 and traceroute6." +SECTION = "net" +HOMEPAGE = "http://www.remlab.net/ndisc6/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRCREV = "7e314b23329f9c24c4c097b8513673fed7e7158a" +SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ + file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ + " + +S = "${WORKDIR}/git" + +DEPENDS = "coreutils-native" + +inherit autotools gettext + +EXTRA_OECONF += "PERL=${USRBINPATH}/perl" + +USE_NLS = "yes" + +EXTRA_OECONF += "--disable-rpath" + +do_configure:prepend() { + cp ${STAGING_DATADIR_NATIVE}/gettext/gettext.h ${S}/include + ${S}/autogen.sh +} + +do_install:append () { + rm -rf ${D}${localstatedir} + # Enable SUID bit for applications that need it + chmod 4555 ${D}${bindir}/rltraceroute6 + chmod 4555 ${D}${bindir}/ndisc6 + chmod 4555 ${D}${bindir}/rdisc6 +} +ALLOW_EMPTY:${PN} = "1" + +# Split into seperate packages since we normal don't want them all +# The main package is left empty and therefore not created. +PACKAGES += "${PN}-ndisc6 ${PN}-tcpspray6 ${PN}-rdisc6 \ + ${PN}-tcptraceroute6 ${PN}-rltraceroute6 \ + ${PN}-tracert6 ${PN}-rdnssd ${PN}-misc" +FILES:${PN} = "" +FILES:${PN}-ndisc6 = "${bindir}/ndisc6" +FILES:${PN}-tcpspray6 = "${bindir}/tcpspray6" +FILES:${PN}-rdisc6 = "${bindir}/rdisc6" +FILES:${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6" +FILES:${PN}-rltraceroute6 = "${bindir}/rltraceroute6" +FILES:${PN}-tracert6 = "${bindir}/tracert6" +FILES:${PN}-rdnssd = "${sbindir}/rdnssd ${sysconfdir}/rdnssd" +FILES:${PN}-misc = "${bindir}/dnssort ${bindir}/name2addr ${bindir}/tcpspray ${bindir}/addr2name" + +DESCRIPTION:${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \ +Performs IPv6 neighbor discovery in userland. Replaces arping from the \ +IPv4 world." +DESCRIPTION:${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \ +Queries IPv6 routers on the network for advertised prefixes. Can be used \ +to detect rogue IPv6 routers, monitor legitimate IPv6 routers." +DESCRIPTION:${PN}-tcpspray6 = "Performs bandwidth measurements of TCP \ +sessions between the local system and a remote echo server in either IPv6 \ +or IPv4." + +DESCRIPTION:${PN}-rdnssd = "Daemon to autoconfigure the list of DNS \ +servers through slateless IPv6 autoconfiguration." + +# The tcptraceroute6 and tracert6 commands depend on rltraceroute6 to +# perform the actual trace operation. +RDEPENDS:${PN}-tcptraceroute6 = "${PN}-rltraceroute6" +RDEPENDS:${PN}-tracert6 = "${PN}-rltraceroute6" +RDEPENDS:${PN}-misc += "perl" + diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_git.bb b/meta-networking/recipes-support/ndisc6/ndisc6_git.bb deleted file mode 100644 index f5467794e6..0000000000 --- a/meta-networking/recipes-support/ndisc6/ndisc6_git.bb +++ /dev/null @@ -1,73 +0,0 @@ -DESCRIPTION = "This package includes some useful diagnostics tools for \ -IPv6 networks, including ndisc6, rdisc6, tcptraceroute6 and traceroute6." -SECTION = "net" -HOMEPAGE = "http://www.remlab.net/ndisc6/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -PV = "1.0.5" -SRCREV = "b706f5f01aa82aa0db678fffd15a1527f330c507" -SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ - file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ - " - -S = "${WORKDIR}/git" - -DEPENDS = "coreutils-native" - -inherit autotools gettext - -EXTRA_OECONF += "PERL=${USRBINPATH}/perl" - -USE_NLS = "yes" - -EXTRA_OECONF += "--disable-rpath" - -do_configure:prepend() { - cp ${STAGING_DATADIR_NATIVE}/gettext/gettext.h ${S}/include - ${S}/autogen.sh -} - -do_install:append () { - rm -rf ${D}${localstatedir} - # Enable SUID bit for applications that need it - chmod 4555 ${D}${bindir}/rltraceroute6 - chmod 4555 ${D}${bindir}/ndisc6 - chmod 4555 ${D}${bindir}/rdisc6 -} -ALLOW_EMPTY:${PN} = "1" - -# Split into seperate packages since we normal don't want them all -# The main package is left empty and therefore not created. -PACKAGES += "${PN}-ndisc6 ${PN}-tcpspray6 ${PN}-rdisc6 \ - ${PN}-tcptraceroute6 ${PN}-rltraceroute6 \ - ${PN}-tracert6 ${PN}-rdnssd ${PN}-misc" -FILES:${PN} = "" -FILES:${PN}-ndisc6 = "${bindir}/ndisc6" -FILES:${PN}-tcpspray6 = "${bindir}/tcpspray6" -FILES:${PN}-rdisc6 = "${bindir}/rdisc6" -FILES:${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6" -FILES:${PN}-rltraceroute6 = "${bindir}/rltraceroute6" -FILES:${PN}-tracert6 = "${bindir}/tracert6" -FILES:${PN}-rdnssd = "${sbindir}/rdnssd ${sysconfdir}/rdnssd" -FILES:${PN}-misc = "${bindir}/dnssort ${bindir}/name2addr ${bindir}/tcpspray ${bindir}/addr2name" - -DESCRIPTION:${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \ -Performs IPv6 neighbor discovery in userland. Replaces arping from the \ -IPv4 world." -DESCRIPTION:${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \ -Queries IPv6 routers on the network for advertised prefixes. Can be used \ -to detect rogue IPv6 routers, monitor legitimate IPv6 routers." -DESCRIPTION:${PN}-tcpspray6 = "Performs bandwidth measurements of TCP \ -sessions between the local system and a remote echo server in either IPv6 \ -or IPv4." - -DESCRIPTION:${PN}-rdnssd = "Daemon to autoconfigure the list of DNS \ -servers through slateless IPv6 autoconfiguration." - -# The tcptraceroute6 and tracert6 commands depend on rltraceroute6 to -# perform the actual trace operation. -RDEPENDS:${PN}-tcptraceroute6 = "${PN}-rltraceroute6" -RDEPENDS:${PN}-tracert6 = "${PN}-rltraceroute6" -RDEPENDS:${PN}-misc += "perl" - -- cgit 1.2.3-korg