Merge branch 'openwrt:master' into master

2023-08-10 18:25:03 +05:30 · 2023-08-10 18:25:03 +05:30 · f0ae6dbbea
commit f0ae6dbbea
parent d1ea99722b 1ebd94a791
74 changed files with 400 additions and 510 deletions
--- 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:=6
+GO_VERSION_PATCH:=7

 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:=62ee5bc6fb55b8bae8f705e0cb8df86d6453626b4ecf93279e2867092e0b7f70
+PKG_HASH:=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597

 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
--- a/lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch
+++ b/lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch
@ -0,0 +1,31 @@
+From f1c6cb7725960487195daa5c5c196fd8d3563811 Mon Sep 17 00:00:00 2001
+From: Damien George <damien@micropython.org>
+Date: Wed, 3 May 2023 15:23:24 +1000
+Subject: [PATCH] py/stackctrl: Add gcc pragmas to ignore dangling-pointer
+ warning.
+
+This warning became apparent in gcc 13.
+
+Signed-off-by: Damien George <damien@micropython.org>
+---
+ py/stackctrl.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/py/stackctrl.c
+++ b/py/stackctrl.c
+@@ -28,8 +28,15 @@
+ #include "py/stackctrl.h"
+ 
+ void mp_stack_ctrl_init(void) {
+    #if __GNUC__ >= 13
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdangling-pointer"
+    #endif
+     volatile int stack_dummy;
+     MP_STATE_THREAD(stack_top) = (char *)&stack_dummy;
+    #if __GNUC__ >= 13
+    #pragma GCC diagnostic pop
+    #endif
+ }
+ 
+ void mp_stack_set_top(void *top) {
--- a/lang/python/python-cachelib/Makefile
+++ b/lang/python/python-cachelib/Makefile
@ -5,15 +5,15 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-cachelib
-PKG_VERSION:=0.3.0
+PKG_VERSION:=0.10.2
 PKG_RELEASE:=1

 PYPI_NAME:=cachelib
-PKG_HASH:=cc1856259f102c9273efa342100f70d9fafbd07b41ce05c501ee28e1dbbb5133
+PKG_HASH:=593faeee62a7c037d50fc835617a01b887503f972fb52b188ae7e50e9cb69740

 PKG_MAINTAINER:=Stepan Henek <stepan.henek@nic.cz>
 PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
+PKG_LICENSE_FILES:=LICENSE.rst

 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
@ -23,9 +23,9 @@ define Package/python3-cachelib
  SECTION:=lang
  CATEGORY:=Languages
  SUBMENU:=Python
-  TITLE:=cachelib
-  URL:=https://github.com/pallets/cachelib
-  DEPENDS:=+python3-light
+  TITLE:=Collection of cache libraries
+  URL:=https://github.com/pallets-eco/cachelib/
+  DEPENDS:=+python3-light +python3-logging
 endef

 define Package/python3-cachelib/description
--- a/lang/python/python-cachetools/Makefile
+++ b/lang/python/python-cachetools/Makefile
@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-cachetools
-PKG_VERSION:=3.1.1
-PKG_RELEASE:=2
+PKG_VERSION:=5.3.1
+PKG_RELEASE:=1

 PYPI_NAME:=cachetools
-PKG_HASH:=8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a
+PKG_HASH:=dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b

 PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
 PKG_LICENSE:=MIT
@ -32,7 +32,9 @@ define Package/python3-cachetools
 endef

 define Package/python3-cachetools/description
-  This module provides various memoizing collections and decorators, including variants of the Python 3 Standard Library lru_cache function decorator.
+This module provides various memoizing collections and decorators,
+including variants of the Python 3 Standard Library's @lru_cache
+function decorator.
 endef

 $(eval $(call Py3Package,python3-cachetools))
--- a/lang/python/python-certifi/Makefile
+++ b/lang/python/python-certifi/Makefile
@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-certifi
-PKG_VERSION:=2022.9.24
+PKG_VERSION:=2023.7.22
 PKG_RELEASE:=1

 PKG_MAINTAINER:=Eneas U de Queiroz <cotequeiroz@gmail.com>
@ -14,7 +14,7 @@ PKG_LICENSE:=MPL-2.0
 PKG_LICENSE_FILES:=LICENSE

 PYPI_NAME:=certifi
-PKG_HASH:=0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14
+PKG_HASH:=539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082

 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
@ -25,13 +25,14 @@ define Package/python3-certifi
  SECTION:=lang
  CATEGORY:=Languages
  TITLE:=Python package for Mozilla's CA Bundle
-  URL:=http://certifi.io/
+  URL:=https://github.com/certifi/python-certifi
  DEPENDS:=+python3-light +python3-urllib
 endef

 define Package/python3-certifi/description
-  Certifi is a carefully curated collection of Root Certificates for validating the
-  trustworthiness of SSL certificates while verifying the identity of TLS hosts.
+Certifi provides Mozilla's carefully curated collection of Root
+Certificates for validating the trustworthiness of SSL certificates
+while verifying the identity of TLS hosts.
 endef

 $(eval $(call Py3Package,python3-certifi))
--- a/lang/python/python-ciso8601/Makefile
+++ b/lang/python/python-ciso8601/Makefile
@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-ciso8601
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.3.0
 PKG_RELEASE:=1

 PYPI_NAME:=ciso8601
-PKG_HASH:=bdbb5b366058b1c87735603b23060962c439ac9be66f1ae91e8c7dbd7d59e262
+PKG_HASH:=19e3fbd786d8bec3358eac94d8774d365b694b604fd1789244b87083f66c8900

 PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
 PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE.txt
+PKG_LICENSE_FILES:=LICENSE

 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
@ -26,13 +26,14 @@ define Package/python3-ciso8601
  SECTION:=lang
  CATEGORY:=Languages
  SUBMENU:=Python
-  TITLE:=Fast ISO8601 date time parser for Python written in C
+  TITLE:=Fast ISO8601 date time parser written in C
  URL:=https://github.com/closeio/ciso8601
  DEPENDS:=+python3-light
 endef

 define Package/python3-ciso8601/description
-  ciso8601 converts ISO 8601 or RFC 3339 date time strings into Python datetime objects.
+ciso8601 converts ISO 8601 or RFC 3339 date time strings into Python
+datetime objects.
 endef

 $(eval $(call Py3Package,python3-ciso8601))
--- a/lang/python/python-click/Makefile
+++ b/lang/python/python-click/Makefile
@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-click
-PKG_VERSION:=8.1.4
+PKG_VERSION:=8.1.6
 PKG_RELEASE:=1

 PYPI_NAME:=click
-PKG_HASH:=b97d0c74955da062a7d4ef92fadb583806a585b2ea81958a81bd72726cbb8e37
+PKG_HASH:=48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd

 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
--- a/lang/python/python-colorama/Makefile
+++ b/lang/python/python-colorama/Makefile
@ -1,14 +1,17 @@
 include $(TOPDIR)/rules.mk

-PKG_NAME:=colorama
-PKG_VERSION:=0.4.1
-PKG_RELEASE:=2
+PKG_NAME:=python-colorama
+PKG_VERSION:=0.4.6
+PKG_RELEASE:=1

-PYPI_NAME:=$(PKG_NAME)
-PKG_HASH:=05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d
+PYPI_NAME:=colorama
+PKG_HASH:=08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44

 PKG_MAINTAINER:=Daniel Danzberger <daniel@dd-wrt.com>
-PKG_LICENSE:=MIT
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE.txt
+
+PKG_BUILD_DEPENDS:=python-hatchling/host

 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
@ -18,14 +21,14 @@ define Package/python3-colorama
  SUBMENU:=Python
  SECTION:=lang
  CATEGORY:=Languages
-  TITLE:=colorama
+  TITLE:=Cross-platform colored terminal text
  URL:=https://github.com/tartley/colorama
-  DEPENDS:=+python3
+  DEPENDS:=+python3-light
 endef

 define Package/python3-colorama/description
-Makes ANSI escape character sequences
-(for producing colored terminal text and cursor positioning) work under MS Windows.
+Makes ANSI escape character sequences (for producing colored terminal
+text and cursor positioning) work under MS Windows.
 endef

 $(eval $(call Py3Package,python3-colorama))
--- a/lang/python/python-contextlib2/Makefile
+++ b/lang/python/python-contextlib2/Makefile
@ -5,12 +5,15 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-contextlib2
-PKG_VERSION:=0.6.0.post1
+PKG_VERSION:=21.6.0
 PKG_RELEASE:=1
-PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>

 PYPI_NAME:=contextlib2
-PKG_HASH:=01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e
+PKG_HASH:=ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869
+
+PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
+PKG_LICENSE:=PSF-2.0 Apache-2.0
+PKG_LICENSE_FILES:=LICENSE.txt

 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
@ -20,13 +23,14 @@ define Package/python3-contextlib2
  SECTION:=lang
  CATEGORY:=Languages
  SUBMENU:=Python
-  URL:=http://contextlib2.readthedocs.org
-  TITLE:=python3-contextlib2
+  URL:=https://contextlib2.readthedocs.org
+  TITLE:=Backports and enhancements for the contextlib module
  DEPENDS:=+python3-light
 endef

 define Package/python-contextlib2/description
-  contextlib2 is a backport of the standard library’s contextlib module to earlier Python versions.
+contextlib2 is a backport of the standard library's contextlib module to
+earlier Python versions.
 endef

 $(eval $(call Py3Package,python3-contextlib2))
--- a/lang/python/python-dns/Makefile
+++ b/lang/python/python-dns/Makefile
@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-dns
-PKG_VERSION:=2.3.0
+PKG_VERSION:=2.4.1
 PKG_RELEASE:=1

 PYPI_NAME:=dnspython
-PKG_HASH:=224e32b03eb46be70e12ef6d64e0be123a64e621ab4c0822ff6d450d52a540b9
+PKG_HASH:=c33971c79af5be968bb897e95c2448e11a645ee84d93b265ce0b7aabe5dfdca8

 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=LICENSE
@ -28,13 +28,15 @@ define Package/python3-dns
  SUBMENU:=Python
  SECTION:=lang
  CATEGORY:=Languages
-  TITLE:=dnspython
-  URL:=http://www.dnspython.org/
+  TITLE:=DNS toolkit
+  URL:=https://www.dnspython.org/
  DEPENDS:=+python3
 endef

 define Package/python3-dns/description
- dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0.
+dnspython is a DNS toolkit for Python. It supports almost all record
+types. It can be used for queries, zone transfers, and dynamic updates.
+It supports TSIG authenticated messages and EDNS0.
 endef

 $(eval $(call Py3Package,python3-dns))
--- a/lang/python/python-docutils/Makefile
+++ b/lang/python/python-docutils/Makefile
@ -1,14 +1,15 @@
 include $(TOPDIR)/rules.mk

-PKG_NAME:=docutils
-PKG_VERSION:=0.19
-PKG_RELEASE:=2
+PKG_NAME:=python-docutils
+PKG_VERSION:=0.20.1
+PKG_RELEASE:=1

-PYPI_NAME:=$(PKG_NAME)
-PKG_HASH:=33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6
+PYPI_NAME:=docutils
+PKG_HASH:=f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b

 PKG_MAINTAINER:=Daniel Danzberger <daniel@dd-wrt.com>
-PKG_LICENSE:=MIT
+PKG_LICENSE:=Public-Domain BSD-2-License Python-2.0.1 GPL-3.0-or-later
+PKG_LICENSE_FILES:=COPYING.txt licenses/BSD-2-Clause.txt licenses/python-2-1-1.txt licenses/gpl-3-0.txt

 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
@ -18,15 +19,16 @@ define Package/python3-docutils
  SUBMENU:=Python
  SECTION:=lang
  CATEGORY:=Languages
-  TITLE:=docutils
-  URL:=http://docutils.sourceforge.net
+  TITLE:=Documentation Utilities
+  URL:=https://docutils.sourceforge.io/
  DEPENDS:=+python3
 endef

 define Package/python3-docutils/description
-Docutils is a modular system for processing documentation into useful formats,
-such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText,
-an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.
+Docutils is a modular system for processing documentation into useful
+formats, such as HTML, XML, and LaTeX. For input Docutils supports
+reStructuredText, an easy-to-read, what-you-see-is-what-you-get
+plaintext markup syntax.
 endef

 $(eval $(call Py3Package,python3-docutils))
--- a/lang/python/python-editables/Makefile
+++ b/lang/python/python-editables/Makefile
@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-editables
-PKG_VERSION:=0.4
+PKG_VERSION:=0.5
 PKG_RELEASE:=1

 PYPI_NAME:=editables
-PKG_HASH:=dc322c42e7ccaf19600874035a4573898d88aadd07e177c239298135b75da772
+PKG_HASH:=309627d9b5c4adc0e668d8c6fa7bac1ba7c8c5d415c2d27f60f081f8e80d1de2

 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE.txt
--- a/lang/python/python-engineio/Makefile
+++ b/lang/python/python-engineio/Makefile
@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-engineio
-PKG_VERSION:=4.1.0
+PKG_VERSION:=4.5.1
 PKG_RELEASE:=1

 PYPI_NAME:=python-engineio
-PKG_HASH:=21e1bcc62f5573a4bb1c805e69915c5a4c5aa953005dde6c2f707c24554c1020
+PKG_HASH:=b167a1b208fcdce5dbe96a61a6ca22391cfa6715d796c22de93e3adf9c07ae0c

 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
 PKG_LICENSE:=MIT
@ -26,7 +26,7 @@ define Package/python3-engineio
  SUBMENU:=Python
  SECTION:=lang
  CATEGORY:=Languages
-  TITLE:=Engine.IO server
+  TITLE:=Engine.IO server and client
  URL:=https://github.com/miguelgrinberg/python-engineio
  DEPENDS:= \
 	+python3-light \
--- a/lang/python/python-flask-babel/Makefile
+++ b/lang/python/python-flask-babel/Makefile
@ -8,16 +8,19 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-flask-babel
-PKG_VERSION:=2.0.0
+PKG_VERSION:=3.1.0
 PKG_RELEASE:=1

-PYPI_NAME:=Flask-Babel
-PKG_HASH:=f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d
+PYPI_NAME:=flask-babel
+PYPI_SOURCE_NAME:=flask_babel
+PKG_HASH:=be015772c5d7f046f3b99c508dcf618636eb93d21b713b356db79f3e79f69f39

 PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE

+PKG_BUILD_DEPENDS:=python-poetry-core/host
+
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
@ -26,7 +29,7 @@ define Package/python3-flask-babel
  SECTION:=lang
  CATEGORY:=Languages
  SUBMENU:=Python
-  TITLE:=Flask Babel
+  TITLE:=i18n/l10n support for Flask applications
  URL:=https://github.com/python-babel/flask-babel
  DEPENDS:= \
    +python3-light \
--- a/lang/python/python-flask-httpauth/Makefile
+++ b/lang/python/python-flask-httpauth/Makefile
@ -7,12 +7,12 @@

 include $(TOPDIR)/rules.mk

-PKG_NAME:=python3-flask-httpauth
-PKG_VERSION:=4.2.0
+PKG_NAME:=python-flask-httpauth
+PKG_VERSION:=4.8.0
 PKG_RELEASE:=1

 PYPI_NAME:=Flask-HTTPAuth
-PKG_HASH:=8c7e49e53ce7dc14e66fe39b9334e4b7ceb8d0b99a6ba1c3562bb528ef9da84a
+PKG_HASH:=66568a05bc73942c65f1e2201ae746295816dc009edd84b482c44c758d75097a

 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
 PKG_LICENSE:=MIT
@ -26,7 +26,7 @@ define Package/python3-flask-httpauth
  SUBMENU:=Python
  SECTION:=lang
  CATEGORY:=Languages
-  TITLE:=Basic and Digest HTTP authentication for Flask routes
+  TITLE:=HTTP authentication for Flask routes
  URL:=https://github.com/miguelgrinberg/flask-httpauth
  DEPENDS:= \
 	+python3-light \
--- a/lang/python/python-flask-login/Makefile
+++ b/lang/python/python-flask-login/Makefile
@ -9,11 +9,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-flask-login
-PKG_VERSION:=0.5.0
-PKG_RELEASE:=2
+PKG_VERSION:=0.6.2
+PKG_RELEASE:=1

 PYPI_NAME:=Flask-Login
-PKG_HASH:=6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b
+PKG_HASH:=c0a7baa9fdc448cdd3dd6f0939df72eec5177b2f7abe6cb82fc934d29caac9c3

 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
 PKG_LICENSE:=MIT
@ -27,9 +27,9 @@ define Package/python3-flask-login
  SECTION:=lang
  CATEGORY:=Languages
  SUBMENU:=Python
-  TITLE:=User session management plugin for Flask
+  TITLE:=User authentication and session management for Flask
  URL:=https://github.com/maxcountryman/flask-login
-  DEPENDS:=+python3-light +python3-flask
+  DEPENDS:=+python3-light +python3-urllib +python3-flask +python3-werkzeug
 endef

 define Package/python3-flask-login/description
--- a/lang/python/python-flask-seasurf/Makefile
+++ b/lang/python/python-flask-seasurf/Makefile
@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-flask-seasurf
-PKG_VERSION:=0.3.0
+PKG_VERSION:=1.1.1
 PKG_RELEASE:=1

 PYPI_NAME:=Flask-SeaSurf
-PKG_HASH:=10d4946fdd9745a8ae0a38a46c48a9add0cca4896333c0893b3133e3852c2e80
+PKG_HASH:=54537008c769ac0ada8237877327c3e7ed74dcd8b01e74a9120ee0232c5951a9

 PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
 PKG_LICENSE:=BSD-3-Clause
@ -26,8 +26,8 @@ define Package/python3-flask-seasurf
  SECTION:=lang
  CATEGORY:=Languages
  SUBMENU:=Python
-  TITLE:=Flask SeaSurf
-  URL:=https://flask-seasurf.readthedocs.io/en/latest/
+  TITLE:=Updated CSRF extension for Flask
+  URL:=https://github.com/maxcountryman/flask-seasurf
  DEPENDS:= \
    +python3-flask \
    +python3-light \
@ -35,7 +35,8 @@ define Package/python3-flask-seasurf
 endef

 define Package/python3-flask-seasurf/description
-  SeaSurf is a Flask extension for preventing cross-site request forgery (CSRF).
+SeaSurf is a Flask extension for preventing cross-site request forgery
+(CSRF).
 endef

 $(eval $(call Py3Package,python3-flask-seasurf))
--- a/lang/python/python-flask-socketio/Makefile
+++ b/lang/python/python-flask-socketio/Makefile
@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-flask-socketio
-PKG_VERSION:=5.3.1
+PKG_VERSION:=5.3.5
 PKG_RELEASE:=1

 PYPI_NAME:=Flask-SocketIO
-PKG_HASH:=fd0ed0fc1341671d92d5f5b2f5503916deb7aa7e2940e6636cfa2c087c828bf9
+PKG_HASH:=5f01158d10db71aa78c969b631ce3b9148b47ab0de1995158f9577f85b004d25

 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
 PKG_LICENSE:=MIT
--- a/lang/python/python-ifaddr/Makefile
+++ b/lang/python/python-ifaddr/Makefile
@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-ifaddr
-PKG_VERSION:=0.1.7
+PKG_VERSION:=0.2.0
 PKG_RELEASE:=1

 PYPI_NAME:=ifaddr
-PKG_HASH:=1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94
+PKG_HASH:=cc0cbfcaabf765d44595825fb96a99bb12c79716b73b44330ea38ee2b0c4aed4

 PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
 PKG_LICENSE:=MIT
@ -26,7 +26,7 @@ define Package/python3-ifaddr
  SECTION:=lang
  CATEGORY:=Languages
  SUBMENU:=Python
-  TITLE:=Enumerate IP addresses on network adapters
+  TITLE:=Network interface and IP address enumeration library
  URL:=https://github.com/pydron/ifaddr
  DEPENDS:= \
 	+python3-light \
@ -34,7 +34,8 @@ define Package/python3-ifaddr
 endef

 define Package/python3-ifaddr/description
-  ifaddr is a small Python library that allows you to find all the IPv4 and IPv6 addresses of the computer.
+ifaddr is a small Python library that allows you to find all the
+Ethernet and IP addresses of the computer.
 endef

 $(eval $(call Py3Package,python3-ifaddr))
--- a/lang/python/python-pathspec/Makefile
+++ b/lang/python/python-pathspec/Makefile
@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-pathspec
-PKG_VERSION:=0.11.1
+PKG_VERSION:=0.11.2
 PKG_RELEASE:=1

 PYPI_NAME:=pathspec
-PKG_HASH:=2798de800fa92780e33acca925945e9a19a133b715067cf165b8866c15a31687
+PKG_HASH:=e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3

 PKG_LICENSE:=MPL-2.0
 PKG_LICENSE_FILES:=LICENSE
--- a/lang/python/python-socketio/Makefile
+++ b/lang/python/python-socketio/Makefile
@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-socketio
-PKG_VERSION:=5.2.1
+PKG_VERSION:=5.8.0
 PKG_RELEASE:=1

 PYPI_NAME:=python-socketio
-PKG_HASH:=356a8a480fa316295b439d63a5f35a7a59fe65cee1ae35dee28e87d00e5aead6
+PKG_HASH:=e714f4dddfaaa0cb0e37a1e2deef2bb60590a5b9fea9c343dd8ca5e688416fd9

 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
 PKG_LICENSE:=MIT
@ -34,7 +34,7 @@ define Package/python3-socketio
 	+python3-engineio \
 	+python3-asyncio \
 	+python3-logging \
-	+python3-urllib
+	+python3-uuid
 endef

 define Package/python3-socketio/description
--- a/lang/python/python-wheel/Makefile
+++ b/lang/python/python-wheel/Makefile
@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-wheel
-PKG_VERSION:=0.41.0
+PKG_VERSION:=0.41.1
 PKG_RELEASE:=1

 PYPI_NAME:=wheel
-PKG_HASH:=55a0f0a5a84869bce5ba775abfd9c462e3a6b1b7b7ec69d72c0b83d673a5114d
+PKG_HASH:=12b911f083e876e10c595779709f8a88a59f45aacc646492a67fe9ef796c1b47

 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE.txt
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 include ./rust-values.mk

 PKG_NAME:=rust
-PKG_VERSION:=1.71.0
+PKG_VERSION:=1.71.1
 PKG_RELEASE:=1

 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=https://static.rust-lang.org/dist/
-PKG_HASH:=a667e4abdc5588ebfea35c381e319d840ffbf8d2dbfb79771730573642034c96
+PKG_HASH:=6fa90d50d1d529a75f6cc349784de57d7ec0ba2419b09bde7d335c25bd4e472e
 HOST_BUILD_DIR:=$(BUILD_DIR)/host/rust-$(RUSTC_TARGET_ARCH)/rustc-$(PKG_VERSION)-src

 PKG_MAINTAINER:=Luca Barbato <lu_zero@luminem.org>
--- a/libs/file/Makefile
+++ b/libs/file/Makefile
@ -56,8 +56,10 @@ CONFIGURE_ARGS += \
 	--enable-xzlib \
 	--enable-zlib \
 	--disable-libseccomp \
+	--disable-lzlib \
 	--disable-rpath \
 	--disable-warnings \
+	--disable-zstdlib \
 	--without-pic

 MAKE_PATH := src
--- a/libs/gpgme/Makefile
+++ b/libs/gpgme/Makefile
@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gpgme
-PKG_VERSION:=1.18.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.21.0
+PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME)
-PKG_HASH:=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
+PKG_HASH:=416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88

 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=GPL-3.0-or-later
--- a/libs/libassuan/Makefile
+++ b/libs/libassuan/Makefile
@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libassuan
-PKG_VERSION:=2.5.5
-PKG_RELEASE:=3
+PKG_VERSION:=2.5.6
+PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME)
-PKG_HASH:=8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
+PKG_HASH:=e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426

 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=GPL-3.0-or-later
--- a/libs/libksba/Makefile
+++ b/libs/libksba/Makefile
@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libksba
-PKG_VERSION:=1.6.2
+PKG_VERSION:=1.6.4
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME)
-PKG_HASH:=fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971
+PKG_HASH:=bbb43f032b9164d86c781ffe42213a83bf4f2fee91455edfa4654521b8b03b6b

 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=LGPL-3.0-or-later GPL-2.0-or-later
--- a/libs/libnvme/Makefile
+++ b/libs/libnvme/Makefile
@ -20,9 +20,8 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/meson.mk

 define Package/libnvme
-  SECTION:=utils
+  SECTION:=libs
  CATEGORY:=Libraries
-  SUBMENU:=Filesystem
  TITLE:=C Library for NVM Express on Linux
  URL:=https://github.com/linux-nvme/libnvme
  DEPENDS:=+libjson-c
--- a/libs/libxcrypt/Makefile
+++ b/libs/libxcrypt/Makefile
@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libxcrypt
-PKG_VERSION:=4.4.33
+PKG_VERSION:=4.4.36
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/besser82/libxcrypt/releases/download/v$(PKG_VERSION)
-PKG_HASH:=e87acf9c652c573a4713d5582159f98f305d56ed5f754ce64f57d4194d6b3a6f
+PKG_HASH:=e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943

 PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.1-or-later
--- a/libs/postgresql/Makefile
+++ b/libs/postgresql/Makefile
@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=postgresql
-PKG_VERSION:=15.2
+PKG_VERSION:=15.3
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=PostgreSQL
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=\
 	http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \
 	ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION)

-PKG_HASH:=99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7
+PKG_HASH:=ffc7d4891f00ffbf5c3f4eab7fbbced8460b8c0ee63c5a5167133b9e6599d932

 PKG_BUILD_FLAGS:=no-mips16
 PKG_FIXUP:=autoreconf
--- a/libs/postgresql/patches/700-no-arm-crc-march-change.patch
+++ b/libs/postgresql/patches/700-no-arm-crc-march-change.patch
@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2236,9 +2236,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
+@@ -2239,9 +2239,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
 # flags. If not, check if adding -march=armv8-a+crc flag helps.
 # CFLAGS_ARMV8_CRC32C is set if the extra flag is required.
 PGAC_ARMV8_CRC32C_INTRINSICS([])
--- a/multimedia/yt-dlp/Makefile
+++ b/multimedia/yt-dlp/Makefile
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=yt-dlp
 PKG_VERSION:=2023.3.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PYPI_NAME:=yt-dlp
 PKG_HASH:=265d5da97a76c15d7d9a4088a67b78acd5dcf6f8cfd8257c52f581ff996ff515
@ -27,9 +27,11 @@ define Package/yt-dlp
    +python3-codecs \
    +python3-ctypes \
    +python3-email \
+    +python3-logging \
    +python3-openssl \
    +python3-sqlite3 \
    +python3-urllib \
+    +python3-uuid \
    +python3-xml
 endef

--- a/net/cloudreve/Makefile
+++ b/net/cloudreve/Makefile
@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=cloudreve
-PKG_VERSION:=3.8.0
+PKG_VERSION:=3.8.1
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/cloudreve/Cloudreve.git
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
-PKG_MIRROR_HASH:=4c05afb2193ab83bf144d75963f4757c1445317e68b2690727375a8e01f7ba3d
+PKG_MIRROR_HASH:=463e8580131c8a021b95ef7014f66556c7fdedad2c1b71627f9efaa86a758f03

 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=gnunet

-PKG_VERSION:=0.19.2
+PKG_VERSION:=0.19.4
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gnunet
-PKG_HASH:=86034d92ebf8f6623dad95f1031ded1466e064b96ffac9d3e9d47229ac2c22ff
+PKG_HASH:=00a63df408d5987f5ba9a50441f2a77182bd9fb32f1e302ae563ac94e7ac009b

 PKG_LICENSE:=AGPL-3.0
 PKG_LICENSE_FILES:=COPYING
--- a/net/gnunet/patches/010-endian.patch
+++ b/net/gnunet/patches/010-endian.patch
@ -1,18 +0,0 @@
--- a/src/include/gnunet_common.h
-+++ b/src/include/gnunet_common.h
-@@ -164,7 +164,6 @@ enum GNUNET_GenericReturnValue
-  * Endian operations
-  */
- 
-#if __BYTE_ORDER == __LITTLE_ENDIAN
- #if defined(bswap_16) || defined(bswap_32) || defined(bswap_64)
- #define BYTE_SWAP_16(x) bswap_16 (x)
- #define BYTE_SWAP_32(x) bswap_32 (x)
-@@ -184,6 +183,7 @@ enum GNUNET_GenericReturnValue
-                                              56))
- #endif
- 
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
- #define GNUNET_htobe16(x) BYTE_SWAP_16 (x)
- #define GNUNET_htole16(x) (x)
- #define GNUNET_be16toh(x) BYTE_SWAP_16 (x)
--- a/net/i2pd/Makefile
+++ b/net/i2pd/Makefile
@ -1,7 +1,7 @@
 #
 # Copyright (C) 2015, 2016 gxcreator
 # Copyright (C) 2017 OpenWrt.org
-# Copyright (C) 2021-2022 PurpleI2P team
+# Copyright (C) 2021-2023 PurpleI2P team
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -10,13 +10,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=i2pd
-PKG_VERSION:=2.46.1
+PKG_VERSION:=2.48.0
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/PurpleI2P/i2pd/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=83bb5e2494d566d41ff3a85e4c93078d290d10e3cf1fbe7807bec9f0d024513e
+PKG_HASH:=ccf417aa66ce37f72ea15b7fbcff4c71e823566ea74bda696b9c1e19aae08739

 PKG_MAINTAINER:=David Yang <mmyangfl@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
@ -55,7 +55,7 @@ define Package/i2pd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/i2pd.init $(1)/etc/init.d/i2pd
 	$(INSTALL_DIR) $(1)/usr/share/i2pd
-	$(CP) $(PKG_BUILD_DIR)/contrib/certificates  $(1)/usr/share/i2pd
+	$(CP) $(PKG_BUILD_DIR)/contrib/certificates $(1)/usr/share/i2pd
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/i2pd.config $(1)/etc/config/i2pd
 	$(INSTALL_DIR) $(1)/etc/i2pd
--- a/net/i2pd/patches/010-config.patch
+++ b/net/i2pd/patches/010-config.patch
@ -18,72 +18,72 @@
 -# certsdir = /var/lib/i2pd/certificates
 +certsdir = /usr/share/i2pd/certificates
 
- ## Where to write pidfile (default: i2pd.pid, not used in Windows)
+ ## Where to write pidfile (default: /run/i2pd.pid, not used in Windows)
 # pidfile = /run/i2pd.pid
@@ -35,7 +35,7 @@
 # logfile = /var/log/i2pd/i2pd.log
- ## Log messages above this level (debug, info, *warn, error, none)
+ ## Log messages above this level (debug, info, *warn, error, critical, none)
 ## If you set it to none, logging will be disabled
 -# loglevel = warn
 +loglevel = none
 ## Write full CLF-formatted date and time to log (default: write only time)
 # logclftime = true
 
-@@ -115,9 +115,9 @@ ssu = false
+@@ -118,9 +118,9 @@ ipv6 = false
 [http]
 ## Web Console settings
- ## Uncomment and set to 'false' to disable Web Console
+ ## Enable the Web Console (default: true)
 -# enabled = true
 +enabled = true
- ## Address and port service will listen on
-address = 127.0.0.1
+ ## Address and port service will listen on (default: 127.0.0.1:7070)
+-# address = 127.0.0.1
 +address = 192.168.1.1
- port = 7070
- ## Path to web console, default "/"
+ # port = 7070
+ ## Path to web console (default: /)
 # webroot = /
-@@ -135,9 +135,9 @@ port = 7070
+@@ -138,9 +138,9 @@ ipv6 = false
 
 [httpproxy]
- ## Uncomment and set to 'false' to disable HTTP Proxy
+ ## Enable the HTTP proxy (default: true)
 -# enabled = true
 +enabled = true
- ## Address and port service will listen on
-address = 127.0.0.1
+ ## Address and port service will listen on (default: 127.0.0.1:4444)
+-# address = 127.0.0.1
 +address = 192.168.1.1
- port = 4444
- ## Optional keys file for proxy local destination
+ # port = 4444
+ ## Optional keys file for proxy local destination (default: http-proxy-keys.dat)
 # keys = http-proxy-keys.dat
-@@ -151,9 +151,9 @@ port = 4444
+@@ -154,9 +154,9 @@ ipv6 = false
 
 [socksproxy]
- ## Uncomment and set to 'false' to disable SOCKS Proxy
+ ## Enable the SOCKS proxy (default: true)
 -# enabled = true
 +enabled = true
- ## Address and port service will listen on
-address = 127.0.0.1
+ ## Address and port service will listen on (default: 127.0.0.1:4447)
+-# address = 127.0.0.1
 +address = 192.168.1.1
- port = 4447
- ## Optional keys file for proxy local destination
+ # port = 4447
+ ## Optional keys file for proxy local destination (default: socks-proxy-keys.dat)
 # keys = socks-proxy-keys.dat
-@@ -167,7 +167,7 @@ port = 4447
+@@ -170,7 +170,7 @@ ipv6 = false
 
 [sam]
- ## Comment or set to 'false' to disable SAM Bridge
-enabled = true
+ ## Enable the SAM bridge (default: true)
+-# enabled = false
 +enabled = false
- ## Address and port service will listen on
+ ## Address and ports service will listen on (default: 127.0.0.1:7656, udp: 7655)
 # address = 127.0.0.1
 # port = 7656
-@@ -202,7 +202,7 @@ enabled = true
+@@ -206,7 +206,7 @@ ipv6 = false
 
 [upnp]
 ## Enable or disable UPnP: automatic port forwarding (enabled by default in WINDOWS, ANDROID)
 -# enabled = false
 +enabled = false
- ## Name i2pd appears in UPnP forwardings list (default = I2Pd)
+ ## Name i2pd appears in UPnP forwardings list (default: I2Pd)
 # name = I2Pd
 
-@@ -244,7 +244,7 @@ verify = true
+@@ -248,7 +248,7 @@ verify = true
 [limits]
 ## Maximum active transit sessions (default: 5000)
 ## This value is doubled if floodfill mode is enabled!
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=knot
-PKG_VERSION:=3.2.8
+PKG_VERSION:=3.2.9
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/
-PKG_HASH:=ef419a428f327def77780bc90eda763b51e6121fe548543da84b9eb96a261a6e
+PKG_HASH:=bc1f9eb8c9f67f52805f3acfa2d0153190245fa145b007fafa9068d2da292506

 PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
 PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD BSD-3-Clause OLDAP-2.8
--- a/net/libcurl-gnutls/Makefile
+++ b/net/libcurl-gnutls/Makefile
@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=libcurl-gnutls

 PKG_SOURCE_NAME:=curl
-PKG_VERSION:=7.86.0
+PKG_VERSION:=8.2.1
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \
 	https://dl.uxnr.de/mirror/curl/ \
 	https://curl.askapache.com/download/ \
 	https://curl.se/download/
-PKG_HASH:=2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b
+PKG_HASH:=dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894

 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=MIT
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=openssh
-PKG_VERSION:=9.3p1
-PKG_RELEASE:=3
+PKG_VERSION:=9.3p2
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 		https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
-PKG_HASH:=e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8
+PKG_HASH:=200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8

 PKG_LICENSE:=BSD ISC
 PKG_LICENSE_FILES:=LICENCE
@ -103,6 +103,7 @@ endef

 define Package/openssh-server/conffiles
 /etc/ssh/sshd_config
+/etc/ssh/sshd_config.d/
 /etc/ssh/ssh_host_ed25519_key
 /etc/ssh/ssh_host_ed25519_key.pub
 /etc/ssh/ssh_host_rsa_key
@ -223,7 +224,7 @@ define Package/openssh-keygen/install
 endef

 define Package/openssh-server/install
-	install -d -m0700 $(1)/etc/ssh
+	install -d -m0700 $(1)/etc/ssh $(1)/etc/ssh/sshd_config.d
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/
 	sed -r -i 's,^#(HostKey /etc/ssh/ssh_host_(rsa|ed25519)_key)$$$$,\1,' $(1)/etc/ssh/sshd_config
 	$(INSTALL_DIR) $(1)/etc/init.d
--- a/net/openssh/patches/900-sshd_config-include-dir.patch
+++ b/net/openssh/patches/900-sshd_config-include-dir.patch
@ -0,0 +1,11 @@
+--- a/sshd_config
+++ b/sshd_config
+@@ -10,6 +10,8 @@
+ # possible, but leave them commented.  Uncommented options override the
+ # default value.
+ 
+Include /etc/ssh/sshd_config.d/*.conf
+
+ #Port 22
+ #AddressFamily any
+ #ListenAddress 0.0.0.0
--- a/net/simple-adblock/Makefile
+++ b/net/simple-adblock/Makefile
@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=simple-adblock
 PKG_VERSION:=1.9.5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_LICENSE:=GPL-3.0-or-later

--- a/net/simple-adblock/files/simple-adblock.init
+++ b/net/simple-adblock/files/simple-adblock.init
@ -1640,7 +1640,7 @@ load_validate_config() {
 	uci_load_validate "$packageName" "$packageName" "$1" "${2}${3:+ $3}" \
 		'enabled:bool:0' \
 		'force_dns:bool:1' \
-		'force_dns_port:list(integer):53 853' \
+		'force_dns_port:list(integer):"53 853"' \
 		'parallel_downloads:bool:1' \
 		'debug:bool:0' \
 		'compressed_cache:bool:0' \
--- a/net/snort3/Makefile
+++ b/net/snort3/Makefile
@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=snort3
-PKG_VERSION:=3.1.66.0
+PKG_VERSION:=3.1.67.0
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/
-PKG_HASH:=4481f882d767620e91fa6d97232ae9527cab06ba77087399c5dd91c72826e0bb
+PKG_HASH:=fed8ea7cf00d69c10e5750a6507392730552594f4f4a0dd5d1bf259a691b9a54

 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=GPL-2.0-only
--- a/net/v2ray-geodata/Makefile
+++ b/net/v2ray-geodata/Makefile
@ -12,22 +12,22 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>

 include $(INCLUDE_DIR)/package.mk

-GEOIP_VER:=202306150049
+GEOIP_VER:=202308030045
 GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
 define Download/geoip
  URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
  URL_FILE:=geoip.dat
  FILE:=$(GEOIP_FILE)
-  HASH:=811085edc67057690c783e735182db32e5a4b446ee5f6d70ef9e12960ce910da
+  HASH:=9b7fa7407f35e3087f3b052d12ed40974182c6e1864570b848c1ec901292ea82
 endef

-GEOSITE_VER:=20230620033122
+GEOSITE_VER:=20230803193133
 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
 define Download/geosite
  URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
  URL_FILE:=dlc.dat
  FILE:=$(GEOSITE_FILE)
-  HASH:=caecb282d72bf6bfc7977257cadd436e59cb7eea8f6aabb0eae656ae4bf57d76
+  HASH:=3d335d493f168eace5414ca1ff54e4f255f8e5b1a90261d2debb1cbefa0666a0
 endef

 define Package/v2ray-geodata/template
--- a/net/v2raya/Makefile
+++ b/net/v2raya/Makefile
@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=v2rayA
-PKG_VERSION:=2.0.5
+PKG_VERSION:=2.1.0
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=a454f382bf199f939e4930c1ee260b212ad66e04fa5dcf9065bb92dd2be274fe
+PKG_HASH:=97cffd5dd568fc3be22fa73768bbc218a0650548ddb0849506eeb168dde0291a
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service

 PKG_LICENSE:=AGPL-3.0-only
@ -59,7 +59,7 @@ define Download/v2raya-web
 	URL:=https://codeload.github.com/v2rayA/v2raya-web/tar.gz/v$(PKG_VERSION)?
 	URL_FILE:=$(WEB_FILE)
 	FILE:=$(WEB_FILE)
-	HASH:=e0460ea4b251339258e037712dc7d7426e2929ce592becbd2182facaedbe7b81
+	HASH:=5fbd8298316167d16aa15b9e8d48c243623cf3a8cfd9b3d36590c35948a93912
 endef

 define Build/Prepare
--- a/net/xtables-addons/Makefile
+++ b/net/xtables-addons/Makefile
@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=xtables-addons
 PKG_VERSION:=3.24
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_HASH:=3e823f71720519ced31c4c7d2bfaf7120d9c01c59a0843dfcbe93c95c64d81c1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@ -129,6 +129,42 @@ define Package/iptaccount/install
 endef


+define Package/iptasn
+  $(call Package/xtables-addons)
+  CATEGORY:=Network
+  TITLE:=iptables-mod-asn support scripts for MaxMind ASN databases
+  DEPENDS:=iptables +iptables-mod-asn \
+		+perl +perlbase-getopt +perlbase-io +perl-text-csv_xs \
+		+perl-net-cidr-lite \
+		+wget-ssl +!BUSYBOX_CONFIG_ZCAT:gzip
+endef
+
+define Package/iptasn/config
+	menu "Select iptasn options"
+		config IPTASN_PRESERVE
+			bool "Preserve across sysupgrades"
+			default n
+			help
+			  Backup and restore during sysupgrade (requires >7MB)
+	endmenu
+endef
+
+ifeq ($(CONFIG_IPTASN_PRESERVE),y)
+define Package/iptasn/conffiles
+/usr/share/xt_asn/
+endef
+endif
+
+define Package/iptasn/install
+	$(INSTALL_DIR) $(1)/usr/lib/xtables-addons
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/xtables-addons/xt_asn_{build,dl} \
+		$(1)/usr/lib/xtables-addons/
+	$(INSTALL_DIR) $(1)/usr/share/xt_asn
+	touch $(1)/usr/share/xt_asn/.keep
+endef
+
+
 define Package/iptgeoip
  $(call Package/xtables-addons)
  CATEGORY:=Network
@ -158,7 +194,7 @@ endif
 define Package/iptgeoip/install
 	$(INSTALL_DIR) $(1)/usr/lib/xtables-addons
 	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/xtables-addons/xt_geoip_{build,dl} \
+		$(PKG_INSTALL_DIR)/usr/lib/xtables-addons/xt_geoip_{build,dl}{,_maxmind} \
 		$(1)/usr/lib/xtables-addons/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) \
@ -175,6 +211,7 @@ $(eval $(call BuildTemplate,compat-xtables,API compatibilty layer,,compat_xtable
 $(eval $(call BuildTemplate,nathelper-rtsp,RTSP Conntrack and NAT,,rtsp/nf_conntrack_rtsp rtsp/nf_nat_rtsp,+kmod-ipt-conntrack-extra +kmod-ipt-nat))

 $(eval $(call BuildTemplate,account,ACCOUNT,xt_ACCOUNT,ACCOUNT/xt_ACCOUNT,+kmod-ipt-compat-xtables))
+$(eval $(call BuildTemplate,asn,asn,xt_asn,xt_asn,))
 $(eval $(call BuildTemplate,chaos,CHAOS,xt_CHAOS,xt_CHAOS,+kmod-ipt-compat-xtables +kmod-ipt-delude +kmod-ipt-tarpit))
 $(eval $(call BuildTemplate,condition,Condition,xt_condition,xt_condition,))
 $(eval $(call BuildTemplate,delude,DELUDE,xt_DELUDE,xt_DELUDE,+kmod-ipt-compat-xtables))
@ -197,4 +234,5 @@ $(eval $(call BuildTemplate,sysrq,SYSRQ,xt_SYSRQ,xt_SYSRQ,+kmod-ipt-compat-xtabl
 $(eval $(call BuildTemplate,tarpit,TARPIT,xt_TARPIT,xt_TARPIT,+kmod-ipt-compat-xtables))

 $(eval $(call BuildPackage,iptaccount))
+$(eval $(call BuildPackage,iptasn))
 $(eval $(call BuildPackage,iptgeoip))
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=collectd
 PKG_VERSION:=5.12.0
-PKG_RELEASE:=44
+PKG_RELEASE:=46

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://collectd.org/files/ \
@ -31,7 +31,7 @@ PKG_CONFIG_DEPENDS:= \

 COLLECTD_PLUGINS_DISABLED:= \
 	amqp \
-	ampq1 \
+	amqp1 \
 	apple_sensors \
 	aquaero \
 	barometer \
@ -341,8 +341,6 @@ ifneq ($(CONFIG_PACKAGE_collectd-mod-smart),)
  CONFIGURE_ARGS+= \
 	--with-libatasmart="$(STAGING_DIR)/usr" \
 	--with-libudev="$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= --without-libudev
 endif

 define Package/collectd/conffiles
--- a/utils/cryptsetup/Makefile
+++ b/utils/cryptsetup/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=cryptsetup
-PKG_VERSION:=2.6.0
-PKG_RELEASE:=2
+PKG_VERSION:=2.6.1
+PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v2.6
-PKG_HASH:=44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735
+PKG_HASH:=410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693

 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later
--- a/utils/docker/Makefile
+++ b/utils/docker/Makefile
@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=docker
-PKG_VERSION:=24.0.2
+PKG_VERSION:=24.0.5
 PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_GIT_URL:=github.com/docker/cli
 PKG_GIT_REF:=v$(PKG_VERSION)
 PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)?
-PKG_HASH:=632357aa58d7f5e16ce87dbd73641c5f65c25b6501e3917ac4f0ce553a01e0bc
-PKG_GIT_SHORT_COMMIT:=cb74dfc # SHA1 used within the docker executables
+PKG_HASH:=fa32b5f3c2f85fba9ef6e1b5099a4b608fa20af45ba71b3da2194e8728037eec
+PKG_GIT_SHORT_COMMIT:=ced0996 # SHA1 used within the docker executables

 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>

--- a/utils/dockerd/Makefile
+++ b/utils/dockerd/Makefile
@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dockerd
-PKG_VERSION:=24.0.2
+PKG_VERSION:=24.0.5
 PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_GIT_URL:=github.com/moby/moby
 PKG_GIT_REF:=v$(PKG_VERSION)
 PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)?
-PKG_HASH:=f4bc7d7cc2ee3671371ae80fd624e61f0598e614b5c235012581f8ec1d593aa0
-PKG_GIT_SHORT_COMMIT:=659604f # SHA1 used within the docker executables
+PKG_HASH:=837d7d667fb64508bf6e53cb5915b4b5ef356599294ffdd5ca8678168230cb38
+PKG_GIT_SHORT_COMMIT:=a61e2b4 # SHA1 used within the docker executables

 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>

--- a/utils/flashrom/Makefile
+++ b/utils/flashrom/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=flashrom
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.3.0
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://download.flashrom.org/releases
-PKG_HASH:=89a7ff5beb08c89b8795bbd253a51b9453547a864c31793302296b56bbc56d65
+PKG_HASH:=a053234453ccd012e79f3443bdcc61625cf97b7fd7cb4cdd8bfbffbe8b149623
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-v$(PKG_VERSION)

 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
@ -67,6 +67,17 @@ define Package/flashrom-usb
  VARIANT:=usb
 endef

+define Package/libflashrom
+  $(Package/flashrom/default)
+  TITLE+= (library)
+  DEPENDS+= \
+    +(TARGET_x86||TARGET_x86_64):dmidecode \
+    +libftdi1 \
+    +libusb-1.0 \
+    +pciutils
+  VARIANT:=full
+endef
+
 define Package/flashrom/default/description
 flashrom is an utility for identifying, reading, writing, verifying
 and erasing flash chips. It's often used to flash BIOS/EFI/coreboot
@ -76,6 +87,16 @@ Package/flashrom/description = $(Package/flashrom/default/description)
 Package/flashrom-pci/description = $(Package/flashrom/default/description)
 Package/flashrom-spi/description = $(Package/flashrom/default/description)
 Package/flashrom-usb/description = $(Package/flashrom/default/description)
+Package/libflashrom/description = $(Package/flashrom/default/description)
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libflashrom.so* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/flashrom.pc $(1)/usr/lib/pkgconfig/
+endef

 define Package/flashrom/install
 	$(INSTALL_DIR) $(1)/usr/sbin
@ -93,8 +114,13 @@ define Package/flashrom-usb/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/flashrom $(1)/usr/sbin/flashrom-usb
 endef
+define Package/libflashrom/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libflashrom.so* $(1)/usr/lib/
+endef

 $(eval $(call BuildPackage,flashrom))
 $(eval $(call BuildPackage,flashrom-pci))
 $(eval $(call BuildPackage,flashrom-spi))
 $(eval $(call BuildPackage,flashrom-usb))
+$(eval $(call BuildPackage,libflashrom))
--- a/utils/flashrom/flashrom.mk
+++ b/utils/flashrom/flashrom.mk
@ -1,11 +1,7 @@
 # Flashrom variants

-define DefaultProgrammer
-  MAKE_FLAGS += CONFIG_DEFAULT_PROGRAMMER=PROGRAMMER_$(1)
-endef
-
 ifeq ($(BUILD_VARIANT),full)
-  $(eval $(call DefaultProgrammer,LINUX_SPI))
+  DEFAULT_PROGRAMMER_NAME := linux_spi
  FLASHROM_BASIC := true
  FLASHROM_FTDI := true
  FLASHROM_PCI := true
@ -14,7 +10,7 @@ ifeq ($(BUILD_VARIANT),full)
  FLASHROM_USB := true
 endif
 ifeq ($(BUILD_VARIANT),pci)
-  $(eval $(call DefaultProgrammer,INTERNAL))
+  DEFAULT_PROGRAMMER_NAME := internal
  FLASHROM_BASIC := true
  FLASHROM_FTDI := false
  FLASHROM_PCI := true
@ -23,7 +19,7 @@ ifeq ($(BUILD_VARIANT),pci)
  FLASHROM_USB := false
 endif
 ifeq ($(BUILD_VARIANT),spi)
-  $(eval $(call DefaultProgrammer,LINUX_SPI))
+  DEFAULT_PROGRAMMER_NAME := linux_spi
  FLASHROM_BASIC := true
  FLASHROM_FTDI := false
  FLASHROM_PCI := false
@ -32,7 +28,7 @@ ifeq ($(BUILD_VARIANT),spi)
  FLASHROM_USB := false
 endif
 ifeq ($(BUILD_VARIANT),usb)
-  $(eval $(call DefaultProgrammer,SERPROG))
+  DEFAULT_PROGRAMMER_NAME := serprog
  FLASHROM_BASIC := true
  FLASHROM_FTDI := true
  FLASHROM_PCI := false
@ -41,59 +37,68 @@ ifeq ($(BUILD_VARIANT),usb)
  FLASHROM_USB := true
 endif

-MESON_ARGS += \
-	-Dconfig_dummy=$(FLASHROM_BASIC) \
-	-Dconfig_linux_mtd=$(FLASHROM_BASIC) \
-	-Dconfig_linux_spi=$(FLASHROM_BASIC) \
-	-Dconfig_mstarddc_spi=$(FLASHROM_BASIC) \
-	\
-	-Dconfig_ft2232_spi=$(FLASHROM_FTDI) \
-	-Dconfig_usbblaster_spi=$(FLASHROM_FTDI) \
-	\
-	-Dpciutils=$(FLASHROM_PCI) \
-	-Dconfig_atavia=$(FLASHROM_PCI) \
-	-Dconfig_drkaiser=$(FLASHROM_PCI) \
-	-Dconfig_gfxnvidia=$(FLASHROM_PCI) \
-	-Dconfig_internal=$(FLASHROM_PCI) \
-	-Dconfig_it8212=$(FLASHROM_PCI) \
-	-Dconfig_nicintel=$(FLASHROM_PCI) \
-	-Dconfig_nicintel_spi=$(FLASHROM_PCI) \
-	-Dconfig_nicintel_eeprom=$(FLASHROM_PCI) \
-	-Dconfig_ogp_spi=$(FLASHROM_PCI) \
-	-Dconfig_satasii=$(FLASHROM_PCI) \
-	\
-	-Dconfig_bitbang_spi=$(FLASHROM_RAW) \
-	-Dconfig_rayer_spi=$(FLASHROM_RAW) \
-	\
-	-Dconfig_buspirate_spi=$(FLASHROM_SERIAL) \
-	-Dconfig_pony_spi=$(FLASHROM_SERIAL) \
-	-Dconfig_serprog=$(FLASHROM_SERIAL) \
-	\
-	-Dusb=$(FLASHROM_USB) \
-	-Dconfig_ch341a_spi=$(FLASHROM_USB) \
-	-Dconfig_dediprog=$(FLASHROM_USB) \
-	-Dconfig_developerbox_spi=$(FLASHROM_USB) \
-	-Dconfig_digilent_spi=$(FLASHROM_USB) \
-	-Dconfig_pickit2_spi=$(FLASHROM_USB) \
-	-Dconfig_stlinkv3_spi=$(FLASHROM_USB)
+PROGRAMMER_ARGS :=
+
+define Programmer
+  ifeq ($(2),true)
+    PROGRAMMER_ARGS += $(1)
+  endif
+endef
+
+$(eval $(call Programmer,dummy,$(FLASHROM_BASIC)))
+$(eval $(call Programmer,linux_mtd,$(FLASHROM_BASIC)))
+$(eval $(call Programmer,linux_spi,$(FLASHROM_BASIC)))
+$(eval $(call Programmer,mstarddc_spi,$(FLASHROM_BASIC)))
+
+$(eval $(call Programmer,ft2232_spi,$(FLASHROM_FTDI)))
+$(eval $(call Programmer,usbblaster_spi,$(FLASHROM_FTDI)))
+
+$(eval $(call Programmer,atavia,$(FLASHROM_PCI)))
+$(eval $(call Programmer,drkaiser,$(FLASHROM_PCI)))
+$(eval $(call Programmer,gfxnvidia,$(FLASHROM_PCI)))
+$(eval $(call Programmer,internal,$(FLASHROM_PCI)))
+$(eval $(call Programmer,it8212,$(FLASHROM_PCI)))
+$(eval $(call Programmer,nicintel,$(FLASHROM_PCI)))
+$(eval $(call Programmer,nicintel_spi,$(FLASHROM_PCI)))
+$(eval $(call Programmer,nicintel_eeprom,$(FLASHROM_PCI)))
+$(eval $(call Programmer,ogp_spi,$(FLASHROM_PCI)))
+$(eval $(call Programmer,satasii,$(FLASHROM_PCI)))
+
+$(eval $(call Programmer,rayer_spi,$(FLASHROM_RAW)))
+
+$(eval $(call Programmer,buspirate_spi,$(FLASHROM_SERIAL)))
+$(eval $(call Programmer,pony_spi,$(FLASHROM_SERIAL)))
+$(eval $(call Programmer,serprog,$(FLASHROM_SERIAL)))
+
+$(eval $(call Programmer,ch341a_spi,$(FLASHROM_USB)))
+$(eval $(call Programmer,dediprog,$(FLASHROM_USB)))
+$(eval $(call Programmer,developerbox_spi,$(FLASHROM_USB)))
+$(eval $(call Programmer,digilent_spi,$(FLASHROM_USB)))
+$(eval $(call Programmer,pickit2_spi,$(FLASHROM_USB)))
+$(eval $(call Programmer,stlinkv3_spi,$(FLASHROM_USB)))

 # PCI
 ifeq ($(findstring i386,$(CONFIG_ARCH))$(findstring x86,$(CONFIG_ARCH)),)
-MESON_ARGS += \
-	-Dconfig_atahpt=false \
-	-Dconfig_atapromise=false \
-	-Dconfig_internal_dmi=true \
-	-Dconfig_nic3com=false \
-	-Dconfig_nicnatsemi=false \
-	-Dconfig_nicrealtek=false \
-	-Dconfig_satamv=false
+  MESON_ARGS += -Duse_internal_dmi=true
+  $(eval $(call Programmer,atahpt,false))
+  $(eval $(call Programmer,atapromise,false))
+  $(eval $(call Programmer,nic3com,false))
+  $(eval $(call Programmer,nicnatsemi,false))
+  $(eval $(call Programmer,nicrealtek,false))
+  $(eval $(call Programmer,satamv,false))
 else
-MESON_ARGS += \
-	-Dconfig_atahpt=$(FLASHROM_PCI) \
-	-Dconfig_atapromise=$(FLASHROM_PCI) \
-	-Dconfig_internal_dmi=$(if $(FLASHROM_PCI),false,true)
-	-Dconfig_nic3com=$(FLASHROM_PCI) \
-	-Dconfig_nicnatsemi=$(FLASHROM_PCI) \
-	-Dconfig_nicrealtek=$(FLASHROM_PCI) \
-	-Dconfig_satamv=$(FLASHROM_PCI)
+  MESON_ARGS += -Duse_internal_dmi=$(if $(FLASHROM_PCI),false,true)
+  $(eval $(call Programmer,atahpt,$(FLASHROM_PCI)))
+  $(eval $(call Programmer,atapromise,$(FLASHROM_PCI)))
+  $(eval $(call Programmer,nic3com,$(FLASHROM_PCI)))
+  $(eval $(call Programmer,nicnatsemi,$(FLASHROM_PCI)))
+  $(eval $(call Programmer,nicrealtek,$(FLASHROM_PCI)))
+  $(eval $(call Programmer,satamv,$(FLASHROM_PCI)))
 endif
+
+comma := ,
+MESON_ARGS += \
+	-Ddefault_programmer_name=$(DEFAULT_PROGRAMMER_NAME) \
+	-Dprogrammer=$(subst $() $(),$(comma),$(PROGRAMMER_ARGS)) \
+	-Dwerror=false \
+	-Dtests=disabled
--- a/utils/flashrom/patches/010-bitbang.patch
+++ b/utils/flashrom/patches/010-bitbang.patch
@ -1,20 +0,0 @@
--- a/meson.build
-+++ b/meson.build
-@@ -33,6 +33,7 @@ add_project_arguments('-DFLASHROM_VERSIO
- config_atahpt = get_option('config_atahpt')
- config_atapromise = get_option('config_atapromise')
- config_atavia = get_option('config_atavia')
-+config_bitbang_spi = get_option('config_bitbang_spi')
- config_buspirate_spi = get_option('config_buspirate_spi')
- config_ch341a_spi = get_option('config_ch341a_spi')
- config_dediprog = get_option('config_dediprog')
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -4,6 +4,7 @@ option('usb', type : 'boolean', value :
- option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers')
- option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller')
- option('config_atavia', type : 'boolean', value : true, description : 'VIA VT6421A LPC memory')
-+option('config_bitbang_spi', type : 'boolean', value : true, description : 'Bitbang')
- option('config_buspirate_spi', type : 'boolean', value : true, description : 'Bus Pirate SPI')
- option('config_ch341a_spi', type : 'boolean', value : true, description : 'Winchiphead CH341A')
- option('config_dediprog', type : 'boolean', value : true, description : 'Dediprog SF100')
--- a/utils/flashrom/patches/020-raw-access.patch
+++ b/utils/flashrom/patches/020-raw-access.patch
@ -1,10 +0,0 @@
--- a/meson.build
-+++ b/meson.build
-@@ -263,6 +263,7 @@ endif
- if config_satasii
-   srcs += 'satasii.c'
-   cargs += '-DCONFIG_SATASII=1'
-+  need_raw_access = true
- endif
- if config_serprog
-   srcs += 'serprog.c'
--- a/utils/flashrom/patches/030-ppc.patch
+++ b/utils/flashrom/patches/030-ppc.patch
@ -1,11 +0,0 @@
--- a/hwaccess.c
-+++ b/hwaccess.c
-@@ -71,7 +71,7 @@ static inline void sync_primitive(void)
-  * See also https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/memory-barriers.txt
-  */
- #if IS_PPC // cf. http://lxr.free-electrons.com/source/arch/powerpc/include/asm/barrier.h
-	asm("eieio" : : : "memory");
-+	__asm__ ("eieio" : : : "memory");
- #elif IS_SPARC
- #if defined(__sparc_v9__) || defined(__sparcv9)
- 	/* Sparc V9 CPUs support three different memory orderings that range from x86-like TSO to PowerPC-like
--- a/utils/flashrom/patches/040-uclibc.patch
+++ b/utils/flashrom/patches/040-uclibc.patch
@ -1,11 +0,0 @@
--- a/meson.build
-+++ b/meson.build
-@@ -25,7 +25,7 @@ conf = configuration_data()
- cc = meson.get_compiler('c')
- add_project_arguments(cc.get_supported_arguments(warning_flags), language : 'c')
- add_project_arguments('-D_DEFAULT_SOURCE', language : 'c')
-add_project_arguments('-D_POSIX_C_SOURCE', language : 'c') # required for fileno
-+add_project_arguments('-D_POSIX_C_SOURCE=200809L', language : 'c') # required for fileno, nanosleep, and strndup
- add_project_arguments('-D_BSD_SOURCE', language : 'c') # required for glibc < v2.19
- add_project_arguments('-DFLASHROM_VERSION="' + meson.project_version() + '"', language : 'c')
- 
--- a/utils/gptfdisk/Makefile
+++ b/utils/gptfdisk/Makefile
@ -75,6 +75,7 @@ endef

 TARGET_CXXFLAGS += -std=c++11 -fno-rtti
 TARGET_LDFLAGS += -Wl,--as-needed
+MAKE_FLAGS += TARGET=linux

 define Package/gdisk/install
 	$(INSTALL_DIR) $(1)/usr/bin
--- a/utils/irqbalance/Makefile
+++ b/utils/irqbalance/Makefile
@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=irqbalance
 PKG_VERSION:=1.9.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/Irqbalance/irqbalance.git
--- a/utils/irqbalance/files/irqbalance.config
+++ b/utils/irqbalance/files/irqbalance.config
@ -8,6 +8,9 @@ config irqbalance 'irqbalance'
 	# The default value is 10 seconds
 	#option interval '10'

+	# Specify excluded cpulist
+	#option banned_cpulist '0'
+
 	# List of IRQ's to ignore
 	#list banirq '36'
 	#list banirq '69'
--- a/utils/irqbalance/files/irqbalance.init
+++ b/utils/irqbalance/files/irqbalance.init
@ -22,6 +22,9 @@ start_service() {
 	# 10 is the default
 	config_get interval irqbalance interval 10

+	# empty is the default
+	config_get banned_cpulist irqbalance banned_cpulist ''
+
 	# A list of IRQ's to ignore
 	banirq=""
 	handle_banirq_value()
@ -31,6 +34,9 @@ start_service() {
 	config_list_foreach irqbalance banirq handle_banirq_value

 	procd_open_instance "irqbalance"
+	if [ -n "$banned_cpulist" ]; then
+		procd_set_param env IRQBALANCE_BANNED_CPULIST="$banned_cpulist"
+	fi
 	procd_set_param command /usr/sbin/irqbalance -f -c "$deepestcache" -t "$interval" "$banirq"
 	procd_set_param respawn
 	procd_close_instance
--- a/utils/lvm2/Makefile
+++ b/utils/lvm2/Makefile
@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=LVM2
-PKG_VERSION:=2.03.17
-PKG_VERSION_DM:=1.02.187
+PKG_VERSION:=2.03.22
+PKG_VERSION_DM:=1.02.196
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=https://sourceware.org/pub/lvm2
-PKG_HASH:=7286cfa9651828c589389509546333b8da965dfa84a1a4c8ab3e681a47fabae7
+PKG_HASH:=4c5a6923bd1ace7ce04474608a84937ce053ba91b1ace9f0b0017268e732dc7c
 PKG_BUILD_DIR:=$(BUILD_DIR)/lvm2-$(BUILD_VARIANT)/$(PKG_NAME).$(PKG_VERSION)

 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
--- a/utils/lvm2/patches/002-const-stdio.patch
+++ b/utils/lvm2/patches/002-const-stdio.patch
@ -9,7 +9,7 @@
 	/* Set in/out stream buffering before glibc */
 	if (set_buffering
 #ifdef SYS_gettid
-@@ -2045,7 +2045,7 @@ void destroy_toolcontext(struct cmd_cont
+@@ -2043,7 +2043,7 @@ void destroy_toolcontext(struct cmd_cont
 		dm_hash_destroy(cmd->cft_def_hash);
 
 	dm_device_list_destroy(&cmd->cache_dm_devs);
@ -20,7 +20,7 @@
 		if (is_valid_fd(STDIN_FILENO) &&
 --- a/tools/lvmcmdline.c
 +++ b/tools/lvmcmdline.c
-@@ -3419,6 +3419,7 @@ int lvm_split(char *str, int *argc, char
+@@ -3432,6 +3432,7 @@ int lvm_split(char *str, int *argc, char
 /* Make sure we have always valid filedescriptors 0,1,2 */
 static int _check_standard_fds(void)
 {
@ -28,7 +28,7 @@
 	int err = is_valid_fd(STDERR_FILENO);
 
 	if (!is_valid_fd(STDIN_FILENO) &&
-@@ -3445,6 +3446,12 @@ static int _check_standard_fds(void)
+@@ -3458,6 +3459,12 @@ static int _check_standard_fds(void)
 		       strerror(errno));
 		return 0;
 	}
--- a/utils/lvm2/patches/003-no-mallinfo.patch
+++ b/utils/lvm2/patches/003-no-mallinfo.patch
@ -1,6 +1,6 @@
 --- a/lib/mm/memlock.c
 +++ b/lib/mm/memlock.c
-@@ -198,12 +198,15 @@ static void _allocate_memory(void)
+@@ -199,12 +199,15 @@ static void _allocate_memory(void)
          *  memory on free(), this is good enough for our purposes.
          */
 	while (missing > 0) {
@ -16,7 +16,7 @@
 		inf = MALLINFO();
 
 		if (hblks < inf.hblks) {
-@@ -213,9 +216,12 @@ static void _allocate_memory(void)
+@@ -214,9 +217,12 @@ static void _allocate_memory(void)
 			free(areas[area]);
 			_size_malloc_tmp /= 2;
 		} else {
@ -29,7 +29,7 @@
 
 		if (area == max_areas && missing > 0) {
 			/* Too bad. Warn the user and proceed, as things are
-@@ -536,8 +542,13 @@ static void _lock_mem(struct cmd_context
+@@ -537,8 +543,13 @@ static void _lock_mem(struct cmd_context
 	 * will not block memory locked thread
 	 * Note: assuming _memlock_count_daemon is updated before _memlock_count
 	 */
--- a/utils/lvm2/patches/004-missing-includes.patch
+++ b/utils/lvm2/patches/004-missing-includes.patch
@ -1,10 +0,0 @@
--- a/tools/vgimportdevices.c
-+++ b/tools/vgimportdevices.c
-@@ -15,6 +15,7 @@
- #include "tools.h"
- #include "lib/cache/lvmcache.h"
- #include "lib/device/device_id.h"
-+#include <sys/file.h>
- 
- struct vgimportdevices_params {
- 	uint32_t added_devices;
--- a/utils/lxc/Makefile
+++ b/utils/lxc/Makefile
@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=lxc
-PKG_VERSION:=5.0.2
-PKG_RELEASE:=2
+PKG_VERSION:=5.0.3
+PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/
-PKG_HASH:=bea08d2e49efcee34fa58acd2bc95c0adc64d291c07f4cfaf4ac1d8ac5a36f45
+PKG_HASH:=2693a4c654dcfdafb3aa95c262051d8122afa1b6f5cef1920221ebbdee934d07

 PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com>
 PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0
--- a/utils/nvme-cli/Makefile
+++ b/utils/nvme-cli/Makefile
@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/meson.mk
 define Package/nvme-cli
  SECTION:=utils
  CATEGORY:=Utilities
-  SUBMENU:=Filesystem
+  SUBMENU:=Disc
  TITLE:=NVMe management command line interface
  URL:=https://nvmexpress.org/
  DEPENDS:=+libnvme 
--- a/utils/prometheus/Makefile
+++ b/utils/prometheus/Makefile
@ -1,66 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=prometheus
-PKG_VERSION:=2.25.2
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/prometheus/prometheus/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=85f50c0cfb4db206a59d2c3301e02d685c3fe4b451b41ca943a4eb94935cf4d4
-
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Paul Spooren <mail@aparcar.org>
-
-PKG_BUILD_DEPENDS:=golang/host
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_FLAGS:=no-mips16
-
-GO_PKG:=github.com/prometheus/prometheus/
-GO_PKG_BUILD_PKG:=github.com/prometheus/prometheus/cmd/prometheus/
-
-GO_PKG_LDFLAGS_X:=\
-	github.com/prometheus/common/version.Version=v$(PKG_VERSION) \
-	github.com/prometheus/common/version.Revision=$(PKG_VERSION)  \
-	github.com/prometheus/common/version.Branch="release" \
-	github.com/prometheus/common/version.BuildUser=openwrt \
-	github.com/prometheus/common/version.BuildDate=$(SOURCE_DATE_EPOCH)
-
-include $(INCLUDE_DIR)/package.mk
-include ../../lang/golang/golang-package.mk
-
-define Package/prometheus/Default
-  TITLE:=Monitoring system & time series database
-  USERID:=prometheus=112:prometheus=112
-  URL:=http://prometheus.io
-  DEPENDS:=$(GO_ARCH_DEPENDS)
-endef
-
-define Package/prometheus
-$(call Package/prometheus/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-endef
-
-define Package/prometheus/description
-Prometheus, a Cloud Native Computing Foundation project, is a systems and
-service monitoring system. It collects metrics from configured targets at given
-intervals, evaluates rule expressions, displays the results, and can trigger
-alerts if some condition is observed to be true.
-
-Default tsdb path is /srv/prometheus, you might want to edit /etc/config/prometheus
-in order to place it on USB storage or external SD card.
-endef
-
-define Package/prometheus/install
-	$(call GoPackage/Package/Install/Bin,$(1))
-
-	$(CP) ./files/* $(1)/
-endef
-
-define Package/prometheus/conffiles
-/etc/prometheus.yml
-endef
-
-$(eval $(call GoBinPackage,prometheus))
-$(eval $(call BuildPackage,prometheus))
--- a/utils/prometheus/files/etc/init.d/prometheus
+++ b/utils/prometheus/files/etc/init.d/prometheus
@ -1,33 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=70
-
-USE_PROCD=1
-PROG=/usr/bin/prometheus
-CONFFILE=/etc/prometheus.yml
-
-start_service() {
-	local config_file
-	local storage_tsdb_path
-	local web_listen_address
-	config_load "prometheus"
-	config_get config_file prometheus config_file "$CONFFILE"
-	config_get storage_tsdb_path prometheus storage_tsdb_path "/srv/prometheus"
-	config_get web_listen_address prometheus web_listen_address "127.0.0.1:9090"
-	
-	# Create tsdb dir & permissions if needed
-	if [ ! -d "$storage_tsdb_path" ]; then
-		mkdir "$storage_tsdb_path"
-		chown prometheus:prometheus "$storage_tsdb_path"
-	fi;
-
-	procd_open_instance
-	procd_set_param command "$PROG"
-	procd_append_param command --config.file="$config_file"
-	procd_append_param command --storage.tsdb.path="$storage_tsdb_path"
-	procd_append_param command --web.listen-address="$web_listen_address"
-	procd_append_param user "prometheus"
-	procd_set_param file "$config_file"
-	procd_set_param respawn
-	procd_close_instance
-}
--- a/utils/prometheus/files/etc/prometheus.yml
+++ b/utils/prometheus/files/etc/prometheus.yml
@ -1,29 +0,0 @@
-# my global config
-global:
-  scrape_interval:     15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
-  evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
-  # scrape_timeout is set to the global default (10s).
-
-# Alertmanager configuration
-alerting:
-  alertmanagers:
-  - static_configs:
-    - targets:
-      # - alertmanager:9093
-
-# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
-rule_files:
-  # - "first_rules.yml"
-  # - "second_rules.yml"
-
-# A scrape configuration containing exactly one endpoint to scrape:
-# Here it's Prometheus itself.
-scrape_configs:
-  # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
-  - job_name: 'prometheus'
-
-    # metrics_path defaults to '/metrics'
-    # scheme defaults to 'http'.
-
-    static_configs:
-    - targets: ['localhost:9090']
--- a/utils/prometheus/files/etc/uci-defaults/prometheus-defaults
+++ b/utils/prometheus/files/etc/uci-defaults/prometheus-defaults
@ -1,13 +0,0 @@
-#!/bin/sh
-
-[ -e /etc/config/prometheus ] || touch /etc/config/prometheus
-
-uci -q get prometheus.prometheus || {
-	uci -q batch <<EOF
-	set prometheus.prometheus=prometheus
-	set prometheus.prometheus.config_file='/etc/prometheus.yml'
-	set prometheus.prometheus.storage_tsdb_path='/srv/prometheus'
-	set prometheus.prometheus.web_listen_address='127.0.0.1:9090'
-	commit prometheus
-EOF
-}
--- a/utils/prometheus/files/prometheus.yml
+++ b/utils/prometheus/files/prometheus.yml
@ -1,29 +0,0 @@
-# my global config
-global:
-  scrape_interval:     15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
-  evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
-  # scrape_timeout is set to the global default (10s).
-
-# Alertmanager configuration
-alerting:
-  alertmanagers:
-  - static_configs:
-    - targets:
-      # - alertmanager:9093
-
-# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
-rule_files:
-  # - "first_rules.yml"
-  # - "second_rules.yml"
-
-# A scrape configuration containing exactly one endpoint to scrape:
-# Here it's Prometheus itself.
-scrape_configs:
-  # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
-  - job_name: 'prometheus'
-
-    # metrics_path defaults to '/metrics'
-    # scheme defaults to 'http'.
-
-    static_configs:
-    - targets: ['localhost:9090']
--- a/utils/prometheus/test.sh
+++ b/utils/prometheus/test.sh
@ -1,3 +0,0 @@
-#!/bin/sh
-
-prometheus --version 2>&1 | grep "$2"
--- a/utils/runc/Makefile
+++ b/utils/runc/Makefile
@ -1,14 +1,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=runc
-PKG_VERSION:=1.1.7
-PKG_RELEASE:=2
+PKG_VERSION:=1.1.8
+PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/opencontainers/runc/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=f1885d6dfa188f8112328ac2355e5d67346174a2e2e795ec514a972bcbfcc2fa
+PKG_HASH:=9076322ded5c7ae30471ea8a6a43e7c62fb357957592f5cb668abc2f7cb5e4bb

 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>