From ff0b697211eb341df6c3de50d0a16958a27e6029 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Mon, 24 Feb 2025 23:56:07 +0800 Subject: radvd: upgrade 2.19 -> 2.20 ChangeLog: https://github.com/radvd-project/radvd/blob/v2.20/CHANGES * Drop backport patch * Add dependency libbsd * Update rdavd.service * Install systemd service file and sysvinit script separately through conditional statements. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- ...-include.h-change-in-46883f8a1a02fe42040d.patch | 32 ---------- .../recipes-daemons/radvd/files/radvd.init | 0 .../recipes-daemons/radvd/files/radvd.service | 7 ++- .../recipes-daemons/radvd/radvd_2.19.bb | 71 --------------------- .../recipes-daemons/radvd/radvd_2.20.bb | 73 ++++++++++++++++++++++ 5 files changed, 78 insertions(+), 105 deletions(-) delete mode 100644 meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch mode change 100755 => 100644 meta-networking/recipes-daemons/radvd/files/radvd.init delete mode 100644 meta-networking/recipes-daemons/radvd/radvd_2.19.bb create mode 100644 meta-networking/recipes-daemons/radvd/radvd_2.20.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch b/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch deleted file mode 100644 index 57338d4713..0000000000 --- a/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 15f439c555289f900eb33111b010bf1266f97edb Mon Sep 17 00:00:00 2001 -From: Jonathan Davies -Date: Thu, 25 Nov 2021 15:29:18 +0000 -Subject: [PATCH] Reverts the include.h change in - 46883f8a1a02fe42040dd8e48aec0ed871545d4d - -Closes: #158 - -Upstream-Status: Backport [https://github.com/radvd-project/radvd/commit/06689f8c06f44c7e87f7ff1d814428f88375b53f] -Signed-off-by: Jonathan Davies -Signed-off-by: Khem Raj ---- - includes.h | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/includes.h b/includes.h -index ef30b10..c528c86 100644 ---- a/includes.h -+++ b/includes.h -@@ -76,12 +76,7 @@ - #include - #endif - --#if !defined(__GLIBC__) && defined(linux) --#include --#define IF_NAMESIZE IFNAMSIZ --#else - #include --#endif - - #ifdef HAVE_NET_IF_DL_H - #include diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.init b/meta-networking/recipes-daemons/radvd/files/radvd.init old mode 100755 new mode 100644 diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.service b/meta-networking/recipes-daemons/radvd/files/radvd.service index e60798a6b3..9230543c48 100644 --- a/meta-networking/recipes-daemons/radvd/files/radvd.service +++ b/meta-networking/recipes-daemons/radvd/files/radvd.service @@ -4,8 +4,11 @@ After=network.target ConditionPathExists=@SYSCONFDIR@/radvd.conf [Service] -EnvironmentFile=-@SYSCONFDIR@/default/radvd -ExecStart=@SBINDIR@/radvd -n $OPTIONS +Type=forking +EnvironmentFile=@SYSCONFDIR@/default/radvd +ExecStart=@SBINDIR@/radvd $OPTIONS +PIDFile=/run/radvd.pid +ExecReload=/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb b/meta-networking/recipes-daemons/radvd/radvd_2.19.bb deleted file mode 100644 index a8a116cbe5..0000000000 --- a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY = "IPv6 router advertisement daemon" -DESCRIPTION = "radvd is the router advertisement daemon for IPv6. It \ -listens to router solicitations and sends router \ -advertisements as described in RFC 2461, Neighbor \ -Discovery for IP Version 6 (IPv6). With these \ -advertisements hosts can automatically configure their \ -addresses and some other parameters. They also can \ -choose a default router based on these advertisements." -HOMEPAGE = "http://www.litech.org/radvd/" -SECTION = "net" -DEPENDS = "flex-native bison-native libdaemon " - -# License is BSD-Style (with advertising clause) but also has an additional 0th clause -LICENSE = "radvd" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=73ebbf7182ae996e65e8fadc9a8c45db" - -SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ - file://radvd.init \ - file://radvd.service \ - file://volatiles.03_radvd \ - file://radvd.default \ - file://radvd.conf \ - file://0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch \ - " -SRC_URI[sha256sum] = "c36470706fec3a9e6bed394ffea08acaff5dac647848d26b96bb9b9c65d58da0" - -inherit autotools useradd pkgconfig systemd - -SYSTEMD_SERVICE:${PN} = "radvd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -do_install:append () { - install -m 0755 -d ${D}${sysconfdir}/init.d \ - ${D}${sysconfdir}/default/volatiles \ - ${D}${docdir}/radvd - # Install init script and volatiles - install -m 0755 ${UNPACKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd - sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd - sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd - - install -m 0644 ${UNPACKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd - - # Install systemd service files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${UNPACKDIR}/radvd.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ - -e 's#@SBINDIR@#${sbindir}#g' \ - -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service - - # Install default environment file - install -m 0644 ${UNPACKDIR}/radvd.default ${D}${sysconfdir}/default/radvd - - # Documentation - for i in radvd.conf.example README; do \ - install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ - done - - install -m 0644 ${UNPACKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf -} - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system nogroup" -USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup --shell /sbin/nologin radvd" - -pkg_postinst:${PN} () { - if [ -z "$D" -a -x /etc/init.d/populate-volatile.sh ]; then - /etc/init.d/populate-volatile.sh update - fi -} diff --git a/meta-networking/recipes-daemons/radvd/radvd_2.20.bb b/meta-networking/recipes-daemons/radvd/radvd_2.20.bb new file mode 100644 index 0000000000..e2d606823b --- /dev/null +++ b/meta-networking/recipes-daemons/radvd/radvd_2.20.bb @@ -0,0 +1,73 @@ +SUMMARY = "IPv6 router advertisement daemon" +DESCRIPTION = "radvd is the router advertisement daemon for IPv6. It \ +listens to router solicitations and sends router \ +advertisements as described in RFC 2461, Neighbor \ +Discovery for IP Version 6 (IPv6). With these \ +advertisements hosts can automatically configure their \ +addresses and some other parameters. They also can \ +choose a default router based on these advertisements." +HOMEPAGE = "http://www.litech.org/radvd/" +SECTION = "net" +DEPENDS = "flex-native bison-native libdaemon libbsd" + +# License is BSD-Style (with advertising clause) but also has an additional 0th clause +LICENSE = "radvd" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=73ebbf7182ae996e65e8fadc9a8c45db" + +SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ + file://radvd.init \ + file://radvd.service \ + file://volatiles.03_radvd \ + file://radvd.default \ + file://radvd.conf \ + " +SRC_URI[sha256sum] = "af37c5a81d59f3bdc00d83056606ffa1810d4550beed6caa4f81181246494220" + +inherit autotools useradd pkgconfig systemd + +SYSTEMD_SERVICE:${PN} = "radvd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +do_install:append () { + install -m 0755 -d ${D}${sysconfdir}/default + install -m 0644 ${UNPACKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf + install -m 0644 ${UNPACKDIR}/radvd.default ${D}${sysconfdir}/default/radvd + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -m 0755 -d ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/default/volatiles + + install -m 0755 ${UNPACKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd + sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd + sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd + + install -m 0644 ${UNPACKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -m 0755 -d ${D}${systemd_unitdir}/system + + install -m 0644 ${UNPACKDIR}/radvd.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ + -e 's#@SBINDIR@#${sbindir}#g' \ + ${D}${systemd_unitdir}/system/radvd.service + fi + + # Documentation + install -m 0755 -d ${D}${docdir}/radvd + for i in radvd.conf.example README; do \ + install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ + done +} + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "--system nogroup" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup --shell /sbin/nologin radvd" + +pkg_postinst:${PN} () { + if [ -z "$D" -a -x /etc/init.d/populate-volatile.sh ]; then + /etc/init.d/populate-volatile.sh update + fi +} -- cgit v1.2.3-54-g00ecf