From f3ec9c3ab6ea2956dd591c6045d96db6cc3dcb24 Mon Sep 17 00:00:00 2001 From: xingwei Date: Mon, 10 Mar 2025 03:21:21 +0000 Subject: [PATCH] revert upstream patch to avoid functional changes --- ...he-socket-option-IPV6_MULTICAST_LOOP.patch | 31 ------------------- radvd.spec | 9 ++++-- 2 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 backport-add-the-socket-option-IPV6_MULTICAST_LOOP.patch diff --git a/backport-add-the-socket-option-IPV6_MULTICAST_LOOP.patch b/backport-add-the-socket-option-IPV6_MULTICAST_LOOP.patch deleted file mode 100644 index 647e8ba..0000000 --- a/backport-add-the-socket-option-IPV6_MULTICAST_LOOP.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bc8f31629d3d6eaaf273781d0b4c83e81bebe0eb Mon Sep 17 00:00:00 2001 -From: Wei Xing -Date: Mon, 18 Dec 2023 02:16:09 +0800 -Subject: [PATCH] Add the socket option IPV6_MULTICAST_LOOP to prevent the - interface from autoconfiguring using RA messages sent by itself. - -Reference:https://github.com/radvd-project/radvd/commit/bc8f31629d3d6eaaf273781d0b4c83e81bebe0eb -Conflict:NA - ---- - socket.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/socket.c b/socket.c -index 849ed744..547fe939 100644 ---- a/socket.c -+++ b/socket.c -@@ -65,6 +65,13 @@ int open_icmpv6_socket(void) - flog(LOG_ERR, "setsockopt(IPV6_MULTICAST_HOPS): %s", strerror(errno)); - return -1; - } -+ -+ err = setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (int[]){0}, sizeof(int)); -+ if (err < 0) { -+ flog(LOG_ERR, "setsockopt(IPV6_MULTICAST_LOOP): %s", strerror(errno)); -+ return -1; -+ } -+ - #ifdef IPV6_RECVHOPLIMIT - err = setsockopt(sock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, (int[]){1}, sizeof(int)); - if (err < 0) { diff --git a/radvd.spec b/radvd.spec index 919e44e..cef30ac 100644 --- a/radvd.spec +++ b/radvd.spec @@ -1,6 +1,6 @@ Name: radvd Version: 2.19 -Release: 3 +Release: 4 Summary: Router ADVertisement Daemon for IPv6 License: BSD with advertising URL: http://www.litech.org/radvd/ @@ -9,7 +9,6 @@ Source1: radvd-tmpfs.conf Source2: radvd.service Patch6000: backport-add-IPV6_DROP_MEMBERSHIP-to-clean-up-resources-when-.patch -Patch6001: backport-add-the-socket-option-IPV6_MULTICAST_LOOP.patch BuildRequires: gcc bison flex flex-static pkgconfig check-devel systemd Requires(pre): shadow-utils @@ -91,6 +90,12 @@ exit 0 %{_mandir}/*/* %changelog +* Mon Mar 10 2025 xingwei - 2.19-4 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:revert upstream patch to avoid functional changes + * Fri Oct 11 2024 lifeifei - 2.19-3 - Type:bugfix - Id:NA