diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile
index a467e08fa..c9e385c87 100644
--- a/lang/golang/golang/Makefile
+++ b/lang/golang/golang/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 GO_VERSION_MAJOR_MINOR:=1.20
-GO_VERSION_PATCH:=4
+GO_VERSION_PATCH:=5
 
 PKG_NAME:=golang
 PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
@@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \
 
 PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
 PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
-PKG_HASH:=9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6
+PKG_HASH:=9a15c133ba2cfafe79652f4815b62e7cfc267f68df1b9454c6ab2a3ca8b96a88
 
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/lang/php8/Makefile b/lang/php8/Makefile
index 1a32d9aa1..fbe33886c 100644
--- a/lang/php8/Makefile
+++ b/lang/php8/Makefile
@@ -94,7 +94,7 @@ endef
 
 define Package/php8-cli
   $(call Package/php8/Default)
-  DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp +riscv64:libatomic
+  DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp
   TITLE+= (CLI)
 endef
 
@@ -105,7 +105,7 @@ endef
 
 define Package/php8-cgi
   $(call Package/php8/Default)
-  DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp +riscv64:libatomic
+  DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp
   TITLE+= (CGI & FastCGI)
 endef
 
@@ -127,7 +127,7 @@ endef
 
 define Package/php8-fpm
   $(call Package/php8/Default)
-  DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp +riscv64:libatomic
+  DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp
   TITLE+= (FPM)
 endef
 
@@ -159,7 +159,6 @@ define Package/apache-mod-php8
   CATEGORY:=Network
   DEPENDS+=PACKAGE_apache-mod-php8:apache \
 	   +PACKAGE_php8-mod-intl:libstdcpp \
-	   +riscv64:libatomic \
 	   +libpcre2 +zlib
   TITLE:=PHP8 module for Apache Web Server
 endef
@@ -198,9 +197,6 @@ endif
 ifeq ($(CONFIG_USE_MUSL),y)
 TARGET_CFLAGS += -D_LARGEFILE64_SOURCE
 endif
-ifneq ($(findstring riscv64,$(CONFIG_ARCH)),)
-TARGET_LDFLAGS += -latomic
-endif
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-bcmath),)
   CONFIGURE_ARGS+= --enable-bcmath=shared
@@ -607,8 +603,6 @@ define BuildModule
   define Package/php8-mod-$(1)
     $(call Package/php8/Default)
 
-    DEPENDS+=+riscv64:libatomic
-
     ifneq ($(3),)
       DEPENDS+=$(3)
     endif
diff --git a/lang/python/python-ble2mqtt/Makefile b/lang/python/python-ble2mqtt/Makefile
index 7cd5c7eaa..851684688 100644
--- a/lang/python/python-ble2mqtt/Makefile
+++ b/lang/python/python-ble2mqtt/Makefile
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-ble2mqtt
-PKG_VERSION:=0.1.5
-PKG_RELEASE:=2
+PKG_VERSION:=0.1.7
+PKG_RELEASE:=1
 
 PYPI_NAME:=ble2mqtt
-PKG_HASH:=0015cae0c36badb48cbd4a1c8b1a8029e45ab0891a95363fe00624c2629b4510
+PKG_HASH:=c57d6823f1133ce0b5e0e3d9f7d2b3fd58d2ad64c0cc86cb3fa180b178999fa6
 
 PKG_MAINTAINER:=Quintin Hill <stuff@quintin.me.uk>
 PKG_LICENSE:=MIT
diff --git a/lang/python/python-bleak/Makefile b/lang/python/python-bleak/Makefile
index 2878bb2ea..e27d4c86d 100644
--- a/lang/python/python-bleak/Makefile
+++ b/lang/python/python-bleak/Makefile
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-bleak
-PKG_VERSION:=0.20.1
+PKG_VERSION:=0.20.2
 PKG_RELEASE:=1
 
 PYPI_NAME:=bleak
-PKG_HASH:=db599f5f100e252e9cdd4020c8657daca0371a3c697e87432abc702f3774cb4c
+PKG_HASH:=6c92a47abe34e6dea8ffc5cea9457cbff6e1be966854839dbc25cddb36b79ee4
 
 PKG_MAINTAINER:=Quintin Hill <stuff@quintin.me.uk>
 PKG_LICENSE:=MIT
diff --git a/lang/python/python-dbus-fast/Makefile b/lang/python/python-dbus-fast/Makefile
index 8579e13a4..ddcfdb046 100644
--- a/lang/python/python-dbus-fast/Makefile
+++ b/lang/python/python-dbus-fast/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-dbus-fast
-PKG_VERSION:=1.84.2
-PKG_RELEASE:=2
+PKG_VERSION:=1.86.0
+PKG_RELEASE:=1
 
 PYPI_NAME:=dbus-fast
 PYPI_SOURCE_NAME:=dbus_fast
-PKG_HASH:=62b00b85c5835bff1d7ab5b12d494e588d92612bedbd7ca86176861729b8e4bc
+PKG_HASH:=ca376a360f1bc2c3d59e9edfb5e4de5be389cca37e8c92f4539176ddf755341e
 
 PKG_MAINTAINER:=Quintin Hill <stuff@quintin.me.uk>
 PKG_LICENSE:=MIT
diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk
index 08bbe3d9a..25185f44b 100644
--- a/lang/python/python3-version.mk
+++ b/lang/python/python3-version.mk
@@ -8,7 +8,7 @@
 # Note: keep in sync with setuptools & pip
 PYTHON3_VERSION_MAJOR:=3
 PYTHON3_VERSION_MINOR:=11
-PYTHON3_VERSION_MICRO:=3
+PYTHON3_VERSION_MICRO:=4
 
 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
 
@@ -16,4 +16,4 @@ PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
 PYTHON3_PIP_PKG_RELEASE:=1
 
 PYTHON3_SETUPTOOLS_VERSION:=65.5.0
-PYTHON3_PIP_VERSION:=22.3.1
+PYTHON3_PIP_VERSION:=23.1.2
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
index d2ef977a2..58ea2e0e0 100644
--- a/lang/python/python3/Makefile
+++ b/lang/python/python3/Makefile
@@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk
 include ../python3-version.mk
 
 PKG_NAME:=python3
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
-PKG_HASH:=8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
+PKG_HASH:=2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6
 
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 PKG_LICENSE:=PSF-2.0
diff --git a/lang/python/python3/patches/003-do-not-run-compileall.patch b/lang/python/python3/patches/003-do-not-run-compileall.patch
index 9f0067b25..9b6bc45a3 100644
--- a/lang/python/python3/patches/003-do-not-run-compileall.patch
+++ b/lang/python/python3/patches/003-do-not-run-compileall.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2084,6 +2084,7 @@ libinstall:	all $(srcdir)/Modules/xxmodu
+@@ -2118,6 +2118,7 @@ libinstall:	all $(srcdir)/Modules/xxmodu
  		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
  			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
  	fi
@@ -8,7 +8,7 @@
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
  		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
  		-j0 -d $(LIBDEST) -f \
-@@ -2111,6 +2112,7 @@ libinstall:	all $(srcdir)/Modules/xxmodu
+@@ -2145,6 +2146,7 @@ libinstall:	all $(srcdir)/Modules/xxmodu
  		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
  		-j0 -d $(LIBDEST)/site-packages -f \
  		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
diff --git a/lang/python/python3/patches/014-remove-platform-so-suffix.patch b/lang/python/python3/patches/014-remove-platform-so-suffix.patch
index 8c23b83f3..2acd9c8b9 100644
--- a/lang/python/python3/patches/014-remove-platform-so-suffix.patch
+++ b/lang/python/python3/patches/014-remove-platform-so-suffix.patch
@@ -1,17 +1,17 @@
 --- a/configure
 +++ b/configure
-@@ -20712,7 +20712,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
- $as_echo "$ABIFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
- $as_echo_n "checking SOABI... " >&6; }
+@@ -23352,7 +23352,7 @@ printf %s "checking ABIFLAGS... " >&6; }
+ printf "%s\n" "$ABIFLAGS" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
+ printf %s "checking SOABI... " >&6; }
 -SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET}
 +SOABI='cpython-'`echo $VERSION | tr -d .`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
- $as_echo "$SOABI" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
+ printf "%s\n" "$SOABI" >&6; }
  
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5684,7 +5684,7 @@ AC_SUBST(SOABI)
+@@ -5683,7 +5683,7 @@ AC_SUBST(SOABI)
  AC_MSG_CHECKING(ABIFLAGS)
  AC_MSG_RESULT($ABIFLAGS)
  AC_MSG_CHECKING(SOABI)
diff --git a/lang/python/python3/patches/016-adjust-config-paths.patch b/lang/python/python3/patches/016-adjust-config-paths.patch
index a8ef48c7e..091bd6356 100644
--- a/lang/python/python3/patches/016-adjust-config-paths.patch
+++ b/lang/python/python3/patches/016-adjust-config-paths.patch
@@ -10,7 +10,7 @@
          '_PYTHON_SYSCONFIGDATA_NAME',
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2077,7 +2077,7 @@ libinstall:	all $(srcdir)/Modules/xxmodu
+@@ -2111,7 +2111,7 @@ libinstall:	all $(srcdir)/Modules/xxmodu
  			esac; \
  		done; \
  	done
@@ -19,7 +19,7 @@
  		$(DESTDIR)$(LIBDEST); \
  	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
  	if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
-@@ -2239,7 +2239,7 @@ sharedinstall: all
+@@ -2273,7 +2273,7 @@ sharedinstall: all
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
  		--root=$(DESTDIR)/
@@ -30,16 +30,16 @@
  # Here are a couple of targets for MacOSX again, to install a full
 --- a/configure
 +++ b/configure
-@@ -3262,7 +3262,7 @@ fi
+@@ -3630,7 +3630,7 @@ fi
      fi
          ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python
      PYTHON_FOR_FREEZE="$with_build_python"
 -    PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python
 +    PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$with_build_python
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5
- $as_echo "$with_build_python" >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5
+ printf "%s\n" "$with_build_python" >&6; }
  
-@@ -20782,7 +20782,7 @@ fi
+@@ -23421,7 +23421,7 @@ fi
  
  
  
@@ -59,7 +59,7 @@
      AC_MSG_RESULT([$with_build_python])
    ], [
      AS_VAR_IF([cross_compiling], [yes],
-@@ -5742,7 +5742,7 @@ fi],
+@@ -5741,7 +5741,7 @@ fi],
  
  dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
  AC_SUBST(PY_ENABLE_SHARED)
diff --git a/lang/python/python3/patches/025-choose-python-config-version.patch b/lang/python/python3/patches/025-choose-python-config-version.patch
index 80d9985fb..a8c06a726 100644
--- a/lang/python/python3/patches/025-choose-python-config-version.patch
+++ b/lang/python/python3/patches/025-choose-python-config-version.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2129,7 +2129,7 @@ python-config: $(srcdir)/Misc/python-con
+@@ -2163,7 +2163,7 @@ python-config: $(srcdir)/Misc/python-con
  	@ # On Darwin, always use the python version of the script, the shell
  	@ # version doesn't use the compiler customizations that are provided
  	@ # in python (_osx_support.py).
diff --git a/lang/python/python3/patches/131-configure_ac-switch-PLATFORM_TRIPLET-suffix-to-musl.patch b/lang/python/python3/patches/131-configure_ac-switch-PLATFORM_TRIPLET-suffix-to-musl.patch
index 675682ab4..a7001e944 100644
--- a/lang/python/python3/patches/131-configure_ac-switch-PLATFORM_TRIPLET-suffix-to-musl.patch
+++ b/lang/python/python3/patches/131-configure_ac-switch-PLATFORM_TRIPLET-suffix-to-musl.patch
@@ -27,7 +27,7 @@ Signed-off-by: Šimon Bořek <simon.borek@nic.cz>
 
 --- a/configure
 +++ b/configure
-@@ -6186,7 +6186,7 @@ EOF
+@@ -6824,7 +6824,7 @@ EOF
  
  if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
    PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' 	'`
diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 6a134763f..5ded2fbdd 100644
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
 PKG_VERSION:=2.74.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/glib/$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
+PKG_SOURCE_URL:=@GNOME/glib/$(basename $(PKG_VERSION))
 PKG_HASH:=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
 
 PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
diff --git a/libs/glib2/patches/006-c99.patch b/libs/glib2/patches/006-c99.patch
new file mode 100644
index 000000000..de348d385
--- /dev/null
+++ b/libs/glib2/patches/006-c99.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -1045,7 +1045,7 @@ if host_system == 'windows' and (cc.get_
+   glib_conf.set('HAVE_C99_SNPRINTF', false)
+   glib_conf.set('HAVE_C99_VSNPRINTF', false)
+   glib_conf.set('HAVE_UNIX98_PRINTF', false)
+-elif not cc_can_run and host_system in ['ios', 'darwin']
++elif true
+   # All these are true when compiling natively on macOS, so we should use good
+   # defaults when building for iOS and tvOS.
+   glib_conf.set('HAVE_C99_SNPRINTF', true)
diff --git a/libs/gnu-efi/Makefile b/libs/gnu-efi/Makefile
index 3125069cc..24963c212 100644
--- a/libs/gnu-efi/Makefile
+++ b/libs/gnu-efi/Makefile
@@ -6,14 +6,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnu-efi
-PKG_VERSION:=3.0.9
+PKG_VERSION:=3.0.17
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/vathpela/gnu-efi.git
-PKG_SOURCE_DATE:=2021-04-11
-PKG_SOURCE_VERSION:=3e4d5c79905afcd815b0beb3dcfe2dfae5b3e6dd
-PKG_MIRROR_HASH:=7660d2259c1d5208bcabee5a0ffb6dc61f41363a79ba9158f3dd413a8af8e238
+PKG_SOURCE_DATE:=2023-06-11
+PKG_SOURCE_VERSION:=64027ee9864d8a8685ae187eb91ddc519d18cedb
+PKG_MIRROR_HASH:=738addbaba775ca1fc8d31a4bb2cbea1b8a0ac9aa888434f36264b2b0ce1dc5b
 PKG_BUILD_PARALLEL:=1
 
 PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
@@ -30,10 +30,24 @@ define Package/gnu-efi
   DEPENDS:=@TARGET_x86_64
 endef
 
+define Package/gnu-efi-programs
+  SECTION:=boot
+  CATEGORY:=Boot Loaders
+  TITLE:=Various EFI programs
+  URL:=https://github.com/vathpela/gnu-efi
+  DEPENDS:=@TARGET_x86_64 +gnu-efi
+endef
+
 define Package/gnu-efi/description
   GNU's EFI library
 endef
 
+define Package/gnu-efi-programs/description
+  Various EFI programs from GNU's EFI library
+endef
+
+TARGET_CFLAGS += -Wno-error=incompatible-pointer-types
+
 define Build/Install
 	$(MAKE_VARS) \
 	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
@@ -44,13 +58,19 @@ endef
 
 define Package/gnu-efi/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/** $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/{crt0-efi-*.o,elf_*.lds,libefi.a,libgnuefi.a} $(1)/usr/lib/
+endef
+
+define gnu-efi-programs/install
+	$(INSTALL_DIR) $(1)/usr/share/gnuefi/apps
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/lib/gnuefi/apps/*.efi $(1)/usr/share/gnuefi/apps/
 endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include/efi
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/** $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/{crt0-efi-*.o,elf_*.lds,libefi.a,libgnuefi.a} $(1)/usr/lib/
 	cp -aR $(PKG_INSTALL_DIR)/usr/local/include/efi/** $(1)/usr/include/efi/
 endef
 
 $(eval $(call BuildPackage,gnu-efi))
+$(eval $(call BuildPackage,gnu-efi-programs))
diff --git a/libs/libmraa/Makefile b/libs/libmraa/Makefile
index 14868194d..2f18f9329 100644
--- a/libs/libmraa/Makefile
+++ b/libs/libmraa/Makefile
@@ -54,7 +54,7 @@ endef
 define Package/libmraa
   $(call Package/libmraa/Default)
   TITLE:=Eclipse MRAA lowlevel IO C/C++ library
-  DEPENDS:=+libstdcpp +libjson-c @!arc @!armeb @!powerpc
+  DEPENDS:=+libstdcpp +libjson-c @!arc @!armeb @!powerpc @!riscv64
 endef
 
 define Package/libmraa/description
diff --git a/net/aardvark-dns/Makefile b/net/aardvark-dns/Makefile
index 0af515c24..16e1b1d14 100644
--- a/net/aardvark-dns/Makefile
+++ b/net/aardvark-dns/Makefile
@@ -1,13 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aardvark-dns
+PKG_VERSION:=1.6.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/containers/aardvark-dns.git
-PKG_SOURCE_DATE:=2023-05-12
-PKG_SOURCE_VERSION:=6e06736707d8a84240858e968a54a083083e3a09
-PKG_MIRROR_HASH:=407d73c0a01b9fd6248a1ce058541707580db46a7d18f776780fe7922ba97391
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/containers/aardvark-dns/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=f3a2ff2d7baf07d8bf2785b6f1c9618db8aa188bd738b7f5cf1b0a31848232f5
 
 PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
 PKG_LICENSE:=Apache-2.0
diff --git a/net/cloudreve/Makefile b/net/cloudreve/Makefile
index 1d6a65e9a..b919f5b85 100644
--- a/net/cloudreve/Makefile
+++ b/net/cloudreve/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cloudreve
-PKG_VERSION:=3.7.1
+PKG_VERSION:=3.8.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/cloudreve/Cloudreve.git
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
-PKG_MIRROR_HASH:=b70601111e727d879a709884bc28237861216b99abac02b6f542f5984ddd8c0d
+PKG_MIRROR_HASH:=4c05afb2193ab83bf144d75963f4757c1445317e68b2690727375a8e01f7ba3d
 
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE
@@ -35,7 +35,7 @@ define Package/cloudreve
   SUBMENU:=Cloud Manager
   TITLE:=A project helps you build your own cloud in minutes
   URL:=https://cloudreve.org
-  DEPENDS:=@(aarch64||arm||i386||i686||x86_64) +ca-bundle
+  DEPENDS:=@(aarch64||arm||i386||i686||riscv64||x86_64) +ca-bundle
 endef
 
 define Package/cloudreve/description
@@ -48,6 +48,8 @@ define Build/Compile
 		pushd $(PKG_BUILD_DIR)/assets ; \
 		yarn install ; \
 		yarn run build ; \
+		cd .. ; \
+		zip -r - assets/build > assets.zip ; \
 		popd ; \
 		$(call GoPackage/Build/Compile) ; \
 	)
diff --git a/net/curl/Makefile b/net/curl/Makefile
index 392679b9b..0e84a06b8 100644
--- a/net/curl/Makefile
+++ b/net/curl/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/nls.mk
 
 PKG_NAME:=curl
-PKG_VERSION:=8.1.1
+PKG_VERSION:=8.1.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,
 	https://dl.uxnr.de/mirror/curl/ \
 	https://curl.askapache.com/download/ \
 	https://curl.se/download/
-PKG_HASH:=08a948e061929645597c1ef7194e07b308b22084ff03fa7400b465e6c05149e5
+PKG_HASH:=31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile
index 19bebeef0..1512fa31b 100644
--- a/net/ddns-scripts/Makefile
+++ b/net/ddns-scripts/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddns-scripts
 PKG_VERSION:=2.8.2
-PKG_RELEASE:=37
+PKG_RELEASE:=38
 
 PKG_LICENSE:=GPL-2.0
 
diff --git a/net/ddns-scripts/files/usr/share/ddns/default/desec.io.json b/net/ddns-scripts/files/usr/share/ddns/default/desec.io.json
index 227762ef6..4d3d21720 100644
--- a/net/ddns-scripts/files/usr/share/ddns/default/desec.io.json
+++ b/net/ddns-scripts/files/usr/share/ddns/default/desec.io.json
@@ -1,11 +1,11 @@
 {
 	"name": "desec.io",
 	"ipv4": {
-		"url": "http://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv4=[IP]",
+		"url": "http://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv4=[IP]&myipv6=preserve",
 		"answer": "good|nochg"
 	},
 	"ipv6": {
-		"url": "http://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv6=[IP]",
+		"url": "http://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv6=[IP]&myipv4=preserve",
 		"answer": "good|nochg"
 	}
 }
diff --git a/net/dnsproxy/Makefile b/net/dnsproxy/Makefile
index d84246e36..754da1d68 100644
--- a/net/dnsproxy/Makefile
+++ b/net/dnsproxy/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsproxy
-PKG_VERSION:=0.49.2
+PKG_VERSION:=0.50.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=e1bbaee78077a94149fc0fe18a4c7c9609d96307fa7c4b3ae09811965d5db96a
+PKG_HASH:=f65764a196508bc134e05cdb9d282b790641dfe0e8e8aa99b01544317f791487
 
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 PKG_LICENSE:=Apache-2.0
diff --git a/net/netavark/Makefile b/net/netavark/Makefile
index cf43a655e..542290c0b 100644
--- a/net/netavark/Makefile
+++ b/net/netavark/Makefile
@@ -1,13 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netavark
+PKG_VERSION:=1.6.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/containers/netavark.git
-PKG_SOURCE_DATE:=2023-05-12
-PKG_SOURCE_VERSION:=07d63eadef1def977f2ece25b0f464f7e5d77be1
-PKG_MIRROR_HASH:=f7597d70528d039b984b2ecc6ef0e1f1c17aacfc7862907e5a79789ebe98aa89
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/containers/netavark/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=3bec9e9b0f3f8f857370900010fb2125ead462d43998ad8f43e4387a5b06f9d6
 
 PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
 PKG_LICENSE:=Apache-2.0
@@ -45,6 +44,7 @@ define Package/netavark/install
 	$(INSTALL_CONF) ./files/netavark-config $(1)/etc/config/netavark
 	$(INSTALL_BIN) ./files/netavark-wrapper $(1)/usr/lib/podman/netavark
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/netavark $(1)/usr/lib/podman/netavark-bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/netavark-dhcp-proxy-client $(1)/usr/lib/podman/
 endef
 
 $(eval $(call RustBinPackage,netavark))
diff --git a/net/netbird/Makefile b/net/netbird/Makefile
index da1881eb6..30d6e1386 100644
--- a/net/netbird/Makefile
+++ b/net/netbird/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netbird
-PKG_VERSION:=0.14.5
+PKG_VERSION:=0.21.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/netbirdio/netbird/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=2ea6be9c50a5ac241fbae35934c9c710697de39e8a0393f8e1800285a7904d0d
+PKG_HASH:=e305bd2f49565e365a5022f0f0e9e9cabf273718fe2aec5f2380ef9a4d528b6e
 
 PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/net/nginx-util/Makefile b/net/nginx-util/Makefile
index ce08d6628..5d7070eb9 100644
--- a/net/nginx-util/Makefile
+++ b/net/nginx-util/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx-util
 PKG_VERSION:=1.6
-PKG_RELEASE:=17
+PKG_RELEASE:=18
 PKG_MAINTAINER:=Peter Stadler <peter.stadler@student.uibk.ac.at>
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/nginx-util/files/uci.conf.template b/net/nginx-util/files/uci.conf.template
index b56b1119e..a9532576c 100644
--- a/net/nginx-util/files/uci.conf.template
+++ b/net/nginx-util/files/uci.conf.template
@@ -1,7 +1,7 @@
 # Consider using UCI or creating files in /etc/nginx/conf.d/ for configuration.
 # Parsing UCI configuration is skipped if uci set nginx.global.uci_enable=false
 # For details see: https://openwrt.org/docs/guide-user/services/webserver/nginx
-# UCI_CONF_VERSION=1.1
+# UCI_CONF_VERSION=1.2
 
 worker_processes auto;
 
diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 061d82346..56b9cc382 100644
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
-PKG_VERSION:=1.24.0
+PKG_VERSION:=1.25.0
 PKG_RELEASE:=2
 
 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://nginx.org/download/
-PKG_HASH:=77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d
+PKG_HASH:=5ed44d45943272a4e8a5bcf4434237210f2de31b903fca5e381c1bbd7eee1e8c
 
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
 				Ansuel Smith <ansuelsmth@gmail.com>
@@ -138,6 +138,7 @@ config_files := mime.types \
 define Package/nginx-ssl/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nginx $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/nginx/module.d
 	$(INSTALL_DIR) $(1)/etc/nginx/conf.d
 	$(INSTALL_DATA) $(addprefix $(PKG_INSTALL_DIR)/etc/nginx/,$(config_files)) $(1)/etc/nginx/
 	$(INSTALL_DIR) $(1)/etc/init.d
diff --git a/net/nginx/files/nginx.init b/net/nginx/files/nginx.init
index 9e3ed0a7a..c84e0496c 100644
--- a/net/nginx/files/nginx.init
+++ b/net/nginx/files/nginx.init
@@ -9,7 +9,7 @@ G_OPTS="daemon off;"
 
 NGINX_UTIL="/usr/bin/nginx-util"
 UCI_CONF_TEMPLATE="/etc/nginx/uci.conf.template"
-LATEST_UCI_CONF_VERSION="1.1"
+LATEST_UCI_CONF_VERSION="1.2"
 
 eval $("${NGINX_UTIL}" get_env)
 
@@ -23,10 +23,25 @@ nginx_check_luci_template() {
 		return
 	fi
 
+	# Fix wrong entry for the module.d include
+	if [ "$UCI_CONF_VERSION" = "1.1" ]; then
+		# Remove any entry
+		sed -i '/^include module\.d\/\*\.module;/d' $UCI_CONF_TEMPLATE
+		# Put the include before events {}
+		sed -i 's/events {/include module.d\/*.module;\n\nevents {/' $UCI_CONF_TEMPLATE
+	fi
+
+	if [ "$UCI_CONF_VERSION" != "$LATEST_UCI_CONF_VERSION" ]; then
+		sed -i "s/# UCI_CONF_VERSION=.*/# UCI_CONF_VERSION=$LATEST_UCI_CONF_VERSION/" $UCI_CONF_TEMPLATE
+	fi
+
 	if [ -z "$UCI_CONF_VERSION" ]; then
+		# Handle funny case with template with the include module but no version
+		if ! grep -q -e '^include module\.d/\*\.module;$' $UCI_CONF_TEMPLATE; then
+			sed -i 's/events {/include module.d\/*.module;\n\nevents {/' $UCI_CONF_TEMPLATE
+		fi
 		echo "" >> $UCI_CONF_TEMPLATE
-		echo "include module.d/*.module;" >> $UCI_CONF_TEMPLATE
-		echo "# UCI_CONF_VERSION=1.1" >> $UCI_CONF_TEMPLATE
+		echo "# UCI_CONF_VERSION=1.2"  >> $UCI_CONF_TEMPLATE
 	fi
 }
 
diff --git a/net/nginx/patches/nginx/101-feature_test_fix.patch b/net/nginx/patches/nginx/101-feature_test_fix.patch
index f09f3af8c..e4d9a7183 100644
--- a/net/nginx/patches/nginx/101-feature_test_fix.patch
+++ b/net/nginx/patches/nginx/101-feature_test_fix.patch
@@ -78,7 +78,7 @@
  ngx_feature_libs=
 --- a/auto/unix
 +++ b/auto/unix
-@@ -805,7 +805,7 @@ ngx_feature_test="void *p; p = memalign(
+@@ -853,7 +853,7 @@ ngx_feature_test="void *p; p = memalign(
  
  ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
  ngx_feature_name="NGX_HAVE_MAP_ANON"
@@ -87,7 +87,7 @@
  ngx_feature_incs="#include <sys/mman.h>"
  ngx_feature_path=
  ngx_feature_libs=
-@@ -818,7 +818,7 @@ ngx_feature_test="void *p;
+@@ -866,7 +866,7 @@ ngx_feature_test="void *p;
  
  ngx_feature='mmap("/dev/zero", MAP_SHARED)'
  ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
@@ -96,7 +96,7 @@
  ngx_feature_incs="#include <sys/mman.h>
                    #include <sys/stat.h>
                    #include <fcntl.h>"
-@@ -833,7 +833,7 @@ ngx_feature_test='void *p; int  fd;
+@@ -881,7 +881,7 @@ ngx_feature_test='void *p; int  fd;
  
  ngx_feature="System V shared memory"
  ngx_feature_name="NGX_HAVE_SYSVSHM"
@@ -105,7 +105,7 @@
  ngx_feature_incs="#include <sys/ipc.h>
                    #include <sys/shm.h>"
  ngx_feature_path=
-@@ -847,7 +847,7 @@ ngx_feature_test="int  id;
+@@ -895,7 +895,7 @@ ngx_feature_test="int  id;
  
  ngx_feature="POSIX semaphores"
  ngx_feature_name="NGX_HAVE_POSIX_SEM"
diff --git a/net/nginx/patches/nginx/201-ignore-invalid-options.patch b/net/nginx/patches/nginx/201-ignore-invalid-options.patch
index 8ea567167..af2bab15e 100644
--- a/net/nginx/patches/nginx/201-ignore-invalid-options.patch
+++ b/net/nginx/patches/nginx/201-ignore-invalid-options.patch
@@ -1,6 +1,6 @@
 --- a/auto/options
 +++ b/auto/options
-@@ -402,8 +402,7 @@ $0: warning: the \"--with-sha1-asm\" opt
+@@ -411,8 +411,7 @@ $0: warning: the \"--with-sha1-asm\" opt
          --test-build-solaris-sendfilev)  NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;;
  
          *)
diff --git a/net/transmission/files/transmission.init b/net/transmission/files/transmission.init
index a1673087f..896cee18f 100644
--- a/net/transmission/files/transmission.init
+++ b/net/transmission/files/transmission.init
@@ -158,8 +158,8 @@ transmission() {
 		logger -t transmission "Starting with $USE virt mem"
 	fi
 
-	[ -d "$web_home" ] && procd_set_param env TRANSMISSION_WEB_HOME="$web_home"
-	[ "$ca_bundle" -gt 0 ] && procd_set_param env CURL_CA_BUNDLE="$ca_bundle_file"
+	[ -d "$web_home" ] && procd_append_param env TRANSMISSION_WEB_HOME="$web_home"
+	[ "$ca_bundle" -gt 0 ] && procd_append_param env CURL_CA_BUNDLE="$ca_bundle_file"
 
 	procd_add_jail transmission log
 	procd_add_jail_mount "$config_file"
diff --git a/net/tunneldigger-broker/Makefile b/net/tunneldigger-broker/Makefile
new file mode 100644
index 000000000..42605406e
--- /dev/null
+++ b/net/tunneldigger-broker/Makefile
@@ -0,0 +1,72 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=tunneldigger-broker
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=https://github.com/wlanslovenija/tunneldigger.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=4f72b30578ac3dbc5482f4a54054bf870355bdf5
+PKG_MIRROR_HASH:=e93b986b60475c16b0022ba4f5da981929cc3d6992c632f41264804912825473
+
+PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
+PKG_LICENSE:=AGPL-3.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_BUILD_DEPENDS:=python-cffi/host
+
+include ../../lang/python/pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/python/python3-package.mk
+
+define Package/tunneldigger-broker
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:= \
+	+ip-full \
+	+kmod-l2tp \
+	+kmod-l2tp-ip \
+	+kmod-l2tp-eth \
+	+kmod-sched \
+	+libnetfilter-conntrack \
+	+libnfnetlink \
+	+libnl-tiny \
+	+libpthread \
+	+librt \
+	+python3-cffi \
+	+python3-ctypes \
+	+python3-light \
+	+python3-logging \
+	+python3-six \
+	+tc-full
+  TITLE:=Broker for L2TPv3 tunnels using tunneldigger
+  URL:=https://github.com/wlanslovenija/tunneldigger
+endef
+
+define Package/tunneldigger-broker/description
+Tunneldigger is a simple VPN tunneling solution based on the Linux kernel
+support for L2TPv3 tunnels over UDP. This package contains the broker.
+endef
+
+PYTHON3_PKG_SETUP_DIR:=broker
+PYTHON3_PKG_WHEEL_VERSION:=0.4.0.dev1
+
+define Py3Package/tunneldigger-broker/install
+	$(INSTALL_DIR) $(1)/lib/functions
+	$(INSTALL_DATA) ./files/tunneldigger.sh $(1)/lib/functions/tunneldigger.sh
+	$(INSTALL_DIR) $(1)/usr/lib/tunneldigger-broker/hooks
+	$(INSTALL_BIN) ./files/hook-setup $(1)/usr/lib/tunneldigger-broker/hooks/setup
+	$(INSTALL_BIN) ./files/hook-teardown $(1)/usr/lib/tunneldigger-broker/hooks/teardown
+	$(INSTALL_BIN) ./files/hook-mtu-changed $(1)/usr/lib/tunneldigger-broker/hooks/mtu-changed
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/tunneldigger-broker.init $(1)/etc/init.d/tunneldigger-broker
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/config.default $(1)/etc/config/tunneldigger-broker
+endef
+
+define Package/tunneldigger-broker/conffiles
+/etc/config/tunneldigger-broker
+endef
+
+$(eval $(call Py3Package,tunneldigger-broker))
+$(eval $(call BuildPackage,tunneldigger-broker))
+$(eval $(call BuildPackage,tunneldigger-broker-src))
diff --git a/net/tunneldigger-broker/files/config.default b/net/tunneldigger-broker/files/config.default
new file mode 100644
index 000000000..13bb45113
--- /dev/null
+++ b/net/tunneldigger-broker/files/config.default
@@ -0,0 +1,18 @@
+config broker
+	list port '53'
+	list port '123'
+	list port '8942'
+	option interface 'loopback'
+	option max_cookies '1024'
+	option max_tunnels '1024'
+	option port_base '20000'
+	option tunnel_id_base '100'
+	option tunnel_timeout '60'
+	option pmtu '0'
+	option namespace 'production'
+	option connection_rate_limit '0.2'
+
+config log
+	option filename '/dev/null'
+	option verbosity 'INFO'
+	option log_ip_addresses '0'
diff --git a/net/tunneldigger-broker/files/hook-mtu-changed b/net/tunneldigger-broker/files/hook-mtu-changed
new file mode 100755
index 000000000..3cfc59a14
--- /dev/null
+++ b/net/tunneldigger-broker/files/hook-mtu-changed
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+. /lib/functions/tunneldigger.sh
+
+TUNNEL_ID="$1"
+INTERFACE="$3"
+OLD_MTU="$4"
+NEW_MTU="$5"
+
+# Get the bridge interface name for the old and new MTUs.
+tunneldigger_get_bridge old_bridge "${OLD_MTU}"
+tunneldigger_get_bridge new_bridge "${NEW_MTU}"
+
+if [ -z "$old_bridge" ]; then
+  echo "Unable to determine which bridge to use for MTU ${OLD_MTU}."
+  exit 1
+fi
+
+if [ -z "$new_bridge" ]; then
+  echo "Unable to determine which bridge to use for MTU ${NEW_MTU}."
+  exit 1
+fi
+
+# Remove interface from old bridge.
+ip link set dev ${INTERFACE} nomaster
+ip link set dev ${old_bridge} mtu ${OLD_MTU}
+
+# Change interface bridge and MTU.
+ip link set dev ${INTERFACE} master ${new_bridge} mtu ${NEW_MTU}
+ip link set dev ${new_bridge} mtu ${NEW_MTU}
diff --git a/net/tunneldigger-broker/files/hook-setup b/net/tunneldigger-broker/files/hook-setup
new file mode 100755
index 000000000..ed809ad6d
--- /dev/null
+++ b/net/tunneldigger-broker/files/hook-setup
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+. /lib/functions/tunneldigger.sh
+
+TUNNEL_ID="$1"
+INTERFACE="$3"
+MTU="$4"
+
+# Get the bridge interface name for this MTU.
+tunneldigger_get_bridge bridge "${MTU}"
+if [ -z "$bridge" ]; then
+  echo "Unable to determine which bridge to use for MTU ${MTU}."
+  exit 1
+fi
+
+# Disable IPv6 on this interface as it will be bridged.
+echo 1 > /proc/sys/net/ipv6/conf/${INTERFACE}/disable_ipv6
+# Add the interface to the proper bridge and bring it up.
+ip link set dev ${INTERFACE} master ${bridge} mtu ${MTU} up
+# Ensure bridge MTU.
+ip link set dev ${bridge} mtu ${MTU}
diff --git a/net/tunneldigger-broker/files/hook-teardown b/net/tunneldigger-broker/files/hook-teardown
new file mode 100755
index 000000000..6f41efee4
--- /dev/null
+++ b/net/tunneldigger-broker/files/hook-teardown
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+TUNNEL_ID="$1"
+INTERFACE="$3"
+MTU="$4"
+
+# Remove interface from the bridge.
+ip link set dev ${INTERFACE} nomaster
diff --git a/net/tunneldigger-broker/files/tunneldigger-broker.init b/net/tunneldigger-broker/files/tunneldigger-broker.init
new file mode 100755
index 000000000..5c0888b04
--- /dev/null
+++ b/net/tunneldigger-broker/files/tunneldigger-broker.init
@@ -0,0 +1,104 @@
+#!/bin/sh /etc/rc.common
+
+. $IPKG_INSTROOT/lib/functions/network.sh
+
+START=90
+USE_PROCD=1
+NAME=tunneldigger-broker
+
+PIDPATH=/var/run
+CONFIGFILE=/var/etc/tunneldigger-broker.cfg
+HOOKPATH=/usr/lib/tunneldigger-broker/hooks
+
+missing() {
+	echo "Not starting tunneldigger-broker - missing $1" >&2
+	exit 1
+}
+
+cfg_append() {
+	local value="$1"
+	echo "$value" >> $CONFIGFILE
+}
+
+cfg_append_section() {
+	local name="$1"
+	cfg_append "[${name}]"
+}
+
+cfg_append_kv() {
+	local key="$1"
+	local value="$2"
+	cfg_append "${key}=${value}"
+}
+
+cfg_append_option() {
+	local cfg="$1"
+	local option="$2"
+	local key="$3"
+	config_get value "$cfg" "${option}"
+	[ -z "${value}" ] && missing ${option}
+	cfg_append_kv "${key}" "${value}"
+}
+
+parse_broker() {
+	local section="$1"
+	cfg_append_section broker		
+	config_get interface "$section" interface
+
+	[ ! -z "${interface}" ] && {
+		# Resolve logical interface name.
+		unset _interface address
+		network_get_device _interface "${interface}" || _interface="${interface}"
+		cfg_append_kv interface "${_interface}"
+		network_get_ipaddr address "${interface}"
+		cfg_append_kv address "${address}"
+	}
+
+	OPTIONS="max_cookies max_tunnels port_base tunnel_id_base tunnel_timeout namespace connection_rate_limit pmtu"
+	for option in ${OPTIONS}; do
+		cfg_append_option "$section" "${option}" "${option}"
+	done
+
+	config_get port "$section" port
+	cfg_append_kv "port" "${port// /,}"
+
+	cfg_append_section hooks
+	cfg_append_kv "session.up" "${HOOKPATH}/setup"
+	cfg_append_kv "session.pre-down" "${HOOKPATH}/teardown"
+	cfg_append_kv "session.mtu-changed" "${HOOKPATH}/mtu-changed"
+}
+
+parse_log() {
+	local section="$1"
+	cfg_append_section log
+	
+	OPTIONS="filename verbosity"
+	for option in ${OPTIONS}; do
+		cfg_append_option "$section" "${option}" "${option}"
+	done
+
+	config_get_bool log_ip_addresses "$section" log_ip_addresses 1
+	if [ "${log_ip_addresses}" -eq 1 ]; then
+		cfg_append_kv "log_ip_addresses" "true"
+	else
+		cfg_append_kv "log_ip_addresses" "false"
+	fi
+}
+
+start_service() {
+	# Prepare the configuration file from UCI settings.
+	rm -f ${CONFIGFILE}
+	config_load tunneldigger-broker
+	config_foreach parse_broker broker
+	config_foreach parse_log log
+	
+	# Start the service using procd.
+	procd_open_instance
+	procd_set_param command "/usr/bin/python"
+	procd_append_param command -m tunneldigger_broker.main
+	procd_append_param command "${CONFIGFILE}"
+	procd_set_param respawn
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_close_instance
+}
diff --git a/net/tunneldigger-broker/files/tunneldigger.sh b/net/tunneldigger-broker/files/tunneldigger.sh
new file mode 100644
index 000000000..68b323f31
--- /dev/null
+++ b/net/tunneldigger-broker/files/tunneldigger.sh
@@ -0,0 +1,39 @@
+. /lib/functions.sh
+. /lib/functions/network.sh
+
+tunneldigger_get_bridge() {
+	local variable="$1"
+	local mtu="$2"
+
+	# Overwrite the destination variable.
+	unset $variable
+	
+	# Discover the configured bridge.
+	unset _td_bridge
+	_td_bridge=""
+	config_cb() {
+		local cfg="$CONFIG_SECTION"
+		config_get configname "$cfg" TYPE
+		if [ "$configname" != "bridge" ]; then
+			return
+		fi
+
+		config_get cfg_mtu "$cfg" mtu
+		config_get interface "$cfg" interface
+		
+		if [ "$cfg_mtu" != "$mtu" ]; then
+			return
+		fi
+
+		_td_bridge="$interface"
+	}
+
+	config_load tunneldigger-broker
+	reset_cb
+	if [ -z "$_td_bridge" ]; then
+		return
+	fi
+
+	eval $variable=$_td_bridge
+	# network_get_device $variable $_td_bridge
+}
diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
new file mode 100644
index 000000000..8cab922f0
--- /dev/null
+++ b/net/tunneldigger/Makefile
@@ -0,0 +1,57 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=tunneldigger
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=https://github.com/wlanslovenija/tunneldigger.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=4f72b30578ac3dbc5482f4a54054bf870355bdf5
+PKG_MIRROR_HASH:=babc71c757b757026f63e298bd4bd0edceae220827fff5cfad0af3f04ed529c7
+
+PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
+PKG_LICENSE:=AGPL-3.0
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+CMAKE_SOURCE_SUBDIR:=client
+
+define Package/tunneldigger
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:= \
+	+kmod-l2tp \
+	+kmod-l2tp-ip \
+	+kmod-l2tp-eth \
+	+libnl-tiny \
+	+libpthread \
+	+librt
+  TITLE:=L2TPv3 tunneling via UDP
+  URL:=https://github.com/wlanslovenija/tunneldigger
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	-I$(STAGING_DIR)/usr/include \
+	-DLIBNL_TINY
+
+define Package/tunneldigger/description
+Tunneldigger is a simple VPN tunneling solution based on the Linux kernel
+support for L2TPv3 tunnels over UDP.
+endef
+
+define Package/tunneldigger/conffiles
+/etc/config/tunneldigger
+endef
+
+define Package/tunneldigger/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tunneldigger $(1)/usr/bin/tunneldigger
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/tunneldigger.init $(1)/etc/init.d/tunneldigger
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/config.default $(1)/etc/config/tunneldigger
+endef
+
+$(eval $(call BuildPackage,tunneldigger))
diff --git a/net/tunneldigger/files/config.default b/net/tunneldigger/files/config.default
new file mode 100644
index 000000000..571621a42
--- /dev/null
+++ b/net/tunneldigger/files/config.default
@@ -0,0 +1,8 @@
+config broker
+	list address 'x.y.z.w:8942'
+	list address 'x.y.z.w:53'
+	list address 'x.y.z.w:123'
+	option uuid 'abcd'
+	option interface 'l2tp0'
+	option limit_bw_down '1024'
+	option enabled '0'
diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
new file mode 100644
index 000000000..ea37751d5
--- /dev/null
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -0,0 +1,67 @@
+#!/bin/sh /etc/rc.common
+
+. $IPKG_INSTROOT/lib/functions/network.sh
+
+USE_PROCD=1
+START=90
+
+tunnel_id=1
+
+missing() {
+	echo "Not starting tunneldigger - missing $1" >&2
+}
+
+parse_broker() {
+	local section="$1"
+
+	config_get_bool enabled "$section" enabled 1
+	config_get addresses "$section" address
+	config_get uuid "$section" uuid
+	config_get interface "$section" interface
+	config_get limit_bw_down "$section" limit_bw_down
+	config_get hook_script "$section" hook_script
+	config_get bind_interface "$section" bind_interface
+	
+	[ $enabled -eq 0 ] && return
+
+	local broker_opts=""
+	for address in $addresses; do
+		append broker_opts "-b ${address}"
+	done
+
+	[ ! -z "${limit_bw_down}" ] && append broker_opts "-L ${limit_bw_down}"
+	[ ! -z "${hook_script}" ] && append broker_opts "-s ${hook_script}"
+	[ ! -z "${bind_interface}" ] && {
+		# Resolve logical interface name.
+		unset _bind_interface
+		network_get_device _bind_interface "${bind_interface}" || _bind_interface="${bind_interface}"
+		append broker_opts "-I ${_bind_interface}"
+	}
+
+	if [ -z "$uuid" ]; then
+		missing uuid
+		return
+	elif [ -z "$interface" ]; then
+		missing interface
+		return
+	fi
+
+	procd_open_instance "tunneldigger_${tunnel_id}"
+	procd_set_param command "/usr/bin/tunneldigger"
+	procd_append_param command -f
+	procd_append_param command -u "${uuid}"
+	procd_append_param command -i "${interface}"
+	procd_append_param command -t "${tunnel_id}"
+	procd_append_param command ${broker_opts}
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_set_param respawn
+	procd_close_instance
+
+	let tunnel_id++
+}
+
+start_service() {
+	config_load tunneldigger
+	config_foreach parse_broker broker
+}
diff --git a/net/xtables-addons/patches/201-fix-lua-packetscript.patch b/net/xtables-addons/patches/201-fix-lua-packetscript.patch
index 5a016e2ae..64130121c 100644
--- a/net/xtables-addons/patches/201-fix-lua-packetscript.patch
+++ b/net/xtables-addons/patches/201-fix-lua-packetscript.patch
@@ -1,3 +1,14 @@
+--- a/extensions/LUA/Kbuild
++++ b/extensions/LUA/Kbuild
+@@ -22,6 +22,8 @@ xt_LUA-y += nf_lua.o \
+ 			prot_buf_dynamic.o \
+ 
+ 
++# Enable <stddef.h> <stdarg.h>
++EXTRA_CFLAGS += -isystem $(shell $(CC) -print-file-name=include)
+ # Adding Lua Support
+ EXTRA_CFLAGS += -I$(src)/lua -I$(src)/lua/include 
+ xt_LUA-y += lua/lapi.o \
 --- a/extensions/LUA/xt_LUA_target.c
 +++ b/extensions/LUA/xt_LUA_target.c
 @@ -19,7 +19,7 @@
diff --git a/utils/attendedsysupgrade-common/Makefile b/utils/attendedsysupgrade-common/Makefile
index 766e8b0b9..5baa05d92 100644
--- a/utils/attendedsysupgrade-common/Makefile
+++ b/utils/attendedsysupgrade-common/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=attendedsysupgrade-common
-PKG_VERSION:=$(COMMITCOUNT)
+PKG_VERSION:=8
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/utils/crun/Makefile b/utils/crun/Makefile
index 7a1b64a7f..d97edb1f2 100644
--- a/utils/crun/Makefile
+++ b/utils/crun/Makefile
@@ -1,14 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crun
-PKG_VERSION:=1.7.2
-PKG_RELEASE:=2
+PKG_VERSION:=1.8.5
+PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/containers/crun.git
-PKG_SOURCE_DATE:=2023-01-11
-PKG_SOURCE_VERSION:=4e5bd755c12a86f2e36962964f3eab7b3516d3ac
-PKG_MIRROR_HASH:=8e6b0f3e9dde982601f562683f5c744b03e630681afaf9aaacaa4c89ccec23dc
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/containers/crun/tar.gz/$(PKG_VERSION)?
+PKG_HASH:=14e3d4b35767e02f2da97342e703a284738f2f0f86b4dbfb467f2b8b294ef391
 
 PKG_BUILD_DEPENDS:=argp-standalone
 PKG_BUILD_PARALLEL:=1
@@ -33,6 +31,18 @@ define Package/crun/description
   A fast and low-memory footprint OCI Container Runtime fully written in C.
 endef
 
+LIBOCISPEC_COMMIT:=19c05670c37a42c217caa7b141bcaada7867cc15
+
+define Download/libocispec
+  PROTO:=git
+  URL:=https://github.com/containers/libocispec.git
+  VERSION:=$(LIBOCISPEC_COMMIT)
+  MIRROR_HASH:=eacd0096e4acdcdb7f5062897e336934844b45d3b1d8a306801eb39ea9fae5c0
+  FILE:=libocispec-$(LIBOCISPEC_COMMIT).tar.xz
+  SUBDIR:=libocispec
+endef
+$(eval $(call Download,libocispec))
+
 CONFIGURE_ARGS+= \
 	--disable-systemd \
 	--enable-embedded-yajl \
@@ -44,6 +54,7 @@ CONFIGURE_ARGS+= \
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	$(SED) '/#include <git-version.h>/d' $(PKG_BUILD_DIR)/src/crun.c
+	xzcat $(DL_DIR)/libocispec-$(LIBOCISPEC_COMMIT).tar.xz | $(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
 endef
 
 define Build/Configure
diff --git a/utils/fakeuname/Makefile b/utils/fakeuname/Makefile
index 26419bc2b..7d2b3fb03 100644
--- a/utils/fakeuname/Makefile
+++ b/utils/fakeuname/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fakeuname
-PKG_RELEASE:=$(COMMITCOUNT)
+PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0-or-later
 
 PKG_MAINTAINER:=Sergey V. Lobanov <sergey@lobanov.in>
diff --git a/utils/gpsd/Makefile b/utils/gpsd/Makefile
index a78e6f91a..2071d65e0 100644
--- a/utils/gpsd/Makefile
+++ b/utils/gpsd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gpsd
-PKG_VERSION:=3.23.1
-PKG_RELEASE:=2
+PKG_VERSION:=3.25
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME)
-PKG_HASH:=ca2c466df783c57b8a07ad3f5c67943186d05befdc377de938ed111d1358a8c1
+PKG_HASH:=7e5e53e5ab157dce560a2f22e20322ef1136d3ebde99162def833a3306de01e5
 
 PKG_MAINTAINER:=Pushpal Sidhu <psidhu.devel@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
@@ -87,7 +87,7 @@ define Package/libgps
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=C service library for communicating with the GPS daemon
-  ABI_VERSION:=29
+  ABI_VERSION:=30
 endef
 
 define Package/libgps/description
diff --git a/utils/gpsd/patches/0002-ncurses6_detection.patch b/utils/gpsd/patches/0002-ncurses6_detection.patch
index 0d16776a0..a626e18fb 100644
--- a/utils/gpsd/patches/0002-ncurses6_detection.patch
+++ b/utils/gpsd/patches/0002-ncurses6_detection.patch
@@ -1,6 +1,6 @@
 --- a/SConscript
 +++ b/SConscript
-@@ -1038,6 +1038,8 @@ if not cleaning and not helping:
+@@ -1118,6 +1118,8 @@ if not cleaning and not helping:
                  ncurseslibs += pkg_config('tinfo', rpath_hack=True)
          # It's not yet known whether rpath_hack is appropriate for
          # ncurses5-config.
diff --git a/utils/gpsd/patches/003_sconscript-cross-platform-build-support.patch b/utils/gpsd/patches/003_sconscript-cross-platform-build-support.patch
deleted file mode 100644
index 68613de9e..000000000
--- a/utils/gpsd/patches/003_sconscript-cross-platform-build-support.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-Backported from:
-
-https://gitlab.com/gpsd/gpsd/-/commit/28fb46ac70059d3b0eb64041c35ef83027bd8506
-https://gitlab.com/gpsd/gpsd/-/commit/c5ed9736d859fed0682e60e899e9617ac67da11b
-
-From c2b4d3fb9a9e011bdc2fb891b78c6ce13f0c7101 Mon Sep 17 00:00:00 2001
-From: "Sergey V. Lobanov" <sergey@lobanov.in>
-Date: Mon, 24 Jan 2022 16:01:54 -0800
-Subject: [PATCH] SConscript: Add target_platform config option.
-
-This patch adds an ability to redefine target platform using config
-optiont target_platform=<platform> to support cross-platform compilation.
-
-This allows cross cimpileg for openWRT (target_platform=linux) on
-osX (sys.platform() == darwin)
-
-Signed-off-by: Gary E. Miller <gem@rellim.com>
----
- SConscript | 41 +++++++++++++++++++++++++++--------------
- 1 file changed, 27 insertions(+), 14 deletions(-)
-
---- a/SConscript
-+++ b/SConscript
-@@ -52,6 +52,7 @@ EnsurePythonVersion(2, 6)
- # e.g. "scons-3" on CentOS 8.
- scons_executable_name = os.path.basename(sys.argv[0]) or 'scons'
- 
-+
- # Have scons rebuild an existing target when the source(s) MD5 changes
- # Do not use time to prevent rebuilding when sources, like gpsd_config.h,
- # are rebuilt, but with no changes.
-@@ -351,6 +352,7 @@ boolopts = (
-     ("gpsdclients",   True,  "gspd client programs"),
-     ("gpsd",          True,  "gpsd itself"),
-     ("implicit_link", imloads, "implicit linkage is supported in shared libs"),
-+    # FIXME: should check for Pi, not for "linux"
-     ("magic_hat", sys.platform.startswith('linux'),
-      "special Linux PPS hack for Raspberry Pi et al"),
-     ("minimal", False, "turn off every option not set on the command line"),
-@@ -410,6 +412,10 @@ nonboolopts = (
-      "Prefix to the binary tools to use (gcc, ld, etc.)\n"
-      "For cross-compiling, or building with multiple local toolchains.\n"
-      ),
-+    # If build and target platform are different, then redefining target
-+    # platform might be necessary to use better build flags
-+    ("target_platform", sys.platform,
-+     "target platform for cross-compiling (linux, darwin, etc.)"),
-     ("target_python",  def_target_python,  "target Python version as command"),
- )
- 
-@@ -878,13 +884,16 @@ have_valgrind = False
- # per SCons 4.0.1 doc: Section 23.9. Not Configuring When Cleaning Targets
- if not cleaning and not helping:
-     # OS X aliases gcc to clang
-+    if (sys.platform != config.env['target_platform']):
-+        announce("Target system is: %s" % config.env['target_platform'])
-+
-     announce("cc is %s, version %s" % (env['CC'], env['CCVERSION']))
-     # clang accepts -pthread, then warns it is unused.
-     if not config.CheckCC():
-         announce("ERROR: CC doesn't work")
- 
-     if ((config.CheckCompilerOption("-pthread") and
--         not sys.platform.startswith('darwin'))):
-+         not config.env['target_platform'].startswith('darwin'))):
-         config.env.MergeFlags("-pthread")
- 
-     confdefs = ["/* gpsd_config.h generated by scons, do not hand-hack. */\n"]
-@@ -935,7 +944,7 @@ if not cleaning and not helping:
-     # confdefs.append('#endif\n')
-     # Reinstated for FreeBSD (below) 16-Aug-2019
- 
--    if sys.platform.startswith('linux'):
-+    if config.env['target_platform'].startswith('linux'):
-         # for cfmakeraw(), strsep(), etc. on CentOS 7
-         # glibc 2.19 and before
-         # sets __USE_MISC
-@@ -947,7 +956,7 @@ if not cleaning and not helping:
-         confdefs.append('#if !defined(_GNU_SOURCE)')
-         confdefs.append('#define _GNU_SOURCE 1')
-         confdefs.append('#endif\n')
--    elif sys.platform.startswith('darwin'):
-+    elif config.env['target_platform'].startswith('darwin'):
-         # strlcpy() and SIGWINCH need _DARWIN_C_SOURCE
-         confdefs.append('#if !defined(_DARWIN_C_SOURCE)')
-         confdefs.append('#define _DARWIN_C_SOURCE 1\n')
-@@ -962,7 +971,7 @@ if not cleaning and not helping:
-                         "-Wl,-compatibility_version,%s" % libgps_version,
-                         "-Wl,-install_name,%s/$TARGET.srcpath" %
-                         installdir('libdir', add_destdir=False)]
--    elif sys.platform.startswith('freebsd'):
-+    elif config.env['target_platform'].startswith('freebsd'):
-         # for isascii(), putenv(), nice(), strptime()
-         confdefs.append('#if !defined(_XOPEN_SOURCE)')
-         confdefs.append('#define _XOPEN_SOURCE 700')
-@@ -975,7 +984,7 @@ if not cleaning and not helping:
-         confdefs.append('#if !defined(__BSD_VISIBLE)')
-         confdefs.append("#define __BSD_VISIBLE 1\n")
-         confdefs.append('#endif\n')
--    elif sys.platform.startswith('openbsd'):
-+    elif config.env['target_platform'].startswith('openbsd'):
-         # required to define u_int in sys/time.h
-         confdefs.append('#if !defined(_BSD_SOURCE)')
-         confdefs.append("#define _BSD_SOURCE 1\n")
-@@ -984,12 +993,12 @@ if not cleaning and not helping:
-         confdefs.append('#if !defined(__BSD_VISIBLE)')
-         confdefs.append("#define __BSD_VISIBLE 1\n")
-         confdefs.append('#endif\n')
--    elif sys.platform.startswith('netbsd'):
-+    elif config.env['target_platform'].startswith('netbsd'):
-         # required to get strlcpy(), and more, from string.h
-         confdefs.append('#if !defined(_NETBSD_SOURCE)')
-         confdefs.append("#define _NETBSD_SOURCE 1\n")
-         confdefs.append('#endif\n')
--    elif sys.platform.startswith('sunos5'):
-+    elif config.env['target_platform'].startswith('sunos5'):
-         # tested with gcc-5.5 on slowlaris 10
-         # required to get isascii(), and more, from ctype.h
-         confdefs.append('#if !defined(__XPG4_CHAR_CLASS__)')
-@@ -1044,11 +1053,11 @@ if not cleaning and not helping:
-             ncurseslibs = ['!ncurses5-config --libs --cflags']
-         elif WhereIs('ncursesw5-config'):
-             ncurseslibs = ['!ncursesw5-config --libs --cflags']
--        elif sys.platform.startswith('freebsd'):
-+        elif config.env['target_platform'].startswith('freebsd'):
-             ncurseslibs = ['-lncurses']
--        elif (sys.platform.startswith('darwin') or
--              sys.platform.startswith('openbsd') or
--              sys.platform.startswith('sunos5')):
-+        elif (config.env['target_platform'].startswith('darwin') or
-+              config.env['target_platform'].startswith('openbsd') or
-+              config.env['target_platform'].startswith('sunos5')):
-             ncurseslibs = ['-lcurses']
-         else:
-             announce('Turning off ncurses support, library not found.')
-@@ -1064,7 +1073,8 @@ if not cleaning and not helping:
-                 announce("pkg_config is confused about the state "
-                          "of libusb-1.0.")
-                 usbflags = []
--        elif sys.platform.startswith("freebsd"):
-+        elif config.env['target_platform'].startswith('freebsd'):
-+            # FIXME: shold directly test for libusb existence.
-             confdefs.append("#define HAVE_LIBUSB 1\n")
-             usbflags = ["-lusb"]
-         else:
-@@ -2498,8 +2508,11 @@ if qt_env:
-     binaryinstall.append(GPSLibraryInstall(qt_env, installdir('libdir'),
-                                            compiled_qgpsmmlib, libgps_version))
- 
--if ((not env['debug'] and not env['debug_opt'] and not env['profiling'] and
--     not env['nostrip'] and not sys.platform.startswith('darwin'))):
-+if ((not env['debug'] and
-+     not env['debug_opt'] and
-+     not env['profiling'] and
-+     not env['nostrip'] and
-+     not env['target_platform'].startswith('darwin'))):
-     env.AddPostAction(binaryinstall, '$STRIP $TARGET')
- 
- binaryinstall.append(env.Install(installdir('bindir'), bin_scripts))
diff --git a/utils/mtools/Makefile b/utils/mtools/Makefile
index 19f012c02..6e528cb33 100644
--- a/utils/mtools/Makefile
+++ b/utils/mtools/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtools
-PKG_VERSION:=4.0.39
-PKG_RELEASE:=2
+PKG_VERSION:=4.0.43
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNU/mtools
-PKG_HASH:=397f1e2b7b7a2a270eb7970fa363e445f956926ec51e8170c3869da85b0987bd
+PKG_HASH:=541e179665dc4e272b9602f2074243591a157da89cc47064da8c5829dbd2b339
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
diff --git a/utils/parted/Makefile b/utils/parted/Makefile
index 709ac7f6d..2afd793f1 100644
--- a/utils/parted/Makefile
+++ b/utils/parted/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=parted
-PKG_VERSION:=3.4
-PKG_RELEASE:=2
+PKG_VERSION:=3.6
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/parted/
-PKG_HASH:=e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342
+PKG_HASH:=3b43dbe33cca0f9a18601ebab56b7852b128ec1a3df3a9b30ccde5e73359e612
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
diff --git a/utils/podman/Makefile b/utils/podman/Makefile
index 82e930a65..c221ad71f 100644
--- a/utils/podman/Makefile
+++ b/utils/podman/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=podman
-PKG_VERSION:=4.5.0
-PKG_RELEASE:=2
+PKG_VERSION:=4.5.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION)
-PKG_HASH:=830a633630bf6e61f2b8d4ca00efdd9a173ef25cdd49d4a4364c293e088561df
+PKG_HASH:=ee2c8b02b7fe301057f0382637b995a9c6c74e8d530692d6918e4c509ade6e39
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -114,7 +114,7 @@ endif
 define Package/podman/install
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/podman
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{podman,podman-remote} $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/podman/rootlessport $(1)/usr/lib/podman/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/podman/{rootlessport,quadlet} $(1)/usr/lib/podman/
 	$(INSTALL_DIR) $(1)/etc/containers
 	$(INSTALL_DATA) $(DL_DIR)/default-policy.json-362f70b056 $(1)/etc/containers/policy.json
 	$(INSTALL_DATA) $(DL_DIR)/registries.fedora-da9a9c8778 $(1)/etc/containers/registries.conf