Merge branch 'master' of github.com:SEESAI/OpenWrt-Packages

.github/workflows/check-apk-valid-version.yml

@@ -55,7 +55,8 @@ jobs:
                 fi
                 PKG_VERSION=$(grep -E '^PKG_VERSION' "$ROOT/Makefile" | cut -f 2 -d '=')
                 if [ -n "$PKG_VERSION" ]; then
-                  if [[ -n $($GITHUB_WORKSPACE/apk version --check "$PKG_VERSION") ]]; then
+                  $GITHUB_WORKSPACE/apk version --quiet --check "$PKG_VERSION"
+                  if [[ "$?" -gt "0" ]]; then
                     echo "PKG_VERSION is not compatible: $PKG_VERSION"
                     INCOMPATIBLE_VERSION+=" $ROOT"
                   fi

admin/atop/Makefile

@@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=atop
 PKG_RELEASE:=1
-PKG_VERSION:=2.7.1
+PKG_VERSION:=2.11.0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.atoptool.nl/download/
-PKG_HASH:=ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e
+PKG_HASH:=9b94c666602efff7bf402ecce706c347f38c39cb63498f9d39626861e5646e20
 
 PKG_MAINTAINER:=Toni Uhlig <[email protected]>
 PKG_LICENSE:=GPL-2.0-or-later
@@ -24,7 +24,7 @@ define Package/atop
   SECTION:=admin
   CATEGORY:=Administration
   TITLE:=System and process monitor for Linux
-  DEPENDS:=+zlib +libncurses
+  DEPENDS:=+zlib +libncurses +glib2
   URL:=https://www.atoptool.nl/
 endef
 
@@ -44,9 +44,6 @@ define Package/atop/description
   network activity per process/thread.
 endef
 
-MAKE_FLAGS += \
-	CFLAGS+="-Wno-misleading-indentation -Wno-unused-const-variable -Wno-format-truncation"
-
 define Package/atop/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/atop $(1)/usr/bin/

admin/rsyslog/Makefile

@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rsyslog
-PKG_VERSION:=8.2406.0
+PKG_VERSION:=8.2408.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= \
 	https://fossies.org/linux/misc \
 	https://www.rsyslog.com/files/download/rsyslog
-PKG_HASH:=1343e0269dd32166ffde04d7ceebfa0e7146cf1dbc6962c56bf428c61f01a7df
+PKG_HASH:=8bb2f15f9bf9bb7e635182e3d3e370bfc39d08bf35a367dce9714e186f787206
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-3.0-or-later

lang/node/Makefile

@@ -8,12 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=node
-PKG_VERSION:=v20.16.0
+PKG_VERSION:=20.17.0
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION)
-PKG_HASH:=8f24bf9abe455a09ab30f9ae8edda1e945ed678a4b1c3b07ee0f901fdc0ff4fd
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://nodejs.org/dist/v$(PKG_VERSION)
+PKG_HASH:=409bda5f1896c7c20866610d778d1760991884ad2e7940837cd3f2854cf73747
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-v$(PKG_VERSION)
 
 PKG_MAINTAINER:=Hirokazu MORIKAWA <[email protected]>, Adrian Panella <[email protected]>
 PKG_LICENSE:=MIT

lang/node/patches/003-path.patch

@@ -1,6 +1,6 @@
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
-@@ -1518,7 +1518,8 @@ Module._initPaths = function() {
+@@ -1650,7 +1650,8 @@ Module._initPaths = function() {
      path.resolve(process.execPath, '..') :
      path.resolve(process.execPath, '..', '..');
 

lang/perl-try-tiny/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=perl-try-tiny
-PKG_VERSION:=0.31
+PKG_VERSION:=0.32
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://cpan.metacpan.org/authors/id/E/ET/ETHER/
 PKG_SOURCE:=Try-Tiny-$(PKG_VERSION).tar.gz
-PKG_HASH:=3300d31d8a4075b26d8f46ce864a1d913e0e8467ceeba6655d5d2b2e206c11be
+PKG_HASH:=ef2d6cab0bad18e3ab1c4e6125cc5f695c7e459899f512451c8fa3ef83fa7fc0
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Try-Tiny-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Matt Merhar <[email protected]>

lang/python/django/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django
-PKG_VERSION:=5.0.7
+PKG_VERSION:=5.1
 PKG_RELEASE:=1
 
 PYPI_NAME:=Django
-PKG_HASH:=bd4505cae0b9bd642313e8fb71810893df5dc2ffcacaa67a33af2d5cd61888f2
+PKG_HASH:=848a5980e8efb76eea70872fb0e4bc5e371619c70fffbe48e3e1b50b2c09455d
 
 PKG_MAINTAINER:=Alexandru Ardelean <[email protected]>, Peter Stadler <[email protected]>
 PKG_LICENSE:=BSD-3-Clause

lang/python/numpy/Makefile

@@ -6,11 +6,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=numpy
-PKG_VERSION:=1.26.4
+PKG_VERSION:=2.1.0
 PKG_RELEASE:=1
 
 PYPI_NAME:=$(PKG_NAME)
-PKG_HASH:=2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010
+PKG_HASH:=7dc90da0081f7e1da49ec4e398ede6a8e9cc4f5ebe5f9e06b443ed889ee9aaa2
 
 PKG_MAINTAINER:=Alexandru Ardelean <[email protected]>
 

lang/python/numpy/patches/003-without-vendored-meson.patch

@@ -1,25 +1,27 @@
 --- a/pyproject.toml
 +++ b/pyproject.toml
-@@ -1,8 +1,8 @@
+@@ -1,7 +1,7 @@
  [build-system]
 -build-backend = "mesonpy"
 +#build-backend = "mesonpy"
  requires = [
-     "Cython>=0.29.34,<3.1",
--    "meson-python>=0.15.0,<0.16.0",
-+#    "meson-python>=0.15.0,<0.16.0",
+-    "meson-python>=0.15.0",
++#    "meson-python>=0.15.0",
+     "Cython>=3.0.6",  # keep in sync with version check in meson.build
  ]
 
- [project]
-@@ -181,14 +181,14 @@ environment = {PKG_CONFIG_PATH="/opt/32/
- config-settings = "setup-args=--vsenv setup-args=-Dallow-noblas=true"
+@@ -181,8 +181,8 @@ select = "*-win32"
+ config-settings = "setup-args=--vsenv setup-args=-Dallow-noblas=true build-dir=build"
  repair-wheel-command = ""
 
 -[tool.meson-python]
 -meson = 'vendored-meson/meson/meson.py'
 +#[tool.meson-python]
 +#meson = 'vendored-meson/meson/meson.py'
 
+ [tool.meson-python.args]
+ install = ['--tags=runtime,python-runtime,tests,devel']
+@@ -190,8 +190,8 @@ install = ['--tags=runtime,python-runtim
  [tool.spin]
  package = 'numpy'
 

lang/python/numpy/patches/004-workaround-for-multiple-top-level-packages-discovered.patch

@@ -0,0 +1,12 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -59,6 +59,9 @@ download = "https://pypi.org/project/num
+ tracker = "https://github.com/numpy/numpy/issues"
+ "release notes" = "https://numpy.org/doc/stable/release"
+
++[tool.setuptools]
++py-modules = []
++
+ [tool.towncrier]
+     single_file = false
+     filename = "doc/source/release/notes-towncrier.rst"

libs/afalg_engine/Makefile

@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=afalg_engine
-PKG_VERSION:=1.2.0-beta.1
-PKG_RELEASE:=5
+PKG_VERSION:=1.2.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/cotequeiroz/afalg_engine/archive/v$(PKG_VERSION)
-PKG_HASH:=6f0da98a3c12eaf50331ac7cd81f7b8800abf54b96fd73bd3e37cc50fd3d2ba8
+PKG_HASH:=3f0f6ee9ea7a5ea9c668ec16f8c492aa024a82dca78d0fbe30fd256f9da95d65
 
 PKG_MAINTAINER:=Eneas U de Queiroz <[email protected]>
 PKG_LICENSE:=Apache-2.0

libs/afalg_engine/test.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+test_afalg_engine() {
+	opkg install openssl-util
+	openssl engine -t -c -v -pre DUMP_INFO afalg
+}
+
+case "$1" in
+	libopenssl-afalg_sync)
+		test_afalg_engine
+		;;
+	*)
+		echo "Unexpected package '$1'" >&2
+		exit 1
+		;;
+esac

libs/apr/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apr
-PKG_VERSION:=1.7.4
+PKG_VERSION:=1.7.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@APACHE/apr/
-PKG_HASH:=fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577
+PKG_HASH:=cd0f5d52b9ab1704c72160c5ee3ed5d3d4ca2df4a7f8ab564e3cb352b67232f2
 
 PKG_MAINTAINER:=Thomas Heil <[email protected]>
 

libs/c-ares/Makefile

@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=c-ares
-PKG_VERSION:=1.32.3
+PKG_VERSION:=1.33.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/c-ares/c-ares/releases/download/v$(PKG_VERSION)
-PKG_HASH:=5f02cc809aac3f6cc5edc1fac6c4423fd5616d7406ce47b904c24adf0ff2cd0f
+PKG_HASH:=06869824094745872fa26efd4c48e622b9bd82a89ef0ce693dc682a23604f415
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE.md

libs/db47/Makefile → libs/db/Makefile

@@ -7,51 +7,49 @@
 
 include $(TOPDIR)/rules.mk
 
-BASE_VERSION:=4.7.25
+PKG_NAME:=db
+PKG_VERSION:=5.3.28
+PKG_RELEASE:=1
 
-PKG_NAME:=db47
-PKG_VERSION:=$(BASE_VERSION).4.NC
-PKG_RELEASE:=7
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/db-$(BASE_VERSION).NC
-PKG_SOURCE:=db-$(BASE_VERSION).NC.tar.gz
-PKG_SOURCE_URL:=http://download.oracle.com/berkeley-db/
-PKG_HASH:=cd39c711023ff44c01d3c8ff0323eef7318660772b24f287556e6bf676a12535
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://download.oracle.com/berkeley-db/
+PKG_HASH:=e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628
 
 PKG_MAINTAINER:=Marcel Denia <[email protected]>
 PKG_LICENSE:=Sleepycat
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=libxml2
 PKG_FIXUP:=autoreconf
-PKG_LIBTOOL_PATHS:=. build_unix
+PKG_BUILD_DEPENDS:=libxml2
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libdb47
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=Berkeley DB library (4.7)
+  TITLE:=Berkeley DB library
   URL:=http://www.oracle.com/us/products/database/berkeley-db
   PROVIDES:=libdb47-full
+  ABI_VERSION:=5
 endef
 
 define Package/libdb47/description
-  Berkeley DB library (4.7).
+  Berkeley DB library.
 endef
 
 define Package/libdb47xx
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=+libdb47 +libstdcpp
-  TITLE:=Berkeley DB library (4.7) for C++
+  TITLE:=Berkeley DB library for C++
   URL:=http://www.oracle.com/us/products/database/berkeley-db
   PROVIDES:=libdb47xx-full
+  ABI_VERSION:=5
 endef
 
 define Package/libdb47xx/description
-  Berkeley DB library (4.7).  C++ wrapper.
+  Berkeley DB library C++ wrapper.
 endef
 
 CONFIGURE_PATH = build_unix
@@ -63,7 +61,6 @@ CONFIGURE_ARGS += \
 	--disable-java \
 	--with-mutex=POSIX/pthreads/library \
 	--disable-tcl \
-	--disable-rpc \
 	--enable-compat185 \
 	--disable-debug \
 	$(if $(CONFIG_PACKAGE_libdb47xx),--enable-cxx,--disable-cxx)

libs/db/patches/010-fix-parallel-build.patch

@@ -0,0 +1,19 @@
+With higher paralelism it sometimes fails with:
+libtool: link: `util_log.lo' is not a valid libtool object
+make: *** [db_replicate] Error 1
+
+Upstream-Status: Inappropriate [as far as open source community is concerned, upstream is dead]
+
+Signed-off-by: Martin Jansa <[email protected]>
+
+--- a/dist/Makefile.in
++++ b/dist/Makefile.in
+@@ -1034,7 +1034,7 @@ db_recover: db_recover@o@ util_sig@o@ $(
+ 	    db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+
+-db_replicate: db_replicate@o@ util_sig@o@ $(DEF_LIB)
++db_replicate: db_replicate@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) \
+ 	    db_replicate@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@

libs/db/patches/020-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch

@@ -0,0 +1,40 @@
+From 29621d637e30982489693f2e207ce6a1790e3337 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 22 Mar 2017 15:32:26 +0000
+Subject: [PATCH] atomic: Rename local __atomic_compare_exchange to avoid clash
+ with builtins
+
+Helps building with clang
+
+Fixes
+
+../db-5.3.28/src/dbinc/atomic.h:179:19: error: definition of builtin function '__atomic_compare_exchange'
+static inline int __atomic_compare_exchange(
+
+Upstream-Status: Inappropriate [as far as open source community is concerned, upstream is dead]
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/dbinc/atomic.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/dbinc/atomic.h
++++ b/src/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define	atomic_inc(env, p)	__atomic_inc(p)
+ #define	atomic_dec(env, p)	__atomic_dec(p)
+ #define	atomic_compare_exchange(env, p, o, n)	\
+-	__atomic_compare_exchange((p), (o), (n))
++	__db_atomic_compare_exchange((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ 	int	temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic
+  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+  * which configure could be changed to use.
+  */
+-static inline int __atomic_compare_exchange(
++static inline int __db_atomic_compare_exchange(
+ 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ 	atomic_value_t was;