Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

.github/pull_request_template.md

@@ -15,7 +15,7 @@
 
 ## ✅ Formalities
 
-- [ ] I have reviewed the [CONTRIBUTING.md](../CONTRIBUTING.md) file for detailed contributing guidelines.
+- [ ] I have reviewed the [CONTRIBUTING.md](https://github.com/immortalwrt/packages/blob/master/CONTRIBUTING.md) file for detailed contributing guidelines.
 
 ### If your PR contains a patch:
 

libs/gperftools/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gperftools
-PKG_VERSION:=2.17
+PKG_VERSION:=2.17.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/gperftools/gperftools/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
-PKG_HASH:=1ccb7ef8ebd1033906e6247a89992b26986401cc1777c07cc63773463a996072
+PKG_HASH:=885dbbf1f25a922de0cdc78b0703c3ab93c43850e1d2f7c889e41be7c824c53d
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=John Audia <therealgraysky@proton.me>

libs/gperftools/patches/100-stacktrace_libgcc-inl.h-fix-build-for-some-ARM-toolc.patch

@@ -1,35 +0,0 @@
-From 2d277134c4b5c56d1c2912330aa44160af52aadf Mon Sep 17 00:00:00 2001
-From: graysky <therealgraysky AT proton DOT me>
-Date: Thu, 7 Aug 2025 02:35:01 -0400
-Subject: [PATCH] stacktrace_libgcc-inl.h: fix build for some ARM toolchains
-
-On OpenWrt when bulding for arm_cortex-a15_neon-vpfv4 or
-arm_cortex-a9_vfpv3-d16, the build errors out due to an undefined symbol
-_URC_NORMAL_STOP. This usually happens when the required header
-(typically <unwind.h>) is not included, or the toolchain's unwind
-implementation does not provide this definition.
-
-Error:
-src/stacktrace_libgcc-inl.h: In function '_Unwind_Reason_Code libgcc_backtrace_helper(_Unwind_Context*, void*)':
-src/stacktrace_libgcc-inl.h:69:12: error: '_URC_NORMAL_STOP' was not declared in this scope
-   69 |     return _URC_NORMAL_STOP;
-      |
-
-A work-around is to use URC_END_OF_STACK.
-
-Signed-off-by: graysky <therealgraysky AT proton DOT me>
----
- src/stacktrace_libgcc-inl.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/stacktrace_libgcc-inl.h
-+++ b/src/stacktrace_libgcc-inl.h
-@@ -66,7 +66,7 @@ static _Unwind_Reason_Code libgcc_backtr
-   }
- 
-   if (data->pos >= data->limit) {
--    return _URC_NORMAL_STOP;
-+    return _URC_END_OF_STACK;
-   }
- 
-   void *ip = reinterpret_cast<void *>(_Unwind_GetIP(ctx));;

net/acme-common/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme-common
-PKG_VERSION:=1.4.3
+PKG_VERSION:=1.4.4
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
 PKG_LICENSE:=GPL-3.0-only

net/acme-common/files/acme.uci-defaults

@@ -55,7 +55,8 @@ uci_commit
 
 # Migrate '/etc/init.d/acme start' to '/etc/init.d/acme renew'
 grep -q '/etc/init.d/acme start' /etc/crontabs/root 2>/dev/null && {
-	echo "0 0 * * * /etc/init.d/acme renew" >>/etc/crontabs/root
+	grep -q '/etc/init.d/acme' /etc/crontabs/root 2>/dev/null || echo "0 0 * * * /etc/init.d/acme renew" >>/etc/crontabs/root
+	sed '/0 0 * * * \/etc\/init.d\/acme start/d' /etc/crontabs/root
 }
 
 exit 0

net/chrony/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chrony
-PKG_VERSION:=4.7
+PKG_VERSION:=4.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://chrony-project.org/releases/
-PKG_HASH:=c0de41a8c051e5d32b101b5f7014b98ca978b18e592f30ce6840b6d4602d947b
+PKG_HASH:=33ea8eb2a4daeaa506e8fcafd5d6d89027ed6f2f0609645c6f149b560d301706
 
 PKG_MAINTAINER:=Miroslav Lichvar <mlichvar0@gmail.com>
 PKG_LICENSE:=GPL-2.0
@@ -82,6 +82,7 @@ CONFIGURE_ARGS+= \
 	--disable-readline \
 	--disable-rtc \
 	$(if $(findstring normal,$(BUILD_VARIANT)),--disable-sechash) \
+	--with-chronyc-user=chrony \
 	--with-user=chrony
 
 CONFIGURE_VARS+=CPPFLAGS=-DNDEBUG

net/esp2net/Makefile

@@ -8,9 +8,9 @@ PKG_MAINTAINER:=Nuno Gonçalves <nunojpg@gmail.com>
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/nunojpg/esp2net.git
-PKG_SOURCE_DATE:=2023-06-20
-PKG_SOURCE_VERSION:=be514c7a50bd8f3aac146ba267856d66cad1abd9
-PKG_MIRROR_HASH:=941b3460ea5b7108a075bebb850cc568f79006e7f85a7831577bd18b2ebd90c9
+PKG_SOURCE_DATE:=2025-09-02
+PKG_SOURCE_VERSION:=4b39dfc679fdf757c48d170e9c0cf0cb5bd53da5
+PKG_MIRROR_HASH:=e26860e32a3cd8773f5b6262c0be19dbdcd3eba07b1339ed93d9699dcbffaf49
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk

net/keepalived/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=keepalived
 PKG_VERSION:=2.3.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.keepalived.org/software
@@ -84,6 +84,7 @@ endef
 
 CONFIGURE_ARGS+= \
 	--enable-json \
+	--enable-reproducible-build \
 	--with-init=SYSV \
 	--disable-track-process \
 	--runstatedir="/var/run"
@@ -216,6 +217,8 @@ endif
 	$(INSTALL_DIR) $(1)/etc/keepalived
 	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/keepalived/keepalived.conf.sample \
 		$(1)/etc/keepalived/keepalived.conf
+	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/keepalived/keepalived.config-opts \
+		$(1)/etc/keepalived/
 
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/etc/uci-defaults/keepalived \

net/keepalived/files/keepalived.config

@@ -1,4 +1,5 @@
 config globals 'globals'
+	option enabled '0'
 #	option alt_config_file		"/etc/keepalived/keepalived.conf"
 #	list notification_email		"acassen@firewall.loc"
 #	list notification_email		"failover@firewall.loc"

net/keepalived/files/keepalived.init

@@ -600,12 +600,6 @@ process_config() {
 	local alt_config_file linkbeat_use_polling
 
 	rm -f "$KEEPALIVED_CONF"
-
-	# First line
-	printf '! Configuration file for keepalived (autogenerated via init script)\n' > "$KEEPALIVED_CONF"
-	printf '! Written %s\n\n' "$(date +'%c')" >> "$KEEPALIVED_CONF"
-
-	[ -f /etc/config/keepalived ] || return 0
 	config_load 'keepalived'
 	config_get alt_config_file globals alt_config_file
 
@@ -617,6 +611,10 @@ process_config() {
 		return 0
 	}
 
+	# First line
+	printf '! Configuration file for keepalived (autogenerated via init script)\n' > "$KEEPALIVED_CONF"
+	printf '! Written %s\n\n' "$(date +'%c')" >> "$KEEPALIVED_CONF"
+
 	config_get_bool linkbeat_use_polling globals linkbeat_use_polling 0
 	[ "$linkbeat_use_polling" -gt 0 ] && printf 'linkbeat_use_polling\n\n' >> "$KEEPALIVED_CONF"
 
@@ -655,14 +653,20 @@ reload_service() {
 }
 
 start_service() {
+	local enabled
+
+	[ -f /etc/config/keepalived ] || return 0
+
+	config_load 'keepalived'
+	config_get_bool enabled globals enabled 1
+	[ "$enabled" = "0" ] && return 0
+
+	process_config
+
 	procd_open_instance
 	procd_set_param command /usr/sbin/keepalived
 	procd_append_param command -n # don't daemonize, procd will handle that for us
 	procd_append_param command -f "$KEEPALIVED_CONF"
-
-	process_config
-
-	# set auto respawn behavior
 	procd_set_param respawn
 	procd_close_instance
 }

net/lksctp-tools/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lksctp-tools
-PKG_VERSION:=1.0.19
+PKG_VERSION:=1.0.21
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/sctp/lksctp-tools/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=9251b1368472fb55aaeafe4787131bdde4e96758f6170620bc75b638449cef01
+PKG_HASH:=8738bf17ecffbbe2440a6e2ffaf1cbcebb633fc99d63d88761af35c02a571893
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0

net/modemmanager/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
 PKG_VERSION:=1.24.0
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git

net/modemmanager/files/lib/netifd/proto/modemmanager.sh

@@ -83,6 +83,7 @@ modemmanager_connected_method_ppp_ipv4() {
 
 	proto_run_command "${interface}" /usr/sbin/pppd \
 		"${ttyname}" \
+		ifname "ppp-${interface}" \
 		115200 \
 		nodetach \
 		noaccomp \
@@ -628,13 +629,10 @@ proto_modemmanager_setup() {
 	}
 
 	# set initial eps bearer settings
-	[ -z "${init_epsbearer}" ] || {
+	if [ -z "${init_epsbearer}" ]; then
+		modemmanager_init_epsbearer "none" "$device" "" "$apn"
+	else
 		case "$init_epsbearer" in
-			"none")
-				connectargs=""
-				modemmanager_init_epsbearer "none" \
-					"$device" "${connectargs}" "$apn"
-				;;
 			"default")
 				cliauth=""
 				for auth in $allowedauth; do
@@ -666,7 +664,7 @@ proto_modemmanager_setup() {
 		esac
 		# check error for init_epsbearer function call
 		[ "$?" -ne "0" ] && return 1
-	}
+	fi
 
 	if [ -z "${allowedmode}" ]; then
 		modemmanager_set_allowed_mode "$device" "$interface" "any"

net/mwan3/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwan3
 PKG_VERSION:=2.12.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
 PKG_LICENSE:=GPL-2.0

net/mwan3/files/etc/init.d/mwan3

@@ -77,7 +77,7 @@ stop_service() {
 			$IP route flush table $tid &> /dev/null
 		done
 
-		for rule in $($IP rule list | grep -E '^[1-3][0-9]{3}\:' | cut -d ':' -f 1); do
+		for rule in $($IP rule list | grep -E '^[1-3][0-9]{3}:' | cut -d ':' -f 1); do
 			$IP rule del pref $rule &> /dev/null
 		done
 		table="$($IPT -S)"

net/mwan3/files/lib/mwan3/common.sh

@@ -63,19 +63,44 @@ mwan3_get_src_ip()
 	if [ "$family" = "ipv4" ]; then
 		addr_cmd='network_get_ipaddr'
 		default_ip="0.0.0.0"
-		sed_str='s/ *inet \([^ \/]*\).*/\1/;T; pq'
+		sed_str='s/ *inet \([^ \/]*\).*/\1/;T;p;q'
 		IP="$IP4"
 	elif [ "$family" = "ipv6" ]; then
 		addr_cmd='network_get_ipaddr6'
 		default_ip="::"
-		sed_str='s/ *inet6 \([^ \/]*\).* scope.*/\1/;T; pq'
+		sed_str='s/ *inet6 \([^ \/]*\).* scope.*/\1/;T;p;q'
 		IP="$IP6"
 	fi
 
 	$addr_cmd _src_ip "$true_iface"
 	if [ -z "$_src_ip" ]; then
-		network_get_device device $true_iface
-		_src_ip=$($IP address ls dev $device 2>/dev/null | sed -ne "$sed_str")
+		if [ "$family" = "ipv6" ]; then
+			# on IPv6-PD interfaces (like PPPoE interfaces) we don't
+			# have a real address, just a prefix, that can be delegated
+			# to interfaces, because using :: (the fallback above) or
+			# the local address (fe80:... which will be returned from
+			# the sed_str expression defined above) will not work
+			# (reliably, if at all) try to find an address which we can
+			# use instead
+			network_get_prefix6 _src_ip "$true_iface"
+			if [ -n "$_src_ip" ]; then
+				# got a prefix like 2001:xxxx:yyyy::/48, clean it up to
+				# only contain the prefix -> 2001:xxxx:yyyy
+				_src_ip=$(echo "$_src_ip" | sed -e 's;:*/.*$;;')
+				# find an interface with a delegated address, and use
+				# it, this would be sth like 2001:xxxx:yyyy:zzzz:...
+				# we just select the first address that matches the prefix
+				# NOTE: is there a better/more reliable way to get a
+				#       usable address to use as source for pings here?
+				local pfx_sed
+				pfx_sed='s/ *inet6 \('"$_src_ip"':[0-6a-f:]\+\).* scope.*/\1/'
+				_src_ip=$($IP address ls | sed -ne "${pfx_sed};T;p;q")
+			fi
+		fi
+		if [ -z "$_src_ip" ]; then
+			network_get_device device $true_iface
+			_src_ip=$($IP address ls dev $device 2>/dev/null | sed -ne "$sed_str")
+		fi
 		if [ -n "$_src_ip" ]; then
 			LOG warn "no src $family address found from netifd for interface '$true_iface' dev '$device' guessing $_src_ip"
 		else

net/stunnel/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunnel
-PKG_VERSION:=5.72
+PKG_VERSION:=5.75
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0-or-later
@@ -23,11 +23,12 @@ PKG_SOURCE_URL:= \
 	https://www.usenix.org.uk/mirrors/stunnel/archive/$(word 1, $(subst .,$(space),$(PKG_VERSION))).x/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=3d532941281ae353319735144e4adb9ae489a10b7e309c58a48157f08f42e949
+PKG_HASH:=0c1ef0ed85240974dccb94fe74fb92d6383474c7c0d10e8796d1f781a3ba5683
 
 PKG_FIXUP:=autoreconf
 PKG_FIXUP:=patch-libtool
 PKG_INSTALL:=1
+PKG_BUILD_FLAGS:=no-mips16
 
 include $(INCLUDE_DIR)/package.mk
 

utils/owut/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=owut
-PKG_SOURCE_DATE:=2025-08-15
+PKG_SOURCE_DATE:=2025-09-03
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=93f2b06b8882e7543d836bac97976d190ac8b22d
+PKG_SOURCE_VERSION:=49e9bce7b8c3550f4ffead5c650884ef4f13fcfa
 PKG_SOURCE_URL:=https://github.com/efahl/owut.git
-PKG_MIRROR_HASH:=91cf14ae1ff48d32ceecac1db6e90fb7fe69c61acf2f19bb8fc9c1dbc8a0f701
+PKG_MIRROR_HASH:=3c799115352da8660a648e1c0a5a350accacf7dfa961641653beadffda78e6e1
 
 PKG_MAINTAINER:=Eric Fahlgren <ericfahlgren@gmail.com>
 PKG_LICENSE:=GPL-2.0-only