diff --git a/package/mrouted/0001-gcc15.patch b/package/mrouted/0001-gcc15.patch deleted file mode 100644 index 781f83f5c7..0000000000 --- a/package/mrouted/0001-gcc15.patch +++ /dev/null @@ -1,33 +0,0 @@ -From cdb388c8dc6e661d2a23f1e9b79102bc68e89af5 Mon Sep 17 00:00:00 2001 -From: Philippe Troin -Date: Wed, 23 Apr 2025 16:04:20 -0700 -Subject: [PATCH] C23 compatibility. - -bool is a keyword in C23. - -Upstream: https://github.com/troglobit/mrouted/pull/65 - -Signed-off-by: Bernd Kuhls ---- - src/kern.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/kern.c b/src/kern.c -index 27f8dd4..04f1c36 100644 ---- a/src/kern.c -+++ b/src/kern.c -@@ -104,11 +104,11 @@ void k_set_rcvbuf(int bufsize, int minsize) - * in the kernel and "panic". The kernel patch for netinet/ip_raw.c - * coming with this distribution fixes it. - */ --void k_hdr_include(int bool) -+void k_hdr_include(int flag) - { - #ifdef IP_HDRINCL -- if (setsockopt(igmp_socket, IPPROTO_IP, IP_HDRINCL, &bool, sizeof(bool)) < 0) -- logit(LOG_ERR, errno, "Failed setting socket IP_HDRINCL %u", bool); -+ if (setsockopt(igmp_socket, IPPROTO_IP, IP_HDRINCL, &flag, sizeof(flag)) < 0) -+ logit(LOG_ERR, errno, "Failed setting socket IP_HDRINCL %u", flag); - #endif - } - diff --git a/package/mrouted/mrouted.hash b/package/mrouted/mrouted.hash index aabfd19f33..a38fec413e 100644 --- a/package/mrouted/mrouted.hash +++ b/package/mrouted/mrouted.hash @@ -1,5 +1,5 @@ -# From https://github.com/troglobit/mrouted/releases/download/4.6/mrouted-4.6.tar.gz.sha256 -sha256 49443c47b5b28a5ab65d796f3495d72a94c1c95e54333cb11fe04075006b576b mrouted-4.6.tar.gz +# Upstream sha256 from GitHub +sha256 24da2782297dad2727c7b467ce232837f3e71a8a42d15e0bd029495da83abc3e mrouted-4.7.tar.gz # Locally calculated sha256 834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29 LICENSE diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index 077afac2b9..e44a0e46b2 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -4,7 +4,7 @@ # ################################################################################ -MROUTED_VERSION = 4.6 +MROUTED_VERSION = 4.7 MROUTED_SITE = \ https://github.com/troglobit/mrouted/releases/download/$(MROUTED_VERSION) MROUTED_DEPENDENCIES = host-bison @@ -13,7 +13,7 @@ MROUTED_LICENSE_FILES = LICENSE MROUTED_CPE_ID_VENDOR = troglobit define MROUTED_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/mrouted/S41mrouted \ + $(INSTALL) -m 0755 -D package/mrouted/S41mrouted \ $(TARGET_DIR)/etc/init.d/S41mrouted endef