[Buildroot] [PATCH 1/1] package/mrouted: bump to version 4.7

[Buildroot] [PATCH 1/1] package/mrouted: bump to version 4.7

[Joachim Wiberg]

Multiple changes upstream, for the full list of changes, see the release
notes: https://github.com/troglobit/mrouted/releases/tag/4.7

Package changes:

- Drop local backported patch, merged in 4.7
- Fix invalid daemon path in S41mrouted
- Drop executable flag from S41mrouted

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/mrouted/0001-gcc15.patch | 33 --------------------------------
 package/mrouted/S41mrouted       |  2 +-
 package/mrouted/mrouted.hash     |  4 ++--
 package/mrouted/mrouted.mk       |  4 ++--
 4 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 package/mrouted/0001-gcc15.patch
 mode change 100755 => 100644 package/mrouted/S41mrouted

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 <phil+github-commits@fifi.org>
-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 <bernd@kuhls.net>
----
- 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/S41mrouted b/package/mrouted/S41mrouted
old mode 100755
new mode 100644
index 7dca258255..d653425719
--- a/package/mrouted/S41mrouted
+++ b/package/mrouted/S41mrouted
@@ -11,7 +11,7 @@ MROUTED_ARGS="-w 30"
 start() {
 	printf 'Starting %s: ' "$DAEMON"
 	# shellcheck disable=SC2086 # we need the word splitting
-	start-stop-daemon -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \
+	start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \
 		-- $MROUTED_ARGS
 	status=$?
 	if [ "$status" -eq 0 ]; then
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
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/mrouted: bump to version 4.7

[Thomas Petazzoni via buildroot]

On Mon, Sep 14, 2026 at 12:30:20PM +0200, Joachim Wiberg wrote:
> Multiple changes upstream, for the full list of changes, see the release
> notes: https://github.com/troglobit/mrouted/releases/tag/4.7
> 
> Package changes:
> 
> - Drop local backported patch, merged in 4.7
> - Fix invalid daemon path in S41mrouted

Is this invalid because of the bump, or was it already wrong for mrouted 4.6 ?

> - Drop executable flag from S41mrouted
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/mrouted: bump to version 4.7

[Joachim Wiberg]

[-- Attachment #1.1: Type: text/plain, Size: 435 bytes --]

On Thu, 2026-09-17 at 09:44 +0200, Thomas Petazzoni wrote:
> On Mon, Sep 14, 2026 at 12:30:20PM +0200, Joachim Wiberg wrote:
> > - Fix invalid daemon path in S41mrouted
> Is this invalid because of the bump, or was it already wrong for
> mrouted 4.6 ?

It hard-coded /sbin/mrouted but the daemon has always installed to
/usr/sbin/mrouted, so it works with BR2_ROOTFS_MERGED_USR=y but not
without.

Best regards
 /Joachim


[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/mrouted: bump to version 4.7

[Thomas Petazzoni via buildroot]

Hello,

On Thu, Sep 17, 2026 at 04:12:28PM +0200, Joachim Wiberg wrote:
> On Thu, 2026-09-17 at 09:44 +0200, Thomas Petazzoni wrote:
> > On Mon, Sep 14, 2026 at 12:30:20PM +0200, Joachim Wiberg wrote:
> > > - Fix invalid daemon path in S41mrouted
> > Is this invalid because of the bump, or was it already wrong for
> > mrouted 4.6 ?
> 
> It hard-coded /sbin/mrouted but the daemon has always installed to
> /usr/sbin/mrouted, so it works with BR2_ROOTFS_MERGED_USR=y but not
> without.

Then, this fix is unrelated to the version bump, and should be in a
separate patch (which should indicate which commit introduced the
issue). Then, this patch will be backported to our stable branches,
while the version bump will only be in master.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 0/2] package/mrouted: bump to version 4.7

[Joachim Wiberg]

Thomas noted that the S41mrouted daemon-path fix is unrelated to the
version bump and should be its own patch, so it can be identified and
backported to the stable branches independently. This v2 splits it
out.

Changes v1 -> v2:
- Split the S41mrouted fix (invalid /sbin path, executable bit) into
  its own patch, 1/2, and note the commit that introduced the bug
- Patch 2/2 is now just the version bump, unchanged otherwise

Best regards
 /Joachim

Joachim Wiberg (2):
  package/lldpd: security bump to version 1.0.22
  package/lldpd: rework start script

 .checkpackageignore      |  1 -
 package/lldpd/S60lldpd   | 80 +++++++++++++++++++++++++++++-----------
 package/lldpd/lldpd.hash |  6 +--
 package/lldpd/lldpd.mk   |  2 +-
 4 files changed, 62 insertions(+), 27 deletions(-)

-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 1/2] package/lldpd: security bump to version 1.0.22

[Joachim Wiberg]

https://github.com/lldpd/lldpd/releases/tag/1.0.22
https://github.com/lldpd/lldpd/releases/tag/1.0.21

Fixes CVE-2026-46433, an out-of-bound read access when removing the
VLAN tag.  1.0.21 fixes path traversal vulnerabilities and arbitrary
file deletion in the privileged process.

GPG signature verified with key AEF2348766F371C689A7360095A42FE8353525F9,
LICENSE hash unchanged.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 package/lldpd/lldpd.hash | 6 +++---
 package/lldpd/lldpd.mk   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/lldpd/lldpd.hash b/package/lldpd/lldpd.hash
index f3cefe7b73..46f2b9b476 100644
--- a/package/lldpd/lldpd.hash
+++ b/package/lldpd/lldpd.hash
@@ -1,6 +1,6 @@
 # Locally computed after checking gpg key
-# https://media.luffy.cx/files/lldpd/lldpd-1.0.20.tar.gz.gpg
+# https://media.luffy.cx/files/lldpd/lldpd-1.0.22.tar.gz.gpg
 # using key AEF2348766F371C689A7360095A42FE8353525F9
-# gpg --verify lldpd-1.0.20.tar.gz.gpg lldpd-1.0.20.tar.gz
-sha256  61b8cb22d4879e68f7825a2fb8e1e92abb4aba4773977cf0258bc32ed9f55450  lldpd-1.0.20.tar.gz
+# gpg --verify lldpd-1.0.22.tar.gz.gpg lldpd-1.0.22.tar.gz
+sha256  9587940ed2314a86774c5499f3dfb13a8eb86232a62d243a83a1f09886848e03  lldpd-1.0.22.tar.gz
 sha256  0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d  LICENSE
diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk
index a3015e9e7d..f0cbc7e436 100644
--- a/package/lldpd/lldpd.mk
+++ b/package/lldpd/lldpd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LLDPD_VERSION = 1.0.20
+LLDPD_VERSION = 1.0.22
 LLDPD_SITE = https://media.luffy.cx/files/lldpd
 LLDPD_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_CHECK),check) \
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 2/2] package/lldpd: rework start script

[Joachim Wiberg]

check-package reports six warnings on S60lldpd: indentation with
spaces, no DAEMON variable, and shellcheck complaints.

The script also masks failures, the exit status of
"[ $? = 0 ] && echo OK || echo FAIL" is the one of echo, so start and
stop always return success.  Stopping does not wait for the daemon to
exit either, so a restart can race the instance on its way out.

Rewrite it after package/busybox/S01syslogd, as the manual asks.  lldpd
daemonizes and writes the PID file itself, but does not remove it on
exit, so pass the PID file to both start-stop-daemon and the daemon and
drop the stale file once the process is gone.  Also pick up arguments
from /etc/default/lldpd and add the customary reload alias.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
[Julien: remove .checkpackageignore entry to fix check-package error]
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 .checkpackageignore    |  1 -
 package/lldpd/S60lldpd | 80 ++++++++++++++++++++++++++++++------------
 2 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/.checkpackageignore b/.checkpackageignore
index 2fc8349f1e..32be4c93aa 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -550,7 +550,6 @@ package/lirc-tools/0001-plugins-devinput.c-fix-build-with-musl-1.2.0.patch lib_p
 package/lirc-tools/0002-configure-add-disable-doc-option.patch lib_patch.Upstream
 package/lirc-tools/S25lircd lib_sysv.Indent lib_sysv.Variables
 package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch lib_patch.Upstream
-package/lldpd/S60lldpd Shellcheck lib_sysv.Indent lib_sysv.Variables
 package/lm-sensors/0001-no-host-ldconfig.patch lib_patch.Upstream
 package/lmbench/0001-scripts-build-use-bin-bash-as-shell.patch lib_patch.Upstream
 package/lmbench/0002-src-Makefile-add-lmbench-to-list-of-executables.patch lib_patch.Upstream
diff --git a/package/lldpd/S60lldpd b/package/lldpd/S60lldpd
index 3dfa6c1aa1..79605c2f02 100644
--- a/package/lldpd/S60lldpd
+++ b/package/lldpd/S60lldpd
@@ -1,25 +1,61 @@
 #!/bin/sh
-#
-# Controls lldpd.
-#
 
-case $1 in
-    start)
-	printf "Starting lldpd: "
-	start-stop-daemon -S -q -p /var/run/lldpd.pid --exec /usr/sbin/lldpd
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
-	;;
-    stop)
-	printf "Stopping lldpd: "
-	start-stop-daemon -K -q -p /var/run/lldpd.pid
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
-	;;
-    restart)
-	$0 stop
-	$0 start
-	;;
-    *)
-	echo "Usage: $0 {start|stop|restart}"
-	exit 1
-	;;
+DAEMON="lldpd"
+PIDFILE="/var/run/$DAEMON.pid"
+
+LLDPD_ARGS=""
+
+# shellcheck source=/dev/null
+[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
+
+# lldpd daemonizes and creates the PID file itself, so tell it where to
+# put it, but it does not remove it on exit.
+start() {
+	printf 'Starting %s: ' "$DAEMON"
+	# shellcheck disable=SC2086 # we need the word splitting
+	start-stop-daemon --start --pidfile "$PIDFILE" \
+		--exec "/usr/sbin/$DAEMON" \
+		-- -p "$PIDFILE" $LLDPD_ARGS
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+stop() {
+	printf 'Stopping %s: ' "$DAEMON"
+	start-stop-daemon --stop --pidfile "$PIDFILE" \
+		--exec "/usr/sbin/$DAEMON"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+		return "$status"
+	fi
+	while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \
+		--exec "/usr/sbin/$DAEMON"; do
+		sleep 0.1
+	done
+	rm -f "$PIDFILE"
+	return "$status"
+}
+
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+	start|stop|restart)
+		"$1";;
+	reload)
+		# Restart, since there is no true "reload" feature.
+		restart;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
 esac
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 0/2] package/mrouted: bump to version 4.7

[Joachim Wiberg]

[-- Attachment #1.1: Type: text/plain, Size: 1069 bytes --]

Oups,

so sorry for the noise this creates! I somehow messed up my patch queue
so please ignore this series.

/Joachim


On Thu, 2026-09-17 at 18:05 +0200, Joachim Wiberg wrote:
> Thomas noted that the S41mrouted daemon-path fix is unrelated to the
> version bump and should be its own patch, so it can be identified and
> backported to the stable branches independently. This v2 splits it
> out.
> 
> Changes v1 -> v2:
> - Split the S41mrouted fix (invalid /sbin path, executable bit) into
>   its own patch, 1/2, and note the commit that introduced the bug
> - Patch 2/2 is now just the version bump, unchanged otherwise
> 
> Best regards
>  /Joachim
> 
> Joachim Wiberg (2):
>   package/lldpd: security bump to version 1.0.22
>   package/lldpd: rework start script
> 
>  .checkpackageignore      |  1 -
>  package/lldpd/S60lldpd   | 80 +++++++++++++++++++++++++++++----------
> -
>  package/lldpd/lldpd.hash |  6 +--
>  package/lldpd/lldpd.mk   |  2 +-
>  4 files changed, 62 insertions(+), 27 deletions(-)
> 


[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/2] package/lldpd: security bump to version 1.0.22

[Joachim Wiberg]

[-- Attachment #1.1: Type: text/plain, Size: 2192 bytes --]

Oups,

this has already been merged, please ignore.

Sorry for the noise this creates! I somehow messed up my patch queue.

/Joachim

On Thu, 2026-09-17 at 18:05 +0200, Joachim Wiberg wrote:
> https://github.com/lldpd/lldpd/releases/tag/1.0.22
> https://github.com/lldpd/lldpd/releases/tag/1.0.21
> 
> Fixes CVE-2026-46433, an out-of-bound read access when removing the
> VLAN tag.  1.0.21 fixes path traversal vulnerabilities and arbitrary
> file deletion in the privileged process.
> 
> GPG signature verified with key
> AEF2348766F371C689A7360095A42FE8353525F9,
> LICENSE hash unchanged.
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
> Signed-off-by: Julien Olivain <ju.o@free.fr>
> ---
>  package/lldpd/lldpd.hash | 6 +++---
>  package/lldpd/lldpd.mk   | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/package/lldpd/lldpd.hash b/package/lldpd/lldpd.hash
> index f3cefe7b73..46f2b9b476 100644
> --- a/package/lldpd/lldpd.hash
> +++ b/package/lldpd/lldpd.hash
> @@ -1,6 +1,6 @@
>  # Locally computed after checking gpg key
> -# https://media.luffy.cx/files/lldpd/lldpd-1.0.20.tar.gz.gpg
> +# https://media.luffy.cx/files/lldpd/lldpd-1.0.22.tar.gz.gpg
>  # using key AEF2348766F371C689A7360095A42FE8353525F9
> -# gpg --verify lldpd-1.0.20.tar.gz.gpg lldpd-1.0.20.tar.gz
> -sha256 
> 61b8cb22d4879e68f7825a2fb8e1e92abb4aba4773977cf0258bc32ed9f55450 
> lldpd-1.0.20.tar.gz
> +# gpg --verify lldpd-1.0.22.tar.gz.gpg lldpd-1.0.22.tar.gz
> +sha256 
> 9587940ed2314a86774c5499f3dfb13a8eb86232a62d243a83a1f09886848e03 
> lldpd-1.0.22.tar.gz
>  sha256 
> 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d 
> LICENSE
> diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk
> index a3015e9e7d..f0cbc7e436 100644
> --- a/package/lldpd/lldpd.mk
> +++ b/package/lldpd/lldpd.mk
> @@ -4,7 +4,7 @@
>  #
>  #####################################################################
> ###########
>  
> -LLDPD_VERSION = 1.0.20
> +LLDPD_VERSION = 1.0.22
>  LLDPD_SITE = https://media.luffy.cx/files/lldpd
>  LLDPD_DEPENDENCIES = \
>  	$(if $(BR2_PACKAGE_CHECK),check) \


[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 2/2] package/lldpd: rework start script

[Joachim Wiberg]

[-- Attachment #1.1: Type: text/plain, Size: 4326 bytes --]

Oups,

this has already been merged, please ignore.

Sorry for the noise this creates! I somehow messed up my patch queue.

/Joachim

On Thu, 2026-09-17 at 18:05 +0200, Joachim Wiberg wrote:
> check-package reports six warnings on S60lldpd: indentation with
> spaces, no DAEMON variable, and shellcheck complaints.
> 
> The script also masks failures, the exit status of
> "[ $? = 0 ] && echo OK || echo FAIL" is the one of echo, so start and
> stop always return success.  Stopping does not wait for the daemon to
> exit either, so a restart can race the instance on its way out.
> 
> Rewrite it after package/busybox/S01syslogd, as the manual asks. 
> lldpd
> daemonizes and writes the PID file itself, but does not remove it on
> exit, so pass the PID file to both start-stop-daemon and the daemon
> and
> drop the stale file once the process is gone.  Also pick up arguments
> from /etc/default/lldpd and add the customary reload alias.
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
> [Julien: remove .checkpackageignore entry to fix check-package error]
> Signed-off-by: Julien Olivain <ju.o@free.fr>
> ---
>  .checkpackageignore    |  1 -
>  package/lldpd/S60lldpd | 80 ++++++++++++++++++++++++++++++-----------
> -
>  2 files changed, 58 insertions(+), 23 deletions(-)
> 
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 2fc8349f1e..32be4c93aa 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -550,7 +550,6 @@ package/lirc-tools/0001-plugins-devinput.c-fix-
> build-with-musl-1.2.0.patch lib_p
>  package/lirc-tools/0002-configure-add-disable-doc-option.patch
> lib_patch.Upstream
>  package/lirc-tools/S25lircd lib_sysv.Indent lib_sysv.Variables
>  package/live555/0001-Add-a-pkg-config-file-for-the-shared-
> libraries.patch lib_patch.Upstream
> -package/lldpd/S60lldpd Shellcheck lib_sysv.Indent lib_sysv.Variables
>  package/lm-sensors/0001-no-host-ldconfig.patch lib_patch.Upstream
>  package/lmbench/0001-scripts-build-use-bin-bash-as-shell.patch
> lib_patch.Upstream
>  package/lmbench/0002-src-Makefile-add-lmbench-to-list-of-
> executables.patch lib_patch.Upstream
> diff --git a/package/lldpd/S60lldpd b/package/lldpd/S60lldpd
> index 3dfa6c1aa1..79605c2f02 100644
> --- a/package/lldpd/S60lldpd
> +++ b/package/lldpd/S60lldpd
> @@ -1,25 +1,61 @@
>  #!/bin/sh
> -#
> -# Controls lldpd.
> -#
>  
> -case $1 in
> -    start)
> -	printf "Starting lldpd: "
> -	start-stop-daemon -S -q -p /var/run/lldpd.pid --exec
> /usr/sbin/lldpd
> -	[ $? = 0 ] && echo "OK" || echo "FAIL"
> -	;;
> -    stop)
> -	printf "Stopping lldpd: "
> -	start-stop-daemon -K -q -p /var/run/lldpd.pid
> -	[ $? = 0 ] && echo "OK" || echo "FAIL"
> -	;;
> -    restart)
> -	$0 stop
> -	$0 start
> -	;;
> -    *)
> -	echo "Usage: $0 {start|stop|restart}"
> -	exit 1
> -	;;
> +DAEMON="lldpd"
> +PIDFILE="/var/run/$DAEMON.pid"
> +
> +LLDPD_ARGS=""
> +
> +# shellcheck source=/dev/null
> +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
> +
> +# lldpd daemonizes and creates the PID file itself, so tell it where
> to
> +# put it, but it does not remove it on exit.
> +start() {
> +	printf 'Starting %s: ' "$DAEMON"
> +	# shellcheck disable=SC2086 # we need the word splitting
> +	start-stop-daemon --start --pidfile "$PIDFILE" \
> +		--exec "/usr/sbin/$DAEMON" \
> +		-- -p "$PIDFILE" $LLDPD_ARGS
> +	status=$?
> +	if [ "$status" -eq 0 ]; then
> +		echo "OK"
> +	else
> +		echo "FAIL"
> +	fi
> +	return "$status"
> +}
> +
> +stop() {
> +	printf 'Stopping %s: ' "$DAEMON"
> +	start-stop-daemon --stop --pidfile "$PIDFILE" \
> +		--exec "/usr/sbin/$DAEMON"
> +	status=$?
> +	if [ "$status" -eq 0 ]; then
> +		echo "OK"
> +	else
> +		echo "FAIL"
> +		return "$status"
> +	fi
> +	while start-stop-daemon --stop --test --quiet --pidfile
> "$PIDFILE" \
> +		--exec "/usr/sbin/$DAEMON"; do
> +		sleep 0.1
> +	done
> +	rm -f "$PIDFILE"
> +	return "$status"
> +}
> +
> +restart() {
> +	stop
> +	start
> +}
> +
> +case "$1" in
> +	start|stop|restart)
> +		"$1";;
> +	reload)
> +		# Restart, since there is no true "reload" feature.
> +		restart;;
> +	*)
> +		echo "Usage: $0 {start|stop|restart|reload}"
> +		exit 1
>  esac


[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 0/2] package/mrouted: bump to version 4.7

[Joachim Wiberg]

Thomas noted that the S41mrouted daemon-path fix is unrelated to the
version bump and should be its own patch, so it can be identified and
backported to the stable branches independently. This v2 splits it
out.

Changes v1 -> v2:
- Split the S41mrouted fix (invalid /sbin path, executable bit) into
  its own patch, 1/2, and note the commit that introduced the bug
- Patch 2/2 is now just the version bump, unchanged otherwise

Best regards
 /Joachim

Joachim Wiberg (2):
  package/mrouted: fix invalid daemon path in S41mrouted
  package/mrouted: bump to version 4.7

 package/mrouted/0001-gcc15.patch | 33 --------------------------------
 package/mrouted/S41mrouted       |  2 +-
 package/mrouted/mrouted.hash     |  4 ++--
 package/mrouted/mrouted.mk       |  4 ++--
 4 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 package/mrouted/0001-gcc15.patch
 mode change 100755 => 100644 package/mrouted/S41mrouted

-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 1/2] package/mrouted: fix invalid daemon path in S41mrouted

[Joachim Wiberg]

S41mrouted hard-coded /sbin/mrouted, but mrouted has always installed
to /usr/sbin/mrouted. This went unnoticed with BR2_ROOTFS_MERGED_USR=y,
but the daemon fails to start without it.

Also drop the script's executable bit to match other sysv init
scripts that do not set it.

Introduced in c25115daf2b2761a2f0f411790c6d24b460c7999
(package/mrouted: add sysv init script).

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/mrouted/S41mrouted | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 package/mrouted/S41mrouted

diff --git a/package/mrouted/S41mrouted b/package/mrouted/S41mrouted
old mode 100755
new mode 100644
index 7dca258255..d653425719
--- a/package/mrouted/S41mrouted
+++ b/package/mrouted/S41mrouted
@@ -11,7 +11,7 @@ MROUTED_ARGS="-w 30"
 start() {
 	printf 'Starting %s: ' "$DAEMON"
 	# shellcheck disable=SC2086 # we need the word splitting
-	start-stop-daemon -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \
+	start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \
 		-- $MROUTED_ARGS
 	status=$?
 	if [ "$status" -eq 0 ]; then
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 2/2] package/mrouted: bump to version 4.7

[Joachim Wiberg]

Multiple changes upstream, for the full list of changes, see the release
notes: https://github.com/troglobit/mrouted/releases/tag/4.7

Package changes:

- Drop local backported patch, merged in 4.7

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/mrouted/0001-gcc15.patch | 33 --------------------------------
 package/mrouted/mrouted.hash     |  4 ++--
 package/mrouted/mrouted.mk       |  4 ++--
 3 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 package/mrouted/0001-gcc15.patch

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 <phil+github-commits@fifi.org>
-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 <bernd@kuhls.net>
----
- 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
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/2] package/mrouted: fix invalid daemon path in S41mrouted

[Julien Olivain via buildroot]

On 20/09/2026 22:04, Joachim Wiberg wrote:
> S41mrouted hard-coded /sbin/mrouted, but mrouted has always installed
> to /usr/sbin/mrouted. This went unnoticed with BR2_ROOTFS_MERGED_USR=y,
> but the daemon fails to start without it.
> 
> Also drop the script's executable bit to match other sysv init
> scripts that do not set it.
> 
> Introduced in c25115daf2b2761a2f0f411790c6d24b460c7999
> (package/mrouted: add sysv init script).
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

Series applied to master, thanks.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 2/2] package/lldpd: rework start script

[Raphaël Mélotte via buildroot]

In reply of:
> check-package reports six warnings on S60lldpd: indentation with
> spaces, no DAEMON variable, and shellcheck complaints.
> 
> The script also masks failures, the exit status of
> "[ $? = 0 ] && echo OK || echo FAIL" is the one of echo, so start and
> stop always return success.  Stopping does not wait for the daemon to
> exit either, so a restart can race the instance on its way out.
> 
> Rewrite it after package/busybox/S01syslogd, as the manual asks.  lldpd
> daemonizes and writes the PID file itself, but does not remove it on
> exit, so pass the PID file to both start-stop-daemon and the daemon and
> drop the stale file once the process is gone.  Also pick up arguments
> from /etc/default/lldpd and add the customary reload alias.
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
> [Julien: remove .checkpackageignore entry to fix check-package error]
> Signed-off-by: Julien Olivain <ju.o@free.fr>

Applied to 2025.02.x, 2026.08.x. Thanks

> ---
>  .checkpackageignore    |  1 -
>  package/lldpd/S60lldpd | 80 ++++++++++++++++++++++++++++++------------
>  2 files changed, 58 insertions(+), 23 deletions(-)
> 
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 2fc8349f1e..32be4c93aa 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -550,7 +550,6 @@ package/lirc-tools/0001-plugins-devinput.c-fix-build-with-musl-1.2.0.patch lib_p
>  package/lirc-tools/0002-configure-add-disable-doc-option.patch lib_patch.Upstream
>  package/lirc-tools/S25lircd lib_sysv.Indent lib_sysv.Variables
>  package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch lib_patch.Upstream
> -package/lldpd/S60lldpd Shellcheck lib_sysv.Indent lib_sysv.Variables
>  package/lm-sensors/0001-no-host-ldconfig.patch lib_patch.Upstream
>  package/lmbench/0001-scripts-build-use-bin-bash-as-shell.patch lib_patch.Upstream
>  package/lmbench/0002-src-Makefile-add-lmbench-to-list-of-executables.patch lib_patch.Upstream
> diff --git a/package/lldpd/S60lldpd b/package/lldpd/S60lldpd
> index 3dfa6c1aa1..79605c2f02 100644
> --- a/package/lldpd/S60lldpd
> +++ b/package/lldpd/S60lldpd
> @@ -1,25 +1,61 @@
>  #!/bin/sh
> -#
> -# Controls lldpd.
> -#
>  
> -case $1 in
> -    start)
> -	printf "Starting lldpd: "
> -	start-stop-daemon -S -q -p /var/run/lldpd.pid --exec /usr/sbin/lldpd
> -	[ $? = 0 ] && echo "OK" || echo "FAIL"
> -	;;
> -    stop)
> -	printf "Stopping lldpd: "
> -	start-stop-daemon -K -q -p /var/run/lldpd.pid
> -	[ $? = 0 ] && echo "OK" || echo "FAIL"
> -	;;
> -    restart)
> -	$0 stop
> -	$0 start
> -	;;
> -    *)
> -	echo "Usage: $0 {start|stop|restart}"
> -	exit 1
> -	;;
> +DAEMON="lldpd"
> +PIDFILE="/var/run/$DAEMON.pid"
> +
> +LLDPD_ARGS=""
> +
> +# shellcheck source=/dev/null
> +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
> +
> +# lldpd daemonizes and creates the PID file itself, so tell it where to
> +# put it, but it does not remove it on exit.
> +start() {
> +	printf 'Starting %s: ' "$DAEMON"
> +	# shellcheck disable=SC2086 # we need the word splitting
> +	start-stop-daemon --start --pidfile "$PIDFILE" \
> +		--exec "/usr/sbin/$DAEMON" \
> +		-- -p "$PIDFILE" $LLDPD_ARGS
> +	status=$?
> +	if [ "$status" -eq 0 ]; then
> +		echo "OK"
> +	else
> +		echo "FAIL"
> +	fi
> +	return "$status"
> +}
> +
> +stop() {
> +	printf 'Stopping %s: ' "$DAEMON"
> +	start-stop-daemon --stop --pidfile "$PIDFILE" \
> +		--exec "/usr/sbin/$DAEMON"
> +	status=$?
> +	if [ "$status" -eq 0 ]; then
> +		echo "OK"
> +	else
> +		echo "FAIL"
> +		return "$status"
> +	fi
> +	while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \
> +		--exec "/usr/sbin/$DAEMON"; do
> +		sleep 0.1
> +	done
> +	rm -f "$PIDFILE"
> +	return "$status"
> +}
> +
> +restart() {
> +	stop
> +	start
> +}
> +
> +case "$1" in
> +	start|stop|restart)
> +		"$1";;
> +	reload)
> +		# Restart, since there is no true "reload" feature.
> +		restart;;
> +	*)
> +		echo "Usage: $0 {start|stop|restart|reload}"
> +		exit 1
>  esac
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/2] package/mrouted: fix invalid daemon path in S41mrouted

[Raphaël Mélotte via buildroot]

In reply of:
> S41mrouted hard-coded /sbin/mrouted, but mrouted has always installed
> to /usr/sbin/mrouted. This went unnoticed with BR2_ROOTFS_MERGED_USR=y,
> but the daemon fails to start without it.
> 
> Also drop the script's executable bit to match other sysv init
> scripts that do not set it.
> 
> Introduced in c25115daf2b2761a2f0f411790c6d24b460c7999
> (package/mrouted: add sysv init script).
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

Applied to 2025.02.x, 2026.08.x. Thanks

> ---
>  package/mrouted/S41mrouted | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>  mode change 100755 => 100644 package/mrouted/S41mrouted
> 
> diff --git a/package/mrouted/S41mrouted b/package/mrouted/S41mrouted
> old mode 100755
> new mode 100644
> index 7dca258255..d653425719
> --- a/package/mrouted/S41mrouted
> +++ b/package/mrouted/S41mrouted
> @@ -11,7 +11,7 @@ MROUTED_ARGS="-w 30"
>  start() {
>  	printf 'Starting %s: ' "$DAEMON"
>  	# shellcheck disable=SC2086 # we need the word splitting
> -	start-stop-daemon -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \
> +	start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \
>  		-- $MROUTED_ARGS
>  	status=$?
>  	if [ "$status" -eq 0 ]; then
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot