Merge pull request #578 from 1582130940/libs

libs: Sync with upstream

kernel/v4l2loopback/Makefile

@@ -0,0 +1,50 @@
+# This software is in the public domain, furnished "as is", without technical
+# support, and with no warranty, express or implied, as to its usefulness for
+# any purpose.
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=v4l2loopback
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/umlaeute/v4l2loopback.git
+PKG_SOURCE_VERSION:=baf9de279afc7a7c7513e9c40a0c9ff88f456af4
+PKG_SOURCE_DATE:=2021-07-13
+PKG_MIRROR_HASH:=811a4b0bbefe14cf4a74dbb3d45f5ae147f50f1d67dbb6f0fe3e5a9888adf49a
+
+PKG_MAINTAINER:=Michel Promonet <michel.promonet@free.fr>
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/v4l2loopback
+  SUBMENU:=Video Support
+  TITLE:=v4l2loopback kernel module
+  FILES:=$(PKG_BUILD_DIR)/v4l2loopback.ko
+  DEPENDS:=+kmod-video-core +kmod-video-videobuf2
+  AUTOLOAD:=$(call AutoProbe,v4l2loopback)
+endef
+
+define KernelPackage/v4l2loopback/description
+  This module allows you to create "virtual video devices".
+  Normal (v4l2) applications will read these devices as if
+  they were ordinary video devices, but the video will not be
+  read from e.g. a capture card but instead it is generated
+  by another application. 
+endef
+
+MAKE_OPTS:= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	M="$(PKG_BUILD_DIR)"
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		CONFIG_PACKAGE_kmod-v4l2loopback=m \
+		modules
+endef
+
+$(eval $(call KernelPackage,v4l2loopback))
+

libs/alsa-lib/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alsa-lib
-PKG_VERSION:=1.2.4
-PKG_RELEASE:=1
+PKG_VERSION:=1.2.6.1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
 		http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7
+PKG_HASH:=ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
 		Peter Wagner <tripolar@gmx.at>
@@ -100,10 +100,13 @@ define Package/alsa-lib/install
 		$(PKG_INSTALL_DIR)/usr/lib/libatopology.so.* \
 		$(1)/usr/lib/
 
-	$(INSTALL_DIR) $(1)/usr/share/alsa/{cards,pcm}
+	$(INSTALL_DIR) $(1)/usr/share/alsa/{cards,ctl,pcm}
 	$(INSTALL_DATA) \
 		$(PKG_INSTALL_DIR)/usr/share/alsa/alsa.conf \
 		$(1)/usr/share/alsa/
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/share/alsa/ctl/* \
+		$(1)/usr/share/alsa/ctl/
 	$(INSTALL_DATA) \
 		$(PKG_INSTALL_DIR)/usr/share/alsa/pcm/* \
 		$(1)/usr/share/alsa/pcm/

libs/alsa-lib/patches/100-link_fix.patch

@@ -1,6 +1,6 @@
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -490,7 +490,7 @@ clean-libLTLIBRARIES:
+@@ -491,7 +491,7 @@ clean-libLTLIBRARIES:
  	}
  
  libasound.la: $(libasound_la_OBJECTS) $(libasound_la_DEPENDENCIES) $(EXTRA_libasound_la_DEPENDENCIES) 
@@ -11,7 +11,7 @@
  	-rm -f *.$(OBJEXT)
 --- a/src/pcm/scopes/Makefile.in
 +++ b/src/pcm/scopes/Makefile.in
-@@ -410,7 +410,7 @@ clean-pkglibLTLIBRARIES:
+@@ -411,7 +411,7 @@ clean-pkglibLTLIBRARIES:
  	}
  
  scope-level.la: $(scope_level_la_OBJECTS) $(scope_level_la_DEPENDENCIES) $(EXTRA_scope_level_la_DEPENDENCIES) 

libs/alsa-lib/patches/200-usleep.patch

@@ -17,9 +17,9 @@
  const char *_snd_module_pcm_shm = "";
 --- a/src/ucm/ucm_local.h
 +++ b/src/ucm/ucm_local.h
-@@ -53,6 +53,14 @@
- #define SEQUENCE_ELEMENT_TYPE_CSET_TLV	6
- #define SEQUENCE_ELEMENT_TYPE_CMPT_SEQ	7
+@@ -58,6 +58,14 @@
+ #define SEQUENCE_ELEMENT_TYPE_SYSSET		11
+ #define SEQUENCE_ELEMENT_TYPE_CFGSAVE		12
  
 +#if _POSIX_C_SOURCE >= 200809L
 +#define usleep(a) \

libs/alsa-lib/patches/300-snd_plugin.patch

@@ -1,27 +0,0 @@
-From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Thu, 22 Oct 2020 20:57:32 +0200
-Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
- declared even for \!DL_ORIGIN_AVAILABLE
-
-Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
-BugLink: https://github.com/alsa-project/alsa-lib/issues/91
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/dlmisc.c | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/src/dlmisc.c
-+++ b/src/dlmisc.c
-@@ -42,11 +42,9 @@
- #ifndef PIC
- struct snd_dlsym_link *snd_dlsym_start = NULL;
- #endif
--#ifdef DL_ORIGIN_AVAILABLE
- static int snd_plugin_dir_set = 0;
- static char *snd_plugin_dir = NULL;
- #endif
--#endif
- 
- #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
- static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;

libs/alsa-ucm-conf/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alsa-ucm-conf
-PKG_VERSION:=1.2.4
-PKG_RELEASE:=1
+PKG_VERSION:=1.2.6.2
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
 		http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=2c3b535c77dcb9aaf62a61f4f8324f1ab184162f105f7ec9ed1e37c742fcd340
+PKG_HASH:=8be24fb9fe789ee2778ae6f32e18e8043fe7f8bc735871e9d17c68a04566a822
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=BSD-3-Clause

libs/apr/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apr
 PKG_VERSION:=1.7.0
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@APACHE/apr/

libs/apr/patches/000-050-backport-use-AC_CHECK_SIZEOF.patch

@@ -0,0 +1,116 @@
+From 374210c50ee9f4dbf265f0172dcf2d45b97d0550
+From: Graham Leggett <minfrin@apache.org>
+Date: Thu, 26 Dec 2019 01:18:53 +0000
+Subject: [PATCH] Use AC_CHECK_SIZEOF, so as to support cross compiling. PR
+ 56053.
+
+git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1871980 13f79535-47bb-0310-9956-ffa450edef68
+---
+ build/apr_common.m4 | 37 -------------------------------------
+ configure.in        | 14 +++++++-------
+ 2 files changed, 7 insertions(+), 44 deletions(-)
+
+--- a/build/apr_common.m4
++++ b/build/apr_common.m4
+@@ -452,43 +452,6 @@ fi
+ 
+ 
+ dnl
+-dnl APR_CHECK_SIZEOF_EXTENDED(INCLUDES, TYPE [, CROSS_SIZE])
+-dnl
+-dnl A variant of AC_CHECK_SIZEOF which allows the checking of
+-dnl sizes of non-builtin types
+-dnl
+-AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED],
+-[changequote(<<, >>)dnl
+-dnl The name to #define.
+-define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl
+-dnl The cache variable name.
+-define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$2, [ *], [_p]))dnl
+-changequote([, ])dnl
+-AC_MSG_CHECKING(size of $2)
+-AC_CACHE_VAL(AC_CV_NAME,
+-[AC_TRY_RUN([#include <stdio.h>
+-$1
+-#ifdef WIN32
+-#define binmode "b"
+-#else
+-#define binmode
+-#endif
+-main()
+-{
+-  FILE *f=fopen("conftestval", "w" binmode);
+-  if (!f) exit(1);
+-  fprintf(f, "%d\n", sizeof($2));
+-  exit(0);
+-}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$3],,,
+-AC_CV_NAME=$3))])dnl
+-AC_MSG_RESULT($AC_CV_NAME)
+-AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The size of ]$2)
+-undefine([AC_TYPE_NAME])dnl
+-undefine([AC_CV_NAME])dnl
+-])
+-
+-
+-dnl
+ dnl APR_TRY_COMPILE_NO_WARNING(INCLUDES, FUNCTION-BODY,
+ dnl             [ACTIONS-IF-NO-WARNINGS], [ACTIONS-IF-WARNINGS])
+ dnl
+--- a/configure.in
++++ b/configure.in
+@@ -1798,7 +1798,7 @@ else
+     socklen_t_value="int"
+ fi
+ 
+-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8)
++AC_CHECK_SIZEOF(pid_t)
+ 
+ if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
+     pid_t_fmt='#define APR_PID_T_FMT "hd"'
+@@ -1870,7 +1870,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, u
+ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"])
+ ])
+ 
+-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
++AC_CHECK_SIZEOF(ssize_t)
+ 
+ dnl the else cases below should no longer occur;
+ AC_MSG_CHECKING([which format to use for apr_ssize_t])
+@@ -1888,7 +1888,7 @@ fi
+ 
+ ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
+ 
+-APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
++AC_CHECK_SIZEOF(size_t)
+ 
+ # else cases below should no longer occur;
+ AC_MSG_CHECKING([which format to use for apr_size_t])
+@@ -1906,7 +1906,7 @@ fi
+ 
+ size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
+ 
+-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
++AC_CHECK_SIZEOF(off_t)
+ 
+ if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
+     # Enable LFS
+@@ -2000,7 +2000,7 @@ case $host in
+     ;;
+ *)
+     ino_t_value=ino_t
+-    APR_CHECK_SIZEOF_EXTENDED(AC_INCLUDES_DEFAULT, ino_t, $ac_cv_sizeof_long)
++    AC_CHECK_SIZEOF(ino_t)
+     if test $ac_cv_sizeof_ino_t = 4; then
+         if test $ac_cv_sizeof_long = 4; then
+             ino_t_value="unsigned long"
+@@ -2020,8 +2020,8 @@ else
+     bigendian=0
+ fi
+ 
+-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
+-#include <sys/uio.h>],struct iovec,0)
++AC_CHECK_SIZEOF(struct iovec,,[AC_INCLUDES_DEFAULT
++#include <sys/uio.h>])
+ if test "$ac_cv_sizeof_struct_iovec" = "0"; then
+     have_iovec=0
+ else

libs/apr/patches/000-055-backport-strerror-cache.patch

@@ -0,0 +1,46 @@
+From 5fd2568c34a8d5c8159d9a5e0f5601f9e8902166
+From: Graham Leggett <minfrin@apache.org>
+Date: Tue, 10 Mar 2020 22:38:59 +0000
+Subject: [PATCH] APR's configure script uses AC_TRY_RUN to detect whether the
+ return type of strerror_r is int. When cross-compiling this defaults to no.
+
+This commit adds an AC_CACHE_CHECK so users who cross-compile APR may
+influence the outcome with a configure variable.
+
+
+git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1875065 13f79535-47bb-0310-9956-ffa450edef68
+---
+ CHANGES             |  7 +++++++ (OPENWRT REMOVED)
+ build/apr_common.m4 | 11 ++++-------
+ 2 files changed, 11 insertions(+), 7 deletions(-)
+
+--- a/build/apr_common.m4
++++ b/build/apr_common.m4
+@@ -489,8 +489,9 @@ dnl  string.
+ dnl
+ dnl
+ AC_DEFUN([APR_CHECK_STRERROR_R_RC], [
+-AC_MSG_CHECKING(for type of return code from strerror_r)
+-AC_TRY_RUN([
++AC_CACHE_CHECK([whether return code from strerror_r has type int],
++[ac_cv_strerror_r_rc_int],
++[AC_TRY_RUN([
+ #include <errno.h>
+ #include <string.h>
+ #include <stdio.h>
+@@ -506,14 +507,10 @@ main()
+ }], [
+     ac_cv_strerror_r_rc_int=yes ], [
+     ac_cv_strerror_r_rc_int=no ], [
+-    ac_cv_strerror_r_rc_int=no ] )
++    ac_cv_strerror_r_rc_int=no ] ) ] )
+ if test "x$ac_cv_strerror_r_rc_int" = xyes; then
+   AC_DEFINE(STRERROR_R_RC_INT, 1, [Define if strerror returns int])
+-  msg="int"
+-else
+-  msg="pointer"
+ fi
+-AC_MSG_RESULT([$msg])
+ ] )
+ 
+ dnl

libs/apr/patches/000-060-backport-require-stdlib.patch

@@ -0,0 +1,106 @@
+From 9d9c6990afaa7ad8eea0be524481bb48a5dd1b09
+From: Jim Jagielski <jim@apache.org>
+Date: Thu, 29 Oct 2020 20:16:55 +0000
+Subject: [PATCH] calls to exit() require stdlib.h or else we get
+ -Werror,-Wimplicit-function-declaration
+
+git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1882979 13f79535-47bb-0310-9956-ffa450edef68
+---
+ build/apr_common.m4  |  3 +++
+ build/apr_network.m4 | 15 +++++++++++++++
+ configure.in         |  6 +++++-
+ 3 files changed, 23 insertions(+), 1 deletion(-)
+
+--- a/build/apr_common.m4
++++ b/build/apr_common.m4
+@@ -495,6 +495,9 @@ AC_CACHE_CHECK([whether return code from
+ #include <errno.h>
+ #include <string.h>
+ #include <stdio.h>
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ main()
+ {
+   char buf[1024];
+--- a/build/apr_network.m4
++++ b/build/apr_network.m4
+@@ -63,6 +63,9 @@ AC_DEFUN([APR_CHECK_WORKING_GETADDRINFO]
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ 
+ int main(void) {
+     struct addrinfo hints, *ai;
+@@ -151,6 +154,9 @@ AC_DEFUN([APR_CHECK_WORKING_GETNAMEINFO]
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ 
+ int main(void) {
+     struct sockaddr_in sa;
+@@ -194,6 +200,9 @@ AC_DEFUN([APR_CHECK_NEGATIVE_EAI], [
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
+ #endif
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ 
+ int main(void) {
+     if (EAI_ADDRFAMILY < 0) {
+@@ -403,6 +412,9 @@ AC_DEFUN([APR_CHECK_TCP_NODELAY_INHERITE
+ #ifndef HAVE_SOCKLEN_T
+ typedef int socklen_t;
+ #endif
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ int main(void) {
+     int listen_s, connected_s, client_s;
+     int listen_port, rc;
+@@ -588,6 +600,9 @@ typedef int socklen_t;
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ int main(void) {
+     int listen_s, connected_s, client_s;
+     int listen_port, rc;
+--- a/configure.in
++++ b/configure.in
+@@ -2208,6 +2208,7 @@ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
++#include <stdlib.h>
+ main()
+ {
+     struct rlimit limit;
+@@ -2307,6 +2308,7 @@ if test "$threads" = "1"; then
+       AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <pthread.h>
++#include <stdlib.h>
+         int main()
+         {
+             pthread_mutex_t mutex;
+@@ -2430,7 +2432,9 @@ AC_TRY_RUN([
+ #endif
+ #include <fcntl.h>
+ #include <errno.h>
+-
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ int fd;
+ struct flock proc_mutex_lock_it = {0};
+ const char *fname = "conftest.fcntl";

libs/apr/patches/000-070-backport-avoid-inclusion-of-confdefs.patch

@@ -0,0 +1,61 @@
+From 0a763c5e500f4304b7c534fae0fad430d64982e8
+From: Yann Ylavic <ylavic@apache.org>
+Date: Sat, 6 Mar 2021 22:20:59 +0000
+Subject: [PATCH] build/apr_common.m4: avoid explicit inclusion of "confdefs.h"
+
+The failure is observed on `autoconf-2.69d` (soon to be released
+as `autoconf-2.70`). There `int64_t` detection fails as:
+
+$ autoreconf && ./configure
+checking whether int64_t and int use fmt %d... no
+checking whether int64_t and long use fmt %ld... no
+checking whether int64_t and long long use fmt %lld... no
+configure: error: could not determine the string function for int64_t
+```
+
+This happens because `./configure` always stumbles on warning:
+
+configure:3350: gcc -c -g -O2 -Werror  conftest.c >&5
+In file included from conftest.c:31:
+confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror]
+   22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
+      |
+
+It's triggered by double inclusion of `"confdefs.h"` contents:
+explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly
+via `AC_LANG_SOURCE` use.
+
+To fix it and avoid having to define `main()` declaration the change
+uses `AC_LANG_PROGRAM` instead.
+
+Tested on both `autoconf-2.69` and `autoconf-2.69d`.
+
+
+Github: closes #25
+Submitted by: Sergei Trofimovich <slyfox gentoo.org>
+Reviewed by: ylavic
+
+
+git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1887279 13f79535-47bb-0310-9956-ffa450edef68
+---
+ build/apr_common.m4 | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+--- a/build/apr_common.m4
++++ b/build/apr_common.m4
+@@ -467,13 +467,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
+    CFLAGS="$CFLAGS -Werror"
+  fi
+  AC_COMPILE_IFELSE(
+-  [AC_LANG_SOURCE(
+-   [#include "confdefs.h"
+-   ]
+-   [[$1]]
+-   [int main(int argc, const char *const *argv) {]
++  [AC_LANG_PROGRAM(
++   [[$1]],
+    [[$2]]
+-   [   return 0; }]
+   )], [CFLAGS=$apr_save_CFLAGS
+ $3],  [CFLAGS=$apr_save_CFLAGS
+ $4])

libs/apr/patches/000-071-backport-fix-APR_TRY_COMPILE_NO_WARNING.patch

@@ -0,0 +1,39 @@
+From ea9344182b7559b12aa523548bb6d37d0e009028
+From: Yann Ylavic <ylavic@apache.org>
+Date: Wed, 24 Mar 2021 15:02:52 +0000
+Subject: [PATCH] Follow up to r1887279: fix new APR_TRY_COMPILE_NO_WARNING.
+
+AC_LANG_PROGRAM generates an "int main()" prototype which some compilers warn
+about. Restore AC_LANG_SOURCE to manually set the correct main() but do not
+#include "confdefs.h" if it is inlined already by AC_LANG_SOURCE (i.e.
+check whether PACKAGE_NAME is already defined).
+
+Github: closes #25
+
+
+git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1888017 13f79535-47bb-0310-9956-ffa450edef68
+---
+ build/apr_common.m4 | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+--- a/build/apr_common.m4
++++ b/build/apr_common.m4
+@@ -467,9 +467,16 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
+    CFLAGS="$CFLAGS -Werror"
+  fi
+  AC_COMPILE_IFELSE(
+-  [AC_LANG_PROGRAM(
+-   [[$1]],
++  [AC_LANG_SOURCE(
++   [
++#ifndef PACKAGE_NAME
++#include "confdefs.h"
++#endif
++   ]
++   [[$1]]
++   [int main(int argc, const char *const *argv) {]
+    [[$2]]
++   [   return 0; }]
+   )], [CFLAGS=$apr_save_CFLAGS
+ $3],  [CFLAGS=$apr_save_CFLAGS
+ $4])

libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch

@@ -1,73 +0,0 @@
-From f4d6e45ed5d2ccffd1af4c2ccdf7099ba0dce137 Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Wed, 14 Dec 2016 18:13:08 +0800
-Subject: [PATCH 6/7] apr: fix off_t size doesn't match in glibc when cross
- compiling
-
-In configure.in, it contains the following:
-
-	APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
-
-the macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4,
-it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross
-compiling enable.
-
-So it was hardcoded for cross compiling, we should detect it dynamic based on
-the sysroot's glibc. We change it to the following:
-
-	AC_CHECK_SIZEOF(off_t)
-
-The same for the following hardcoded types for cross compiling:
-
-	pid_t	8
-	ssize_t	8
-	size_t	8
-	off_t	8
-
-Change the above correspondingly.
-
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
-
-Upstream-Status: Pending
----
- configure.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/configure.in
-+++ b/configure.in
-@@ -1809,7 +1809,7 @@ else
-     socklen_t_value="int"
- fi
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8)
-+AC_CHECK_SIZEOF(pid_t)
- 
- if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
-     pid_t_fmt='#define APR_PID_T_FMT "hd"'
-@@ -1881,7 +1881,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, u
- APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"])
- ])
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
-+AC_CHECK_SIZEOF(ssize_t)
- 
- dnl the else cases below should no longer occur;
- AC_MSG_CHECKING([which format to use for apr_ssize_t])
-@@ -1899,7 +1899,7 @@ fi
- 
- ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
-+AC_CHECK_SIZEOF(size_t)
- 
- # else cases below should no longer occur;
- AC_MSG_CHECKING([which format to use for apr_size_t])
-@@ -1917,7 +1917,7 @@ fi
- 
- size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
-+AC_CHECK_SIZEOF(off_t)
- 
- if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
-     # Enable LFS

libs/apr/patches/302-add-cache-for-strerror_r.patch

@@ -1,30 +0,0 @@
---- a/build/apr_common.m4
-+++ b/build/apr_common.m4
-@@ -526,8 +526,9 @@ dnl  string.
- dnl
- dnl
- AC_DEFUN([APR_CHECK_STRERROR_R_RC], [
--AC_MSG_CHECKING(for type of return code from strerror_r)
--AC_TRY_RUN([
-+AC_CACHE_CHECK([whether return code from strerror_r has type int],
-+[ac_cv_strerror_r_rc_int],
-+[AC_TRY_RUN([
- #include <errno.h>
- #include <string.h>
- #include <stdio.h>
-@@ -543,14 +544,10 @@ main()
- }], [
-     ac_cv_strerror_r_rc_int=yes ], [
-     ac_cv_strerror_r_rc_int=no ], [
--    ac_cv_strerror_r_rc_int=no ] )
-+    ac_cv_strerror_r_rc_int=no ] ) ] )
- if test "x$ac_cv_strerror_r_rc_int" = xyes; then
-   AC_DEFINE(STRERROR_R_RC_INT, 1, [Define if strerror returns int])
--  msg="int"
--else
--  msg="pointer"
- fi
--AC_MSG_RESULT([$msg])
- ] )
- 
- dnl

libs/apr/patches/CVE-2021-35940.patch

@@ -0,0 +1,49 @@
+
+SECURITY: CVE-2021-35940 (cve.mitre.org)
+
+Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though
+was addressed in 1.6.x in 1.6.3 and later via r1807976.
+
+The fix was merged back to 1.7.x in r1891198.
+
+Since this was a regression in 1.7.0, a new CVE name has been assigned
+to track this, CVE-2021-35940.
+
+Thanks to Iveta Cesalova <icesalov redhat.com> for reporting this issue.
+
+https://svn.apache.org/viewvc?view=revision&revision=1891198
+
+--- a/time/unix/time.c
++++ b/time/unix/time.c
+@@ -142,6 +142,9 @@ APR_DECLARE(apr_status_t) apr_time_exp_g
+     static const int dayoffset[12] =
+     {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
+ 
++    if (xt->tm_mon < 0 || xt->tm_mon >= 12)
++        return APR_EBADDATE;
++
+     /* shift new year to 1st March in order to make leap year calc easy */
+ 
+     if (xt->tm_mon < 2)
+--- a/time/win32/time.c
++++ b/time/win32/time.c
+@@ -54,6 +54,9 @@ static void SystemTimeToAprExpTime(apr_t
+     static const int dayoffset[12] =
+     {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
+ 
++    if (tm->wMonth < 1 || tm->wMonth > 12)
++        return APR_EBADDATE;
++
+     /* Note; the caller is responsible for filling in detailed tm_usec,
+      * tm_gmtoff and tm_isdst data when applicable.
+      */
+@@ -228,6 +231,9 @@ APR_DECLARE(apr_status_t) apr_time_exp_g
+     static const int dayoffset[12] =
+     {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
+ 
++    if (xt->tm_mon < 0 || xt->tm_mon >= 12)
++        return APR_EBADDATE;
++
+     /* shift new year to 1st March in order to make leap year calc easy */
+ 
+     if (xt->tm_mon < 2)

libs/avahi/Makefile

@@ -21,6 +21,7 @@ PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:avahi:avahi
 
+PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 

libs/avahi/patches/020-revert-runtime-dir-systemd-change.patch

@@ -1,11 +1,11 @@
---- a/configure
-+++ b/configure
-@@ -24638,7 +24638,7 @@ _ACEOF
+--- a/configure.ac
++++ b/configure.ac
+@@ -1004,7 +1004,7 @@ AC_DEFINE_UNQUOTED(AVAHI_AUTOIPD_GROUP,"
  #
  # Avahi runtime dir
  #
 -avahi_runtime_dir="/run"
 +avahi_runtime_dir="${localstatedir}/run"
  avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
- 
- 
+ AC_SUBST(avahi_runtime_dir)
+ AC_SUBST(avahi_socket)

libs/boringssl/Makefile

@@ -0,0 +1,52 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2021 Martin Schneider <martschneider@google.com>
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=boringssl
+PKG_VERSION:=20210608
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://boringssl.googlesource.com/boringssl
+PKG_SOURCE_DATE:=2021-06-08
+PKG_SOURCE_VERSION:=1f54fd9864c054dc33e15b1144e2a6a19fa0a52e
+PKG_MIRROR_HASH:=a60c79ca40d1a73639d4c1bba3431ca630ab1d670ab06307e8442b69cfaf0cc7
+
+PKG_MAINTAINER:=Martin Schneider <martschneider@google.com>
+PKG_LICENSE:=OpenSSL ISC
+PKG_LICENSE_FILES:=LICENSE
+PKG_BUILD_DEPENDS:=golang/host
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+include ../../lang/golang/golang-values.mk
+
+define Package/boringssl
+	SECTION:=libs
+	CATEGORY:=Libraries
+	TITLE:=An implementation of the TLS protocol
+	URL:=https://boringssl.googlesource.com/boringssl/
+	DEPENDS:=+libstdcpp $(GO_ARCH_DEPENDS) @!(mips||mips64)
+endef
+
+define Package/boringssl/description
+	An implementation of the TLS protocol
+endef
+
+CMAKE_OPTIONS+=-DBUILD_SHARED_LIBS=ON
+
+define Package/boringssl/install
+	$(INSTALL_DIR) $(1)/usr/lib/boringssl
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/bin/lib{crypto,ssl}.so $(1)/usr/lib/boringssl
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/boringssl
+	$(INSTALL_DIR) $(1)/usr/include/boringssl
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/lib{crypto,ssl}.so $(1)/usr/lib/boringssl
+	$(CP) $(PKG_BUILD_DIR)/include/* $(1)/usr/include/boringssl
+endef
+
+$(eval $(call BuildPackage,boringssl))

libs/boringssl/patches/300-support-mipsel-arch.patch

@@ -0,0 +1,21 @@
+From 425b44bc6f6abcd4c12e2fb72f42622e825ad700 Mon Sep 17 00:00:00 2001
+From: Martin Schneider <martschneider@google.com>
+Date: Mon, 25 Oct 2021 09:53:33 +0800
+Subject: [PATCH] Support mipsel architecture.
+
+Signed-off-by: Martin Schneider <martschneider@google.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -489,7 +489,7 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUA
+   set(ARCH "aarch64")
+ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm*")
+   set(ARCH "arm")
+-elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "mips")
++elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^mips*")
+   # Just to avoid the “unknown processor” error.
+   set(ARCH "generic")
+ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le")

libs/boringssl/patches/900-add-install-target.patch

@@ -0,0 +1,18 @@
+From 8f62d432745a65671332281363409229c238cd1e Mon Sep 17 00:00:00 2001
+From: Martin Schneider <martschneider@google.com>
+Date: Mon, 25 Oct 2021 10:53:01 +0800
+Subject: [PATCH] Add install target to CMakeLists.txt
+
+Signed-off-by: Martin Schneider <martschneider@google.com>
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -649,3 +649,5 @@ add_custom_target(
+     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+     DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any
+     USES_TERMINAL)
++
++install(TARGETS ssl crypto DESTINATION bin)

libs/cjson/Makefile

@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cJSON
-PKG_VERSION:=1.7.14
+PKG_VERSION:=1.7.15
 PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/DaveGamble/cJSON/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=fb50a663eefdc76bafa80c82bc045af13b1363e8f45cec8b442007aef6a41343
+PKG_HASH:=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2
 
 PKG_MAINTAINER:=Karl Palsson <karlp@etactica.com>
 PKG_LICENSE:=MIT

libs/cyrus-sasl/Makefile

@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cyrus-sasl
-PKG_VERSION:=2.1.27
-PKG_RELEASE:=3
+PKG_VERSION:=2.1.28
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://www.cyrusimap.org/releases/
-PKG_HASH:=26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
+PKG_SOURCE_URL:=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/
+PKG_HASH:=7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
 
 PKG_LICENSE:=BSD-4c BSD
 PKG_LICENSE_FILES:=COPYING cmulocal/COPYING saslauthd/COPYING
@@ -28,12 +28,23 @@ PKG_REMOVE_FILES:=aclocal.m4 saslauthd/aclocal.m4 config/libtool.m4
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libsasl2
+define Package/libsasl2/Default
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A general purpose authentication library
   URL:=http://asg.web.cmu.edu/sasl/
+endef
+
+define Package/libsasl2
+  $(call Package/libsasl2/Default)
   DEPENDS:=+libopenssl
+  TITLE+= (libraries)
+endef
+
+define Package/libsasl2-sasldb
+  $(call Package/libsasl2/Default)
+  DEPENDS:=+libsasl2 +libdb47
+  TITLE+= (sasldb libraries)
 endef
 
 TARGET_CFLAGS += $(FPIC)
@@ -47,7 +58,7 @@ CONFIGURE_ARGS += \
 	--disable-checkapop \
 	--enable-cram \
 	--enable-digest \
-	--without-auth-sasldb \
+	--enable-auth-sasldb \
 	--disable-otp \
 	--disable-srp \
 	--disable-srp-setpass \
@@ -60,7 +71,7 @@ CONFIGURE_ARGS += \
 	--disable-ntlm \
 	--disable-sql \
 	--disable-ldapdb \
-	--without-dblib \
+	--with-dblib=berkeley \
 	--without-gdbm \
 	--with-devrandom="/dev/urandom" \
 	--without-pam \
@@ -109,7 +120,17 @@ define Package/libsasl2/install
 	$(INSTALL_DIR) $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so.* $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/sasl2
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so* $(1)/usr/lib/sasl2/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/libanonymous.so* $(1)/usr/lib/sasl2/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/libplain.so* $(1)/usr/lib/sasl2/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/libcrammd5.so* $(1)/usr/lib/sasl2/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/libdigestmd5.so* $(1)/usr/lib/sasl2/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/libscram.so* $(1)/usr/lib/sasl2/
+endef
+
+define Package/libsasl2-sasldb/install
+	$(INSTALL_DIR) $(1)/usr/lib/sasl2
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/libsasldb.so* $(1)/usr/lib/sasl2/
 endef
 
 $(eval $(call BuildPackage,libsasl2))
+$(eval $(call BuildPackage,libsasl2-sasldb))

libs/elektra/Makefile

@@ -14,11 +14,11 @@ PKG_MAINTAINER:=Harald Geyer <harald@ccbib.org>
 PKG_NAME:=elektra
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE.md
-PKG_VERSION:=0.9.2
-PKG_RELEASE:=3
+PKG_VERSION:=0.9.7
+PKG_RELEASE:=4
 
 # Use this for official releasees
-PKG_HASH:=6f2fcf8aaed8863e1cc323265ca2617751ca50dac974b43a0811bcfd4a511f2e
+PKG_HASH:=12b7b046004db29317b7b937dc794abf719c400ba3115af8d41849127b562681
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://ftp.libelektra.org/ftp/elektra/releases
 
@@ -98,8 +98,8 @@ endef
 
 define CONTENT_ELEKTRA_PLUGINS_TEXT
 base64 conditionals csvstorage date file filecheck glob hexcode
-hexnumber hidden hosts iconv ipaddr keytometa line lineendings list
-mathcheck macaddr mini network null path profile quickdump
+hexnumber hosts iconv ipaddr keytometa line lineendings list
+mathcheck macaddr mini network path profile quickdump
 range reference rgbcolor shell syslog type uname unit validation
 endef
 
@@ -130,19 +130,6 @@ Currently these are:
 $(CONTENT_ELEKTRA_CPP)
 endef
 
-define Package/libelektra-boost
-  $(call Package/libelektra/Default)
-  TITLE:=Elektra plugins depending on boost
-  DEPENDS:=+libelektra-core +libstdcpp +boost
-endef
-
-define Package/libelektra-boost/description
-$(call Package/libelektra/Default-description)
-
-This package contains plugins written in C++ with an dependency on
-boost. Currently this is a plugin for a tcl like format.
-endef
-
 define Package/libelektra-crypto
   $(call Package/libelektra/Default)
   TITLE:=Elektra crypto plugin
@@ -180,6 +167,32 @@ This package contains support for dbus notification on configuration
 changes.
 endef
 
+define Package/libelektra-ev
+  $(call Package/libelektra/Default)
+  TITLE:=Elektra libev binding plugin
+  DEPENDS:=+libelektra-core +libev
+endef
+
+define Package/libelektra-ev/description
+$(call Package/libelektra/Default-description)
+
+This package contains support for notification on configuration
+changes via libev events.
+endef
+
+define Package/libelektra-uv
+  $(call Package/libelektra/Default)
+  TITLE:=Elektra libuv binding plugin
+  DEPENDS:=+libelektra-core +libuv
+endef
+
+define Package/libelektra-uv/description
+$(call Package/libelektra/Default-description)
+
+This package contains support for notification on configuration
+changes via libuv events.
+endef
+
 define Package/libelektra-xerces
   $(call Package/libelektra/Default)
   TITLE:=Elektra xerces based xml plugin
@@ -270,7 +283,7 @@ endef
 define CONTENT_EXTRA_PLUGINS_TEXT
 blockresolver c constants counter desktop dpkg error fcrypt
 fstab logchange mozprefs passwd process rename
-timeofday tracer yamlsmith
+timeofday tracer
 endef
 
 CONTENT_ELEKTRA_EXTRA:=$(strip $(CONTENT_EXTRA_PLUGINS_TEXT))
@@ -295,16 +308,16 @@ CMAKE_OPTIONS += \
 	-DFORCE_IN_SOURCE_BUILD=ON \
 	-DBUILD_TESTING=OFF \
 	-DKDB_DEFAULT_RESOLVER=resolver_fm_pb_b \
-	-DKDB_DEFAULT_STORAGE=ini \
+	-DKDB_DEFAULT_STORAGE=toml \
 	-DENABLE_OPTIMIZATIONS=OFF \
-	-DPLUGINS="ALL;-gpgme;-internalnotification;-multifile;-simpleini" \
-	-DIconv_INCLUDE_DIR="$(ICONV_PREFIX)/include" \
-	-DIconv_LIBRARY="$(ICONV_PREFIX)/lib/libiconv.$(if $(CONFIG_BUILD_NLS),so,a)" \
-	-DBINDINGS="MAINTAINED;-intercept_env;-intercept_fs;-io_uv;-io_ev;-io_glib"
+	-DPLUGINS="ALL;-gpgme;-multifile;-simpleini" \
+	-DBINDINGS="MAINTAINED;-intercept_env;-intercept_fs;-io_glib"
 
 define Package/libelektra-core/install
 	$(INSTALL_DIR) $(1)/etc/kdb/
+	$(INSTALL_DIR) $(1)/etc/profile.d/
 	$(INSTALL_DIR) $(1)/usr/lib/
+	$(INSTALL_DATA) files/elektra.profile $(1)/etc/profile.d/elektra.sh
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-core.so* $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-ease.so* $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-globbing.so* $(1)/usr/lib/
@@ -314,22 +327,22 @@ define Package/libelektra-core/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-kdb.so* $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-merge.so* $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-meta.so* $(1)/usr/lib/
-	#The next is excluded because of an upstream bug
-	#$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-notification.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-notification.so* $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-opts.so* $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-plugin.so* $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-pluginprocess.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-proposal.so* $(1)/usr/lib/
 	#The next is only supported with glibc, so skip it.
 	#$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektraintercept-* $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-resolver_fm_pb_b.so $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-utility.so* $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-cache.so $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-internalnotification.so $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-mmapstorage.so $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-ni.so $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-ini.so $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-spec.so $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-sync.so $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-storage.so $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-toml.so $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-resolver.so $(1)/usr/lib/
 endef
 
@@ -354,11 +367,6 @@ define Package/libelektra-plugins/install
 	$(CP) $(foreach plugin,$(CONTENT_ELEKTRA_PLUGINS),$(PKG_INSTALL_DIR)/usr/lib/libelektra-$(plugin).so) $(1)/usr/lib/
 endef
 
-define Package/libelektra-boost/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-tcl.so $(1)/usr/lib/
-endef
-
 define Package/libelektra-cpp/install
 	$(INSTALL_DIR) $(1)/usr/lib/
 	$(CP) $(foreach plugin,$(CONTENT_ELEKTRA_CPP),$(PKG_INSTALL_DIR)/usr/lib/libelektra-$(plugin).so) $(1)/usr/lib/
@@ -380,6 +388,16 @@ define Package/libelektra-dbus/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-dbusrecv.so $(1)/usr/lib/
 endef
 
+define Package/libelektra-ev/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-io-ev.so $(1)/usr/lib/
+endef
+
+define Package/libelektra-uv/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-io-uv.so $(1)/usr/lib/
+endef
+
 define Package/libelektra-xerces/install
 	$(INSTALL_DIR) $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelektra-xerces.so $(1)/usr/lib/
@@ -432,15 +450,16 @@ $(eval $(call BuildPackage,libelektra-core))
 $(eval $(call BuildPackage,elektra-kdb))
 $(eval $(call BuildPackage,libelektra-resolvers))
 $(eval $(call BuildPackage,libelektra-plugins))
-$(eval $(call BuildPackage,libelektra-boost))
 $(eval $(call BuildPackage,libelektra-cpp))
 $(eval $(call BuildPackage,libelektra-curlget))
 $(eval $(call BuildPackage,libelektra-crypto))
 $(eval $(call BuildPackage,libelektra-dbus))
+$(eval $(call BuildPackage,libelektra-ev))
+$(eval $(call BuildPackage,libelektra-uv))
 $(eval $(call BuildPackage,libelektra-xerces))
-$(eval $(call BuildPackage,libelektra-yamlcpp))
 $(eval $(call BuildPackage,libelektra-xml))
 $(eval $(call BuildPackage,libelektra-yajl))
+$(eval $(call BuildPackage,libelektra-yamlcpp))
 $(eval $(call BuildPackage,libelektra-python3))
 $(eval $(call BuildPackage,libelektra-lua))
 $(eval $(call BuildPackage,libelektra-zmq))

libs/elektra/files/elektra.profile

@@ -0,0 +1 @@
+export XDG_CACHE_HOME=/tmp/

libs/elektra/patches/010-gcc11.patch

@@ -1,19 +0,0 @@
-From 7b57dc698834937b6913887544c6416e7f39192d Mon Sep 17 00:00:00 2001
-From: Mihael Pranjic <mpranj@limun.org>
-Date: Mon, 26 Apr 2021 14:53:21 +0200
-Subject: [PATCH] kdb: add missing <limits> include
-
----
- src/tools/kdb/cmdline.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/tools/kdb/cmdline.cpp
-+++ b/src/tools/kdb/cmdline.cpp
-@@ -16,6 +16,7 @@
- 
- #include <cstdio>
- #include <iostream>
-+#include <limits>
- #include <set>
- #include <vector>
- 

libs/elektra/patches/010-iconv.patch

@@ -0,0 +1,121 @@
+--- a/src/plugins/filecheck/CMakeLists.txt
++++ b/src/plugins/filecheck/CMakeLists.txt
+@@ -1,20 +1,46 @@
+ include (LibAddMacros)
+-if (DEPENDENCY_PHASE)
+-	find_package (Iconv QUIET)
+-
+-	if (NOT Iconv_FOUND)
+-		remove_plugin (filecheck "Cannot find iconv library")
+-	endif ()
++find_package (Iconv QUIET)
+ 
++if (DEPENDENCY_PHASE)
+ 	if (ENABLE_ASAN AND CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+ 		# See also: https://cirrus-ci.com/task/5751822404288512?command=tests#L237-L239
+ 		remove_plugin (filecheck "the unit test of the plugin fails on FreeBSD if ASan is active")
+ 	endif (ENABLE_ASAN AND CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+ endif ()
+ 
+-add_plugin (
+-	filecheck
+-	SOURCES filecheck.h filecheck.c
+-	INCLUDE_DIRECTORIES ${Iconv_INCLUDE_DIRS}
+-	LINK_LIBRARIES ${Iconv_LIBRARIES}
+-	ADD_TEST INSTALL_TEST_DATA COMPONENT libelektra${SO_VERSION}-extra)
++if(Iconv_FOUND)
++	add_plugin (
++		filecheck
++		SOURCES filecheck.h filecheck.c
++		INCLUDE_DIRECTORIES ${Iconv_INCLUDE_DIRS}
++		LINK_LIBRARIES ${Iconv_LIBRARIES}
++		ADD_TEST INSTALL_TEST_DATA COMPONENT libelektra${SO_VERSION}-extra)
++else()
++	# Sometime the build environment is not setup
++	# in a way CMake can find Iconv on its own by default.
++	# But if we simply link against iconv (-liconv), the build may succeed
++	# due to other compiler/link flags.
++	set(CMAKE_REQUIRED_LIBRARIES "iconv")
++	check_c_source_compiles("
++		#include <stddef.h>
++		#include <iconv.h>
++		int main() {
++			char *a, *b;
++			size_t i, j;
++			iconv_t ic;
++			ic = iconv_open(\"to\", \"from\");
++			iconv(ic, &a, &i, &b, &j);
++			iconv_close(ic);
++		}
++		"
++	Iconv_EXPLICITLY_AT_ENV)
++	if(Iconv_EXPLICITLY_AT_ENV)
++		add_plugin (
++			filecheck
++			SOURCES filecheck.h filecheck.c
++			LINK_LIBRARIES iconv
++			ADD_TEST INSTALL_TEST_DATA COMPONENT libelektra${SO_VERSION}-extra)
++	else()
++			message(FATAL_ERROR "Cannot find iconv library")
++	endif()
++endif()
+--- a/src/plugins/iconv/CMakeLists.txt
++++ b/src/plugins/iconv/CMakeLists.txt
+@@ -1,19 +1,45 @@
+-if (DEPENDENCY_PHASE)
+-	find_package (Iconv QUIET)
++find_package (Iconv QUIET)
+ 
++if (DEPENDENCY_PHASE)
+ 	if (ENABLE_ASAN AND CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+ 		# See also: https://cirrus-ci.com/task/5751822404288512?command=tests#L253-L255
+ 		remove_plugin (iconv "the unit test of the plugin fails on FreeBSD if ASan is active")
+ 	endif (ENABLE_ASAN AND CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+-
+-	if (NOT Iconv_FOUND)
+-		remove_plugin (iconv "Cannot find iconv library")
+-	endif ()
+ endif ()
+ 
+-add_plugin (
+-	iconv
+-	SOURCES conv.h iconv.c
+-	INCLUDE_DIRECTORIES ${Iconv_INCLUDE_DIRS}
+-	LINK_LIBRARIES ${Iconv_LIBRARIES}
+-	ADD_TEST TEST_README COMPONENT libelektra${SO_VERSION}-extra)
++if(Iconv_FOUND)
++	add_plugin (
++		iconv
++		SOURCES conv.h iconv.c
++		INCLUDE_DIRECTORIES ${Iconv_INCLUDE_DIRS}
++		LINK_LIBRARIES ${Iconv_LIBRARIES}
++		ADD_TEST TEST_README COMPONENT libelektra${SO_VERSION}-extra)
++else()
++	# Sometime the build environment is not setup
++	# in a way CMake can find Iconv on its own by default.
++	# But if we simply link against iconv (-liconv), the build may succeed
++	# due to other compiler/link flags.
++	set(CMAKE_REQUIRED_LIBRARIES "iconv")
++	check_c_source_compiles("
++		#include <stddef.h>
++		#include <iconv.h>
++		int main() {
++			char *a, *b;
++			size_t i, j;
++			iconv_t ic;
++			ic = iconv_open(\"to\", \"from\");
++			iconv(ic, &a, &i, &b, &j);
++			iconv_close(ic);
++		}
++		"
++	Iconv_EXPLICITLY_AT_ENV)
++	if(Iconv_EXPLICITLY_AT_ENV)
++		add_plugin (
++			iconv
++			SOURCES conv.h iconv.c
++			LINK_LIBRARIES iconv
++			ADD_TEST TEST_README COMPONENT libelektra${SO_VERSION}-extra)
++	else()
++		message(FATAL_ERROR "Cannot find iconv library")
++	endif()
++endif()

libs/freetype/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freetype
-PKG_VERSION:=2.11.0
+PKG_VERSION:=2.11.1
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/freetype
-PKG_HASH:=8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
+PKG_HASH:=3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8
 
 PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
 PKG_LICENSE:=FTL GPL-2.0-only MIT ZLIB GPL-3.0-or-later

libs/gdbm/Makefile

@@ -8,18 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gdbm
-PKG_VERSION:=1.19
+PKG_VERSION:=1.21
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gdbm
-PKG_HASH:=37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc
+PKG_HASH:=b0b7dbdefd798de7ddccdd8edf6693a30494f7789777838042991ef107339cc2
 
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
-PKG_INSTALL:=1
+PKG_INSTALL:=2
 PKG_BUILD_PARALLEL:=0
 
 include $(INCLUDE_DIR)/package.mk
@@ -38,8 +38,9 @@ define Package/libgdbm/description
 endef
 
 CONFIGURE_ARGS += \
+	--enable-libgdbm-compat \
 	--enable-shared \
-	--enable-static
+	--without-readline
 
 define Build/Compile
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
@@ -51,14 +52,16 @@ endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/{gdbm,ndbm}.h $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm_compat.so* $(1)/usr/lib/
 endef
 
 define Package/libgdbm/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm_compat.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libgdbm))

libs/glib2/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
-PKG_VERSION:=2.70.4
+PKG_VERSION:=2.74.0
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/glib/2.70
-PKG_HASH:=ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33
+PKG_SOURCE_URL:=@GNOME/glib/$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
+PKG_HASH:=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
 
 PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -22,9 +22,8 @@ PKG_CPE_ID:=cpe:/a:gnome:glib
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=libiconv/host
-HOST_BUILD_DEPENDS:=libiconv/host libffi/host pcre/host
 PKG_CONFIG_DEPENDS:=CONFIG_BUILD_NLS
+PKG_FORTIFY_SOURCE:=0
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
@@ -34,7 +33,7 @@ include $(INCLUDE_DIR)/meson.mk
 define Package/glib2
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +zlib +libpthread +libffi +libattr +libpcre
+  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +zlib +libpthread +libffi +libattr +libpcre2
   TITLE:=glib 2.0
   URL:=http://www.gtk.org/
 endef
@@ -43,12 +42,10 @@ define Package/glib2/description
   The GLib library of C routines
 endef
 
-HOST_LDFLAGS += -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib
 TARGET_CFLAGS += -ffunction-sections -fdata-sections
-TARGET_LDFLAGS += -Wl,--gc-sections $(if $(INTL_FULL),-lintl)
+TARGET_LDFLAGS += -Wl,--gc-sections
 
 COMP_ARGS= \
-	-Diconv=external \
 	-Dselinux=disabled \
 	-Dlibmount=disabled \
 	-Dman=false \
@@ -58,16 +55,15 @@ COMP_ARGS= \
 	-Dgtk_doc=false \
 	-Dbsymbolic_functions=true \
 	-Dforce_posix_threads=true \
-	-Dfam=false \
 	-Dtests=false \
 	-Dinstalled_tests=false \
 	-Doss_fuzz=disabled \
 	-Dglib_debug=disabled \
 	-Dglib_assert=false \
-	-Dglib_checks=false \
+	-Dglib_checks=true \
 	-Dlibelf=disabled
 
-MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Ddefault_library=static -Dnls=disabled
+MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Ddefault_library=static -Dnls=disabled -Dwrap_mode=forcefallback
 MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Ddefault_library=both -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled
 
 define Build/InstallDev
@@ -97,10 +93,6 @@ define Build/InstallDev
 		$(1)/usr/lib/
 
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-ifneq ($(INTL_FULL),)
-	$(SED) '/^Libs:/s/$$$$/ -lintl/' \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/glib-2.0.pc
-endif
 	$(INSTALL_DATA) \
 		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
 		$(1)/usr/lib/pkgconfig

libs/glib2/patches/006-c99.patch

@@ -1,11 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -948,7 +948,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)

libs/glib2/patches/010-pcre.patch

@@ -0,0 +1,10 @@
+--- a/glib/meson.build
++++ b/glib/meson.build
+@@ -365,6 +365,7 @@ pcre2_static_args = []
+ 
+ if use_pcre2_static_flag
+   pcre2_static_args = ['-DPCRE2_STATIC']
++  pcre2 = pcre2.as_link_whole()
+ endif
+ 
+ glib_c_args = ['-DG_LOG_DOMAIN="GLib"', '-DGLIB_COMPILATION'] + pcre2_static_args + glib_hidden_visibility_args

libs/glib2/patches/020-locale.patch

@@ -0,0 +1,24 @@
+From ebcc3c01db27b79af38b42c3c52a79d0225f744c Mon Sep 17 00:00:00 2001
+From: Seungha Yang <seungha@centricular.com>
+Date: Sun, 14 Aug 2022 04:56:20 +0900
+Subject: [PATCH] glib-mkenums: Specify output encoding as UTF-8 explicitly for
+ non-English locale
+
+Fixup regression introduced by
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2797
+---
+ gobject/glib-mkenums.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/gobject/glib-mkenums.in
++++ b/gobject/glib-mkenums.in
+@@ -19,6 +19,9 @@ import errno
+ import codecs
+ import locale
+ 
++# Non-english locale systems might complain to unrecognized character
++sys.stdout = io.TextIOWrapper(sys.stdout.detach(), encoding='utf-8')
++
+ VERSION_STR = '''glib-mkenums version @VERSION@
+ glib-mkenums comes with ABSOLUTELY NO WARRANTY.
+ You may redistribute copies of glib-mkenums under the terms of

libs/gnutls/Makefile

@@ -104,7 +104,7 @@ endef
 define Package/libgnutls-dane
 $(call Package/gnutls/Default)
   TITLE+= (libgnutls-dane library)
-  DEPENDS:= +libgnutls +libunbound
+  DEPENDS:= +libgnutls +PACKAGE_libgnutls-dane:libunbound
 endef
 
 define Package/libgnutls/description

libs/hidapi/Makefile

@@ -8,29 +8,26 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hidapi
-PKG_VERSION:=0.9.0
-PKG_RELEASE:=1
+PKG_VERSION:=0.12.0
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/libusb/hidapi/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
-PKG_HASH:=630ee1834bdd5c5761ab079fd04f463a89585df8fcae51a7bfe4229b1e02a652
+PKG_HASH:=28ec1451f0527ad40c1a4c92547966ffef96813528c8b184a665f03ecbb508bc
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Paul Fertser <fercerpav@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE-bsd.txt
 
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/hidapi
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libusb-1.0 +librt +libudev $(ICONV_DEPENDS)
+  DEPENDS:=+libusb-1.0 +libudev $(ICONV_DEPENDS)
   TITLE:=Library to talk to HID devices
   URL:=https://github.com/libusb/hidapi
 endef
@@ -43,19 +40,16 @@ can be embedded directly into a target application by adding a single source
 file (per platform) and a single header.
 endef
 
-CONFIGURE_ARGS += \
-	--disable-static
-
-TARGET_LDFLAGS += -liconv
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/hidapi
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/hidapi/hidapi.h $(1)/usr/include/hidapi/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/hidapi/hidapi_libusb.h $(1)/usr/include/hidapi/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libhidapi-hidraw.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib//libhidapi-libusb.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libhidapi-libusb.so* $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/hidapi-libusb.pc $(1)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/hidapi-hidraw.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/hidapi/install

libs/hidapi/patches/020-iconv.patch

@@ -0,0 +1,100 @@
+From cfcddf90ea6add9d4aaa99ee2decc5a9140bdf37 Mon Sep 17 00:00:00 2001
+From: Ihor Dutchak <ihor.youw@gmail.com>
+Date: Sat, 18 Jun 2022 15:58:31 +0300
+Subject: [PATCH 1/3] Ensure Iconv is found when provided via CFLAGS/LDFLAGS
+
+- by default find_file/find_library doesn't respect CFLAGS/LDFLAGS,
+and FindIconv fails to find Iconv;
+- by explicitly trying to link against `-liconv` - we're checking if library is available in such way;
+- additionally: if Iconv is detected as BUILT_IN, no need to explicitly depend on `Iconv::Iconv`;
+---
+ libusb/CMakeLists.txt | 41 +++++++++++++++++++++++++++++++++--------
+ src/CMakeLists.txt    |  3 ---
+ 2 files changed, 33 insertions(+), 11 deletions(-)
+
+--- a/libusb/CMakeLists.txt
++++ b/libusb/CMakeLists.txt
+@@ -22,11 +22,53 @@ target_link_libraries(hidapi_libusb PRIV
+ if(HIDAPI_NO_ICONV)
+     target_compile_definitions(hidapi_libusb PRIVATE NO_ICONV)
+ else()
+-    if(NOT ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.11)
+-        find_package(Iconv REQUIRED)
++    if(NOT ANDROID)
+         include(CheckCSourceCompiles)
+-        target_link_libraries(hidapi_libusb PRIVATE Iconv::Iconv)
+-        set(CMAKE_REQUIRED_LIBRARIES "Iconv::Iconv")
++
++        if(NOT CMAKE_VERSION VERSION_LESS 3.11)
++            message(STATUS "Check for Iconv")
++            find_package(Iconv)
++            if(Iconv_FOUND)
++                if(NOT Iconv_IS_BUILT_IN)
++                    target_link_libraries(hidapi_libusb PRIVATE Iconv::Iconv)
++                    set(CMAKE_REQUIRED_LIBRARIES "Iconv::Iconv")
++                    if(NOT BUILD_SHARED_LIBS)
++                        set(HIDAPI_NEED_EXPORT_ICONV TRUE PARENT_SCOPE)
++                    endif()
++                endif()
++            else()
++                message(STATUS "Iconv Explicitly check '-liconv'")
++                # Sometime the build environment is not setup
++                # in a way CMake can find Iconv on its own by default.
++                # But if we simply link against iconv (-liconv), the build may succeed
++                # due to other compiler/link flags.
++                set(CMAKE_REQUIRED_LIBRARIES "iconv")
++                check_c_source_compiles("
++                    #include <stddef.h>
++                    #include <iconv.h>
++                    int main() {
++                    char *a, *b;
++                    size_t i, j;
++                    iconv_t ic;
++                    ic = iconv_open(\"to\", \"from\");
++                    iconv(ic, &a, &i, &b, &j);
++                    iconv_close(ic);
++                    }
++                    "
++                    Iconv_EXPLICITLY_AT_ENV)
++                if(Iconv_EXPLICITLY_AT_ENV)
++                    message(STATUS "Iconv Explicitly check '-liconv' - Available")
++                    target_link_libraries(hidapi_libusb PRIVATE iconv)
++                else()
++                    message(FATAL_ERROR "Iconv is not found, make sure to provide it in the build environment")
++                endif()
++            endif()
++        else()
++            # otherwise there is 2 options:
++            # 1) iconv is provided by Standard C library and the build will be just fine
++            # 2) The _user_ has to provide additiona compilation options for this project/target
++        endif()
++
+         # check for error: "conflicting types for 'iconv'"
+         check_c_source_compiles("#include<iconv.h>
+             extern size_t iconv (iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+@@ -35,11 +77,9 @@ else()
+         if(HIDAPI_ICONV_CONST)
+             target_compile_definitions(hidapi_libusb PRIVATE "ICONV_CONST=const")
+         endif()
++    else()
++        # On Android Iconv is disabled on the code level anyway, so no issue;
+     endif()
+-    # otherwise there is 3 options:
+-    # 1) On Android Iconv is disabled on the code level anyway, so no issue;
+-    # 2) iconv is provided by Standard C library and the build will be just fine;
+-    # 4) The _user_ has to provide additiona compilation options for this project/target.
+ endif()
+ 
+ set_target_properties(hidapi_libusb
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -148,9 +148,6 @@ else()
+             if(NOT TARGET usb-1.0)
+                 set(HIDAPI_NEED_EXPORT_LIBUSB TRUE)
+             endif()
+-            if(NOT HIDAPI_NO_ICONV AND NOT ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.11)
+-                set(HIDAPI_NEED_EXPORT_ICONV TRUE)
+-            endif()
+         endif()
+     elseif(NOT TARGET hidapi_hidraw)
+         message(FATAL_ERROR "Select at least one option to build: HIDAPI_WITH_LIBUSB or HIDAPI_WITH_HIDRAW")

libs/hiredis/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hiredis
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/redis/hiredis/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=2a0b5fe5119ec973a0c1966bfc4bd7ed39dbce1cb6d749064af9121fe971936f
+PKG_HASH:=e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
@@ -35,7 +35,7 @@ define Package/libhiredis/description
 	Hiredis is a minimalistic C client library for the Redis database.
 endef
 
-MAKE_FLAGS += ARCH="" DEBUG="" PREFIX="/usr"
+MAKE_FLAGS += ARCH="" DEBUG="" PREFIX="/usr" uname_S="Linux"
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/hiredis/adapters

libs/icu/Makefile

@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icu4c
-MAJOR_VERSION:=71
+MAJOR_VERSION:=72
 MINOR_VERSION:=1
 PKG_VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(MAJOR_VERSION)_$(MINOR_VERSION)-src.tgz
 PKG_SOURCE_URL:=https://github.com/unicode-org/icu/releases/download/release-$(MAJOR_VERSION)-$(MINOR_VERSION)
-PKG_HASH:=67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf
+PKG_HASH:=a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68
 
 PKG_LICENSE:=ICU
 PKG_LICENSE_FILES:=LICENSE

libs/icu/patches/001-change_optimization_option.patch

@@ -1,6 +1,6 @@
 --- a/runConfigureICU
 +++ b/runConfigureICU
-@@ -239,8 +239,8 @@ case $platform in
+@@ -254,8 +254,8 @@ case $platform in
          THE_COMP="the GNU C++"
          CC=gcc; export CC
          CXX=g++; export CXX

libs/jsoncpp/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jsoncpp
-PKG_VERSION:=1.9.4
-PKG_RELEASE:=3
+PKG_VERSION:=1.9.5
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/open-source-parsers/jsoncpp/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999
+PKG_HASH:=f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2
 
 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
 PKG_LICENSE:=MIT

libs/ldns/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ldns
-PKG_VERSION:=1.7.1
-PKG_RELEASE:=3
+PKG_VERSION:=1.8.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.nlnetlabs.nl/downloads/ldns
-PKG_HASH:=8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229
+PKG_HASH:=c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860
 
 PKG_MAINTAINER:=Eric Luehrsen <ericluehrsen@gmail.com>
 PKG_LICENSE:=BSD-3-Clause

libs/ldns/patches/001-compile-for-darwin.patch

@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -861,7 +861,7 @@ AC_ARG_WITH(xcode-sdk, AC_HELP_STRING([-
-  [],[with_xcode_sdk="yes"])
- if test "x_$with_xcode_sdk" != "x_no" ; then
-    # check OSX deployment target, if needed
--   if echo $build_os | grep darwin > /dev/null; then
-+   if echo $target_os | grep darwin > /dev/null; then
-      sdk_p=`xcode-select -print-path`;
-      if test "x_$with_xcode_sdk" = "x_yes" ; then
-         sdk_v="$( /usr/bin/xcrun --show-sdk-version 2>/dev/null )"

libs/ldns/patches/010-openssl-deprecated.patch

@@ -1,48 +0,0 @@
-From cee98e71bb3d69e41cd4d2c6e33c68639dd1eaf0 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Thu, 5 Dec 2019 12:13:44 -0800
-Subject: [PATCH] Fix compilation without deprecated APIs
-
----
- dnssec_verify.c | 2 ++
- drill/drill.c   | 2 ++
- keys.c          | 1 +
- 3 files changed, 5 insertions(+)
-
---- a/dnssec_verify.c
-+++ b/dnssec_verify.c
-@@ -597,7 +597,9 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE
- 						if (tree->parent_status[i]
- 						    == LDNS_STATUS_SSL_ERR) {
- 							printf("; SSL Error: ");
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
- 							ERR_load_crypto_strings();
-+#endif
- 							ERR_print_errors_fp(stdout);
- 							printf("\n");
- 						}
---- a/drill/drill.c
-+++ b/drill/drill.c
-@@ -994,10 +994,12 @@ main(int argc, char *argv[])
- 	xfree(tsig_algorithm);
- 
- #ifdef HAVE_SSL
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
- 	CRYPTO_cleanup_all_ex_data();
- 	ERR_free_strings();
- 	EVP_cleanup();
- #endif
-+#endif
- #ifdef USE_WINSOCK
- 	WSACleanup();
- #endif
---- a/keys.c
-+++ b/keys.c
-@@ -15,6 +15,7 @@
- #include <ldns/ldns.h>
- 
- #ifdef HAVE_SSL
-+#include <openssl/ui.h>
- #include <openssl/ssl.h>
- #include <openssl/rand.h>
- #include <openssl/bn.h>

libs/ldns/patches/020-openssl-dsa.patch

@@ -1,316 +0,0 @@
-From 8a12d9183271b2b16f399c3fe867f149dbf753d7 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Thu, 20 Feb 2020 18:58:52 -0800
-Subject: [PATCH] Fix compilation without DSA and deprecated APIs
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- dnssec.c                    |  2 ++
- examples/ldns-dane.c        |  2 ++
- examples/ldns-keygen.c      |  2 ++
- examples/ldns-signzone.c    | 16 ++++++++++++++++
- examples/ldns-verify-zone.c |  2 ++
- host2str.c                  |  8 ++++++++
- keys.c                      | 10 +++++++---
- ldns/keys.h                 |  8 ++++++++
- rr_functions.c              |  4 ++++
- 9 files changed, 51 insertions(+), 3 deletions(-)
-
---- a/dnssec.c
-+++ b/dnssec.c
-@@ -332,6 +332,7 @@ uint16_t ldns_calc_keytag_raw(const uint
- }
- 
- #ifdef HAVE_SSL
-+#ifdef USE_DSA
- DSA *
- ldns_key_buf2dsa(const ldns_buffer *key)
- {
-@@ -407,6 +408,7 @@ ldns_key_buf2dsa_raw(const unsigned char
- #endif /* OPENSSL_VERSION_NUMBER */
- 	return dsa;
- }
-+#endif /* USE_DSA */
- 
- RSA *
- ldns_key_buf2rsa(const ldns_buffer *key)
---- a/examples/ldns-dane.c
-+++ b/examples/ldns-dane.c
-@@ -1680,9 +1680,11 @@ main(int argc, char* const* argv)
- 		assert(0);
- 	}
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
- 	/* ssl inititalize */
- 	SSL_load_error_strings();
- 	SSL_library_init();
-+#endif
- 
- 	/* ssl load validation store */
- 	if (! assume_pkix_validity || CAfile || CApath) {
---- a/examples/ldns-keygen.c
-+++ b/examples/ldns-keygen.c
-@@ -148,6 +148,7 @@ main(int argc, char *argv[])
- 			exit(1);
- 		}
- 		break;
-+#ifdef USE_DSA
- 	case LDNS_SIGN_DSA:
- 	case LDNS_SIGN_DSA_NSEC3:
- 		if (bits < 512 || bits > 1024) {
-@@ -156,6 +157,7 @@ main(int argc, char *argv[])
- 			exit(1);
- 		}
- 		break;
-+#endif /* USE_DSA */
- #ifdef USE_GOST
- 	case LDNS_SIGN_ECC_GOST:
- 		if(!ldns_key_EVP_load_gost_id()) {
---- a/examples/ldns-signzone.c
-+++ b/examples/ldns-signzone.c
-@@ -72,10 +72,14 @@ usage(FILE *fp, const char *prog) {
- 
- 	fprintf ( fp, "\n " );
- 	__LIST ( RSAMD5 );
-+#ifdef USE_DSA
- 	__LIST ( DSA );
-+#endif
- 	__LIST ( RSASHA1 );
- 	fprintf ( fp, "\n " );
-+#ifdef USE_DSA
- 	__LIST ( DSA_NSEC3 );
-+#endif
- 	__LIST ( RSASHA1_NSEC3 );
- 	__LIST ( RSASHA256 );
- 	fprintf ( fp, "\n " );
-@@ -350,11 +354,15 @@ parse_algspec ( const char * const p )
- 
- 	__MATCH ( RSAMD5 );
- 	__MATCH ( RSASHA1 );
-+#ifdef USE_DSA
- 	__MATCH ( DSA );
-+#endif
- 	__MATCH ( RSASHA1_NSEC3 );
- 	__MATCH ( RSASHA256 );
- 	__MATCH ( RSASHA512 );
-+#ifdef USE_DSA
- 	__MATCH ( DSA_NSEC3 );
-+#endif
- 	__MATCH ( ECC_GOST );
- 	__MATCH ( ECDSAP256SHA256 );
- 	__MATCH ( ECDSAP384SHA384 );
-@@ -419,8 +427,10 @@ load_key ( const char * const p, ENGINE
- 	case LDNS_SIGN_RSASHA1_NSEC3:
- 	case LDNS_SIGN_RSASHA256:
- 	case LDNS_SIGN_RSASHA512:
-+#ifdef USE_DSA
- 	case LDNS_SIGN_DSA:
- 	case LDNS_SIGN_DSA_NSEC3:
-+#endif
- 	case LDNS_SIGN_ECC_GOST:
- #ifdef USE_ECDSA
- 	case LDNS_SIGN_ECDSAP256SHA256:
-@@ -995,9 +1005,13 @@ main(int argc, char *argv[])
- 
- #ifdef HAVE_SSL
- 		if (ERR_peek_error()) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
- 			ERR_load_crypto_strings();
-+#endif
- 			ERR_print_errors_fp(stderr);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
- 			ERR_free_strings();
-+#endif
- 		}
- #endif
- 		exit(EXIT_FAILURE);
-@@ -1018,8 +1032,10 @@ main(int argc, char *argv[])
- #ifndef OPENSSL_NO_ENGINE
- 	shutdown_openssl ( engine );
- #else
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
- 	CRYPTO_cleanup_all_ex_data();
- #endif
-+#endif
- 
- 	free(prog);
- 	exit(EXIT_SUCCESS);
---- a/examples/ldns-verify-zone.c
-+++ b/examples/ldns-verify-zone.c
-@@ -113,7 +113,9 @@ print_rr_status_error(FILE* stream, ldns
- 	if (status != LDNS_STATUS_OK) {
- 		print_rr_error(stream, rr, ldns_get_errorstr_by_id(status));
- 		if (verbosity > 0 && status == LDNS_STATUS_SSL_ERR) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
- 			ERR_load_crypto_strings();
-+#endif
- 			ERR_print_errors_fp(stream);
- 		}
- 	}
---- a/host2str.c
-+++ b/host2str.c
-@@ -49,10 +49,14 @@
- ldns_lookup_table ldns_algorithms[] = {
-         { LDNS_RSAMD5, "RSAMD5" },
-         { LDNS_DH, "DH" },
-+#ifdef USE_DSA
-         { LDNS_DSA, "DSA" },
-+#endif /* USE_DSA */
-         { LDNS_ECC, "ECC" },
-         { LDNS_RSASHA1, "RSASHA1" },
-+#ifdef USE_DSA
-         { LDNS_DSA_NSEC3, "DSA-NSEC3-SHA1" },
-+#endif /* USE_DSA */
-         { LDNS_RSASHA1_NSEC3, "RSASHA1-NSEC3-SHA1" },
- #ifdef USE_SHA2
- 	{ LDNS_RSASHA256, "RSASHA256"},
-@@ -2133,7 +2137,9 @@ ldns_key2buffer_str(ldns_buffer *output,
- 	unsigned char  *bignum;
- #ifdef HAVE_SSL
- 	RSA *rsa;
-+#ifdef USE_DSA
- 	DSA *dsa;
-+#endif /* USE_DSA */
- #endif /* HAVE_SSL */
- 
- 	if (!k) {
-@@ -2243,6 +2249,7 @@ ldns_key2buffer_str(ldns_buffer *output,
- 
- 				RSA_free(rsa);
- 				break;
-+#ifdef USE_DSA
- 			case LDNS_SIGN_DSA:
- 			case LDNS_SIGN_DSA_NSEC3:
- 				dsa = ldns_key_dsa_key(k);
-@@ -2283,6 +2290,7 @@ ldns_key2buffer_str(ldns_buffer *output,
- 						goto error;
- 				}
- 				break;
-+#endif /* USE_DSA */
- 			case LDNS_SIGN_ECC_GOST:
- 				/* no format defined, use blob */
- #if defined(HAVE_SSL) && defined(USE_GOST)
---- a/keys.c
-+++ b/keys.c
-@@ -905,6 +905,7 @@ error:
- 	return NULL;
- }
- 
-+#ifdef USE_DSA
- DSA *
- ldns_key_new_frm_fp_dsa(FILE *f)
- {
-@@ -1015,6 +1016,7 @@ error:
- 	BN_free(pub_key);
- 	return NULL;
- }
-+#endif /* USE_DSA */
- 
- unsigned char *
- ldns_key_new_frm_fp_hmac(FILE *f, size_t *hmac_size)
-@@ -1149,9 +1151,9 @@ ldns_key_new_frm_algorithm(ldns_signing_
- #endif /* HAVE_EVP_PKEY_KEYGEN */
- #endif /* HAVE_SSL */
- 			break;
-+#ifdef USE_DSA
- 		case LDNS_SIGN_DSA:
- 		case LDNS_SIGN_DSA_NSEC3:
--#ifdef USE_DSA
- #ifdef HAVE_SSL
- # if OPENSSL_VERSION_NUMBER < 0x00908000L
- 			d = DSA_generate_parameters((int)size, NULL, 0, NULL, NULL, NULL, NULL);
-@@ -1878,10 +1880,10 @@ ldns_key2rr(const ldns_key *k)
- #endif
- 			size++;
- 			break;
-+#ifdef USE_DSA
- 		case LDNS_SIGN_DSA:
- 			ldns_rr_push_rdf(pubkey,
- 					ldns_native2rdf_int8(LDNS_RDF_TYPE_ALG, LDNS_DSA));
--#ifdef USE_DSA
- #ifdef HAVE_SSL
- 			dsa = ldns_key_dsa_key(k);
- 			if (dsa) {
-@@ -1901,10 +1903,10 @@ ldns_key2rr(const ldns_key *k)
- #endif /* HAVE_SSL */
- #endif /* USE_DSA */
- 			break;
-+#ifdef USE_DSA
- 		case LDNS_SIGN_DSA_NSEC3:
- 			ldns_rr_push_rdf(pubkey,
- 					ldns_native2rdf_int8(LDNS_RDF_TYPE_ALG, LDNS_DSA_NSEC3));
--#ifdef USE_DSA
- #ifdef HAVE_SSL
- 			dsa = ldns_key_dsa_key(k);
- 			if (dsa) {
-@@ -2165,7 +2167,9 @@ ldns_signing_algorithm ldns_get_signing_
-         ldns_lookup_table aliases[] = {
-                 /* from bind dnssec-keygen */
-                 {LDNS_SIGN_HMACMD5, "HMAC-MD5"},
-+#ifdef USE_DSA
-                 {LDNS_SIGN_DSA_NSEC3, "NSEC3DSA"},
-+#endif /* USE_DSA */
-                 {LDNS_SIGN_RSASHA1_NSEC3, "NSEC3RSASHA1"},
-                 /* old ldns usage, now RFC names */
- #ifdef USE_DSA
---- a/ldns/keys.h
-+++ b/ldns/keys.h
-@@ -45,10 +45,14 @@ enum ldns_enum_algorithm
- {
-         LDNS_RSAMD5             = 1,   /* RFC 4034,4035 */
-         LDNS_DH                 = 2,
-+#ifdef USE_DSA
-         LDNS_DSA                = 3,
-+#endif /* USE_DSA */
-         LDNS_ECC                = 4,
-         LDNS_RSASHA1            = 5,
-+#ifdef USE_DSA
-         LDNS_DSA_NSEC3          = 6,
-+#endif /* USE_DSA */
-         LDNS_RSASHA1_NSEC3      = 7,
-         LDNS_RSASHA256          = 8,   /* RFC 5702 */
-         LDNS_RSASHA512          = 10,  /* RFC 5702 */
-@@ -90,11 +94,15 @@ enum ldns_enum_signing_algorithm
- {
- 	LDNS_SIGN_RSAMD5	 = LDNS_RSAMD5,
- 	LDNS_SIGN_RSASHA1	 = LDNS_RSASHA1,
-+#ifdef USE_DSA
- 	LDNS_SIGN_DSA		 = LDNS_DSA,
-+#endif /* USE_DSA */
- 	LDNS_SIGN_RSASHA1_NSEC3  = LDNS_RSASHA1_NSEC3,
- 	LDNS_SIGN_RSASHA256	 = LDNS_RSASHA256,
- 	LDNS_SIGN_RSASHA512	 = LDNS_RSASHA512,
-+#ifdef USE_DSA
- 	LDNS_SIGN_DSA_NSEC3	 = LDNS_DSA_NSEC3,
-+#endif /* USE_DSA */
- 	LDNS_SIGN_ECC_GOST       = LDNS_ECC_GOST,
-         LDNS_SIGN_ECDSAP256SHA256 = LDNS_ECDSAP256SHA256,
-         LDNS_SIGN_ECDSAP384SHA384 = LDNS_ECDSAP384SHA384,
---- a/rr_functions.c
-+++ b/rr_functions.c
-@@ -269,14 +269,17 @@ ldns_rr_dnskey_key_size_raw(const unsign
-                             const size_t len,
-                             const ldns_algorithm alg)
- {
-+#ifdef USE_DSA
- 	/* for DSA keys */
- 	uint8_t t;
-+#endif /* USE_DSA */
- 	
- 	/* for RSA keys */
- 	uint16_t exp;
- 	uint16_t int16;
- 	
- 	switch ((ldns_signing_algorithm)alg) {
-+#ifdef USE_DSA
- 	case LDNS_SIGN_DSA:
- 	case LDNS_SIGN_DSA_NSEC3:
- 		if (len > 0) {
-@@ -286,6 +289,7 @@ ldns_rr_dnskey_key_size_raw(const unsign
- 			return 0;
- 		}
- 		break;
-+#endif /* USE_DSA */
- 	case LDNS_SIGN_RSAMD5:
- 	case LDNS_SIGN_RSASHA1:
- 	case LDNS_SIGN_RSASHA1_NSEC3:

libs/ldns/patches/030-signzone.patch

@@ -1,18 +0,0 @@
---- a/examples/ldns-signzone.c
-+++ b/examples/ldns-signzone.c
-@@ -535,6 +535,7 @@ init_openssl_engine ( const char * const
- static void
- shutdown_openssl ( ENGINE * const e )
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
- 	if ( e != NULL ) {
- 		ENGINE_free ( e );
- 		ENGINE_cleanup ();
-@@ -544,6 +545,7 @@ shutdown_openssl ( ENGINE * const e )
- 	EVP_cleanup ();
- 	CRYPTO_cleanup_all_ex_data ();
- 	ERR_free_strings ();
-+#endif
- }
- #endif
- 

libs/libaio/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libaio
-PKG_VERSION:=0.3.112
-PKG_RELEASE:=2
+PKG_VERSION:=0.3.113
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://releases.pagure.org/libaio
-PKG_HASH:=ab0462f2c9d546683e5147b1ce9c195fe95d07fac5bf362f6c01637955c3b492
+PKG_HASH:=2c44d1c5fd0d43752287c9ae1eb9c023f04ef848ea8d4aafa46e9aedb678200b
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.1-only

libs/libaio/patches/001_arches.patch

@@ -34,7 +34,7 @@ Last-Update: 2014-10-09
 +#include "syscall-parisc.h"
 +#elif defined(__mips__)
 +#include "syscall-mips.h"
- #elif defined(__aarch64__) || defined(__riscv)
+ #elif defined(__aarch64__) || defined(__loongarch__) || defined(__riscv)
  #include "syscall-generic.h"
  #else
 --- /dev/null
@@ -96,7 +96,7 @@ Last-Update: 2014-10-09
 +#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 --- a/src/libaio.h
 +++ b/src/libaio.h
-@@ -72,6 +72,7 @@ typedef enum io_iocb_cmd {
+@@ -74,6 +74,7 @@ typedef enum io_iocb_cmd {
  
  /* big endian, 64 bits */
  #elif defined(__powerpc64__) || defined(__s390x__) || \

libs/libaio/patches/002_arches_sh.patch

@@ -33,10 +33,10 @@ Description: Add SH supprt
 -    defined(__sh__) || defined(__bfin__) || defined(__MIPSEL__) || \
 +    (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \
 +    defined(__bfin__) || defined(__MIPSEL__) || \
-     defined(__cris__) || (defined(__riscv) && __riscv_xlen == 32) || \
+     defined(__cris__) || defined(__loongarch32) || \
+     (defined(__riscv) && __riscv_xlen == 32) || \
      (defined(__GNUC__) && defined(__BYTE_ORDER__) && \
-          __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && __SIZEOF_LONG__ == 4)
-@@ -84,6 +85,7 @@ typedef enum io_iocb_cmd {
+@@ -86,6 +87,7 @@ typedef enum io_iocb_cmd {
  /* big endian, 32 bits */
  #elif defined(__PPC__) || defined(__s390__) || \
        (defined(__arm__) && defined(__ARMEB__)) || \
@@ -61,6 +61,6 @@ Description: Add SH supprt
  #include "syscall-mips.h"
 +#elif defined(__sh__)
 +#include "syscall-sh.h"
- #elif defined(__aarch64__) || defined(__riscv)
+ #elif defined(__aarch64__) || defined(__loongarch__) || defined(__riscv)
  #include "syscall-generic.h"
  #else

libs/libaio/patches/003_arches_mips_fix_padding.patch

@@ -17,18 +17,18 @@ Last-Update: 2014-07-23
 -    defined(__bfin__) || defined(__MIPSEL__) || \
 +    defined(__bfin__) || \
 +    (defined(__MIPSEL__) && !defined(__mips64)) || \
-     defined(__cris__) || (defined(__riscv) && __riscv_xlen == 32) || \
+     defined(__cris__) || defined(__loongarch32) || \
+     (defined(__riscv) && __riscv_xlen == 32) || \
      (defined(__GNUC__) && defined(__BYTE_ORDER__) && \
-          __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && __SIZEOF_LONG__ == 4)
-@@ -63,6 +64,7 @@ typedef enum io_iocb_cmd {
+@@ -64,6 +65,7 @@ typedef enum io_iocb_cmd {
  
  /* little endian, 64 bits */
  #elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) || \
 +      (defined(__mips64) && defined(__MIPSEL__)) || \
        (defined(__aarch64__) && defined(__AARCH64EL__)) || \
+       defined(__loongarch64) || \
        (defined(__riscv) && __riscv_xlen == 64) || \
-       (defined(__GNUC__) && defined(__BYTE_ORDER__) && \
-@@ -75,6 +77,7 @@ typedef enum io_iocb_cmd {
+@@ -77,6 +79,7 @@ typedef enum io_iocb_cmd {
  #elif defined(__powerpc64__) || defined(__s390x__) || \
        (defined(__hppa__) && defined(__arch64__)) || \
        (defined(__sparc__) && defined(__arch64__)) || \

libs/libarchive/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libarchive
-PKG_VERSION:=3.5.1
-PKG_RELEASE:=1
+PKG_VERSION:=3.6.1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.libarchive.org/downloads
-PKG_HASH:=0e17d3a8d0b206018693b27f08029b598f6ef03600c2b5d10c94ce58692e299b
+PKG_HASH:=5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6
 
 PKG_MAINTAINER:=Johannes Morgenroth <morgenroth@ibr.cs.tu-bs.de>
 PKG_LICENSE:=BSD-2-Clause
@@ -53,6 +53,7 @@ endef
 define Package/bsdtar
   $(call Package/bsdtar/Default)
   DEPENDS:= +libarchive
+  CONFLICTS:=bsdtar-noopenssl
 endef
 
 define Package/bsdtar-noopenssl
@@ -103,6 +104,14 @@ else
 	CMAKE_OPTIONS += -DENABLE_OPENSSL=ON
 endif
 
+EXTRA_CFLAGS += "-I$(PKG_BUILD_DIR)/extra-includes"
+
+define Build/Configure
+	$(INSTALL_DIR) $(PKG_BUILD_DIR)/extra-includes/
+	$(CP) -R $(STAGING_DIR_HOST)/include/ext2fs $(PKG_BUILD_DIR)/extra-includes/
+	$(Build/Configure/Default)
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/

libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch

@@ -0,0 +1,39 @@
+From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 25 Jul 2022 10:56:53 -0700
+Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is
+ present
+
+These headers are in conflict and only one is needed by
+archive_read_disk_posix.c therefore include linux/fs.h if it exists
+otherwise include sys/mount.h
+
+It also helps compiling with glibc 2.36
+where sys/mount.h conflicts with linux/mount.h see [1]
+
+[1] https://sourceware.org/glibc/wiki/Release/2.36
+---
+ libarchive/archive_read_disk_posix.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/libarchive/archive_read_disk_posix.c
++++ b/libarchive/archive_read_disk_posix.c
+@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+-#ifdef HAVE_SYS_MOUNT_H
+-#include <sys/mount.h>
+-#endif
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
+ #endif
+ #ifdef HAVE_LINUX_FS_H
+ #include <linux/fs.h>
++#elif HAVE_SYS_MOUNT_H
++#include <sys/mount.h>
+ #endif
+ /*
+  * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.

libs/libcap-ng/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libcap-ng
-PKG_VERSION:=0.8.1
-PKG_RELEASE:=1
+PKG_VERSION:=0.8.3
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://people.redhat.com/sgrubb/libcap-ng
-PKG_HASH:=f06b17aaca029e245c9a26c698c6cc8a1cf42b58483d93e94ee02b478bdc1055
+PKG_HASH:=bed6f6848e22bb2f83b5f764b2aef0ed393054e803a8e3a8711cb2a39e6b492d
 
 PKG_MAINTAINER:=Lucian CRISTIAN <lucian.cristian@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later

libs/libcli/Makefile

@@ -0,0 +1,57 @@
+# Copyright (C) 2022 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libcli
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL=https://github.com/dparrish/libcli.git
+PKG_SOURCE_DATE:=2022-07-06
+PKG_SOURCE_VERSION:=V1.10.7
+PKG_MIRROR_HASH:=7698898364d91a1abf9e19c588a19c9587615106cf1caaf2a7e135f9ce1b1b45
+
+PKG_MAINTAINER:=Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=COPYING
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libcli
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=libcli
+  URL:=https://dparrish.com/link/libcli
+  DEPENDS:=+libc
+endef
+
+define Package/libcli/description
+  Libcli provides a shared library for including a Cisco-like
+  command-line interface into other software.
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		TESTS=0 \
+		all install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/local/include/libcli.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/libcli.so* $(1)/usr/lib/
+endef
+
+define Package/libcli/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/libcli.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libcli))

libs/libcoap/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libcoap
-PKG_VERSION:=4.2.1
-PKG_RELEASE:=1
+PKG_VERSION:=4.3.0
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/obgm/libcoap/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=29a0394a265d3febee41e5e2dc03d34292a0aede37f5f80334e529ac0dab2321
+PKG_HASH:=1a195adacd6188d3b71c476e7b21706fef7f3663ab1fb138652e8da49a9ec556
 
 PKG_MAINTAINER:=Anton Glukhov <anton.a.glukhov@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later BSD-2-Clause
@@ -30,7 +30,7 @@ define Package/libcoap
   CATEGORY:=Libraries
   TITLE:=CoAP (RFC 7252) library
   URL:=https://libcoap.net/
-  ABI_VERSION:=2
+  ABI_VERSION:=3
 endef
 
 define Package/libcoap/description
@@ -79,7 +79,7 @@ endef
 
 define Package/libcoap/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcoap-$(ABI_VERSION).so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcoap-$(ABI_VERSION)*.so* $(1)/usr/lib/
 endef
 
 define Package/coap-client/install

libs/libconfig/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libconfig
-PKG_VERSION:=1.7.2
-PKG_RELEASE:=3
+PKG_VERSION:=1.7.3
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://hyperrealm.github.io/libconfig/dist/
-PKG_HASH:=7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a16fad9
+PKG_HASH:=545166d6cac037744381d1e9cc5a5405094e7bfad16a411699bcff40bbb31ee7
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=LGPL-2.1-or-later

libs/libdaq3/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdaq3
-PKG_VERSION:=3.0.3
+PKG_VERSION:=3.0.7
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -17,7 +17,7 @@ PKG_LICENSE:=GPL-2.0-only
 
 PKG_SOURCE:=libdaq-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/snort3/libdaq/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=920344f5c98ac68b401d1bc92ebaed78b0d15779b0480c213db279d0a60acc32
+PKG_HASH:=e3af1ef17d764294ae428e662f7d2a6187a0085c6e0f15fc230e754a298cabe2
 PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION)
 
 PKG_FIXUP:=autoreconf
@@ -31,7 +31,7 @@ define Package/libdaq3
   CATEGORY:=Libraries
   TITLE:=DAQ library
   URL:=$(PKG_SOURCE_URL)
-  DEPENDS:=+libdnet +libpcap +libstdcpp
+  DEPENDS:=+libdnet +libpcap +libstdcpp +libmnl +libnetfilter-queue
 endef
 
 define Package/libdaq3/description
@@ -40,7 +40,7 @@ endef
 
 CONFIGURE_ARGS+= \
 	--disable-static \
-	--disable-nfq-module \
+	--enable-nfq-module \
 	--with-dnet-includes="$(STAGING_DIR)/usr/include" \
 	--with-dnet-libraries="$(STAGING_DIR)/usr/lib" \
 	--with-libpcap-includes="$(STAGING_DIR)/usr/include" \

libs/libdnet/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdnet
-PKG_VERSION:=1.14
-PKG_RELEASE:=2
+PKG_VERSION:=1.16.1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ofalk/libdnet/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
-PKG_HASH:=592599c54a57102a177270f3a2caabda2c2ac7768b977d7458feba97da923dfe
+PKG_HASH:=b151c4913758ef80daf4558361b4f2680a37b01d59272625bb78c77183062c63
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
@@ -42,6 +42,10 @@ CONFIGURE_ARGS += \
 	--without-python \
 	--without-wpdpack
 
+CONFIGURE_VARS += \
+	ac_cv_dnet_bsd_bpf=no \
+	ac_cv_dnet_linux_pf_packet=yes
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(1)/usr/bin/

libs/libdrm/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdrm
-PKG_VERSION:=2.4.107
+PKG_VERSION:=2.4.114
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://dri.freedesktop.org/libdrm
-PKG_HASH:=c554cef03b033636a975543eab363cc19081cb464595d3da1ec129f87370f888
+PKG_HASH:=3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026
 
 PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
@@ -43,20 +43,20 @@ define Package/libdrm/config
 endef
 
 MESON_ARGS += \
-	$(if $(CONFIG_LIBDRM_INTEL),-Dintel=true -Dlibkms=true,-Dintel=false -Dlibkms=false) \
-	-Dradeon=$(if $(CONFIG_LIBDRM_RADEON),true,false) \
-	-Damdgpu=false \
-	-Dnouveau=$(if $(CONFIG_LIBDRM_NOUVEAU),true,false) \
-	-Dvmwgfx=false \
-	-Domap=false \
-	-Dexynos=false \
-	-Dfreedreno=false \
-	-Dtegra=false \
-	-Dvc4=false \
-	-Detnaviv=false \
-	-Dcairo-tests=false \
-	-Dman-pages=false \
-	-Dvalgrind=false \
+	-Dintel=$(if $(CONFIG_LIBDRM_INTEL),en,dis)abled \
+	-Dradeon=$(if $(CONFIG_LIBDRM_RADEON),en,dis)abled \
+	-Damdgpu=disabled \
+	-Dnouveau=$(if $(CONFIG_LIBDRM_NOUVEAU),en,dis)abled \
+	-Dvmwgfx=disabled \
+	-Domap=disabled \
+	-Dexynos=disabled \
+	-Dfreedreno=disabled \
+	-Dtegra=disabled \
+	-Dvc4=disabled \
+	-Detnaviv=disabled \
+	-Dcairo-tests=disabled \
+	-Dman-pages=disabled \
+	-Dvalgrind=disabled \
 	-Dfreedreno-kgsl=false \
 	-Dinstall-test-programs=false \
 	-Dudev=false

libs/libdrm/patches/010-64bit.patch

@@ -0,0 +1,12 @@
+--- a/include/drm/drm.h
++++ b/include/drm/drm.h
+@@ -37,6 +37,9 @@
+ 
+ #if   defined(__linux__)
+ 
++#ifndef __SANE_USERSPACE_TYPES__
++#define __SANE_USERSPACE_TYPES__	/* For PPC64, to get LL64 types */
++#endif
+ #include <linux/types.h>
+ #include <asm/ioctl.h>
+ typedef unsigned int drm_handle_t;

libs/libedit/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libedit
-PKG_VERSION:=20210419-3.1
+PKG_VERSION:=20221030-3.1
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
@@ -16,7 +16,7 @@ PKG_LICENSE:=BSD-3-Clause
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thrysoee.dk/editline/
-PKG_HASH:=571ebe44b74860823e24a08cf04086ff104fd7dfa1020abf26c52543134f5602
+PKG_HASH:=f0925a5adf4b1bf116ee19766b7daa766917aec198747943b1c4edf67a4be2bb
 
 PKG_INSTALL:=1
 

libs/libesmtp/Makefile

@@ -8,21 +8,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libesmtp
-PKG_VERSION:=1.0.6
-PKG_RELEASE:=5
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
 PKG_LICENSE:=LGPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/libesmtp
-PKG_HASH:=d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/libesmtp/libESMTP/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=32bc3614ca12d21c7d933f32d43410e8744b6f91fdca7732da9877a385e4e6c3
+PKG_BUILD_DIR:=$(BUILD_DIR)/libESMTP-$(PKG_VERSION)
 
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=meson/host
 
 include $(INCLUDE_DIR)/package.mk
+include ../../devel/meson/meson.mk
 
 define Package/libesmtp
   SECTION:=libs
@@ -33,21 +34,27 @@ define Package/libesmtp
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libesmtp-config $(1)/usr/bin/
-	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/libesmtp-config
-
 	$(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/libesmtp.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(2)/bin
-	$(LN) ../../usr/bin/libesmtp-config $(2)/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libesmtp.so* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/esmtp-plugins-6.2.0
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/esmtp-plugins-6.2.0/sasl-crammd5.so $(1)/usr/lib/esmtp-plugins-6.2.0
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/esmtp-plugins-6.2.0/sasl-login.so $(1)/usr/lib/esmtp-plugins-6.2.0
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/esmtp-plugins-6.2.0/sasl-ntlm.so $(1)/usr/lib/esmtp-plugins-6.2.0
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/esmtp-plugins-6.2.0/sasl-plain.so $(1)/usr/lib/esmtp-plugins-6.2.0
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libesmtp-1.0.pc $(1)/usr/lib/pkgconfig
 endef
 
 define Package/libesmtp/install
-	$(INSTALL_DIR)  $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libesmtp.so.* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/esmtp-plugins-6.2.0
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/esmtp-plugins-6.2.0/sasl-crammd5.so $(1)/usr/lib/esmtp-plugins-6.2.0
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/esmtp-plugins-6.2.0/sasl-login.so $(1)/usr/lib/esmtp-plugins-6.2.0
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/esmtp-plugins-6.2.0/sasl-ntlm.so $(1)/usr/lib/esmtp-plugins-6.2.0
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/esmtp-plugins-6.2.0/sasl-plain.so $(1)/usr/lib/esmtp-plugins-6.2.0
 endef
 
 $(eval $(call BuildPackage,libesmtp))

libs/libesmtp/patches/100-openssl-1.1.patch

@@ -1,88 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -11896,9 +11896,9 @@ fi
- 
- fi
- if test x$with_openssl != xno ; then
--	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
--$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
--if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then :
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
-+$as_echo_n "checking for SSL_new in -lssl... " >&6; }
-+if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -11913,27 +11913,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- #ifdef __cplusplus
- extern "C"
- #endif
--char SSL_library_init ();
-+char SSL_new ();
- int
- main ()
- {
--return SSL_library_init ();
-+return SSL_new ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_ssl_SSL_library_init=yes
-+  ac_cv_lib_ssl_SSL_new=yes
- else
--  ac_cv_lib_ssl_SSL_library_init=no
-+  ac_cv_lib_ssl_SSL_new=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
--$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
--if test "x$ac_cv_lib_ssl_SSL_library_init" = x""yes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
-+$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
-+if test "x$ac_cv_lib_ssl_SSL_new" = x""yes; then :
- 
- 				with_openssl=yes
- 				LIBS="-lssl -lcrypto $LIBS"
---- a/smtp-tls.c
-+++ b/smtp-tls.c
-@@ -64,10 +64,12 @@ openssl_mutexcb (int mode, int n,
- 		 const char *file __attribute__ ((unused)),
- 		 int line __attribute__ ((unused)))
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   if (mode & CRYPTO_LOCK)
-     pthread_mutex_lock (&openssl_mutex[n]);
-   else
-     pthread_mutex_unlock (&openssl_mutex[n]);
-+#endif
- }
- #endif
- 
-@@ -76,7 +78,7 @@ starttls_init (void)
- {
-   if (tls_init)
-     return 1;
--
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- #ifdef USE_PTHREADS
-   /* Set up mutexes for the OpenSSL library */
-   if (openssl_mutex == NULL)
-@@ -94,9 +96,12 @@ starttls_init (void)
-       CRYPTO_set_locking_callback (openssl_mutexcb);
-     }
- #endif
--  tls_init = 1;
-   SSL_load_error_strings ();
-   SSL_library_init ();
-+#else
-+  OPENSSL_init_ssl(0, NULL);
-+#endif
-+  tls_init = 1;
-   return 1;
- }
- 

libs/libesmtp/patches/200-add-TLSv1_1-TLSv1_2-support.patch

@@ -1,36 +0,0 @@
-Description: Add TLSv1.1 and TLSv1.2 support
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/802658
-Forwarded: yes
-Author: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2015-11-07
-
---- a/smtp-tls.c
-+++ b/smtp-tls.c
-@@ -202,11 +202,24 @@ starttls_create_ctx (smtp_session_t sess
-   ckf_t status;
- 
-   /* The decision not to support SSL v2 and v3 but instead to use only
--     TLSv1 is deliberate.  This is in line with the intentions of RFC
-+     TLSv1.X is deliberate.  This is in line with the intentions of RFC
-      3207.  Servers typically support SSL as well as TLS because some
-      versions of Netscape do not support TLS.  I am assuming that all
-      currently deployed servers correctly support TLS.  */
--  ctx = SSL_CTX_new (TLSv1_client_method ());
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
-+    !defined(LIBRESSL_VERSION_NUMBER)  && !defined(OPENSSL_IS_BORINGSSL)
-+    ctx = SSL_CTX_new (TLS_client_method ());
-+#else
-+    ctx = SSL_CTX_new (SSLv23_client_method ());
-+#endif
-+
-+#ifdef OPENSSL_NO_SSL3
-+    SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3);
-+#endif
-+
-+#ifdef OPENSSL_NO_SSL2
-+    SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
-+#endif
- 
-   /* Load our keys and certificates.  To avoid messing with configuration
-      variables etc, use fixed paths for the certificate store.  These are

libs/libexif/Makefile

@@ -8,19 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libexif
-PKG_VERSION:=0.6.22
-PKG_RELEASE:=1
+PKG_VERSION:=0.6.24
+PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/$(PKG_NAME)-0_6_22-release/
-PKG_HASH:=5048f1c8fc509cc636c2f97f4b40c293338b6041a5652082d5ee2cf54b530c56
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://github.com/libexif/libexif/releases/download/v$(PKG_VERSION)
+PKG_HASH:=d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae
 
-PKG_LICENSE:=LGPL-2.1
+PK_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:libexif:libexif
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -29,7 +31,6 @@ define Package/libexif
   CATEGORY:=Libraries
   TITLE:=library for jpeg files with exif tags
   URL:=https://libexif.github.io/
-  MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 endef
 
 define Package/libexif/description

libs/libexif/patches/100-no_doc.patch

@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -393,7 +393,7 @@ target_alias = @target_alias@
+@@ -406,7 +406,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@

libs/libextractor/Makefile

@@ -20,6 +20,7 @@ PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 
+PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 PKG_CONFIG_DEPENDS:= \
@@ -65,9 +66,6 @@ CONFIGURE_ARGS += \
 CONFIGURE_VARS += \
 	ac_cv_lib_jpeg_jpeg_mem_src=yes
 
-TARGET_LDFLAGS += \
-	-liconv
-
 define Package/libextractor
 	SECTION:=libs
 	CATEGORY:=Libraries

libs/libffi/Makefile

@@ -8,16 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libffi
-PKG_VERSION:=3.3
+PKG_VERSION:=3.4.2
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://sourceware.org/pub/libffi/
-PKG_HASH:=72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
+PKG_SOURCE_URL:=https://codeload.github.com/libffi/libffi/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=0acbca9fd9c0eeed7e5d9460ae2ea945d3f1f3d48e13a4c54da12c7e0d23c313
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
@@ -47,11 +48,13 @@ between the two languages.
 endef
 
 HOST_CONFIGURE_ARGS += \
+	--disable-shared \
 	--disable-debug \
 	--disable-docs \
 	--disable-multi-os-directory \
 	--disable-raw-api \
-	--disable-structs
+	--disable-structs \
+	--with-pic
 
 CONFIGURE_ARGS += \
 	--disable-debug \

libs/libffi/patches/100-fix_mips_softfloat.patch

@@ -1,24 +0,0 @@
-From 76c0cfea70f78586231d7994492396eebfb12d5f Mon Sep 17 00:00:00 2001
-From: Carl Hurd <carl.m.hurd@gmail.com>
-Date: Fri, 29 Nov 2019 14:46:11 -0500
-Subject: [PATCH] Fixed missed #ifndef for __mips_soft_float (#442)
-
-Thank you!
----
- src/mips/o32.S | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/src/mips/o32.S
-+++ b/src/mips/o32.S
-@@ -282,9 +282,11 @@ $LCFI12:
- 	li	$13, 1		# FFI_O32
- 	bne	$16, $13, 1f	# Skip fp save if FFI_O32_SOFT_FLOAT
- 	
-+#ifndef __mips_soft_float
- 	# Store all possible float/double registers.
- 	s.d	$f12, FA_0_0_OFF2($fp)
- 	s.d	$f14, FA_1_0_OFF2($fp)
-+#endif
- 1:
- 	# prepare arguments for ffi_closure_mips_inner_O32
- 	REG_L	a0, 4($15)	 # cif 

libs/libffi/patches/200-ppc.patch

@@ -1,34 +0,0 @@
-From 01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 28 Nov 2019 12:42:41 +0000
-Subject: [PATCH] powerpc: fix build failure on power7 and older (#532)
-
-Build failure looks as:
-```
-libtool: compile:  powerpc-unknown-linux-gnu-gcc \
-    -O2 -mcpu=powerpc -mtune=powerpc -pipe ... -c src/powerpc/ffi.c ...
-In file included from src/powerpc/ffi.c:33:
-src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target
-   65 | typedef __int128 float128;
-      |         ^~~~~~~~
-```
-
-The fix avoids using __int128 in favour of aligned char[16].
-
-Closes: https://github.com/libffi/libffi/issues/531
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/powerpc/ffi_powerpc.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/powerpc/ffi_powerpc.h
-+++ b/src/powerpc/ffi_powerpc.h
-@@ -62,7 +62,7 @@ typedef _Float128 float128;
- #elif defined(__FLOAT128__)
- typedef __float128 float128;
- #else
--typedef __int128 float128;
-+typedef char float128[16] __attribute__((aligned(16)));
- #endif
- 
- void FFI_HIDDEN ffi_closure_SYSV (void);

libs/libfido2/Makefile

@@ -8,22 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libfido2
-PKG_VERSION:=1.6.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.12.0
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/Yubico/libfido2/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=6aed47aafd22be49c38f9281fb88ccd08c98678d9b8c39cdc87d1bb3ea2c63e4
-
-PKG_FORTIFY_SOURCE:=0
-CMAKE_INSTALL:=1
-
-TARGET_CFLAGS += -Wno-error=overflow -Wno-error=sign-conversion
+PKG_HASH:=813d6d25116143d16d2e96791718a74825da16b774a8d093d96f06ae1730d9c5
 
 PKG_MAINTAINER:=Linos Giannopoulos <linosgian00+openwrt@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
+PKG_FORTIFY_SOURCE:=0
+CMAKE_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -33,7 +31,7 @@ define Package/libfido2
   TITLE:=FIDO2 Library
   URL:=https://github.com/Yubico/libfido2
   ABI_VERSION:=1
-  DEPENDS += +libcbor +libopenssl +libudev
+  DEPENDS += +libcbor +libopenssl +libudev +zlib
 endef
 
 define Package/libfido2/description

libs/libfmt/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libfmt
-PKG_VERSION:=8.0.0
+PKG_VERSION:=9.1.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_NAME:=fmt
 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/fmtlib/$(PKG_SOURCE_NAME)/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83
+PKG_HASH:=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>

libs/libfstrm/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libfstrm
-PKG_VERSION:=0.6.0
+PKG_VERSION:=0.6.1
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=fstrm-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://dl.farsightsecurity.com/dist/fstrm/
-PKG_HASH:=a7049089eb0861ecaa21150a05613caa6dee4e8545b91191eff2269caa923910
+PKG_HASH:=bca4ac1e982a2d923ccd24cce2c98f4ceeed5009694430f73fc0dcebca8f098f
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fstrm-$(PKG_VERSION)
 

libs/libgd/Makefile

@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/cmake.mk
 define Package/libgd/default
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libjpeg +libpng +libwebp +LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype
+  DEPENDS:=+libjpeg +libpng +libwebp
   TITLE:=The GD graphics library
   URL:=https://libgd.github.io/
 endef
@@ -36,6 +36,7 @@ define Package/libgd
   MENU:=1
   DEPENDS+=+LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype
   VARIANT:=default
+  CONFLICTS:=libgd-full
 endef
 
 define Package/libgd-full
@@ -43,6 +44,7 @@ define Package/libgd-full
   DEPENDS+=+libtiff +libfreetype
   TITLE+=(full)
   VARIANT:=full
+  PROVIDES:=libgd
 endef
 
 define Package/libgd/description/default

libs/libgee/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgee
-PKG_VERSION:=0.20.4
+PKG_VERSION:=0.20.6
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/libgee/0.20
-PKG_HASH:=524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e
+PKG_HASH:=1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=LGPL-2.1-or-later

libs/libgpg-error/Makefile

@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgpg-error
-PKG_VERSION:=1.45
+PKG_VERSION:=1.46
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://mirrors.dotsrc.org/gcrypt/libgpg-error \
 		http://ring.ksc.gr.jp/archives/net/gnupg/libgpg-error \
 		https://www.gnupg.org/ftp/gcrypt/libgpg-error
-PKG_HASH:=570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26
+PKG_HASH:=b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -45,6 +45,7 @@ endef
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
+	--enable-install-gpg-error-config \
 	--disable-doc \
 	--disable-languages \
 	--disable-rpath \
@@ -58,7 +59,7 @@ define Build/InstallDev
 	$(SED) \
 		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
 		$(2)/bin/gpg-error-config
-	ln -sf $(STAGING_DIR)/host/bin/gpg-error-config $(1)/usr/bin/gpg-error-config
+	$(LN) $(STAGING_DIR)/host/bin/gpg-error-config $(1)/usr/bin/gpg-error-config
 
 	$(INSTALL_BIN) \
 		$(PKG_INSTALL_DIR)/usr/bin/gpgrt-config \
@@ -66,7 +67,7 @@ define Build/InstallDev
 	$(SED) \
 		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
 		$(2)/bin/gpgrt-config
-	ln -sf $(STAGING_DIR)/host/bin/gpgrt-config $(1)/usr/bin/gpgrt-config
+	$(LN) $(STAGING_DIR)/host/bin/gpgrt-config $(1)/usr/bin/gpgrt-config
 
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DATA) \

libs/libgpg-error/patches/010-add-arc-support.patch

@@ -28,7 +28,7 @@ Signed-off-by: Alexey Brodkin <abrodkin at synopsys.com>
 
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -48,6 +48,7 @@ lock_obj_pub = \
+@@ -40,6 +40,7 @@ lock_obj_pub = \
          syscfg/lock-obj-pub.aarch64-unknown-linux-gnu_ilp32.h \
  	syscfg/lock-obj-pub.aarch64-apple-darwin.h          \
          syscfg/lock-obj-pub.alpha-unknown-linux-gnu.h       \

libs/libgpiod/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgpiod
-PKG_VERSION:=1.4.4
+PKG_VERSION:=1.6.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/libs/libgpiod/
-PKG_HASH:=f1cda2789e6a13a92aefc012a76e5a7cc57a1b402d66f71df8719ee314b67699
+PKG_HASH:=841be9d788f00bab08ef22c4be5c39866f0e46cb100a3ae49ed816ac9c5dddc7
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 PKG_LICENSE:=LGPL-2.1-or-later

libs/libidn/Makefile

@@ -8,18 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libidn
-PKG_VERSION:=1.36
-PKG_RELEASE:=1
+PKG_VERSION:=1.41
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libidn
-PKG_HASH:=14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038
+PKG_HASH:=884d706364b81abdd17bee9686d8ff2ae7431c5a14651047c68adf8b31fd8945
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0-or-later GPL-3.0-or-later LGPL-2.1-or-later LGPL-3.0-or-later Apache-2.0
 PKG_LICENSE_FILES:=COPYING COPYINGv2 COPYINGv3 COPYING.LESSERv2 COPYING.LESSERv3 java/LICENSE-2.0.txt
 
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 

libs/libidn2/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libidn2
-PKG_VERSION:=2.3.0
-PKG_RELEASE:=1
+PKG_VERSION:=2.3.4
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_URL:=@GNU/libidn
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=e1cb1db3d2e249a6a3eb6f0946777c2e892d5c5dc7bd91c74394fc3a01cab8b5
+PKG_HASH:=93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f
 
 PKG_MAINTAINER:=
 PKG_CPE_ID:=cpe:/a:libidn2_project:libidn2

libs/libinput/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libinput
-PKG_VERSION:=1.19.2
+PKG_VERSION:=1.19.4
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.freedesktop.org/software/libinput
-PKG_HASH:=0fc39f0af3ee1a77c60c34bc45391a4d0879169f7c0f7bbbeb5eef590b98b883
+PKG_HASH:=ff33a570b5a936c81e6c08389a8581c2665311d026ce3d225c88d09c49f9b440
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=MIT

libs/libjpeg-turbo/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libjpeg-turbo
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.1.4
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_HASH:=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+PKG_HASH:=d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b
 
 PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
 PKG_LICENSE:=BSD-3-Clause IJG zlib
@@ -58,7 +58,7 @@ CMAKE_OPTIONS += \
 	-DWITH_JAVA=OFF \
 	-DWITH_JPEG7=OFF \
 	-DWITH_JPEG8=OFF \
-	-DWITH_MEM_SRCDST=OFF \
+	-DWITH_MEM_SRCDST=ON \
 	-DWITH_SIMD=O$(if $(findstring mips,$(CONFIG_ARCH)),FF,N) \
 	-DWITH_TURBOJPEG=OFF
 
@@ -77,8 +77,6 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig/
 	$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libjpeg.pc
 	$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libjpeg.pc
-	$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libturbojpeg.pc
-	$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libturbojpeg.pc
 endef
 
 define Package/libjpeg-turbo/install

libs/libksba/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libksba
-PKG_VERSION:=1.5.1
+PKG_VERSION:=1.6.2
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME)
-PKG_HASH:=b0f4c65e4e447d9a2349f6b8c0e77a28be9531e4548ba02c545d1f46dc7bf921
+PKG_HASH:=fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=LGPL-3.0-or-later GPL-2.0-or-later

libs/liblz4/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lz4
-PKG_VERSION:=1.9.3
-PKG_RELEASE:=1
+PKG_VERSION:=1.9.4
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/lz4/lz4/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1
+PKG_HASH:=0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b
 
 PKG_MAINTAINER:=Darik Horn <dajhorn@vanadac.com>
 
@@ -65,12 +65,12 @@ define Package/lz4/description
 endef
 
 MESON_ARGS += \
-	-Ddebug_level=0 \
-	-Dbacktrace=false \
-	-Dbin_programs=$(if $(CONFIG_PACKAGE_lz4),true,false) \
-	-Dbin_tests=false \
-	-Dbin_contrib=false \
-	-Dbin_examples=false \
+	-Ddebug-level=0 \
+	-Dunstable=false \
+	-Dprograms=$(if $(CONFIG_PACKAGE_lz4),true,false) \
+	-Dtests=false \
+	-Dcontrib=false \
+	-Dexamples=false \
 	-Db_lto=false
 
 ifeq ($(CONFIG_LZ4_OPTIMIZE_SPEED),y)

libs/libmad/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmad
-PKG_VERSION:=0.16.1
+PKG_VERSION:=0.16.3
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/tenacityteam/libmad/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=3b716425cfab52d4c5127f45675a784f5c15d21b61d55850a49b2152c1bb108d
+PKG_HASH:=83ca48db60f480ae22234bae08e6ad651adec2667a68ad2df6fd61e6a50a32c7
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=GPL-2.0-or-later
@@ -21,6 +21,7 @@ PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:underbit:mad_libmad
 
 CMAKE_INSTALL:=1
+PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -39,6 +40,11 @@ define Package/libmad/description
 	Layer I, Layer II, and Layer III (i.e. MP3) - are fully implemented.
 endef
 
+CMAKE_OPTIONS += \
+	-DOPTIMIZE=SPEED
+
+TARGET_CFLAGS:= $(filter-out -O%,$(TARGET_CFLAGS)) -O2
+
 define Package/libmad/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(1)/usr/lib/

libs/libmad/patches/010-cmake.patch

@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,6 +62,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".
-   message(STATUS "Using ARM fixed point math")
-   option (FPM_ARM "ARM fixed point math" ON)
-   if(ASO)
-+    enable_language(ASM)
-     target_compile_definitions(mad PRIVATE ASO_INTERLEAVE1 ASO_IMDCT)
-     target_sources(mad PRIVATE imdct_l_arm.S)
-   endif()

libs/libmicrohttpd/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmicrohttpd
-PKG_VERSION:=0.9.73
+PKG_VERSION:=0.9.75
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libmicrohttpd
-PKG_HASH:=a37b2f1b88fd1bfe74109586be463a434d34e773530fc2a74364cfcf734c032e
+PKG_HASH:=9278907a6f571b391aab9644fd646a5108ed97311ec66f6359cebbedb0a4e3bb
 
 PKG_MAINTAINER:=Alexander Couzens <lynxis@fe80.eu>
 PKG_LICENSE:=LGPL-2.1-or-later

libs/libmodbus/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmodbus
-PKG_VERSION:=3.1.7
+PKG_VERSION:=3.1.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://libmodbus.org/releases
-PKG_HASH:=7dfe958431d0570b271e1a5b329b76a658e89c614cf119eb5aadb725c87f8fbd
+PKG_SOURCE_URL:=https://github.com/stephane/libmodbus/releases/download/v$(PKG_VERSION)/
+PKG_HASH:=b122f2bc29f749702a22c0a760a7ca2182d541f5fa26bf25e3431f907b606f3c
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 
@@ -36,7 +36,7 @@ define Package/libmodbus/description
   A Modbus library for Linux, Mac OS X, FreeBSD, QNX and Win32.
 endef
 
-CONFIGURE_ARGS += --without-documentation --disable-tests
+CONFIGURE_ARGS += --disable-tests
 TARGET_CFLAGS += $(FPIC)
 
 define Build/InstallDev

libs/libmraa/Makefile

@@ -32,6 +32,7 @@ include ../../lang/python/python3-package.mk
 CMAKE_OPTIONS += \
 	-DENABLEEXAMPLES=0 \
 	-DBUILDSWIGNODE=OFF \
+	-DBUILDTESTS=OFF \
 	-DFIRMATA=ON
 
 define Package/libmraa/Default

libs/libmspack/Makefile

@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2021 TDT AG <development@tdt.de>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See https://www.gnu.org/licenses/gpl-2.0.txt for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libmspack
+PKG_VERSION:=0.10.1alpha
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://www.cabextract.org.uk/$(PKG_NAME)/
+PKG_HASH:=bac862dee6e0fc10d92c70212441d9f8ad9b0222edc9a708c3ead4adb1b24a8e
+
+PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
+PKG_LICENSE:=LGPL-2.1-or-later
+PKG_LICENSE_FILES:=COPYING.LIB
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libmspack
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Compressors and decompressors for Microsoft formats
+  DEPENDS:=@TARGET_x86
+  URL:=https://github.com/kyz/libmspack
+endef
+
+define Package/libmspack/description
+  The purpose of libmspack is to provide compressors and decompressors,
+  archivers and dearchivers for Microsoft compression formats: CAB, CHM, WIM,
+  LIT, HLP, KWAJ and SZDD. It is also designed to be easily embeddable,
+  stable, robust and resource-efficient.
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/mspack.h \
+		$(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
+		$(1)/usr/lib/pkgconfig
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+		$(1)/usr/lib
+endef
+
+define Package/libmspack/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+		$(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,libmspack))

libs/libndpi/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libndpi
-PKG_VERSION:=3.4
-PKG_RELEASE:=2
+PKG_VERSION:=4.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ntop/nDPI/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=dc9b291c7fde94edb45fb0f222e0d93c93f8d6d37f4efba20ebd9c655bfcedf9
+PKG_HASH:=5df3a7bc251e3838079c403707334c1cd93f20c17b33e31e090f30a16adb3702
 PKG_BUILD_DIR:=$(BUILD_DIR)/nDPI-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Banglang Huang <banglang.huang@foxmail.com>, Toni Uhlig <matzeton@googlemail.com>
@@ -27,8 +27,20 @@ PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-ifeq ($(CONFIG_LIBNDPI_GCRYPT),)
-CONFIGURE_ARGS += --disable-gcrypt
+ifeq ($(LIBNDPI_NDPIREADER),)
+CONFIGURE_ARGS += --with-only-libndpi
+endif
+
+ifneq ($(CONFIG_LIBNDPI_GCRYPT),)
+CONFIGURE_ARGS += --with-local-libgcrypt
+endif
+
+ifneq ($(CONFIG_LIBNDPI_PCRE),)
+CONFIGURE_ARGS += --with-pcre
+endif
+
+ifneq ($(CONFIG_LIBNDPI_MAXMINDDB),)
+CONFIGURE_ARGS += --with-maxminddb
 endif
 
 define Package/libndpi
@@ -36,7 +48,7 @@ define Package/libndpi
   CATEGORY:=Libraries
   TITLE:=Library for deep-packet inspection
   URL:=https://github.com/ntop/nDPI
-  DEPENDS:=+LIBNDPI_GCRYPT:libgcrypt +libpcap +libjson-c
+  DEPENDS:=+LIBNDPI_GCRYPT:libgcrypt +LIBNDPI_PCRE:libpcre +LIBNDPI_MAXMINDDB:libmaxminddb +LIBNDPI_NDPIREADER:libpcap
 endef
 
 define Package/libndpi/description
@@ -45,25 +57,41 @@ define Package/libndpi/description
 endef
 
 define Package/libndpi/config
-config LIBNDPI_GCRYPT
-	bool "GCrypt support"
+config LIBNDPI_NDPIREADER
+	bool "Enable ndpiReader"
 	depends on PACKAGE_libndpi
 	default n
 	help
-	  This option enables QUIC client hello decryption.
-	  Disabled by default.
-endef
+	  This option builds and installs ndpiReader,
+	  an example application that show some nDPI features.
 
-define Build/Prepare
-	$(PKG_UNPACK)
-	$(Build/Patch)
-	mv $(PKG_BUILD_DIR)/configure.seed $(PKG_BUILD_DIR)/configure.ac
-	$(SED) "s/@NDPI_MAJOR@/3/g" \
-		-e "s/@NDPI_MINOR@/4/g" \
-		-e "s/@NDPI_PATCH@/0/g" \
-		-e "s/@NDPI_VERSION_SHORT@/3.4.0/g" \
-		-e "s/@FUZZY@/dnl> /g" \
-		$(PKG_BUILD_DIR)/configure.ac
+config LIBNDPI_GCRYPT
+	bool "Use host GCrypt"
+	depends on PACKAGE_libndpi
+	default n
+	help
+	  This option enables the use of libgcrypt to decrypt QUIC client hello's.
+	  If disabled, nDPI will use a builtin lightweight libgcrypt version to
+	  decrypt QUIC client hello's.
+	  Disabled by default.
+
+config LIBNDPI_PCRE
+	bool "pcre support"
+	depends on PACKAGE_libndpi
+	default n
+	help
+	  This option enables the use of regular expressions.
+	  Used by nDPI to detect RCE injection.
+	  Disabled by default.
+
+config LIBNDPI_MAXMINDDB
+	bool "Maxmind GeoIP support"
+	depends on PACKAGE_libndpi
+	default n
+	help
+	  This options enables geographical information processing
+	  and serialization based on IP addresses.
+	  Disabled by default.
 endef
 
 define Build/InstallDev
@@ -85,8 +113,10 @@ define Package/libndpi/install
 	$(CP) $(PKG_BUILD_DIR)/src/lib/libndpi.so* \
 		$(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/bin/
+ifneq ($(LIBNDPI_NDPIREADER),)
 	$(CP) $(PKG_BUILD_DIR)/example/ndpiReader \
 		$(1)/usr/bin/
+endif
 endef
 
 $(eval $(call BuildPackage,libndpi))

libs/libnetfilter-log/Makefile

@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnetfilter_log
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=3
+PKG_VERSION:=1.0.2
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
 	http://www.netfilter.org/projects/libnetfilter_log/files/ \
 	ftp://ftp.netfilter.org/pub/libnetfilter_log/
-PKG_HASH:=74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21
+PKG_HASH:=e3f408575614d849e4726b45e90c7ebb0e6744b04859555a9ce6ec40744ffeea
 PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
 
 PKG_FIXUP:=autoreconf

libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch

@@ -1,20 +0,0 @@
-From 8858b8eacd1385f99796ead78b3a7157c5e93121 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sun, 24 Jun 2012 14:57:14 +0200
-Subject: [PATCH 1/6] build: remove unnecessary pkgconfig->config.status
- dependency
-
-The flags obtained from pkgconfig are in essence preprocessor ones.
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- Make_global.am |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/Make_global.am
-+++ b/Make_global.am
-@@ -1,2 +1,2 @@
--AM_CPPFLAGS = -I${top_srcdir}/include
--AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
-+AM_CPPFLAGS = -I${top_srcdir}/include ${LIBNFNETLINK_CFLAGS}
-+AM_CFLAGS = -Wall

libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch

@@ -1,19 +0,0 @@
-From fee63b81ee432d0b3e03ffcf9f54cda99476f267 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sun, 24 Jun 2012 14:57:48 +0200
-Subject: [PATCH 2/6] build: remove unused lines in Makefile.am
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- Makefile.am |    2 --
- 1 file changed, 2 deletions(-)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/include
- SUBDIRS	= include src utils
--LINKOPTS = -lnfnetlink
- 
- ACLOCAL_AMFLAGS = -I m4
- 

libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch

@@ -1,24 +0,0 @@
-From 1aa23946431ac593568ccac0e0b6925e7dfd7bd3 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Mon, 8 Oct 2012 15:15:07 +0200
-Subject: [PATCH 3/6] build: resolve automake-1.12 warnings
-
-am/ltlibrary.am: warning: 'libnetfilter_log.la': linking libtool
-libraries using a non-POSIX archiver requires 'AM_PROG_AR' in
-'configure.ac'
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- configure.ac |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,6 +7,7 @@ AC_CONFIG_MACRO_DIR([m4])
- 
- AM_INIT_AUTOMAKE([-Wall foreign subdir-objects
- 	tar-pax no-dist-gzip dist-bzip2 1.6])
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
- 
- dnl kernel style compile messages
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch

@@ -1,19 +0,0 @@
-From 7529487f70e244cd31ef84b037b1c32749c134a7 Mon Sep 17 00:00:00 2001
-From: Eric Leblond <eric@regit.org>
-Date: Sun, 4 Nov 2012 09:29:44 +0100
-Subject: [PATCH 4/6] Add include needed for integer type definition.
-
----
- include/libnetfilter_log/libnetfilter_log.h |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/include/libnetfilter_log/libnetfilter_log.h
-+++ b/include/libnetfilter_log/libnetfilter_log.h
-@@ -9,6 +9,7 @@
- #ifndef __LIBNETFILTER_LOG_H
- #define __LIBNETFILTER_LOG_H
- 
-+#include <sys/types.h>
- #include <libnetfilter_log/linux_nfnetlink_log.h>
- 
- struct nflog_handle;

libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch

@@ -1,22 +0,0 @@
-From 2f22d3c4453135c27873b9014e9dc5b5712804df Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 10 Sep 2013 16:23:31 -0300
-Subject: [PATCH 5/6] configure: uclinux is also linux
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
- 
- case "$host" in 
--*-*-linux*) ;;
-+*-*-linux* | *-*-uclinux*) ;;
- *) AC_MSG_ERROR([Linux only, dude!]);;
- esac
- 

libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch

@@ -1,84 +0,0 @@
-From a1b392b4156db984ab2b695a4a70d113f70cb9b8 Mon Sep 17 00:00:00 2001
-From: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
-Date: Wed, 5 Feb 2014 14:18:57 +0100
-Subject: [PATCH 6/6] configure: add --without-ipulog option to disable
- libipulog build
-
-This is a compat library used for netfilter ULOG target.
-ULOG only works with IPv4. NFLOG has replaced ULOG.
-
-Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- configure.ac                         |    5 +++++
- include/libnetfilter_log/Makefile.am |    5 ++++-
- src/Makefile.am                      |    6 +++++-
- utils/Makefile.am                    |    7 +++++--
- 4 files changed, 19 insertions(+), 4 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,6 +24,11 @@ case "$host" in
- *) AC_MSG_ERROR([Linux only, dude!]);;
- esac
- 
-+AC_ARG_WITH([ipulog],
-+  AC_HELP_STRING([--without-ipulog], [don't build libipulog compat library]),
-+  [ipulog_skip=1], [ipulog_skip=0])
-+AM_CONDITIONAL([BUILD_IPULOG], [test $ipulog_skip = 0])
-+
- dnl Dependencies
- PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41])
- 
---- a/include/libnetfilter_log/Makefile.am
-+++ b/include/libnetfilter_log/Makefile.am
-@@ -1,3 +1,6 @@
- 
--pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
-+pkginclude_HEADERS = libnetfilter_log.h linux_nfnetlink_log.h
- 
-+if BUILD_IPULOG
-+pkginclude_HEADERS += libipulog.h
-+endif
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -22,14 +22,18 @@ LIBVERSION=2:0:1
- 
- include ${top_srcdir}/Make_global.am
- 
--lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la
-+lib_LTLIBRARIES = libnetfilter_log.la
- 
- libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink	\
- 			      -version-info $(LIBVERSION)
- libnetfilter_log_la_SOURCES = libnetfilter_log.c 
- libnetfilter_log_la_LIBADD  = ${LIBNFNETLINK_LIBS}
- 
-+if BUILD_IPULOG
-+lib_LTLIBRARIES += libnetfilter_log_libipulog.la
-+
- libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles	\
- 					-version-info 1:0:0
- libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la
- libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c
-+endif
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -1,12 +1,15 @@
- include ${top_srcdir}/Make_global.am
- 
--check_PROGRAMS = nfulnl_test ulog_test
-+check_PROGRAMS = nfulnl_test
- 
- nfulnl_test_SOURCES = nfulnl_test.c
- nfulnl_test_LDADD = ../src/libnetfilter_log.la
- nfulnl_test_LDFLAGS = -dynamic
- 
-+if BUILD_IPULOG
-+check_PROGRAMS += ulog_test
-+
- ulog_test_SOURCES = ulog_test.c
- ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la ../src/libnetfilter_log.la
- ulog_test_LDFLAGS = -dynamic
--
-+endif

libs/libnetfilter-log/patches/0007-include-Sync-with-current-kernel-headers.patch

@@ -1,103 +0,0 @@
-From 614d8b6cfb969c6102ef320de22b1eb199efce2a Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Sat, 16 May 2015 13:37:53 +0200
-Subject: include: Sync with current kernel headers
-
-Signed-off-by: Felix Janda <felix.janda@posteo.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/libnetfilter_log/linux_nfnetlink_log.h | 51 +++++++++++++-------------
- 1 file changed, 25 insertions(+), 26 deletions(-)
-
---- a/include/libnetfilter_log/linux_nfnetlink_log.h
-+++ b/include/libnetfilter_log/linux_nfnetlink_log.h
-@@ -20,33 +20,31 @@ enum nfulnl_msg_types {
- };
- 
- struct nfulnl_msg_packet_hdr {
--	u_int16_t	hw_protocol;	/* hw protocol (network order) */
--	u_int8_t	hook;		/* netfilter hook */
--	u_int8_t	_pad;
--} __attribute__ ((packed));
-+	__be16		hw_protocol;	/* hw protocol (network order) */
-+	__u8	hook;		/* netfilter hook */
-+	__u8	_pad;
-+};
- 
- struct nfulnl_msg_packet_hw {
--	u_int16_t	hw_addrlen;
--	u_int16_t	_pad;
--	u_int8_t	hw_addr[8];
--} __attribute__ ((packed));
-+	__be16		hw_addrlen;
-+	__u16	_pad;
-+	__u8	hw_addr[8];
-+};
- 
- struct nfulnl_msg_packet_timestamp {
--	aligned_u64	sec;
--	aligned_u64	usec;
--} __attribute__ ((packed));
--
--#define NFULNL_PREFIXLEN	30	/* just like old log target */
-+	__aligned_be64	sec;
-+	__aligned_be64	usec;
-+};
- 
- enum nfulnl_attr_type {
- 	NFULA_UNSPEC,
- 	NFULA_PACKET_HDR,
--	NFULA_MARK,			/* u_int32_t nfmark */
-+	NFULA_MARK,			/* __u32 nfmark */
- 	NFULA_TIMESTAMP,		/* nfulnl_msg_packet_timestamp */
--	NFULA_IFINDEX_INDEV,		/* u_int32_t ifindex */
--	NFULA_IFINDEX_OUTDEV,		/* u_int32_t ifindex */
--	NFULA_IFINDEX_PHYSINDEV,	/* u_int32_t ifindex */
--	NFULA_IFINDEX_PHYSOUTDEV,	/* u_int32_t ifindex */
-+	NFULA_IFINDEX_INDEV,		/* __u32 ifindex */
-+	NFULA_IFINDEX_OUTDEV,		/* __u32 ifindex */
-+	NFULA_IFINDEX_PHYSINDEV,	/* __u32 ifindex */
-+	NFULA_IFINDEX_PHYSOUTDEV,	/* __u32 ifindex */
- 	NFULA_HWADDR,			/* nfulnl_msg_packet_hw */
- 	NFULA_PAYLOAD,			/* opaque data payload */
- 	NFULA_PREFIX,			/* string prefix */
-@@ -71,23 +69,23 @@ enum nfulnl_msg_config_cmds {
- };
- 
- struct nfulnl_msg_config_cmd {
--	u_int8_t	command;	/* nfulnl_msg_config_cmds */
-+	__u8	command;	/* nfulnl_msg_config_cmds */
- } __attribute__ ((packed));
- 
- struct nfulnl_msg_config_mode {
--	u_int32_t	copy_range;
--	u_int8_t	copy_mode;
--	u_int8_t	_pad;
-+	__be32		copy_range;
-+	__u8	copy_mode;
-+	__u8	_pad;
- } __attribute__ ((packed));
- 
- enum nfulnl_attr_config {
- 	NFULA_CFG_UNSPEC,
- 	NFULA_CFG_CMD,			/* nfulnl_msg_config_cmd */
- 	NFULA_CFG_MODE,			/* nfulnl_msg_config_mode */
--	NFULA_CFG_NLBUFSIZ,		/* u_int32_t buffer size */
--	NFULA_CFG_TIMEOUT,		/* u_int32_t in 1/100 s */
--	NFULA_CFG_QTHRESH,		/* u_int32_t */
--	NFULA_CFG_FLAGS,		/* u_int16_t */
-+	NFULA_CFG_NLBUFSIZ,		/* __u32 buffer size */
-+	NFULA_CFG_TIMEOUT,		/* __u32 in 1/100 s */
-+	NFULA_CFG_QTHRESH,		/* __u32 */
-+	NFULA_CFG_FLAGS,		/* __u16 */
- 	__NFULA_CFG_MAX
- };
- #define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
-@@ -95,6 +93,7 @@ enum nfulnl_attr_config {
- #define NFULNL_COPY_NONE	0x00
- #define NFULNL_COPY_META	0x01
- #define NFULNL_COPY_PACKET	0x02
-+/* 0xff is reserved, don't use it for new copy modes. */
- 
- #define NFULNL_CFG_F_SEQ	0x0001
- #define NFULNL_CFG_F_SEQ_GLOBAL	0x0002

libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch

@@ -1,47 +0,0 @@
-From 721ea5ec049e12afdd7c182f2899ab6d92914e68 Mon Sep 17 00:00:00 2001
-From: Ken-ichirou MATSUZAWA <chamaken@gmail.com>
-Date: Fri, 11 Sep 2015 12:12:11 +0900
-Subject: include: Sync with kernel headers
-
-Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/libnetfilter_log/linux_nfnetlink_log.h | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
---- a/include/libnetfilter_log/linux_nfnetlink_log.h
-+++ b/include/libnetfilter_log/linux_nfnetlink_log.h
-@@ -1,16 +1,12 @@
- #ifndef _NFNETLINK_LOG_H
- #define _NFNETLINK_LOG_H
- 
--#ifndef aligned_u64
--#define aligned_u64 unsigned long long __attribute__((aligned(8)))
--#endif
--
- /* This file describes the netlink messages (i.e. 'protocol packets'),
-  * and not any kind of function definitions.  It is shared between kernel and
-  * userspace.  Don't put kernel specific stuff in here */
- 
- #include <linux/types.h>
--#include <libnfnetlink/linux_nfnetlink.h>
-+#include <linux/netfilter/nfnetlink.h>
- 
- enum nfulnl_msg_types {
- 	NFULNL_MSG_PACKET,		/* packet from kernel to userspace */
-@@ -55,6 +51,8 @@ enum nfulnl_attr_type {
- 	NFULA_HWTYPE,			/* hardware type */
- 	NFULA_HWHEADER,			/* hardware header */
- 	NFULA_HWLEN,			/* hardware header length */
-+	NFULA_CT,			/* nf_conntrack_netlink.h */
-+	NFULA_CT_INFO,			/* enum ip_conntrack_info */
- 
- 	__NFULA_MAX
- };
-@@ -97,5 +95,6 @@ enum nfulnl_attr_config {
- 
- #define NFULNL_CFG_F_SEQ	0x0001
- #define NFULNL_CFG_F_SEQ_GLOBAL	0x0002
-+#define NFULNL_CFG_F_CONNTRACK	0x0004
- 
- #endif /* _NFNETLINK_LOG_H */

libs/libnpupnp/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnpupnp
-PKG_VERSION:=4.1.4
+PKG_VERSION:=5.0.0
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads
-PKG_HASH:=03506f02546e3b3d31b389e046c4691f020b82d315426ce79f1e2b1eb7958656
+PKG_HASH:=2e5648cf180a425ef57b8c9c0d9dbd77f0314487ea0e0a85ebc6c3ef87cab05b
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -14,6 +14,7 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS:=libmicrohttpd
 
 include $(INCLUDE_DIR)/package.mk
 

libs/libogg/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libogg
-PKG_VERSION:=1.3.4
-PKG_RELEASE:=1
+PKG_VERSION:=1.3.5
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://downloads.xiph.org/releases/ogg/
-PKG_HASH:=c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe
+PKG_HASH:=c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=BSD-3-Clause