From 4a57352b5a5bac84ba5da417dee4fd6820b47f47 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 12 Jun 2021 20:20:17 -0700 Subject: [PATCH 001/241] alsa-lib: update to 1.2.5 Refresh patches. Remove upstream one. Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev --- libs/alsa-lib/Makefile | 6 ++--- libs/alsa-lib/patches/100-link_fix.patch | 4 ++-- libs/alsa-lib/patches/200-usleep.patch | 6 ++--- libs/alsa-lib/patches/300-snd_plugin.patch | 27 ---------------------- 4 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 libs/alsa-lib/patches/300-snd_plugin.patch diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index df498028..691ab4fb 100644 --- a/libs/alsa-lib/Makefile +++ b/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.5 +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:=9092894a8c083b33acf8d6deb901b58f5d20d6da583789f814e8e46f2850ef18 PKG_MAINTAINER:=Ted Hess , \ Peter Wagner diff --git a/libs/alsa-lib/patches/100-link_fix.patch b/libs/alsa-lib/patches/100-link_fix.patch index 9a3258c7..31d836f8 100644 --- a/libs/alsa-lib/patches/100-link_fix.patch +++ b/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) diff --git a/libs/alsa-lib/patches/200-usleep.patch b/libs/alsa-lib/patches/200-usleep.patch index 86badc20..7551584a 100644 --- a/libs/alsa-lib/patches/200-usleep.patch +++ b/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) \ diff --git a/libs/alsa-lib/patches/300-snd_plugin.patch b/libs/alsa-lib/patches/300-snd_plugin.patch deleted file mode 100644 index 2c6f2677..00000000 --- a/libs/alsa-lib/patches/300-snd_plugin.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -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 ---- - 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; From 7cadbccb8204f30559ae8a16f700f23df57ad2c6 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 20 Jul 2021 20:29:24 -0700 Subject: [PATCH 002/241] alsa-lib: update to 12.5.1 Signed-off-by: Rosen Penev --- libs/alsa-lib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index 691ab4fb..1d7f9a19 100644 --- a/libs/alsa-lib/Makefile +++ b/libs/alsa-lib/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-lib -PKG_VERSION:=1.2.5 +PKG_VERSION:=1.2.5.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:=9092894a8c083b33acf8d6deb901b58f5d20d6da583789f814e8e46f2850ef18 +PKG_HASH:=628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e PKG_MAINTAINER:=Ted Hess , \ Peter Wagner From 8b09bc4bb1b969af74bf64409ff26a251cda998f Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Mon, 19 Jul 2021 05:50:09 +0000 Subject: [PATCH 003/241] alsa-lib: install also /usr/share/alsa/ctl or alsa-mixer fails with: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ❯ alsamixer ALSA lib conf.c:827:(get_char_skip_comments) Cannot access file /usr/share/alsa/ctl/default.conf ALSA lib conf.c:1994:(_snd_config_load_with_include) _toplevel_:61:26:No such file or directory ALSA lib conf.c:4040:(config_file_open) /usr/share/alsa/cards/aliases.conf may be old or corrupted: consider to remove or fix it ALSA lib conf.c:3962:(snd_config_hooks_call) function snd_config_hook_load returned error: No such file or directory ALSA lib control.c:1481:(snd_ctl_open_noupdate) Invalid CTL cards.ctl.default cannot open mixer: No such file or directory Signed-off-by: Javier Marcet --- libs/alsa-lib/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index 1d7f9a19..c7ca612e 100644 --- a/libs/alsa-lib/Makefile +++ b/libs/alsa-lib/Makefile @@ -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/ From 26d7b94a11497d7bfa90d8122fbe072f15e95dfb Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 15 Dec 2021 16:23:22 -0800 Subject: [PATCH 004/241] alsa-lib: update to 1.2.6.1 Signed-off-by: Rosen Penev --- libs/alsa-lib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index c7ca612e..b59d2f3b 100644 --- a/libs/alsa-lib/Makefile +++ b/libs/alsa-lib/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-lib -PKG_VERSION:=1.2.5.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:=628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e +PKG_HASH:=ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f PKG_MAINTAINER:=Ted Hess , \ Peter Wagner From 22ca90020ed777190306d97022cd5c14759c06b3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 20 Jul 2021 20:29:41 -0700 Subject: [PATCH 005/241] alsa-ucm-conf: update to 12.5.1 Signed-off-by: Rosen Penev --- libs/alsa-ucm-conf/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/alsa-ucm-conf/Makefile b/libs/alsa-ucm-conf/Makefile index d30b3cd9..7b4984ab 100644 --- a/libs/alsa-ucm-conf/Makefile +++ b/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.5.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:=2c3b535c77dcb9aaf62a61f4f8324f1ab184162f105f7ec9ed1e37c742fcd340 +PKG_HASH:=5841a444166dcbf479db751303dbc3556f685085ac7e00f0c9e7755676195d97 PKG_MAINTAINER:= PKG_LICENSE:=BSD-3-Clause From 4831929a472453016ae59fbaaf49c59368c14e3e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 15 Dec 2021 16:24:59 -0800 Subject: [PATCH 006/241] alsa-ucm-conf: update to 1.2.6.2 Signed-off-by: Rosen Penev --- libs/alsa-ucm-conf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/alsa-ucm-conf/Makefile b/libs/alsa-ucm-conf/Makefile index 7b4984ab..6c92a1ad 100644 --- a/libs/alsa-ucm-conf/Makefile +++ b/libs/alsa-ucm-conf/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-ucm-conf -PKG_VERSION:=1.2.5.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:=5841a444166dcbf479db751303dbc3556f685085ac7e00f0c9e7755676195d97 +PKG_HASH:=8be24fb9fe789ee2778ae6f32e18e8043fe7f8bc735871e9d17c68a04566a822 PKG_MAINTAINER:= PKG_LICENSE:=BSD-3-Clause From 7277f69e204243c91d5397b69e76a5154bf3b31c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 23 Aug 2021 13:37:53 +0200 Subject: [PATCH 007/241] apr: patch CVE-2021-35940 Signed-off-by: Michal Vasilek --- libs/apr/Makefile | 2 +- libs/apr/patches/CVE-2021-35940.patch | 49 +++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 libs/apr/patches/CVE-2021-35940.patch diff --git a/libs/apr/Makefile b/libs/apr/Makefile index f7869d5d..33ea07dd 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apr PKG_VERSION:=1.7.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@APACHE/apr/ diff --git a/libs/apr/patches/CVE-2021-35940.patch b/libs/apr/patches/CVE-2021-35940.patch new file mode 100644 index 00000000..49a858aa --- /dev/null +++ b/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 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) From 4fbc3eb0ddc05d7b281e7b28898cacc6c2e073c5 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Thu, 25 Aug 2022 14:50:14 -0400 Subject: [PATCH 008/241] apr: add autotools compatibility backports Backport a bunch of patches that fixes build when using new Autoconf and Automake. The patches removed are replaced by upstream backports which are more complete. Signed-off-by: Michael Pratt --- libs/apr/Makefile | 2 +- ...000-050-backport-use-AC_CHECK_SIZEOF.patch | 116 ++++++++++++++++++ .../000-055-backport-strerror-cache.patch | 46 +++++++ .../000-060-backport-require-stdlib.patch | 106 ++++++++++++++++ ...backport-avoid-inclusion-of-confdefs.patch | 61 +++++++++ ...kport-fix-APR_TRY_COMPILE_NO_WARNING.patch | 39 ++++++ ...ze-doesn-t-match-in-glibc-when-cross.patch | 73 ----------- .../302-add-cache-for-strerror_r.patch | 30 ----- 8 files changed, 369 insertions(+), 104 deletions(-) create mode 100644 libs/apr/patches/000-050-backport-use-AC_CHECK_SIZEOF.patch create mode 100644 libs/apr/patches/000-055-backport-strerror-cache.patch create mode 100644 libs/apr/patches/000-060-backport-require-stdlib.patch create mode 100644 libs/apr/patches/000-070-backport-avoid-inclusion-of-confdefs.patch create mode 100644 libs/apr/patches/000-071-backport-fix-APR_TRY_COMPILE_NO_WARNING.patch delete mode 100644 libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch delete mode 100644 libs/apr/patches/302-add-cache-for-strerror_r.patch diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 33ea07dd..8138e632 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apr PKG_VERSION:=1.7.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@APACHE/apr/ diff --git a/libs/apr/patches/000-050-backport-use-AC_CHECK_SIZEOF.patch b/libs/apr/patches/000-050-backport-use-AC_CHECK_SIZEOF.patch new file mode 100644 index 00000000..5b6ce100 --- /dev/null +++ b/libs/apr/patches/000-050-backport-use-AC_CHECK_SIZEOF.patch @@ -0,0 +1,116 @@ +From 374210c50ee9f4dbf265f0172dcf2d45b97d0550 +From: Graham Leggett +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(<>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl +-dnl The cache variable name. +-define(<>, 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 +-$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 ], 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 ], 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 ], 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 ], 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 +-#include ],struct iovec,0) ++AC_CHECK_SIZEOF(struct iovec,,[AC_INCLUDES_DEFAULT ++#include ]) + if test "$ac_cv_sizeof_struct_iovec" = "0"; then + have_iovec=0 + else diff --git a/libs/apr/patches/000-055-backport-strerror-cache.patch b/libs/apr/patches/000-055-backport-strerror-cache.patch new file mode 100644 index 00000000..7a0caca6 --- /dev/null +++ b/libs/apr/patches/000-055-backport-strerror-cache.patch @@ -0,0 +1,46 @@ +From 5fd2568c34a8d5c8159d9a5e0f5601f9e8902166 +From: Graham Leggett +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 + #include + #include +@@ -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 diff --git a/libs/apr/patches/000-060-backport-require-stdlib.patch b/libs/apr/patches/000-060-backport-require-stdlib.patch new file mode 100644 index 00000000..5a15db26 --- /dev/null +++ b/libs/apr/patches/000-060-backport-require-stdlib.patch @@ -0,0 +1,106 @@ +From 9d9c6990afaa7ad8eea0be524481bb48a5dd1b09 +From: Jim Jagielski +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 + #include + #include ++#ifdef HAVE_STDLIB_H ++#include ++#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 + #endif ++#ifdef HAVE_STDLIB_H ++#include ++#endif + + int main(void) { + struct addrinfo hints, *ai; +@@ -151,6 +154,9 @@ AC_DEFUN([APR_CHECK_WORKING_GETNAMEINFO] + #ifdef HAVE_NETINET_IN_H + #include + #endif ++#ifdef HAVE_STDLIB_H ++#include ++#endif + + int main(void) { + struct sockaddr_in sa; +@@ -194,6 +200,9 @@ AC_DEFUN([APR_CHECK_NEGATIVE_EAI], [ + #ifdef HAVE_NETDB_H + #include + #endif ++#ifdef HAVE_STDLIB_H ++#include ++#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 ++#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 + #endif ++#ifdef HAVE_STDLIB_H ++#include ++#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 + #include + #include ++#include + main() + { + struct rlimit limit; +@@ -2307,6 +2308,7 @@ if test "$threads" = "1"; then + AC_TRY_RUN([ + #include + #include ++#include + int main() + { + pthread_mutex_t mutex; +@@ -2430,7 +2432,9 @@ AC_TRY_RUN([ + #endif + #include + #include +- ++#ifdef HAVE_STDLIB_H ++#include ++#endif + int fd; + struct flock proc_mutex_lock_it = {0}; + const char *fname = "conftest.fcntl"; diff --git a/libs/apr/patches/000-070-backport-avoid-inclusion-of-confdefs.patch b/libs/apr/patches/000-070-backport-avoid-inclusion-of-confdefs.patch new file mode 100644 index 00000000..61ab3a1e --- /dev/null +++ b/libs/apr/patches/000-070-backport-avoid-inclusion-of-confdefs.patch @@ -0,0 +1,61 @@ +From 0a763c5e500f4304b7c534fae0fad430d64982e8 +From: Yann Ylavic +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 +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]) diff --git a/libs/apr/patches/000-071-backport-fix-APR_TRY_COMPILE_NO_WARNING.patch b/libs/apr/patches/000-071-backport-fix-APR_TRY_COMPILE_NO_WARNING.patch new file mode 100644 index 00000000..01aae483 --- /dev/null +++ b/libs/apr/patches/000-071-backport-fix-APR_TRY_COMPILE_NO_WARNING.patch @@ -0,0 +1,39 @@ +From ea9344182b7559b12aa523548bb6d37d0e009028 +From: Yann Ylavic +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]) diff --git a/libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch deleted file mode 100644 index ff0dc108..00000000 --- a/libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +++ /dev/null @@ -1,73 +0,0 @@ -From f4d6e45ed5d2ccffd1af4c2ccdf7099ba0dce137 Mon Sep 17 00:00:00 2001 -From: Dengke Du -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 ], 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 - -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 ], 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 ], 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 ], 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 ], off_t, 8) -+AC_CHECK_SIZEOF(off_t) - - if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then - # Enable LFS diff --git a/libs/apr/patches/302-add-cache-for-strerror_r.patch b/libs/apr/patches/302-add-cache-for-strerror_r.patch deleted file mode 100644 index c25175d5..00000000 --- a/libs/apr/patches/302-add-cache-for-strerror_r.patch +++ /dev/null @@ -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 - #include - #include -@@ -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 From ffca837f0bbb07488f1415ce089a507836892b1f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Feb 2022 21:48:29 +0100 Subject: [PATCH 009/241] avahi: fix build on some distributions This seems to happen only on some distributions (Void, Arch): /usr/lib/libgcc_s.so.1: file not recognized: file format not recognized collect2: error: ld returned 1 exit status libtool: error: error: relink 'libdns_sd.la' with the above command before installing it Signed-off-by: Michal Vasilek --- libs/avahi/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index d8e23cff..e80e9149 100644 --- a/libs/avahi/Makefile +++ b/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 From 4274f335e79ded70ee98fa1c0df41f4d63c2f1a8 Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Sun, 13 Feb 2022 10:14:50 +0900 Subject: [PATCH 010/241] avahi: Changed the target file for the patch Fixed the affected issue in the latest commit daemon.err avahi-daemon[xxx]: mkdir("/run/avahi-daemon/"): No such file or directory Signed-off-by: Hirokazu MORIKAWA --- .../020-revert-runtime-dir-systemd-change.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/avahi/patches/020-revert-runtime-dir-systemd-change.patch b/libs/avahi/patches/020-revert-runtime-dir-systemd-change.patch index 5e31bfd8..6a6f9030 100644 --- a/libs/avahi/patches/020-revert-runtime-dir-systemd-change.patch +++ b/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) From 310ee85b30a32c0259d4e02d6d98f3f55d17af2f Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Fri, 23 Sep 2022 12:01:25 +0000 Subject: [PATCH 011/241] libs/cjson: bump to 1.7.15 This is a bugfix release. Full release notes available at: https://github.com/DaveGamble/cJSON/releases/tag/v1.7.15 Signed-off-by: Karl Palsson --- libs/cjson/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/cjson/Makefile b/libs/cjson/Makefile index 1bd9b80b..1f893d10 100644 --- a/libs/cjson/Makefile +++ b/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 PKG_LICENSE:=MIT From b16c54e8397d4b571265092c5669f441cb501246 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 2 Aug 2021 12:35:48 -0500 Subject: [PATCH 012/241] cyrus-sasl: add optional sasldb package Signed-off-by: W. Michael Petullo --- libs/cyrus-sasl/Makefile | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/libs/cyrus-sasl/Makefile b/libs/cyrus-sasl/Makefile index f0ae3c21..5d517140 100644 --- a/libs/cyrus-sasl/Makefile +++ b/libs/cyrus-sasl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cyrus-sasl PKG_VERSION:=2.1.27 -PKG_RELEASE:=3 +PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=W. Michael Petullo @@ -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)) From 4eafa98e331ecb6dae218d24ac9505294f42cf11 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 12 Nov 2021 18:09:39 +0100 Subject: [PATCH 013/241] cyrus-sasl: patch CVE-2019-19906 Signed-off-by: Michal Vasilek --- libs/cyrus-sasl/patches/CVE-2019-19906.patch | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 libs/cyrus-sasl/patches/CVE-2019-19906.patch diff --git a/libs/cyrus-sasl/patches/CVE-2019-19906.patch b/libs/cyrus-sasl/patches/CVE-2019-19906.patch new file mode 100644 index 00000000..1b9fdfa8 --- /dev/null +++ b/libs/cyrus-sasl/patches/CVE-2019-19906.patch @@ -0,0 +1,23 @@ +From dcc9f51cbd4ed622cfb0f9b1c141eb2ffe3b12f1 Mon Sep 17 00:00:00 2001 +From: Quanah Gibson-Mount +Date: Tue, 18 Feb 2020 19:05:12 +0000 +Subject: [PATCH] Fix #587 + +Off by one error in common.c, CVE-2019-19906. + +Thanks to Stephan Zeisberg for reporting +--- + lib/common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/lib/common.c ++++ b/lib/common.c +@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t + + if (add==NULL) add = "(null)"; + +- addlen=strlen(add); /* only compute once */ ++ addlen=strlen(add)+1; /* only compute once */ + if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK) + return SASL_NOMEM; + From 41f69d5e8d5c96c575ee1737932705d69d3789ea Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 10 May 2022 14:45:22 -0500 Subject: [PATCH 014/241] cyrus-sasl: update to 2.1.28 Signed-off-by: W. Michael Petullo --- libs/cyrus-sasl/Makefile | 6 ++--- libs/cyrus-sasl/patches/CVE-2019-19906.patch | 23 -------------------- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 libs/cyrus-sasl/patches/CVE-2019-19906.patch diff --git a/libs/cyrus-sasl/Makefile b/libs/cyrus-sasl/Makefile index 5d517140..9f0f16ab 100644 --- a/libs/cyrus-sasl/Makefile +++ b/libs/cyrus-sasl/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cyrus-sasl -PKG_VERSION:=2.1.27 +PKG_VERSION:=2.1.28 PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=W. Michael Petullo 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 diff --git a/libs/cyrus-sasl/patches/CVE-2019-19906.patch b/libs/cyrus-sasl/patches/CVE-2019-19906.patch deleted file mode 100644 index 1b9fdfa8..00000000 --- a/libs/cyrus-sasl/patches/CVE-2019-19906.patch +++ /dev/null @@ -1,23 +0,0 @@ -From dcc9f51cbd4ed622cfb0f9b1c141eb2ffe3b12f1 Mon Sep 17 00:00:00 2001 -From: Quanah Gibson-Mount -Date: Tue, 18 Feb 2020 19:05:12 +0000 -Subject: [PATCH] Fix #587 - -Off by one error in common.c, CVE-2019-19906. - -Thanks to Stephan Zeisberg for reporting ---- - lib/common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/lib/common.c -+++ b/lib/common.c -@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t - - if (add==NULL) add = "(null)"; - -- addlen=strlen(add); /* only compute once */ -+ addlen=strlen(add)+1; /* only compute once */ - if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK) - return SASL_NOMEM; - From 711b0012702b56eb087b3c89f03a0e9c4975f43d Mon Sep 17 00:00:00 2001 From: Harald Geyer Date: Tue, 13 Jul 2021 23:41:08 +0200 Subject: [PATCH 015/241] elektra: update to 0.9.7 Notable changes: * Use toml as new default storage backend: Upstream has removed the ini plugin, we have been using in the past. toml is still somewhat experimental, but upstream has designated it as future recommended default. * Remove the dependency on boost. The only plugin needing that has been removed upstram. * Enable plugins for libev and libuv event loop integration. This adds two new packages with the respective dependencies. Upstream has fixed the bugs preventing us from using this. * Enable the internal notification plugin/system. This allows applications to automatically receive notifications about changes to their configuration. Again upstream fixing bugs enables this for us. * Set the environment variable $XDG_CACHE_HOME to "/tmp/" globally to prevent elektra (and possibly other applications) from writing temporary data to flash. Signed-off-by: Harald Geyer --- libs/elektra/Makefile | 87 +++++++++++++++++----------- libs/elektra/files/elektra.profile | 1 + libs/elektra/patches/010-gcc11.patch | 19 ------ 3 files changed, 55 insertions(+), 52 deletions(-) create mode 100644 libs/elektra/files/elektra.profile delete mode 100644 libs/elektra/patches/010-gcc11.patch diff --git a/libs/elektra/Makefile b/libs/elektra/Makefile index 7a900e57..fd48fb79 100644 --- a/libs/elektra/Makefile +++ b/libs/elektra/Makefile @@ -14,11 +14,11 @@ PKG_MAINTAINER:=Harald Geyer 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:=1 # 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,18 @@ 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" \ + -DPLUGINS="ALL;-gpgme;-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" + -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 +329,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 +369,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 +390,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 +452,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)) diff --git a/libs/elektra/files/elektra.profile b/libs/elektra/files/elektra.profile new file mode 100644 index 00000000..3df9be8f --- /dev/null +++ b/libs/elektra/files/elektra.profile @@ -0,0 +1 @@ +export XDG_CACHE_HOME=/tmp/ diff --git a/libs/elektra/patches/010-gcc11.patch b/libs/elektra/patches/010-gcc11.patch deleted file mode 100644 index 3a91cbe9..00000000 --- a/libs/elektra/patches/010-gcc11.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 7b57dc698834937b6913887544c6416e7f39192d Mon Sep 17 00:00:00 2001 -From: Mihael Pranjic -Date: Mon, 26 Apr 2021 14:53:21 +0200 -Subject: [PATCH] kdb: add missing 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 - #include -+#include - #include - #include - From b15f69d3ea718ded857e5a218e6997ebeb416e32 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 9 Jun 2022 15:33:02 -0700 Subject: [PATCH 016/241] elektra: fix compilation with external iconv Patch mostly taken from hidapi. Signed-off-by: Rosen Penev --- libs/elektra/Makefile | 4 +- libs/elektra/patches/010-iconv.patch | 112 +++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 libs/elektra/patches/010-iconv.patch diff --git a/libs/elektra/Makefile b/libs/elektra/Makefile index fd48fb79..4cb9d174 100644 --- a/libs/elektra/Makefile +++ b/libs/elektra/Makefile @@ -15,7 +15,7 @@ PKG_NAME:=elektra PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.md PKG_VERSION:=0.9.7 -PKG_RELEASE:=1 +PKG_RELEASE:=3 # Use this for official releasees PKG_HASH:=12b7b046004db29317b7b937dc794abf719c400ba3115af8d41849127b562681 @@ -311,8 +311,6 @@ CMAKE_OPTIONS += \ -DKDB_DEFAULT_STORAGE=toml \ -DENABLE_OPTIMIZATIONS=OFF \ -DPLUGINS="ALL;-gpgme;-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_glib" define Package/libelektra-core/install diff --git a/libs/elektra/patches/010-iconv.patch b/libs/elektra/patches/010-iconv.patch new file mode 100644 index 00000000..55eb29a6 --- /dev/null +++ b/libs/elektra/patches/010-iconv.patch @@ -0,0 +1,112 @@ +--- a/src/plugins/filecheck/CMakeLists.txt ++++ b/src/plugins/filecheck/CMakeLists.txt +@@ -2,19 +2,45 @@ include (LibAddMacros) + if (DEPENDENCY_PHASE) + find_package (Iconv QUIET) + +- if (NOT Iconv_FOUND) +- remove_plugin (filecheck "Cannot find iconv library") +- endif () +- + 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 ++ #include ++ 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() ++ remove_plugin (filecheck "Cannot find iconv library") ++ endif() ++endif() +--- a/src/plugins/iconv/CMakeLists.txt ++++ b/src/plugins/iconv/CMakeLists.txt +@@ -5,15 +5,41 @@ if (DEPENDENCY_PHASE) + # 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 ++ #include ++ 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() ++ remove_plugin (iconv "Cannot find iconv library") ++ endif() ++endif() From 66f17c5245003e523b8ad4e782738fc1998ebb6f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 14 Jul 2022 01:04:59 -0700 Subject: [PATCH 017/241] elektra: actually fix compilation with iconv find_package needs to be moved outside of if. Signed-off-by: Rosen Penev --- libs/elektra/Makefile | 2 +- libs/elektra/patches/010-iconv.patch | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/libs/elektra/Makefile b/libs/elektra/Makefile index 4cb9d174..d2a0e960 100644 --- a/libs/elektra/Makefile +++ b/libs/elektra/Makefile @@ -15,7 +15,7 @@ PKG_NAME:=elektra PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.md PKG_VERSION:=0.9.7 -PKG_RELEASE:=3 +PKG_RELEASE:=4 # Use this for official releasees PKG_HASH:=12b7b046004db29317b7b937dc794abf719c400ba3115af8d41849127b562681 diff --git a/libs/elektra/patches/010-iconv.patch b/libs/elektra/patches/010-iconv.patch index 55eb29a6..96d5b727 100644 --- a/libs/elektra/patches/010-iconv.patch +++ b/libs/elektra/patches/010-iconv.patch @@ -1,13 +1,16 @@ --- a/src/plugins/filecheck/CMakeLists.txt +++ b/src/plugins/filecheck/CMakeLists.txt -@@ -2,19 +2,45 @@ include (LibAddMacros) - if (DEPENDENCY_PHASE) - find_package (Iconv QUIET) - +@@ -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") @@ -53,12 +56,18 @@ + LINK_LIBRARIES iconv + ADD_TEST INSTALL_TEST_DATA COMPONENT libelektra${SO_VERSION}-extra) + else() -+ remove_plugin (filecheck "Cannot find iconv library") ++ message(FATAL_ERROR "Cannot find iconv library") + endif() +endif() --- a/src/plugins/iconv/CMakeLists.txt +++ b/src/plugins/iconv/CMakeLists.txt -@@ -5,15 +5,41 @@ if (DEPENDENCY_PHASE) +@@ -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) @@ -107,6 +116,6 @@ + LINK_LIBRARIES iconv + ADD_TEST TEST_README COMPONENT libelektra${SO_VERSION}-extra) + else() -+ remove_plugin (iconv "Cannot find iconv library") ++ message(FATAL_ERROR "Cannot find iconv library") + endif() +endif() From c9f65d1ae4b5f85b86acc691c2633bafb524bdaa Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 15 Dec 2021 22:06:55 -0800 Subject: [PATCH 018/241] freetype: update to 2.11.1 Signed-off-by: Rosen Penev --- libs/freetype/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile index d2779077..af7955ff 100644 --- a/libs/freetype/Makefile +++ b/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 PKG_LICENSE:=FTL GPL-2.0-only MIT ZLIB GPL-3.0-or-later From 4d3d18e70704a5b600bcbbd14fc71279d7f5444f Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Wed, 19 May 2021 17:16:43 +0300 Subject: [PATCH 019/241] libs: gdbm: enable/install Berkley DBM compat layer Python supports both GNU dbm and Berkley DBM. GNU dbm also has a compatibility layer for Berkeley. The current Berkley DB in OpenWrt is 4.7 and hasn't been updated in ages. It's also pretty big. So, an alternative for Python is to use GNU dbm for both (GNU and Berkley). Also, removing static shared libraries from the build, to encourage the usage of the shared ones. Signed-off-by: Alexandru Ardelean --- libs/gdbm/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile index 8e0e85d7..b23cb74c 100644 --- a/libs/gdbm/Makefile +++ b/libs/gdbm/Makefile @@ -19,7 +19,7 @@ PKG_MAINTAINER:=Marcel Denia 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,8 @@ define Package/libgdbm/description endef CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static + --enable-libgdbm-compat \ + --enable-shared define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ @@ -51,14 +51,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)) From ba61c571243fcfe28225c76b443c8b88df3616a8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Sep 2021 00:37:43 -0700 Subject: [PATCH 020/241] gdbm: update to 1.21 Signed-off-by: Rosen Penev --- libs/gdbm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile index b23cb74c..1155d736 100644 --- a/libs/gdbm/Makefile +++ b/libs/gdbm/Makefile @@ -8,12 +8,12 @@ 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 PKG_LICENSE:=GPL-3.0-or-later From adda53bcb13d2526ee28c26c405ded8a3856a128 Mon Sep 17 00:00:00 2001 From: Alois Klink Date: Wed, 26 Oct 2022 12:59:07 +0100 Subject: [PATCH 021/241] gdbm: configure with `--without-readline` By default, gdbm configures/builds with readline and curses support if they exist. This can cause race conditions when compiling gdbm and ncurses in parallel, as gdbm may try to link to ncurses when it doesn't exist. This commit forces gdbm to skip using readline/ncurses, since it's unlikely that anybody is using the line-editing feature of gdbm. See [gdbm's README][1] for more info. [1]: https://git.gnu.org.ua/gdbm.git/tree/README?h=v1.21#n50 Signed-off-by: Alois Klink --- libs/gdbm/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile index 1155d736..c9be1c5f 100644 --- a/libs/gdbm/Makefile +++ b/libs/gdbm/Makefile @@ -39,7 +39,8 @@ endef CONFIGURE_ARGS += \ --enable-libgdbm-compat \ - --enable-shared + --enable-shared \ + --without-readline define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ From 3de25485ddf3db2f4f13265f5d749711cfd57eae Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 16 May 2022 06:52:37 -0700 Subject: [PATCH 022/241] glib2: update to 2.70.5 Enabled glib_checks to fix podman. Signed-off-by: Rosen Penev --- libs/glib2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 4ec3ffed..e651fd8c 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glib2 -PKG_VERSION:=2.70.4 +PKG_VERSION:=2.70.5 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/glib/2.70 -PKG_HASH:=ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 +PKG_HASH:=f70bf76ebcc84e0705722f038be8e2f9a58d17e1a700810c635fcc18b8974b7e PKG_MAINTAINER:=Peter Wagner PKG_LICENSE:=LGPL-2.1-or-later @@ -64,7 +64,7 @@ COMP_ARGS= \ -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 From edde446cac1824c8600314e9c533401c173e9322 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Mon, 6 Jun 2022 10:07:08 +0200 Subject: [PATCH 023/241] glib2: update libintl handling glib2's meson.build runs check cc.has_function('ngettext', args : osx_ldflags) and, if successful, it never looks for non-libc libintl. For musl and glibc this test is always successful. glib2 unconditionally sets ENABLE_NLS, so during compile gets included always. But then we have a disconnect when the OpenWrt pkg is being built with BUILD_NLS=y, because the will be from libintl-full but glib2 will not link to libintl-full. With BUILD_NLS=n there's no problem, because the will be from libc. In lieu of proper libintl detection in glib2's meson build, removing the SED call from the Makefile together with the added patch sorts this out. The SED call can be removed because when we force libintl-full use, the meson build will put the necessary linker flag into the pkg-config file itself. Alpine Linux does something similar (see [1]), but they always force the use of the external libintl. I assume they always go for full NLS support. [1] https://git.alpinelinux.org/aports/tree/main/glib/musl-libintl.patch Signed-off-by: Sebastian Kemper --- libs/glib2/Makefile | 4 ---- libs/glib2/patches/007-openwrt-libintl.patch | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 libs/glib2/patches/007-openwrt-libintl.patch diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index e651fd8c..ba4a0e50 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -97,10 +97,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 diff --git a/libs/glib2/patches/007-openwrt-libintl.patch b/libs/glib2/patches/007-openwrt-libintl.patch new file mode 100644 index 00000000..8441e634 --- /dev/null +++ b/libs/glib2/patches/007-openwrt-libintl.patch @@ -0,0 +1,15 @@ +--- a/meson.build ++++ b/meson.build +@@ -2045,8 +2045,11 @@ endif + # proxy-libintl subproject. + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible + # implementations. This could be extended if issues are found in some platforms. ++# ++# 007-openwrt-libintl.patch: with BUILD_NLS=y use libintl-full, else use libc ++# + libintl_deps = [] +-if cc.has_function('ngettext', args : osx_ldflags) ++if get_option('nls').disabled() and cc.has_function('ngettext', args : osx_ldflags) + have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') + else + # First just find the bare library. From 0ccf4966e2380ce3d4d0a18fc6b3ca6bfeb8cc30 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 7 Jun 2022 16:26:49 -0700 Subject: [PATCH 024/241] glib2: replace intl patch with upstream solution Signed-off-by: Rosen Penev --- libs/glib2/Makefile | 4 +- libs/glib2/patches/007-openwrt-libintl.patch | 15 -- libs/glib2/patches/010-libintl.patch | 144 +++++++++++++++++++ 3 files changed, 145 insertions(+), 18 deletions(-) delete mode 100644 libs/glib2/patches/007-openwrt-libintl.patch create mode 100644 libs/glib2/patches/010-libintl.patch diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index ba4a0e50..dd6f3907 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -43,12 +43,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 \ diff --git a/libs/glib2/patches/007-openwrt-libintl.patch b/libs/glib2/patches/007-openwrt-libintl.patch deleted file mode 100644 index 8441e634..00000000 --- a/libs/glib2/patches/007-openwrt-libintl.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -2045,8 +2045,11 @@ endif - # proxy-libintl subproject. - # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible - # implementations. This could be extended if issues are found in some platforms. -+# -+# 007-openwrt-libintl.patch: with BUILD_NLS=y use libintl-full, else use libc -+# - libintl_deps = [] --if cc.has_function('ngettext', args : osx_ldflags) -+if get_option('nls').disabled() and cc.has_function('ngettext', args : osx_ldflags) - have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') - else - # First just find the bare library. diff --git a/libs/glib2/patches/010-libintl.patch b/libs/glib2/patches/010-libintl.patch new file mode 100644 index 00000000..7e99b82d --- /dev/null +++ b/libs/glib2/patches/010-libintl.patch @@ -0,0 +1,144 @@ +From 750687bf2824fcaf8976fb8b558d583f29acdfeb Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 7 Jun 2022 16:14:04 -0400 +Subject: [PATCH 1/2] meson: simplify iconv lookups using Meson's builtin + dependency lookup + +iconv is complicated to look up. That complexity now resides in +Meson, since 0.60.0, via a `dependency('iconv')` lookup, so use that +instead. + +No effort is made to support the old option for which type of iconv to +use. It was a false choice, because if only one was available, then +that's the only one you can use, and if both are available, the external +iconv shadows the builtin one and renders the builtin one unusable, +so there is still only one you can use. + +This meant that when configuring glib with -Diconv=libc on systems that +had an external iconv, the configure check would detect a valid libc +iconv, try to use it, and then fail during the build because iconv.h +belongs to the external iconv and generates machine code using the +external iconv ABI, but fails to link to the iconv `find_library()`. +Meson handles this transparently. +--- + meson.build | 20 +------------------- + meson_options.txt | 8 +------- + 2 files changed, 2 insertions(+), 26 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -1958,28 +1958,10 @@ glibconfig_conf.set10('G_HAVE_GROWING_ST + # We should never use the MinGW C library's iconv because it may not be + # available in the actual runtime environment. On Windows, we always use + # the built-in implementation +-iconv_opt = get_option('iconv') + if host_system == 'windows' + libiconv = [] +- # We have a #include "win_iconv.c" in gconvert.c on Windows, so we don't need +- # any external library for it +- if iconv_opt != 'auto' +- warning('-Diconv was set to @0@, which was ignored') +- endif + else +- found_iconv = false +- if ['auto', 'libc'].contains(iconv_opt) and cc.has_function('iconv_open') +- libiconv = [] +- found_iconv = true +- endif +- if not found_iconv and ['auto', 'external'].contains(iconv_opt) and cc.has_header_symbol('iconv.h', 'iconv_open') +- libiconv = [cc.find_library('iconv')] +- found_iconv = true +- endif +- +- if not found_iconv +- error('iconv implementation "@0@" not found'.format(iconv_opt)) +- endif ++ libiconv = dependency('iconv') + endif + + pcre = dependency('libpcre', version: '>= 8.31', required : false) # Should check for Unicode support, too. FIXME +@@ -2046,42 +2028,37 @@ endif + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible + # implementations. This could be extended if issues are found in some platforms. + libintl_deps = [] +-if cc.has_function('ngettext', args : osx_ldflags) +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') +-else +- # First just find the bare library. +- libintl = cc.find_library('intl', required : false) +- # The bare library probably won't link without help if it's static. +- if libintl.found() and not cc.has_function('ngettext', args : osx_ldflags, dependencies : libintl) +- libintl_iconv = cc.find_library('iconv', required : false) +- # libintl supports different threading APIs, which may not +- # require additional flags, but it defaults to using pthreads if +- # found. Meson's "threads" dependency does not allow you to +- # prefer pthreads. We may not be using pthreads for glib itself +- # either so just link the library to satisfy libintl rather than +- # also defining the macros with the -pthread flag. +- libintl_pthread = cc.find_library('pthread', required : false) +- # Try linking with just libiconv. +- if libintl_iconv.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv]) +- libintl_deps += [libintl_iconv] +- # Then also try linking with pthreads. +- elif libintl_iconv.found() and libintl_pthread.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv, libintl_pthread]) +- libintl_deps += [libintl_iconv, libintl_pthread] +- else +- libintl = disabler() +- endif +- endif +- if not libintl.found() +- libintl = subproject('proxy-libintl').get_variable('intl_dep') +- libintl_deps = [libintl] + libintl_deps +- have_bind_textdomain_codeset = true # proxy-libintl supports it ++libintl = dependency('intl', required: false) ++if libintl.found() ++ # libintl supports different threading APIs, which may not ++ # require additional flags, but it defaults to using pthreads if ++ # found. Meson's "threads" dependency does not allow you to ++ # prefer pthreads. We may not be using pthreads for glib itself ++ # either so just link the library to satisfy libintl rather than ++ # also defining the macros with the -pthread flag. ++ # ++ # Meson's builtin dependency lookup as of 0.60.0 doesn't check for ++ # pthread, so we do this manually here. ++ if cc.has_function('ngettext', dependencies : libintl) ++ libintl_deps += [libintl] + else +- libintl_deps = [libintl] + libintl_deps +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags, +- dependencies : libintl_deps) ++ libintl_pthread = cc.find_library('pthread', required : false) ++ if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread]) ++ libintl_deps += [libintl, libintl_pthread] ++ else ++ libintl = disabler() ++ endif + endif + endif + ++if libintl.found() ++ have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps) ++else ++ libintl = subproject('proxy-libintl').get_variable('intl_dep') ++ libintl_deps = [libintl] ++ have_bind_textdomain_codeset = true # proxy-libintl supports it ++endif ++ + glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset) + + # We require gettext to always be present +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -3,12 +3,6 @@ option('runtime_libdir', + value : '', + description : 'install runtime libraries relative to libdir') + +-option('iconv', +- type : 'combo', +- choices : ['auto', 'libc', 'external'], +- value : 'auto', +- description : 'iconv implementation to use (\'libc\' = \'Part of the C library\'; \'external\' = \'External libiconv\'; \'auto\' = \'Auto-detect which iconv is available\')') +- + option('charsetalias_dir', + type : 'string', + value : '', From 69c59fc2d11778056ec2b816d9844426cfdf8b91 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 15 Jul 2022 13:54:35 -0700 Subject: [PATCH 025/241] glib2: remove libiconv/host build dependency No longer present. The original reason for having it was an unfortunate side effect of the way meson uses HOST_LDFLAGS. Since the transistion to use dependency('iconv'), this is no longer relevant. Signed-off-by: Rosen Penev --- libs/glib2/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index dd6f3907..d598d50c 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -22,8 +22,7 @@ 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 +HOST_BUILD_DEPENDS:=libffi/host pcre/host PKG_CONFIG_DEPENDS:=CONFIG_BUILD_NLS include $(INCLUDE_DIR)/host-build.mk From 45982f74abe1fd402580a32414f9d3f403fe76f6 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sun, 9 Jan 2022 18:13:15 +0200 Subject: [PATCH 026/241] glib2: disable fortify source The glib2 package fails to build when CONFIG_PKG_FORTIFY_SOURCE_1 or CONFIG_PKG_FORTIFY_SOURCE_2 is enabled in the OpenWrt config: In file included from ../glib/libcharset/localcharset.c:28: /home/stijn/Development/OpenWrt/openwrt/staging_dir/toolchain-powerpc64_e5500_gcc-11.2.0_musl/include/fortify/stdio.h: In function 'snprintf': /home/stijn/Development/OpenWrt/openwrt/staging_dir/toolchain-powerpc64_e5500_gcc-11.2.0_musl/include/fortify/stdio.h:101:9: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] 101 | return __orig_snprintf(__s, __n, __f, __builtin_va_arg_pack()); | ^~~~~~ /home/stijn/Development/OpenWrt/openwrt/staging_dir/toolchain-powerpc64_e5500_gcc-11.2.0_musl/include/fortify/stdio.h: In function 'sprintf': /home/stijn/Development/OpenWrt/openwrt/staging_dir/toolchain-powerpc64_e5500_gcc-11.2.0_musl/include/fortify/stdio.h:110:17: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] 110 | __r = __orig_snprintf(__s, __b, __f, __builtin_va_arg_pack()); | ^~~ /home/stijn/Development/OpenWrt/openwrt/staging_dir/toolchain-powerpc64_e5500_gcc-11.2.0_musl/include/fortify/stdio.h:114:17: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] 114 | __r = __orig_sprintf(__s, __f, __builtin_va_arg_pack()); | ^~~ Disable fortify source for the package as a workaround. Signed-off-by: Stijn Tintel --- libs/glib2/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index d598d50c..c19e3d70 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -24,6 +24,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION) HOST_BUILD_DEPENDS:=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 From b3d7dc82dd4282816ed1108b45e15d0d9dbf2df2 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 18 Sep 2022 19:49:21 -0700 Subject: [PATCH 027/241] glib2: update to 2.74.0 Remove upstreamed patch and delete pointless one. Signed-off-by: Rosen Penev --- libs/glib2/Makefile | 12 +-- libs/glib2/patches/006-c99.patch | 11 -- libs/glib2/patches/010-libintl.patch | 144 --------------------------- libs/glib2/patches/010-pcre.patch | 10 ++ 4 files changed, 15 insertions(+), 162 deletions(-) delete mode 100644 libs/glib2/patches/006-c99.patch delete mode 100644 libs/glib2/patches/010-libintl.patch create mode 100644 libs/glib2/patches/010-pcre.patch diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index c19e3d70..5493e5e6 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glib2 -PKG_VERSION:=2.70.5 +PKG_VERSION:=2.74.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@GNOME/glib/2.70 -PKG_HASH:=f70bf76ebcc84e0705722f038be8e2f9a58d17e1a700810c635fcc18b8974b7e +PKG_SOURCE_URL:=@GNOME/glib/$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION))) +PKG_HASH:=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30 PKG_MAINTAINER:=Peter Wagner PKG_LICENSE:=LGPL-2.1-or-later @@ -22,7 +22,6 @@ PKG_CPE_ID:=cpe:/a:gnome:glib PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION) -HOST_BUILD_DEPENDS:=libffi/host pcre/host PKG_CONFIG_DEPENDS:=CONFIG_BUILD_NLS PKG_FORTIFY_SOURCE:=0 @@ -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 @@ -56,7 +55,6 @@ COMP_ARGS= \ -Dgtk_doc=false \ -Dbsymbolic_functions=true \ -Dforce_posix_threads=true \ - -Dfam=false \ -Dtests=false \ -Dinstalled_tests=false \ -Doss_fuzz=disabled \ @@ -65,7 +63,7 @@ COMP_ARGS= \ -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 diff --git a/libs/glib2/patches/006-c99.patch b/libs/glib2/patches/006-c99.patch deleted file mode 100644 index f2f168c1..00000000 --- a/libs/glib2/patches/006-c99.patch +++ /dev/null @@ -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) diff --git a/libs/glib2/patches/010-libintl.patch b/libs/glib2/patches/010-libintl.patch deleted file mode 100644 index 7e99b82d..00000000 --- a/libs/glib2/patches/010-libintl.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 750687bf2824fcaf8976fb8b558d583f29acdfeb Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Tue, 7 Jun 2022 16:14:04 -0400 -Subject: [PATCH 1/2] meson: simplify iconv lookups using Meson's builtin - dependency lookup - -iconv is complicated to look up. That complexity now resides in -Meson, since 0.60.0, via a `dependency('iconv')` lookup, so use that -instead. - -No effort is made to support the old option for which type of iconv to -use. It was a false choice, because if only one was available, then -that's the only one you can use, and if both are available, the external -iconv shadows the builtin one and renders the builtin one unusable, -so there is still only one you can use. - -This meant that when configuring glib with -Diconv=libc on systems that -had an external iconv, the configure check would detect a valid libc -iconv, try to use it, and then fail during the build because iconv.h -belongs to the external iconv and generates machine code using the -external iconv ABI, but fails to link to the iconv `find_library()`. -Meson handles this transparently. ---- - meson.build | 20 +------------------- - meson_options.txt | 8 +------- - 2 files changed, 2 insertions(+), 26 deletions(-) - ---- a/meson.build -+++ b/meson.build -@@ -1958,28 +1958,10 @@ glibconfig_conf.set10('G_HAVE_GROWING_ST - # We should never use the MinGW C library's iconv because it may not be - # available in the actual runtime environment. On Windows, we always use - # the built-in implementation --iconv_opt = get_option('iconv') - if host_system == 'windows' - libiconv = [] -- # We have a #include "win_iconv.c" in gconvert.c on Windows, so we don't need -- # any external library for it -- if iconv_opt != 'auto' -- warning('-Diconv was set to @0@, which was ignored') -- endif - else -- found_iconv = false -- if ['auto', 'libc'].contains(iconv_opt) and cc.has_function('iconv_open') -- libiconv = [] -- found_iconv = true -- endif -- if not found_iconv and ['auto', 'external'].contains(iconv_opt) and cc.has_header_symbol('iconv.h', 'iconv_open') -- libiconv = [cc.find_library('iconv')] -- found_iconv = true -- endif -- -- if not found_iconv -- error('iconv implementation "@0@" not found'.format(iconv_opt)) -- endif -+ libiconv = dependency('iconv') - endif - - pcre = dependency('libpcre', version: '>= 8.31', required : false) # Should check for Unicode support, too. FIXME -@@ -2046,42 +2028,37 @@ endif - # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible - # implementations. This could be extended if issues are found in some platforms. - libintl_deps = [] --if cc.has_function('ngettext', args : osx_ldflags) -- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') --else -- # First just find the bare library. -- libintl = cc.find_library('intl', required : false) -- # The bare library probably won't link without help if it's static. -- if libintl.found() and not cc.has_function('ngettext', args : osx_ldflags, dependencies : libintl) -- libintl_iconv = cc.find_library('iconv', required : false) -- # libintl supports different threading APIs, which may not -- # require additional flags, but it defaults to using pthreads if -- # found. Meson's "threads" dependency does not allow you to -- # prefer pthreads. We may not be using pthreads for glib itself -- # either so just link the library to satisfy libintl rather than -- # also defining the macros with the -pthread flag. -- libintl_pthread = cc.find_library('pthread', required : false) -- # Try linking with just libiconv. -- if libintl_iconv.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv]) -- libintl_deps += [libintl_iconv] -- # Then also try linking with pthreads. -- elif libintl_iconv.found() and libintl_pthread.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv, libintl_pthread]) -- libintl_deps += [libintl_iconv, libintl_pthread] -- else -- libintl = disabler() -- endif -- endif -- if not libintl.found() -- libintl = subproject('proxy-libintl').get_variable('intl_dep') -- libintl_deps = [libintl] + libintl_deps -- have_bind_textdomain_codeset = true # proxy-libintl supports it -+libintl = dependency('intl', required: false) -+if libintl.found() -+ # libintl supports different threading APIs, which may not -+ # require additional flags, but it defaults to using pthreads if -+ # found. Meson's "threads" dependency does not allow you to -+ # prefer pthreads. We may not be using pthreads for glib itself -+ # either so just link the library to satisfy libintl rather than -+ # also defining the macros with the -pthread flag. -+ # -+ # Meson's builtin dependency lookup as of 0.60.0 doesn't check for -+ # pthread, so we do this manually here. -+ if cc.has_function('ngettext', dependencies : libintl) -+ libintl_deps += [libintl] - else -- libintl_deps = [libintl] + libintl_deps -- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags, -- dependencies : libintl_deps) -+ libintl_pthread = cc.find_library('pthread', required : false) -+ if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread]) -+ libintl_deps += [libintl, libintl_pthread] -+ else -+ libintl = disabler() -+ endif - endif - endif - -+if libintl.found() -+ have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps) -+else -+ libintl = subproject('proxy-libintl').get_variable('intl_dep') -+ libintl_deps = [libintl] -+ have_bind_textdomain_codeset = true # proxy-libintl supports it -+endif -+ - glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset) - - # We require gettext to always be present ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -3,12 +3,6 @@ option('runtime_libdir', - value : '', - description : 'install runtime libraries relative to libdir') - --option('iconv', -- type : 'combo', -- choices : ['auto', 'libc', 'external'], -- value : 'auto', -- description : 'iconv implementation to use (\'libc\' = \'Part of the C library\'; \'external\' = \'External libiconv\'; \'auto\' = \'Auto-detect which iconv is available\')') -- - option('charsetalias_dir', - type : 'string', - value : '', diff --git a/libs/glib2/patches/010-pcre.patch b/libs/glib2/patches/010-pcre.patch new file mode 100644 index 00000000..87b32e73 --- /dev/null +++ b/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 From e03daef9d1374a769bb938da5840aca25b2055bf Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 22 Sep 2022 11:51:35 -0700 Subject: [PATCH 028/241] glib2: backport locale fix Fixes compilation with non English locale. Signed-off-by: Rosen Penev --- libs/glib2/patches/020-locale.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 libs/glib2/patches/020-locale.patch diff --git a/libs/glib2/patches/020-locale.patch b/libs/glib2/patches/020-locale.patch new file mode 100644 index 00000000..e171d58e --- /dev/null +++ b/libs/glib2/patches/020-locale.patch @@ -0,0 +1,24 @@ +From ebcc3c01db27b79af38b42c3c52a79d0225f744c Mon Sep 17 00:00:00 2001 +From: Seungha Yang +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 From 9cfc82bdb300865bc862777fcbb5f6cd04fd19fb Mon Sep 17 00:00:00 2001 From: Boris Krasnovskiy Date: Fri, 22 Jul 2022 14:25:17 -0400 Subject: [PATCH 029/241] gnutls: Avoid building unused gnutls dependency Avoid building unused gnutls dependency Signed-off-by: Boris Krasnovskiy --- libs/gnutls/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index e9b0b02c..21147020 100644 --- a/libs/gnutls/Makefile +++ b/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 From 9eab0ce0a00c7abab8da0ec9079f872b9f948ef2 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Sep 2021 00:45:12 -0700 Subject: [PATCH 030/241] hidapi: update to 0.10.1 Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev --- libs/hidapi/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/hidapi/Makefile b/libs/hidapi/Makefile index 51c7d0be..b5e2b16a 100644 --- a/libs/hidapi/Makefile +++ b/libs/hidapi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hidapi -PKG_VERSION:=0.9.0 -PKG_RELEASE:=1 +PKG_VERSION:=0.10.1 +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:=f71dd8a1f46979c17ee521bc2117573872bbf040f8a4750e492271fc141f2644 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Paul Fertser From 36b075248f4060f8372cb5c3e8bdff61070531ee Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 10 Jun 2022 12:52:30 -0700 Subject: [PATCH 031/241] hidapi: update to 0.12.0 Switch to cmake. Add upstream patch fixing iconv detection. Signed-off-by: Rosen Penev --- libs/hidapi/Makefile | 20 ++---- libs/hidapi/patches/020-iconv.patch | 100 ++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 13 deletions(-) create mode 100644 libs/hidapi/patches/020-iconv.patch diff --git a/libs/hidapi/Makefile b/libs/hidapi/Makefile index b5e2b16a..59261bfe 100644 --- a/libs/hidapi/Makefile +++ b/libs/hidapi/Makefile @@ -8,29 +8,26 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hidapi -PKG_VERSION:=0.10.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:=f71dd8a1f46979c17ee521bc2117573872bbf040f8a4750e492271fc141f2644 +PKG_HASH:=28ec1451f0527ad40c1a4c92547966ffef96813528c8b184a665f03ecbb508bc PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Paul Fertser 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 diff --git a/libs/hidapi/patches/020-iconv.patch b/libs/hidapi/patches/020-iconv.patch new file mode 100644 index 00000000..a30d540e --- /dev/null +++ b/libs/hidapi/patches/020-iconv.patch @@ -0,0 +1,100 @@ +From cfcddf90ea6add9d4aaa99ee2decc5a9140bdf37 Mon Sep 17 00:00:00 2001 +From: Ihor Dutchak +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 ++ #include ++ 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 + 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") From a7a3ea592897cc0772c574052c7f3b401fa004b1 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 4 Oct 2021 17:25:15 -0700 Subject: [PATCH 032/241] hiredis: fix compilation with macOS uname is used to test the host OS. Override it. Signed-off-by: Rosen Penev --- libs/hiredis/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/hiredis/Makefile b/libs/hiredis/Makefile index 0e77e5e3..3194f132 100644 --- a/libs/hiredis/Makefile +++ b/libs/hiredis/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hiredis PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/redis/hiredis/tar.gz/v$(PKG_VERSION)? @@ -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 From 61ff06899f2c1d53ef97e643de9ae1f1bf8b544c Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 15 Nov 2021 02:00:35 +0000 Subject: [PATCH 033/241] hiredis: update to version 1.0.2 Signed-off-by: Daniel Golle --- libs/hiredis/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/hiredis/Makefile b/libs/hiredis/Makefile index 3194f132..01e6b864 100644 --- a/libs/hiredis/Makefile +++ b/libs/hiredis/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hiredis -PKG_VERSION:=1.0.0 -PKG_RELEASE:=2 +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 From acc6d5be7f72d5aea4a6b6668b5b0418679575ba Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Fri, 21 Oct 2022 12:05:52 +0900 Subject: [PATCH 034/241] icu: bump to 72.1 It updates to Unicode 15, including new characters, scripts, emoji, and corresponding API constants. It also updates to CLDR 42 locale data with various additions and corrections. ICU 72 adds technology preview implementations for person name formatting, as well as for a new version of message formatting based on a proposed draft Unicode specification. Signed-off-by: Hirokazu MORIKAWA --- libs/icu/Makefile | 4 ++-- libs/icu/patches/001-change_optimization_option.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/icu/Makefile b/libs/icu/Makefile index 23975413..3534d5d8 100644 --- a/libs/icu/Makefile +++ b/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 diff --git a/libs/icu/patches/001-change_optimization_option.patch b/libs/icu/patches/001-change_optimization_option.patch index f4ee626d..9b6c3214 100644 --- a/libs/icu/patches/001-change_optimization_option.patch +++ b/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 From b4583a3a22f22ba0090f8221fda3b8caa7c0b3a6 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 15 Dec 2021 18:25:12 -0800 Subject: [PATCH 035/241] jsoncpp: update to 1.9.5 Signed-off-by: Rosen Penev --- libs/jsoncpp/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/jsoncpp/Makefile b/libs/jsoncpp/Makefile index ee9b3936..6024e462 100644 --- a/libs/jsoncpp/Makefile +++ b/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 PKG_LICENSE:=MIT From 97a0dd79c0033f0b845a47dd546f24ed9df692c1 Mon Sep 17 00:00:00 2001 From: Eric Luehrsen Date: Sun, 5 Dec 2021 22:24:34 -0500 Subject: [PATCH 036/241] ldns: update to 1.8.1 Signed-off-by: Eric Luehrsen --- libs/ldns/Makefile | 6 +- .../ldns/patches/001-compile-for-darwin.patch | 11 - .../ldns/patches/010-openssl-deprecated.patch | 48 --- libs/ldns/patches/020-openssl-dsa.patch | 316 ------------------ libs/ldns/patches/030-signzone.patch | 18 - 5 files changed, 3 insertions(+), 396 deletions(-) delete mode 100644 libs/ldns/patches/001-compile-for-darwin.patch delete mode 100644 libs/ldns/patches/010-openssl-deprecated.patch delete mode 100644 libs/ldns/patches/020-openssl-dsa.patch delete mode 100644 libs/ldns/patches/030-signzone.patch diff --git a/libs/ldns/Makefile b/libs/ldns/Makefile index c53567d9..d137fe78 100644 --- a/libs/ldns/Makefile +++ b/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.1 +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:=958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3 PKG_MAINTAINER:=Eric Luehrsen PKG_LICENSE:=BSD-3-Clause diff --git a/libs/ldns/patches/001-compile-for-darwin.patch b/libs/ldns/patches/001-compile-for-darwin.patch deleted file mode 100644 index 68c44dae..00000000 --- a/libs/ldns/patches/001-compile-for-darwin.patch +++ /dev/null @@ -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 )" diff --git a/libs/ldns/patches/010-openssl-deprecated.patch b/libs/ldns/patches/010-openssl-deprecated.patch deleted file mode 100644 index f5d92d2c..00000000 --- a/libs/ldns/patches/010-openssl-deprecated.patch +++ /dev/null @@ -1,48 +0,0 @@ -From cee98e71bb3d69e41cd4d2c6e33c68639dd1eaf0 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -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 - - #ifdef HAVE_SSL -+#include - #include - #include - #include diff --git a/libs/ldns/patches/020-openssl-dsa.patch b/libs/ldns/patches/020-openssl-dsa.patch deleted file mode 100644 index fc95e1a1..00000000 --- a/libs/ldns/patches/020-openssl-dsa.patch +++ /dev/null @@ -1,316 +0,0 @@ -From 8a12d9183271b2b16f399c3fe867f149dbf753d7 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Thu, 20 Feb 2020 18:58:52 -0800 -Subject: [PATCH] Fix compilation without DSA and deprecated APIs - -Signed-off-by: Rosen Penev ---- - 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: diff --git a/libs/ldns/patches/030-signzone.patch b/libs/ldns/patches/030-signzone.patch deleted file mode 100644 index b9ef8fe5..00000000 --- a/libs/ldns/patches/030-signzone.patch +++ /dev/null @@ -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 - From 13a1dd8467ad8972e2ea4d36bc3133977390ac0d Mon Sep 17 00:00:00 2001 From: Eric Luehrsen Date: Mon, 5 Sep 2022 19:51:28 -0400 Subject: [PATCH 037/241] ldns: update to 1.8.3 Signed-off-by: Eric Luehrsen --- libs/ldns/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ldns/Makefile b/libs/ldns/Makefile index d137fe78..3711b316 100644 --- a/libs/ldns/Makefile +++ b/libs/ldns/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ldns -PKG_VERSION:=1.8.1 +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:=958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3 +PKG_HASH:=c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860 PKG_MAINTAINER:=Eric Luehrsen PKG_LICENSE:=BSD-3-Clause From 963630b7176cf7e729bd62ddb0c33193e759614f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 4 Nov 2022 20:35:56 -0700 Subject: [PATCH 038/241] libaio: update to 0.3.113 Signed-off-by: Rosen Penev --- libs/libaio/Makefile | 6 +++--- libs/libaio/patches/001_arches.patch | 4 ++-- libs/libaio/patches/002_arches_sh.patch | 8 ++++---- libs/libaio/patches/003_arches_mips_fix_padding.patch | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libs/libaio/Makefile b/libs/libaio/Makefile index 463b9657..48501f70 100644 --- a/libs/libaio/Makefile +++ b/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 diff --git a/libs/libaio/patches/001_arches.patch b/libs/libaio/patches/001_arches.patch index a0b801c4..569c9a1d 100644 --- a/libs/libaio/patches/001_arches.patch +++ b/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__) || \ diff --git a/libs/libaio/patches/002_arches_sh.patch b/libs/libaio/patches/002_arches_sh.patch index b8886363..db6abea7 100644 --- a/libs/libaio/patches/002_arches_sh.patch +++ b/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 diff --git a/libs/libaio/patches/003_arches_mips_fix_padding.patch b/libs/libaio/patches/003_arches_mips_fix_padding.patch index 4e0a1187..539d236d 100644 --- a/libs/libaio/patches/003_arches_mips_fix_padding.patch +++ b/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__)) || \ From 34d91d63dbc0cb8352a05eaa143e098f12a18d1a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Sep 2021 00:52:57 -0700 Subject: [PATCH 039/241] libarchive: update to 3.5.2 Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev --- libs/libarchive/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index 3f88ac64..ff7c5be1 100644 --- a/libs/libarchive/Makefile +++ b/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.5.2 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.libarchive.org/downloads -PKG_HASH:=0e17d3a8d0b206018693b27f08029b598f6ef03600c2b5d10c94ce58692e299b +PKG_HASH:=f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 PKG_MAINTAINER:=Johannes Morgenroth PKG_LICENSE:=BSD-2-Clause From 4476c2e5046b805c39a75422bcbb2ee405776e2c Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sat, 5 Mar 2022 11:35:40 +0100 Subject: [PATCH 040/241] libarchive: add conflict to bsdtar/bsdtar-noopenssl Fixes: Packages 'bsdtar' and 'bsdtar-noopenssl' do not conflict while providing same file: /usr/bin/bsdtar Signed-off-by: Josef Schlehofer --- libs/libarchive/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index ff7c5be1..23d6341b 100644 --- a/libs/libarchive/Makefile +++ b/libs/libarchive/Makefile @@ -53,6 +53,7 @@ endef define Package/bsdtar $(call Package/bsdtar/Default) DEPENDS:= +libarchive + CONFLICTS:=bsdtar-noopenssl endef define Package/bsdtar-noopenssl From 961ba6c4656b2fd49a0412f725380e158ab9cae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 16 Jun 2022 13:38:11 +0200 Subject: [PATCH 041/241] libarchive: fix ext2fs build race error condition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libarchive looks for ext2fs headers during configure, and if it finds them it will expect to find them during compile, or on the rare occasion when they aren't it will fail: libarchive/archive_entry.c:59:55: fatal error: ext2fs/ext2_fs.h: No such file or directory As we just need headers for some type constants, let's re-use headers from tools/e2fsprogs package which are always available. Reported-by: Adam Dov Suggested-by: Paul Eggleton References: https://git.yoctoproject.org/poky/commit/?id=f0b9a7cf9f80be1917e45266fa201f464a28c1e5 Signed-off-by: Petr Štetiar --- libs/libarchive/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index 23d6341b..d871e88d 100644 --- a/libs/libarchive/Makefile +++ b/libs/libarchive/Makefile @@ -104,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/ From 8d8825c284beea1dc7f5f68aaddbe8199464f41f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Nov 2022 20:12:56 -0700 Subject: [PATCH 042/241] libarchive: update to 3.6.1 Signed-off-by: Rosen Penev --- libs/libarchive/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index d871e88d..ead7b904 100644 --- a/libs/libarchive/Makefile +++ b/libs/libarchive/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libarchive -PKG_VERSION:=3.5.2 +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:=f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 +PKG_HASH:=5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6 PKG_MAINTAINER:=Johannes Morgenroth PKG_LICENSE:=BSD-2-Clause From 98adba887ba6ddf4489ca674519a5d1099f4c64f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 6 Nov 2022 17:27:31 +0100 Subject: [PATCH 043/241] libarchive: Backport build fix for glibc 2.36 This backports a build fix for libarchive when compiling against glibc 2.36. Signed-off-by: Hauke Mehrtens --- ...s-mount.h-when-linux-fs.h-is-present.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch diff --git a/libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch b/libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch new file mode 100644 index 00000000..812e451c --- /dev/null +++ b/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 +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 + #endif +-#ifdef HAVE_SYS_MOUNT_H +-#include +-#endif + #ifdef HAVE_SYS_STAT_H + #include + #endif +@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$"); + #endif + #ifdef HAVE_LINUX_FS_H + #include ++#elif HAVE_SYS_MOUNT_H ++#include + #endif + /* + * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. From 9979914a08f09e4fc2f5b0c9e3bf4b221db7b773 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 15 Jun 2021 19:04:15 -0700 Subject: [PATCH 044/241] libcap-ng: update to 0.8.2 Signed-off-by: Rosen Penev --- libs/libcap-ng/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libcap-ng/Makefile b/libs/libcap-ng/Makefile index a1026f5e..ba2f3201 100644 --- a/libs/libcap-ng/Makefile +++ b/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.2 +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:=52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9 PKG_MAINTAINER:=Lucian CRISTIAN PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later From 7886a16ce2e186eb95e1209b3111a9178e33aed7 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 4 Nov 2022 20:58:25 -0700 Subject: [PATCH 045/241] libcap-ng: update to 0.8.3 Signed-off-by: Rosen Penev --- libs/libcap-ng/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libcap-ng/Makefile b/libs/libcap-ng/Makefile index ba2f3201..b8d12ff0 100644 --- a/libs/libcap-ng/Makefile +++ b/libs/libcap-ng/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcap-ng -PKG_VERSION:=0.8.2 +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:=52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9 +PKG_HASH:=bed6f6848e22bb2f83b5f764b2aef0ed393054e803a8e3a8711cb2a39e6b492d PKG_MAINTAINER:=Lucian CRISTIAN PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later From 1caab4129857326a5768bb8e8ad9dda95133fd79 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Sep 2021 00:55:44 -0700 Subject: [PATCH 046/241] libcoap: update to 4.3.0 Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev --- libs/libcoap/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/libcoap/Makefile b/libs/libcoap/Makefile index 4fe5475b..56d88403 100644 --- a/libs/libcoap/Makefile +++ b/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 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 From 3974b842769c0157ebf9c636831dbade84006de5 Mon Sep 17 00:00:00 2001 From: Leo Soares Date: Tue, 17 May 2022 00:02:26 +0100 Subject: [PATCH 047/241] libcoap: make sure `libcoap-3-notls.so` is installed This commit fixes an issue where the `libcoap-3-notls.so` is not installed, in some cases leaving the target's root with no library and just a broken link from `libcoap-3.so` to `libcoap-3-notls.so`. Signed-off-by: Leo Soares --- libs/libcoap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libcoap/Makefile b/libs/libcoap/Makefile index 56d88403..eef8820f 100644 --- a/libs/libcoap/Makefile +++ b/libs/libcoap/Makefile @@ -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 From 5fa9348db527930c9472cc38fdfa20732d281d37 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Sep 2021 00:59:11 -0700 Subject: [PATCH 048/241] libconfig: update to 1.7.3 Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev --- libs/libconfig/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libconfig/Makefile b/libs/libconfig/Makefile index fe7c5f57..f902c135 100644 --- a/libs/libconfig/Makefile +++ b/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 PKG_LICENSE:=LGPL-2.1-or-later From 9118978c0b72183dd774ea587398ffc2c563d8c7 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 14 Dec 2021 09:02:40 -0600 Subject: [PATCH 049/241] libdaq3: update to 3.0.5 Signed-off-by: W. Michael Petullo --- libs/libdaq3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libdaq3/Makefile b/libs/libdaq3/Makefile index 5cfc855e..3ee1c11d 100644 --- a/libs/libdaq3/Makefile +++ b/libs/libdaq3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdaq3 -PKG_VERSION:=3.0.3 +PKG_VERSION:=3.0.5 PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=W. Michael Petullo @@ -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:=4281464c5502037669e69d314b628df863420f590c4999c5b567c8016cd1e658 PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION) PKG_FIXUP:=autoreconf From 0fbbbcfcb546724e19728a4c873b03da90b24b8c Mon Sep 17 00:00:00 2001 From: Michal Hrusecky Date: Thu, 17 Feb 2022 20:13:46 +0100 Subject: [PATCH 050/241] libdaq3: Enable NFQ DAQ Enable support for DAQ module that uses NFQUEUE. Signed-off-by: Michal Hrusecky --- libs/libdaq3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libdaq3/Makefile b/libs/libdaq3/Makefile index 3ee1c11d..887b0cf8 100644 --- a/libs/libdaq3/Makefile +++ b/libs/libdaq3/Makefile @@ -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" \ From 80e3eab03a707f95b3bcaa9a6626be59c7a2478a Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 10 May 2022 14:38:00 -0500 Subject: [PATCH 051/241] libdaq3: update to 3.0.7 Signed-off-by: W. Michael Petullo --- libs/libdaq3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libdaq3/Makefile b/libs/libdaq3/Makefile index 887b0cf8..bac43082 100644 --- a/libs/libdaq3/Makefile +++ b/libs/libdaq3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdaq3 -PKG_VERSION:=3.0.5 +PKG_VERSION:=3.0.7 PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=W. Michael Petullo @@ -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:=4281464c5502037669e69d314b628df863420f590c4999c5b567c8016cd1e658 +PKG_HASH:=e3af1ef17d764294ae428e662f7d2a6187a0085c6e0f15fc230e754a298cabe2 PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION) PKG_FIXUP:=autoreconf From 4cd1608c026b1ab784d9cb6e25580b667de969b5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 4 Oct 2021 16:20:34 -0700 Subject: [PATCH 052/241] libdnet: fix compilation under macOS configure checks the host system not the target one. Override these variables. Signed-off-by: Rosen Penev --- libs/libdnet/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile index 5b77b044..52f17975 100644 --- a/libs/libdnet/Makefile +++ b/libs/libdnet/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdnet PKG_VERSION:=1.14 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ofalk/libdnet/tar.gz/$(PKG_NAME)-$(PKG_VERSION)? @@ -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/ From 97e821fc3eb226901c56a73a0a53d55f48afc95d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 4 Nov 2022 20:57:53 -0700 Subject: [PATCH 053/241] libdnet: update to 1.16.1 Signed-off-by: Rosen Penev --- libs/libdnet/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile index 52f17975..c1e69406 100644 --- a/libs/libdnet/Makefile +++ b/libs/libdnet/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdnet -PKG_VERSION:=1.14 -PKG_RELEASE:=3 +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 From 6b9981a731e4afb461b86ea2904c3304ef3a1ea9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 30 Jan 2022 22:57:30 -0800 Subject: [PATCH 054/241] libdrm: fix bad formats for mips64 and ppc64 Signed-off-by: Rosen Penev --- libs/libdrm/patches/010-64bit.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 libs/libdrm/patches/010-64bit.patch diff --git a/libs/libdrm/patches/010-64bit.patch b/libs/libdrm/patches/010-64bit.patch new file mode 100644 index 00000000..adc7e555 --- /dev/null +++ b/libs/libdrm/patches/010-64bit.patch @@ -0,0 +1,12 @@ +--- a/include/drm/drm.h ++++ b/include/drm/drm.h +@@ -38,6 +38,9 @@ + + #if defined(__linux__) + ++#ifndef __SANE_USERSPACE_TYPES__ ++#define __SANE_USERSPACE_TYPES__ /* For PPC64, to get LL64 types */ ++#endif + #include + #include + typedef unsigned int drm_handle_t; From 9f60d15f226f29915854fd9bd0b7c1762c08b44c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 4 Nov 2022 20:58:07 -0700 Subject: [PATCH 055/241] libdrm: update to 2.4.114 Signed-off-by: Rosen Penev --- libs/libdrm/Makefile | 32 ++++++++++++++--------------- libs/libdrm/patches/010-64bit.patch | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libs/libdrm/Makefile b/libs/libdrm/Makefile index 7356ba0d..2032cee2 100644 --- a/libs/libdrm/Makefile +++ b/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 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 diff --git a/libs/libdrm/patches/010-64bit.patch b/libs/libdrm/patches/010-64bit.patch index adc7e555..b02a2b58 100644 --- a/libs/libdrm/patches/010-64bit.patch +++ b/libs/libdrm/patches/010-64bit.patch @@ -1,6 +1,6 @@ --- a/include/drm/drm.h +++ b/include/drm/drm.h -@@ -38,6 +38,9 @@ +@@ -37,6 +37,9 @@ #if defined(__linux__) From 7f2c32714186d450c4642843c884f2580cd9e01b Mon Sep 17 00:00:00 2001 From: Jan Hak Date: Mon, 21 Jun 2021 10:51:13 +0200 Subject: [PATCH 056/241] libedit: update to version 20210522-3.1 Signed-off-by: Jan Hak --- libs/libedit/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libedit/Makefile b/libs/libedit/Makefile index c8aa4890..2b779ada 100644 --- a/libs/libedit/Makefile +++ b/libs/libedit/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libedit -PKG_VERSION:=20210419-3.1 +PKG_VERSION:=20210522-3.1 PKG_RELEASE:=1 PKG_MAINTAINER:=Daniel Salzman @@ -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:=0220bc2047e927c0c1984ef5f7b4eb2a9469a5b7bf12ba573ca3b23ca02bbb6f PKG_INSTALL:=1 From 9390d1cdee041d9d50827c9a990f56d90039ce2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=A1k?= Date: Tue, 1 Nov 2022 14:24:23 +0100 Subject: [PATCH 057/241] libedit: update to version 20221030-3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Hák --- libs/libedit/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libedit/Makefile b/libs/libedit/Makefile index 2b779ada..9192ff26 100644 --- a/libs/libedit/Makefile +++ b/libs/libedit/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libedit -PKG_VERSION:=20210522-3.1 +PKG_VERSION:=20221030-3.1 PKG_RELEASE:=1 PKG_MAINTAINER:=Daniel Salzman @@ -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:=0220bc2047e927c0c1984ef5f7b4eb2a9469a5b7bf12ba573ca3b23ca02bbb6f +PKG_HASH:=f0925a5adf4b1bf116ee19766b7daa766917aec198747943b1c4edf67a4be2bb PKG_INSTALL:=1 From a0fa796f085d435e727bda7a761198fb5eefdf8a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 15 Jun 2021 19:03:43 -0700 Subject: [PATCH 058/241] libesmtp: update to 1.1.0 New upstream. Uses meson now. Removed outdated patches. Signed-off-by: Rosen Penev --- libs/libesmtp/Makefile | 37 ++++---- libs/libesmtp/patches/100-openssl-1.1.patch | 88 ------------------- .../200-add-TLSv1_1-TLSv1_2-support.patch | 36 -------- 3 files changed, 22 insertions(+), 139 deletions(-) delete mode 100644 libs/libesmtp/patches/100-openssl-1.1.patch delete mode 100644 libs/libesmtp/patches/200-add-TLSv1_1-TLSv1_2-support.patch diff --git a/libs/libesmtp/Makefile b/libs/libesmtp/Makefile index aa058242..50c66840 100644 --- a/libs/libesmtp/Makefile +++ b/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 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)) diff --git a/libs/libesmtp/patches/100-openssl-1.1.patch b/libs/libesmtp/patches/100-openssl-1.1.patch deleted file mode 100644 index fcbbcc27..00000000 --- a/libs/libesmtp/patches/100-openssl-1.1.patch +++ /dev/null @@ -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; - } - diff --git a/libs/libesmtp/patches/200-add-TLSv1_1-TLSv1_2-support.patch b/libs/libesmtp/patches/200-add-TLSv1_1-TLSv1_2-support.patch deleted file mode 100644 index 32f87e0f..00000000 --- a/libs/libesmtp/patches/200-add-TLSv1_1-TLSv1_2-support.patch +++ /dev/null @@ -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 -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 From 8879c981eae8f395f3f912d411f65f233cb3416e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Sep 2021 01:05:16 -0700 Subject: [PATCH 059/241] libexif: update to 0.6.23 Switch to AUTORELEASE for simplicity. Fix license information. Add PKG_BUILD_PARALLEL for faster compilation. Fixes CVE-2020-0198 and CVE-2020-0452. Signed-off-by: Rosen Penev --- libs/libexif/Makefile | 13 +++++++------ libs/libexif/patches/100-no_doc.patch | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/libexif/Makefile b/libs/libexif/Makefile index 82ee39d7..4fa8a2c0 100644 --- a/libs/libexif/Makefile +++ b/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.23 +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_URL:=https://github.com/libexif/libexif/releases/download/v$(PKG_VERSION) +PKG_HASH:=a740a99920eb81ae0aa802bb46e683ce6e0cde061c210f5d5bde5b8572380431 -PKG_LICENSE:=LGPL-2.1 +PK_MAINTAINER:=W. Michael Petullo +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 endef define Package/libexif/description diff --git a/libs/libexif/patches/100-no_doc.patch b/libs/libexif/patches/100-no_doc.patch index dc0d662e..a67f79da 100644 --- a/libs/libexif/patches/100-no_doc.patch +++ b/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@ From 124b2da87b1febd50e84e721636ad687b65786bb Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 15 Dec 2021 18:28:07 -0800 Subject: [PATCH 060/241] libexif: update to 0.6.24 Signed-off-by: Rosen Penev --- libs/libexif/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libexif/Makefile b/libs/libexif/Makefile index 4fa8a2c0..aaa184a0 100644 --- a/libs/libexif/Makefile +++ b/libs/libexif/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libexif -PKG_VERSION:=0.6.23 +PKG_VERSION:=0.6.24 PKG_RELEASE:=$(AUTORELEASE) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/libexif/libexif/releases/download/v$(PKG_VERSION) -PKG_HASH:=a740a99920eb81ae0aa802bb46e683ce6e0cde061c210f5d5bde5b8572380431 +PKG_HASH:=d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae PK_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later From 05dbef1f9c32ae30000480da18e6fccfa1218042 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 10 Jul 2022 00:32:58 -0700 Subject: [PATCH 061/241] libextractor: fix iconv handling Autoreconf is enough to fix. Signed-off-by: Rosen Penev --- libs/libextractor/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/libextractor/Makefile b/libs/libextractor/Makefile index ad9e17f5..d01ef29b 100644 --- a/libs/libextractor/Makefile +++ b/libs/libextractor/Makefile @@ -20,6 +20,7 @@ PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Daniel Golle +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 From b798d81822976d72c509c2741bd454882708b8d3 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sat, 7 Aug 2021 13:08:52 +0300 Subject: [PATCH 062/241] libffi: bump to 3.4.2 Remove both patches as they have been upstreamed. This new release is only available on Github and does not ship configure or Makefile, so autoreconf is needed. Signed-off-by: Stijn Tintel --- libs/libffi/Makefile | 9 ++--- .../patches/100-fix_mips_softfloat.patch | 24 ------------- libs/libffi/patches/200-ppc.patch | 34 ------------------- 3 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 libs/libffi/patches/100-fix_mips_softfloat.patch delete mode 100644 libs/libffi/patches/200-ppc.patch diff --git a/libs/libffi/Makefile b/libs/libffi/Makefile index af6b525c..56c9f5d6 100644 --- a/libs/libffi/Makefile +++ b/libs/libffi/Makefile @@ -8,16 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libffi -PKG_VERSION:=3.3 -PKG_RELEASE:=2 +PKG_VERSION:=3.4.2 +PKG_RELEASE:=1 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 diff --git a/libs/libffi/patches/100-fix_mips_softfloat.patch b/libs/libffi/patches/100-fix_mips_softfloat.patch deleted file mode 100644 index 66f4711e..00000000 --- a/libs/libffi/patches/100-fix_mips_softfloat.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 76c0cfea70f78586231d7994492396eebfb12d5f Mon Sep 17 00:00:00 2001 -From: Carl Hurd -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 diff --git a/libs/libffi/patches/200-ppc.patch b/libs/libffi/patches/200-ppc.patch deleted file mode 100644 index fb36ba3f..00000000 --- a/libs/libffi/patches/200-ppc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -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 ---- - 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); From 6854ea1319e73c04ab97ae1fc406b5afbc3ecc94 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 18 Oct 2021 01:00:07 -0700 Subject: [PATCH 063/241] libffi: don't build host shared libs Avoids rpath hacks. Add --with-pic. Needed for static library. Signed-off-by: Rosen Penev --- libs/libffi/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/libffi/Makefile b/libs/libffi/Makefile index 56c9f5d6..901a4f3a 100644 --- a/libs/libffi/Makefile +++ b/libs/libffi/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libffi PKG_VERSION:=3.4.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/libffi/libffi/tar.gz/v$(PKG_VERSION)? @@ -48,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 \ From 79c03c8e25f35c0e07ce8d5688e2a2f53970002b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Sep 2021 01:10:37 -0700 Subject: [PATCH 064/241] libfido2: update to 1.8.0 Switch to AUTORELEASE for simplicity. Remove no longer necessary warning fixes. Add now needed zlib dependency. Signed-off-by: Rosen Penev --- libs/libfido2/Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libs/libfido2/Makefile b/libs/libfido2/Makefile index 8fd8aae9..5a47b9d7 100644 --- a/libs/libfido2/Makefile +++ b/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.8.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:=554291188f24ab595cb947f9d2b6ec40ce5afe39d9257c1e2cd0bdef8bf7fd1d PKG_MAINTAINER:=Linos Giannopoulos 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 From ca31c453bedcc2acfa6e6f69f220db2cfb20025a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 4 Nov 2022 21:07:05 -0700 Subject: [PATCH 065/241] libfido2: update to 1.12.0 Signed-off-by: Rosen Penev --- libs/libfido2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libfido2/Makefile b/libs/libfido2/Makefile index 5a47b9d7..0ede55e1 100644 --- a/libs/libfido2/Makefile +++ b/libs/libfido2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfido2 -PKG_VERSION:=1.8.0 +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:=554291188f24ab595cb947f9d2b6ec40ce5afe39d9257c1e2cd0bdef8bf7fd1d +PKG_HASH:=813d6d25116143d16d2e96791718a74825da16b774a8d093d96f06ae1730d9c5 PKG_MAINTAINER:=Linos Giannopoulos PKG_LICENSE:=GPL-3.0-or-later From 09bd0f60ba8427bbd8a1707c12edc8a79e6cbe8c Mon Sep 17 00:00:00 2001 From: Othmar Truniger Date: Mon, 5 Jul 2021 16:41:21 +0200 Subject: [PATCH 066/241] libfmt: bump to version 8.0.1 Signed-off-by: Othmar Truniger --- libs/libfmt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libfmt/Makefile b/libs/libfmt/Makefile index 274b89aa..53cb4372 100644 --- a/libs/libfmt/Makefile +++ b/libs/libfmt/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfmt -PKG_VERSION:=8.0.0 +PKG_VERSION:=8.0.1 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:=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Othmar Truniger From 1287979b2a25e1b38556b0a27b733330412f49da Mon Sep 17 00:00:00 2001 From: Othmar Truniger Date: Wed, 12 Jan 2022 17:54:47 +0100 Subject: [PATCH 067/241] libfmt: bump to new upstream version 8.1.1 Signed-off-by: Othmar Truniger --- libs/libfmt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libfmt/Makefile b/libs/libfmt/Makefile index 53cb4372..f4cee55a 100644 --- a/libs/libfmt/Makefile +++ b/libs/libfmt/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfmt -PKG_VERSION:=8.0.1 +PKG_VERSION:=8.1.1 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:=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01 +PKG_HASH:=3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Othmar Truniger From 8bcd9646ea976458e95fc01ecefef92db649e6e5 Mon Sep 17 00:00:00 2001 From: Othmar Truniger Date: Mon, 11 Jul 2022 20:07:52 +0200 Subject: [PATCH 068/241] libfmt: bump to new upstream version 9.0.0 Signed-off-by: Othmar Truniger --- libs/libfmt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libfmt/Makefile b/libs/libfmt/Makefile index f4cee55a..45623371 100644 --- a/libs/libfmt/Makefile +++ b/libs/libfmt/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfmt -PKG_VERSION:=8.1.1 +PKG_VERSION:=9.0.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:=3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346 +PKG_HASH:=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Othmar Truniger From 47b3feec2675b968df77754174c9c57ce6c8c8df Mon Sep 17 00:00:00 2001 From: Othmar Truniger Date: Tue, 30 Aug 2022 18:41:40 +0200 Subject: [PATCH 069/241] libfmt: bump to upstream version 9.1.0 Signed-off-by: Othmar Truniger --- libs/libfmt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libfmt/Makefile b/libs/libfmt/Makefile index 45623371..6cfe65d1 100644 --- a/libs/libfmt/Makefile +++ b/libs/libfmt/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfmt -PKG_VERSION:=9.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:=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5 +PKG_HASH:=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Othmar Truniger From f34995be3a3b08b504522a1c03525bc90e3753ac Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Sep 2021 01:13:58 -0700 Subject: [PATCH 070/241] libfstrm: update to 0.6.1 Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev --- libs/libfstrm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libfstrm/Makefile b/libs/libfstrm/Makefile index da626531..cf04b574 100644 --- a/libs/libfstrm/Makefile +++ b/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) From 71c03f72f60bd8d57bb4b5b40662dca4d2056b0c Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Mon, 22 Aug 2022 14:58:19 +0200 Subject: [PATCH 071/241] libgd: add conflicts to each other The full variant should conflict with the default variant. This prevents that libgd and libgd-full could be installed side by side, and also, the full variant should provide the libgd. Otherwise, if you install libgd-full, you can not install vnstat. Signed-off-by: Josef Schlehofer --- libs/libgd/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile index 0e614ea1..83a61ca6 100644 --- a/libs/libgd/Makefile +++ b/libs/libgd/Makefile @@ -43,6 +43,8 @@ define Package/libgd-full DEPENDS+=+libtiff +libfreetype TITLE+=(full) VARIANT:=full + PROVIDES:=libgd + CONFLICTS:=libgd endef define Package/libgd/description/default From 4276aad668d438b35b68d725b82e695a5ad2cc49 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 14 Sep 2022 18:32:47 -0300 Subject: [PATCH 072/241] libgd: avoid recursive and redundant dependencies Change the CONFLICTS line from the libgd-full to libgd to fix a recursive dependency. While at it, remove the redundant +LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype dependencies from Package/libgd/default. Signed-off-by: Eneas U de Queiroz --- libs/libgd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile index 83a61ca6..4ca2eff2 100644 --- a/libs/libgd/Makefile +++ b/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 @@ -44,7 +45,6 @@ define Package/libgd-full TITLE+=(full) VARIANT:=full PROVIDES:=libgd - CONFLICTS:=libgd endef define Package/libgd/description/default From 81799f5f5f837edfd0a4dfb62c0ceec55abb6ea7 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 10 May 2022 14:30:55 -0500 Subject: [PATCH 073/241] libgee: update to 0.20.5 Signed-off-by: W. Michael Petullo --- libs/libgee/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libgee/Makefile b/libs/libgee/Makefile index 592131ec..c2264bcc 100644 --- a/libs/libgee/Makefile +++ b/libs/libgee/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgee -PKG_VERSION:=0.20.4 +PKG_VERSION:=0.20.5 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/libgee/0.20 -PKG_HASH:=524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e +PKG_HASH:=31863a8957d5a727f9067495cabf0a0889fa5d3d44626e54094331188d5c1518 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later From 5aba30ce30a3da7f68d8e524b4ea1c6b65558bda Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 4 Nov 2022 21:01:49 -0700 Subject: [PATCH 074/241] libgee: update to 0.20.6 Signed-off-by: Rosen Penev --- libs/libgee/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libgee/Makefile b/libs/libgee/Makefile index c2264bcc..8615a15e 100644 --- a/libs/libgee/Makefile +++ b/libs/libgee/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgee -PKG_VERSION:=0.20.5 +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:=31863a8957d5a727f9067495cabf0a0889fa5d3d44626e54094331188d5c1518 +PKG_HASH:=1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later From 44fcaef3565d355a9305cd9d0f7f8df13c6bd0ba Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 4 Nov 2022 20:47:45 -0700 Subject: [PATCH 075/241] libgpg-error: update to 1.46 Signed-off-by: Rosen Penev --- libs/libgpg-error/Makefile | 12 ++---------- libs/libgpg-error/patches/010-add-arc-support.patch | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile index 1db83571..559077e1 100644 --- a/libs/libgpg-error/Makefile +++ b/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 PKG_LICENSE:=LGPL-2.1-or-later @@ -52,14 +52,6 @@ CONFIGURE_ARGS += \ define Build/InstallDev $(INSTALL_DIR) $(2)/bin $(1)/usr/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config \ - $(2)/bin/ - $(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 - $(INSTALL_BIN) \ $(PKG_INSTALL_DIR)/usr/bin/gpgrt-config \ $(2)/bin/ diff --git a/libs/libgpg-error/patches/010-add-arc-support.patch b/libs/libgpg-error/patches/010-add-arc-support.patch index 5ecf81c2..03387f8e 100644 --- a/libs/libgpg-error/patches/010-add-arc-support.patch +++ b/libs/libgpg-error/patches/010-add-arc-support.patch @@ -28,7 +28,7 @@ Signed-off-by: Alexey Brodkin --- 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 \ From ecb53e233440361e0017ae8233ba828c6abdeffa Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 5 Nov 2022 14:52:08 -0700 Subject: [PATCH 076/241] libgpg-error: install gpg-error-config again Upstream deprecated it while not fixing libgcrypt not to use it. Signed-off-by: Rosen Penev --- libs/libgpg-error/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile index 559077e1..0f026632 100644 --- a/libs/libgpg-error/Makefile +++ b/libs/libgpg-error/Makefile @@ -45,6 +45,7 @@ endef CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ + --enable-install-gpg-error-config \ --disable-doc \ --disable-languages \ --disable-rpath \ @@ -52,13 +53,21 @@ CONFIGURE_ARGS += \ define Build/InstallDev $(INSTALL_DIR) $(2)/bin $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config \ + $(2)/bin/ + $(SED) \ + 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ + $(2)/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 \ $(2)/bin/ $(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) \ From 5a2d282a012159a90c9df214cc3e36fd5504c5d1 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Thu, 11 Feb 2021 00:31:12 +0100 Subject: [PATCH 077/241] libgpiod: update to 1.6.3 Signed-off-by: Michael Heimpold --- libs/libgpiod/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libgpiod/Makefile b/libs/libgpiod/Makefile index 68996c83..a5ece103 100644 --- a/libs/libgpiod/Makefile +++ b/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 PKG_LICENSE:=LGPL-2.1-or-later From f2958df1e6510b76d9cc0eecb147407935fc1545 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Nov 2022 20:31:31 -0700 Subject: [PATCH 078/241] libidn: update to 1.41 Signed-off-by: Rosen Penev --- libs/libidn/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile index c99ea24d..4237df27 100644 --- a/libs/libidn/Makefile +++ b/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 From 61d085457eec1760713b8252d9e85b163e1dc667 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Nov 2022 20:31:09 -0700 Subject: [PATCH 079/241] libidn2: update to 2.3.4 Signed-off-by: Rosen Penev --- libs/libidn2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libidn2/Makefile b/libs/libidn2/Makefile index 84baf329..ccc26857 100644 --- a/libs/libidn2/Makefile +++ b/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 From 60199d19d3e39947c1c0e72f4a710bb3c7240d58 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 18 Mar 2022 18:46:53 +0000 Subject: [PATCH 080/241] libinput: update to 1.19.3 ed79e4fa quirks: changes touchpad pressure Lenovo Yoga 2 Pro 797a66c1 doc/user: fix broken link to "Observations on trackpoint input data" 7db2a339 quirks: add ModelBouncingKeys for A4Tech X-710BK Mouse 5e7bae44 quirks: Dell 15R touchpad settings for firmware v3 54275910 gestures: cancel hold gestures on thumb detection 033aee76 doc/user: fix broken link to systemd 60-evdev.hwdb Signed-off-by: Daniel Golle --- libs/libinput/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libinput/Makefile b/libs/libinput/Makefile index d8f4947b..6d7a189b 100644 --- a/libs/libinput/Makefile +++ b/libs/libinput/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libinput -PKG_VERSION:=1.19.2 +PKG_VERSION:=1.19.3 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:=3cae78ccde19d7d0f387e58bc734d4d17ab5f6426f54a9e8b728c90b17baa068 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=MIT From dc61de744f2dcb5a52a8a88f2ddc177d48bb1b8e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 7 Sep 2022 19:33:30 +0100 Subject: [PATCH 081/241] libinput: update to version 1.19.4 This release includes a fix for CVE-2022-1215, a format string vulnerabilty in the evdev device handling. For details, see https://gitlab.freedesktop.org/libinput/libinput/-/issues/752 Peter Hutterer (2): evdev: strip the device name of format directives libinput 1.19.4 Signed-off-by: Daniel Golle --- libs/libinput/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libinput/Makefile b/libs/libinput/Makefile index 6d7a189b..7a34b571 100644 --- a/libs/libinput/Makefile +++ b/libs/libinput/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libinput -PKG_VERSION:=1.19.3 +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:=3cae78ccde19d7d0f387e58bc734d4d17ab5f6426f54a9e8b728c90b17baa068 +PKG_HASH:=ff33a570b5a936c81e6c08389a8581c2665311d026ce3d225c88d09c49f9b440 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=MIT From 260cc9f4a9fae57e77fd3aeb7289b1cb8925f1fa Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 15 Aug 2021 18:18:30 -0700 Subject: [PATCH 082/241] libjpeg-turbo: update to 2.1.1 Signed-off-by: Rosen Penev --- libs/libjpeg-turbo/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libjpeg-turbo/Makefile b/libs/libjpeg-turbo/Makefile index 8aad8b2e..2646c62f 100644 --- a/libs/libjpeg-turbo/Makefile +++ b/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.1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444 +PKG_HASH:=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510 PKG_MAINTAINER:=Rosen Penev PKG_LICENSE:=BSD-3-Clause IJG zlib From c4acee44a0c78089a1fef4884ffd78bdac89fba9 Mon Sep 17 00:00:00 2001 From: Michel Promonet Date: Sun, 3 Oct 2021 20:53:16 +0200 Subject: [PATCH 083/241] multimedia: add v4l2tools & v4l2loopback Signed-off-by: Michel Promonet --- kernel/v4l2loopback/Makefile | 54 +++++++++++++++++++++++++++++++++++ libs/libjpeg-turbo/Makefile | 2 +- multimedia/v4l2tools/Makefile | 38 ++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 kernel/v4l2loopback/Makefile create mode 100644 multimedia/v4l2tools/Makefile diff --git a/kernel/v4l2loopback/Makefile b/kernel/v4l2loopback/Makefile new file mode 100644 index 00000000..7194002b --- /dev/null +++ b/kernel/v4l2loopback/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2008-2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=v4l2loopback +PKG_VERSION:=master +PKG_RELEASE:=$(AUTORELEASE) + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/umlaeute/v4l2loopback +PKG_SOURCE_VERSION:=baf9de279afc7a7c7513e9c40a0c9ff88f456af4 +PKG_MIRROR_HASH:=ff834e16b13e9b38814095d95ab033ea7eae075689956e227f157e95bc075983 + + +PKG_MAINTAINER:=Michel Promonet + +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)) + diff --git a/libs/libjpeg-turbo/Makefile b/libs/libjpeg-turbo/Makefile index 2646c62f..12541756 100644 --- a/libs/libjpeg-turbo/Makefile +++ b/libs/libjpeg-turbo/Makefile @@ -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 diff --git a/multimedia/v4l2tools/Makefile b/multimedia/v4l2tools/Makefile new file mode 100644 index 00000000..1c1f7c61 --- /dev/null +++ b/multimedia/v4l2tools/Makefile @@ -0,0 +1,38 @@ +# +# Copyright (C) 2017 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. + +include $(TOPDIR)/rules.mk + +PKG_NAME:=v4l2tools +PKG_VERSION:=0.1.5 +PKG_RELEASE:=$(AUTORELEASE) + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/mpromonet/v4l2tools.git +PKG_SOURCE_VERSION:=v$(PKG_VERSION) +PKG_MIRROR_HASH:=af63df7f88c1031aa5a438d175d77ca9c976e48eb55ff78a6ff6d2bd7272ac51 + +PKG_MAINTAINER:=Michel Promonet +PKG_LICENSE:=Unlicense +PKG_LICENSE_FILES:=LICENCE + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/v4l2tools + SECTION:=multimedia + CATEGORY:=Multimedia + TITLE:=v4l2tools + DEPENDS:=+libstdcpp +libjpeg + URL:=https://github.com/mpromonet/v4l2tools +endef + +define Package/v4l2tools/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/v4l2tools-$(PKG_VERSION) $(1)/usr/bin/v4l2tools +endef + +$(eval $(call BuildPackage,v4l2tools)) From ee2a6aacf0ec1eb997bba32e5997357ffb40b1a2 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 15 Dec 2021 18:30:05 -0800 Subject: [PATCH 084/241] libjpeg-turbo: update to 2.1.2 Signed-off-by: Rosen Penev --- libs/libjpeg-turbo/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libjpeg-turbo/Makefile b/libs/libjpeg-turbo/Makefile index 12541756..2d0dacdb 100644 --- a/libs/libjpeg-turbo/Makefile +++ b/libs/libjpeg-turbo/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libjpeg-turbo -PKG_VERSION:=2.1.1 +PKG_VERSION:=2.1.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510 +PKG_HASH:=09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5 PKG_MAINTAINER:=Rosen Penev PKG_LICENSE:=BSD-3-Clause IJG zlib From 197944c08226fd9fb59cc48f857f1a000880e9fe Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Nov 2022 20:18:12 -0700 Subject: [PATCH 085/241] libjpeg-turbo: update to 2.1.4 Signed-off-by: Rosen Penev --- libs/libjpeg-turbo/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/libjpeg-turbo/Makefile b/libs/libjpeg-turbo/Makefile index 2d0dacdb..ecf6a1f9 100644 --- a/libs/libjpeg-turbo/Makefile +++ b/libs/libjpeg-turbo/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libjpeg-turbo -PKG_VERSION:=2.1.2 +PKG_VERSION:=2.1.4 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5 +PKG_HASH:=d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b PKG_MAINTAINER:=Rosen Penev PKG_LICENSE:=BSD-3-Clause IJG zlib @@ -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 From 1b5a8525440dc7d5a5f999aa490987ec6024506e Mon Sep 17 00:00:00 2001 From: Michel Promonet Date: Sun, 31 Oct 2021 21:21:31 +0100 Subject: [PATCH 086/241] v4l2loopback: update version following PR comment Signed-off-by: Michel Promonet --- kernel/v4l2loopback/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kernel/v4l2loopback/Makefile b/kernel/v4l2loopback/Makefile index 7194002b..179899fb 100644 --- a/kernel/v4l2loopback/Makefile +++ b/kernel/v4l2loopback/Makefile @@ -9,14 +9,13 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=v4l2loopback -PKG_VERSION:=master PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/umlaeute/v4l2loopback +PKG_SOURCE_URL:=https://github.com/umlaeute/v4l2loopback.git PKG_SOURCE_VERSION:=baf9de279afc7a7c7513e9c40a0c9ff88f456af4 -PKG_MIRROR_HASH:=ff834e16b13e9b38814095d95ab033ea7eae075689956e227f157e95bc075983 - +PKG_SOURCE_DATE:=2021-07-13 +PKG_MIRROR_HASH:=811a4b0bbefe14cf4a74dbb3d45f5ae147f50f1d67dbb6f0fe3e5a9888adf49a PKG_MAINTAINER:=Michel Promonet From 4a9c542fd76f07d2be3f5106350367c52d6e1f5d Mon Sep 17 00:00:00 2001 From: Michel Promonet Date: Sun, 3 Oct 2021 20:53:16 +0200 Subject: [PATCH 087/241] multimedia: add v4l2tools & v4l2loopback Signed-off-by: Michel Promonet --- kernel/v4l2loopback/Makefile | 19 ++++++++----------- multimedia/v4l2tools/Makefile | 8 +++----- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/kernel/v4l2loopback/Makefile b/kernel/v4l2loopback/Makefile index 179899fb..64855192 100644 --- a/kernel/v4l2loopback/Makefile +++ b/kernel/v4l2loopback/Makefile @@ -1,9 +1,6 @@ -# -# Copyright (C) 2008-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# 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 @@ -30,11 +27,11 @@ define KernelPackage/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. + 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:= \ diff --git a/multimedia/v4l2tools/Makefile b/multimedia/v4l2tools/Makefile index 1c1f7c61..5e26a1f5 100644 --- a/multimedia/v4l2tools/Makefile +++ b/multimedia/v4l2tools/Makefile @@ -1,8 +1,6 @@ -# -# Copyright (C) 2017 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. +# 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 From c4eba9472baa49705593bdda19d31bc489db3594 Mon Sep 17 00:00:00 2001 From: Michel Promonet Date: Sat, 6 Nov 2021 11:38:11 +0100 Subject: [PATCH 088/241] v4l2tools: add vpx dependency if library installed Signed-off-by: Michel Promonet --- multimedia/v4l2tools/Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/multimedia/v4l2tools/Makefile b/multimedia/v4l2tools/Makefile index 5e26a1f5..a376112c 100644 --- a/multimedia/v4l2tools/Makefile +++ b/multimedia/v4l2tools/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v4l2tools -PKG_VERSION:=0.1.5 +PKG_VERSION:=0.1.7 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/mpromonet/v4l2tools.git PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_MIRROR_HASH:=af63df7f88c1031aa5a438d175d77ca9c976e48eb55ff78a6ff6d2bd7272ac51 +PKG_MIRROR_HASH:=ded23eef11efbba8467ba58c5e69071ab4b34c0d29ad1a4fdc96683cfe2aff3c PKG_MAINTAINER:=Michel Promonet PKG_LICENSE:=Unlicense @@ -20,14 +20,22 @@ PKG_LICENSE_FILES:=LICENCE include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk +PKG_CONFIG_DEPENDS := CONFIG_PACKAGE_libvpx + define Package/v4l2tools SECTION:=multimedia CATEGORY:=Multimedia TITLE:=v4l2tools - DEPENDS:=+libstdcpp +libjpeg + DEPENDS:=+libstdcpp +libjpeg +PACKAGE_libvpx:libvpx URL:=https://github.com/mpromonet/v4l2tools endef +CMAKE_OPTIONS += \ + -DWITH_JPEG=ON \ + -DWITH_VPX=$(if $(CONFIG_PACKAGE_libvpx),ON,OFF) \ + -DWITH_X264=OFF \ + -DWITH_X265=OFF + define Package/v4l2tools/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/v4l2tools-$(PKG_VERSION) $(1)/usr/bin/v4l2tools From 883f3e0467b53a473f2a926b8d9dbbc90751ba9f Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Thu, 10 Feb 2022 00:10:09 +0100 Subject: [PATCH 089/241] v4l2tools: update to version 0.1.8 Changelog: https://github.com/mpromonet/v4l2tools/releases/tag/v0.1.8 Signed-off-by: Josef Schlehofer --- multimedia/v4l2tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multimedia/v4l2tools/Makefile b/multimedia/v4l2tools/Makefile index a376112c..0b577984 100644 --- a/multimedia/v4l2tools/Makefile +++ b/multimedia/v4l2tools/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v4l2tools -PKG_VERSION:=0.1.7 +PKG_VERSION:=0.1.8 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/mpromonet/v4l2tools.git PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_MIRROR_HASH:=ded23eef11efbba8467ba58c5e69071ab4b34c0d29ad1a4fdc96683cfe2aff3c +PKG_MIRROR_HASH:=5d848ab811126e9ad11cc374e312e460cebe40fab99164d4368fe0e69dc07997 PKG_MAINTAINER:=Michel Promonet PKG_LICENSE:=Unlicense From 64950810a0d53186d65e623a4669767e6f34872d Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 1 Aug 2021 04:05:30 +0100 Subject: [PATCH 090/241] libksba: update to version 1.6.0 Signed-off-by: Daniel Golle --- libs/libksba/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libksba/Makefile b/libs/libksba/Makefile index 56dc5370..f9182900 100644 --- a/libs/libksba/Makefile +++ b/libs/libksba/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libksba -PKG_VERSION:=1.5.1 +PKG_VERSION:=1.6.0 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:=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=LGPL-3.0-or-later GPL-2.0-or-later From 1876995e628cccdb9a31ff5a8ff9aafd3656a205 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 6 Oct 2022 15:24:28 +0100 Subject: [PATCH 091/241] libksba: update to version 1.6.1 Update to stable release 1.6.1. See commit log since version 1.6.0 for changes[1]. [1]: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=shortlog;h=d3c1e063d708a46ef39152256f8b1ea466b61be0 Signed-off-by: Daniel Golle --- libs/libksba/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libksba/Makefile b/libs/libksba/Makefile index f9182900..2a9c2677 100644 --- a/libs/libksba/Makefile +++ b/libs/libksba/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libksba -PKG_VERSION:=1.6.0 +PKG_VERSION:=1.6.1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME) -PKG_HASH:=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b +PKG_HASH:=40750864c3ca11fa0833227938db6603661f6c1a3cc267485e81fa140cc6ea04 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=LGPL-3.0-or-later GPL-2.0-or-later From d50366c2c9a97acd63d753ac4091f6596913e4f9 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 16 Oct 2022 20:29:08 +0100 Subject: [PATCH 092/241] libksba: update to version 1.6.2 Noteworthy changes in version 1.6.2 (2022-10-07) [C22/A14/R2] ------------------------------------------------ * Fix integer overflow in the CRL parser. [rK4b7d9cd4a0] Release-info: https://dev.gnupg.org/T6230 Signed-off-by: Daniel Golle --- libs/libksba/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libksba/Makefile b/libs/libksba/Makefile index 2a9c2677..635066c5 100644 --- a/libs/libksba/Makefile +++ b/libs/libksba/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libksba -PKG_VERSION:=1.6.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:=40750864c3ca11fa0833227938db6603661f6c1a3cc267485e81fa140cc6ea04 +PKG_HASH:=fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=LGPL-3.0-or-later GPL-2.0-or-later From dc061fdafcabc50456ccc5ac86f9fe39fad4f280 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Nov 2022 20:10:05 -0700 Subject: [PATCH 093/241] liblz4: update to 1.9.4 Signed-off-by: Rosen Penev --- libs/liblz4/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/liblz4/Makefile b/libs/liblz4/Makefile index 2f78bbf6..c7380402 100644 --- a/libs/liblz4/Makefile +++ b/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 @@ -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) From 38f6776f2f714a79821f50ca689c465925fbacc3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 8 Jul 2022 00:15:53 -0700 Subject: [PATCH 094/241] libmad: update to 0.16.2 Backport aarch64 patch. Signed-off-by: Rosen Penev --- libs/libmad/Makefile | 10 ++++++++-- libs/libmad/patches/010-aarch64.patch | 21 +++++++++++++++++++++ libs/libmad/patches/010-cmake.patch | 10 ---------- 3 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 libs/libmad/patches/010-aarch64.patch delete mode 100644 libs/libmad/patches/010-cmake.patch diff --git a/libs/libmad/Makefile b/libs/libmad/Makefile index 1ec1b168..23197957 100644 --- a/libs/libmad/Makefile +++ b/libs/libmad/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmad -PKG_VERSION:=0.16.1 +PKG_VERSION:=0.16.2 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:=6c14c2f4dcf7fd32e447eef99d6c53faded52e22f95e223e6f58844030851b99 PKG_MAINTAINER:=Ted Hess 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/ diff --git a/libs/libmad/patches/010-aarch64.patch b/libs/libmad/patches/010-aarch64.patch new file mode 100644 index 00000000..8563d170 --- /dev/null +++ b/libs/libmad/patches/010-aarch64.patch @@ -0,0 +1,21 @@ +From 9ec2efa6ba4bfaed7805867077d3a67daa022331 Mon Sep 17 00:00:00 2001 +From: Daniel Engberg +Date: Mon, 27 Jun 2022 01:58:45 +0200 +Subject: [PATCH] cmake: Add aarch64 as valid match for 64-bit (#5) + +Allow aarch64 aka arm64 to use 64-bit fixed point math +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,7 +78,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ". + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".(ppc|PPC).*") + message(STATUS "Using PowerPC fixed point math") + option(FPM_PPC "PowerPC fixed point math" ON) +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".*(x86_64|x86-64|x64|AMD64|amd64).*") ++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".*(x86_64|x86-64|x64|AMD64|amd64|aarch64).*") + message(STATUS "Using 64 bit fixed point math") + option(FPM_64BIT "64 bit fixed point math" ON) + else() diff --git a/libs/libmad/patches/010-cmake.patch b/libs/libmad/patches/010-cmake.patch deleted file mode 100644 index f5ac2460..00000000 --- a/libs/libmad/patches/010-cmake.patch +++ /dev/null @@ -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() From 30fa187bc50beaa30d52e4ff0cac32f71b7244de Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Nov 2022 19:54:32 -0700 Subject: [PATCH 095/241] libmad: update to 0.16.3 Remove upstreamed patch. Signed-off-by: Rosen Penev --- libs/libmad/Makefile | 4 ++-- libs/libmad/patches/010-aarch64.patch | 21 --------------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 libs/libmad/patches/010-aarch64.patch diff --git a/libs/libmad/Makefile b/libs/libmad/Makefile index 23197957..934705fd 100644 --- a/libs/libmad/Makefile +++ b/libs/libmad/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmad -PKG_VERSION:=0.16.2 +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:=6c14c2f4dcf7fd32e447eef99d6c53faded52e22f95e223e6f58844030851b99 +PKG_HASH:=83ca48db60f480ae22234bae08e6ad651adec2667a68ad2df6fd61e6a50a32c7 PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=GPL-2.0-or-later diff --git a/libs/libmad/patches/010-aarch64.patch b/libs/libmad/patches/010-aarch64.patch deleted file mode 100644 index 8563d170..00000000 --- a/libs/libmad/patches/010-aarch64.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9ec2efa6ba4bfaed7805867077d3a67daa022331 Mon Sep 17 00:00:00 2001 -From: Daniel Engberg -Date: Mon, 27 Jun 2022 01:58:45 +0200 -Subject: [PATCH] cmake: Add aarch64 as valid match for 64-bit (#5) - -Allow aarch64 aka arm64 to use 64-bit fixed point math ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -78,7 +78,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ". - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".(ppc|PPC).*") - message(STATUS "Using PowerPC fixed point math") - option(FPM_PPC "PowerPC fixed point math" ON) --elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".*(x86_64|x86-64|x64|AMD64|amd64).*") -+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".*(x86_64|x86-64|x64|AMD64|amd64|aarch64).*") - message(STATUS "Using 64 bit fixed point math") - option(FPM_64BIT "64 bit fixed point math" ON) - else() From 6dd32b27522a805f954c3794f4abc56e5438a62d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 8 Mar 2022 21:03:02 -0800 Subject: [PATCH 096/241] libmicrohttpd: update to 0.9.75 Signed-off-by: Rosen Penev --- libs/libmicrohttpd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libmicrohttpd/Makefile b/libs/libmicrohttpd/Makefile index 95e54fcf..8fb5f19d 100644 --- a/libs/libmicrohttpd/Makefile +++ b/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 PKG_LICENSE:=LGPL-2.1-or-later From c598770c4e95359c737e492cbd8a4c21bb3c85bd Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Wed, 28 Sep 2022 21:23:58 +0200 Subject: [PATCH 097/241] libmodbus: update to 3.1.8 - drop obsolete configure argument - update download url Signed-off-by: Michael Heimpold --- libs/libmodbus/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/libmodbus/Makefile b/libs/libmodbus/Makefile index 53f2b734..9115eb23 100644 --- a/libs/libmodbus/Makefile +++ b/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 @@ -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 From 2330e233abc3d2aa553f7eec9acf00aafcb0c67b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 18 Jun 2021 22:37:35 -0700 Subject: [PATCH 098/241] libmraa: don't build tests Fixes compilation when gtest is present. Signed-off-by: Rosen Penev --- libs/libmraa/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/libmraa/Makefile b/libs/libmraa/Makefile index bb65a568..0a85d1f1 100644 --- a/libs/libmraa/Makefile +++ b/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 From 5399c20a342b327f5a561e962219c9968abeac28 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Mon, 26 Jul 2021 12:36:20 +0200 Subject: [PATCH 099/241] libndpi: update to 4.0 - libmaxminddb config option Signed-off-by: Toni Uhlig --- libs/libndpi/Makefile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/libs/libndpi/Makefile b/libs/libndpi/Makefile index bc4437df..772c2d76 100644 --- a/libs/libndpi/Makefile +++ b/libs/libndpi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libndpi -PKG_VERSION:=3.4 -PKG_RELEASE:=2 +PKG_VERSION:=4.0 +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:=99e0aba6396fd633c3840f30e4942f6591a08066d037f560b65ba64e7310f4d6 PKG_BUILD_DIR:=$(BUILD_DIR)/nDPI-$(PKG_VERSION) PKG_MAINTAINER:=Banglang Huang , Toni Uhlig @@ -31,12 +31,16 @@ ifeq ($(CONFIG_LIBNDPI_GCRYPT),) CONFIGURE_ARGS += --disable-gcrypt endif +ifneq ($(CONFIG_LIBNDPI_MAXMINDDB),) +CONFIGURE_ARGS += --with-maxminddb +endif + define Package/libndpi SECTION:=libs 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_MAXMINDDB:libmaxminddb +libpcap +libjson-c endef define Package/libndpi/description @@ -52,6 +56,15 @@ config LIBNDPI_GCRYPT help This option enables QUIC client hello decryption. 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/Prepare From 264981cdeb42c0e7394c5e39f10d20509025ba4a Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Fri, 3 Jun 2022 22:20:51 +0200 Subject: [PATCH 100/241] libndpi: update to 4.2 - removed clunky sed patching, issue was fixed upstream Signed-off-by: Toni Uhlig --- libs/libndpi/Makefile | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/libs/libndpi/Makefile b/libs/libndpi/Makefile index 772c2d76..1a36812b 100644 --- a/libs/libndpi/Makefile +++ b/libs/libndpi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libndpi -PKG_VERSION:=4.0 +PKG_VERSION:=4.2 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:=99e0aba6396fd633c3840f30e4942f6591a08066d037f560b65ba64e7310f4d6 +PKG_HASH:=e54ce8fe13adc5d747be7553513657fae78f796e0bd459e122c280cc06ce4daf PKG_BUILD_DIR:=$(BUILD_DIR)/nDPI-$(PKG_VERSION) PKG_MAINTAINER:=Banglang Huang , Toni Uhlig @@ -27,8 +27,12 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk -ifeq ($(CONFIG_LIBNDPI_GCRYPT),) -CONFIGURE_ARGS += --disable-gcrypt +ifneq ($(CONFIG_LIBNDPI_GCRYPT),) +CONFIGURE_ARGS += --with-local-libgcrypt +endif + +ifneq ($(CONFIG_LIBNDPI_PCRE2),) +CONFIGURE_ARGS += --with-pcre endif ifneq ($(CONFIG_LIBNDPI_MAXMINDDB),) @@ -40,7 +44,7 @@ define Package/libndpi CATEGORY:=Libraries TITLE:=Library for deep-packet inspection URL:=https://github.com/ntop/nDPI - DEPENDS:=+LIBNDPI_GCRYPT:libgcrypt +LIBNDPI_MAXMINDDB:libmaxminddb +libpcap +libjson-c + DEPENDS:=+LIBNDPI_GCRYPT:libgcrypt +LIBNDPI_PCRE2:pcre2 +LIBNDPI_MAXMINDDB:libmaxminddb +libpcap +libjson-c endef define Package/libndpi/description @@ -57,6 +61,15 @@ config LIBNDPI_GCRYPT This option enables QUIC client hello decryption. Disabled by default. +config LIBNDPI_PCRE2 + bool "pcre2 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 @@ -67,18 +80,6 @@ config LIBNDPI_MAXMINDDB Disabled by default. endef -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 -endef - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/ndpi $(CP) $(PKG_BUILD_DIR)/src/include/*.h \ From d232ff69ebb4048c64faeb949737ad65d5e6dc00 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Sat, 4 Jun 2022 13:20:16 +0200 Subject: [PATCH 101/241] libndpi: fix pcre2 dependency name Signed-off-by: Toni Uhlig --- libs/libndpi/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libndpi/Makefile b/libs/libndpi/Makefile index 1a36812b..558099a8 100644 --- a/libs/libndpi/Makefile +++ b/libs/libndpi/Makefile @@ -44,7 +44,7 @@ define Package/libndpi CATEGORY:=Libraries TITLE:=Library for deep-packet inspection URL:=https://github.com/ntop/nDPI - DEPENDS:=+LIBNDPI_GCRYPT:libgcrypt +LIBNDPI_PCRE2:pcre2 +LIBNDPI_MAXMINDDB:libmaxminddb +libpcap +libjson-c + DEPENDS:=+LIBNDPI_GCRYPT:libgcrypt +LIBNDPI_PCRE2:libpcre2 +LIBNDPI_MAXMINDDB:libmaxminddb +libpcap +libjson-c endef define Package/libndpi/description From de22bb57284bdbbf0a0b4f89717b8c0d79085d31 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Tue, 12 Jul 2022 03:07:32 +0200 Subject: [PATCH 102/241] libndpi: update to 4.4 Signed-off-by: Toni Uhlig --- libs/libndpi/Makefile | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/libs/libndpi/Makefile b/libs/libndpi/Makefile index 558099a8..a4142c66 100644 --- a/libs/libndpi/Makefile +++ b/libs/libndpi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libndpi -PKG_VERSION:=4.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:=e54ce8fe13adc5d747be7553513657fae78f796e0bd459e122c280cc06ce4daf +PKG_HASH:=5df3a7bc251e3838079c403707334c1cd93f20c17b33e31e090f30a16adb3702 PKG_BUILD_DIR:=$(BUILD_DIR)/nDPI-$(PKG_VERSION) PKG_MAINTAINER:=Banglang Huang , Toni Uhlig @@ -27,11 +27,15 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk +ifeq ($(LIBNDPI_NDPIREADER),) +CONFIGURE_ARGS += --with-only-libndpi +endif + ifneq ($(CONFIG_LIBNDPI_GCRYPT),) CONFIGURE_ARGS += --with-local-libgcrypt endif -ifneq ($(CONFIG_LIBNDPI_PCRE2),) +ifneq ($(CONFIG_LIBNDPI_PCRE),) CONFIGURE_ARGS += --with-pcre endif @@ -44,7 +48,7 @@ define Package/libndpi CATEGORY:=Libraries TITLE:=Library for deep-packet inspection URL:=https://github.com/ntop/nDPI - DEPENDS:=+LIBNDPI_GCRYPT:libgcrypt +LIBNDPI_PCRE2:libpcre2 +LIBNDPI_MAXMINDDB:libmaxminddb +libpcap +libjson-c + DEPENDS:=+LIBNDPI_GCRYPT:libgcrypt +LIBNDPI_PCRE:libpcre +LIBNDPI_MAXMINDDB:libmaxminddb +LIBNDPI_NDPIREADER:libpcap endef define Package/libndpi/description @@ -53,16 +57,26 @@ 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. + This option builds and installs ndpiReader, + an example application that show some nDPI features. + +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_PCRE2 - bool "pcre2 support" +config LIBNDPI_PCRE + bool "pcre support" depends on PACKAGE_libndpi default n help @@ -99,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)) From 96ac288a7c25a00202b4827cfacf3d6bd7b28427 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 15 Dec 2021 20:36:17 -0800 Subject: [PATCH 103/241] libnetfilter-log: update to 1.0.2 Remove all patches as they have been upstreamed. Signed-off-by: Rosen Penev --- libs/libnetfilter-log/Makefile | 6 +- ...ecessary-pkgconfig-config.status-dep.patch | 20 ---- ...d-remove-unused-lines-in-Makefile.am.patch | 19 ---- ...build-resolve-automake-1.12-warnings.patch | 24 ---- ...e-needed-for-integer-type-definition.patch | 19 ---- ...0005-configure-uclinux-is-also-linux.patch | 22 ---- ...thout-ipulog-option-to-disable-libip.patch | 84 -------------- ...ude-Sync-with-current-kernel-headers.patch | 103 ------------------ ...ude-Sync-with-current-kernel-headers.patch | 47 -------- 9 files changed, 3 insertions(+), 341 deletions(-) delete mode 100644 libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch delete mode 100644 libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch delete mode 100644 libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch delete mode 100644 libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch delete mode 100644 libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch delete mode 100644 libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch delete mode 100644 libs/libnetfilter-log/patches/0007-include-Sync-with-current-kernel-headers.patch delete mode 100644 libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch diff --git a/libs/libnetfilter-log/Makefile b/libs/libnetfilter-log/Makefile index 7dc45a01..15c5d2d1 100644 --- a/libs/libnetfilter-log/Makefile +++ b/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 PKG_FIXUP:=autoreconf diff --git a/libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch b/libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch deleted file mode 100644 index 02938c1a..00000000 --- a/libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 8858b8eacd1385f99796ead78b3a7157c5e93121 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -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 ---- - 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 diff --git a/libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch b/libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch deleted file mode 100644 index 5be6999a..00000000 --- a/libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch +++ /dev/null @@ -1,19 +0,0 @@ -From fee63b81ee432d0b3e03ffcf9f54cda99476f267 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -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 ---- - 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 - diff --git a/libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch b/libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch deleted file mode 100644 index c6261982..00000000 --- a/libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1aa23946431ac593568ccac0e0b6925e7dfd7bd3 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -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 ---- - 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])]) diff --git a/libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch b/libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch deleted file mode 100644 index 1e612561..00000000 --- a/libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 7529487f70e244cd31ef84b037b1c32749c134a7 Mon Sep 17 00:00:00 2001 -From: Eric Leblond -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 - #include - - struct nflog_handle; diff --git a/libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch b/libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch deleted file mode 100644 index b1daa0a7..00000000 --- a/libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2f22d3c4453135c27873b9014e9dc5b5712804df Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 16:23:31 -0300 -Subject: [PATCH 5/6] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Pablo Neira Ayuso ---- - 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 - diff --git a/libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch b/libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch deleted file mode 100644 index d8f5667d..00000000 --- a/libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch +++ /dev/null @@ -1,84 +0,0 @@ -From a1b392b4156db984ab2b695a4a70d113f70cb9b8 Mon Sep 17 00:00:00 2001 -From: Matthieu Crapet -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 -Signed-off-by: Pablo Neira Ayuso ---- - 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 diff --git a/libs/libnetfilter-log/patches/0007-include-Sync-with-current-kernel-headers.patch b/libs/libnetfilter-log/patches/0007-include-Sync-with-current-kernel-headers.patch deleted file mode 100644 index 07efe830..00000000 --- a/libs/libnetfilter-log/patches/0007-include-Sync-with-current-kernel-headers.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 614d8b6cfb969c6102ef320de22b1eb199efce2a Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 13:37:53 +0200 -Subject: include: Sync with current kernel headers - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso ---- - 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 diff --git a/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch b/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch deleted file mode 100644 index 778e773f..00000000 --- a/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 721ea5ec049e12afdd7c182f2899ab6d92914e68 Mon Sep 17 00:00:00 2001 -From: Ken-ichirou MATSUZAWA -Date: Fri, 11 Sep 2015 12:12:11 +0900 -Subject: include: Sync with kernel headers - -Signed-off-by: Ken-ichirou MATSUZAWA -Signed-off-by: Pablo Neira Ayuso ---- - 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 --#include -+#include - - 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 */ From 188c4e24f9037b6ba7015bc547433b122d12e183 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 22 Oct 2021 22:27:00 -0700 Subject: [PATCH 104/241] libnpupnp: update to 4.1.5 Add libmicrohttpd to PKG_BUILD_DEPENDS as it doesn't get added for some reason. Signed-off-by: Rosen Penev --- libs/libnpupnp/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/libnpupnp/Makefile b/libs/libnpupnp/Makefile index 9b5aadd9..74aeba1a 100644 --- a/libs/libnpupnp/Makefile +++ b/libs/libnpupnp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnpupnp -PKG_VERSION:=4.1.4 +PKG_VERSION:=4.1.5 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:=566f5895376a14aa87997de7ce3454595646613d1d0af34d05c31f6d9fe884a9 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 From 136461ce207b7a6da70666374eae083ed9420a95 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 8 Mar 2022 21:03:29 -0800 Subject: [PATCH 105/241] libnpupnp: update to 4.2.1 Signed-off-by: Rosen Penev --- libs/libnpupnp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libnpupnp/Makefile b/libs/libnpupnp/Makefile index 74aeba1a..402966ad 100644 --- a/libs/libnpupnp/Makefile +++ b/libs/libnpupnp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnpupnp -PKG_VERSION:=4.1.5 +PKG_VERSION:=4.2.1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads -PKG_HASH:=566f5895376a14aa87997de7ce3454595646613d1d0af34d05c31f6d9fe884a9 +PKG_HASH:=e0e59eb2d3d024e827050428e0e7eb228355912a38c85eb30bfeb2f0926eca4c PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later From ae1f383899c5057a058883a674cefc412e770833 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 13 Jul 2022 21:13:04 -0700 Subject: [PATCH 106/241] libnpupnp: update to 4.2.3 Signed-off-by: Rosen Penev --- libs/libnpupnp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libnpupnp/Makefile b/libs/libnpupnp/Makefile index 402966ad..44480b8f 100644 --- a/libs/libnpupnp/Makefile +++ b/libs/libnpupnp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnpupnp -PKG_VERSION:=4.2.1 +PKG_VERSION:=4.2.3 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads -PKG_HASH:=e0e59eb2d3d024e827050428e0e7eb228355912a38c85eb30bfeb2f0926eca4c +PKG_HASH:=fdf053c47acbbae104ffd8743fcd662634cf2e4fe7e3a81c3a1a8c5934d10d0e PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later From d7902c2ca0a41907194cbac8420732dd5657878a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Nov 2022 20:04:52 -0700 Subject: [PATCH 107/241] libnpupnp: update to 5.0.0 Signed-off-by: Rosen Penev --- libs/libnpupnp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libnpupnp/Makefile b/libs/libnpupnp/Makefile index 44480b8f..dcfa5137 100644 --- a/libs/libnpupnp/Makefile +++ b/libs/libnpupnp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnpupnp -PKG_VERSION:=4.2.3 +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:=fdf053c47acbbae104ffd8743fcd662634cf2e4fe7e3a81c3a1a8c5934d10d0e +PKG_HASH:=2e5648cf180a425ef57b8c9c0d9dbd77f0314487ea0e0a85ebc6c3ef87cab05b PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later From f01fcb1153b5520b486f9d9225214e6ffb22ed8a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 15 Jun 2021 19:04:40 -0700 Subject: [PATCH 108/241] libogg: update to 1.3.5 Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev --- libs/libogg/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libogg/Makefile b/libs/libogg/Makefile index 91dfe8e1..bd80514b 100644 --- a/libs/libogg/Makefile +++ b/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 PKG_LICENSE:=BSD-3-Clause From 29c65b959855be9a6d9c06144cd1b95ab7587192 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 9 Sep 2022 17:44:27 -0700 Subject: [PATCH 109/241] liboil: small cleanups Fixes a compile error when glib2 is missing. get rid of nls.mk. iconv/gettext is not used. This was previously here because of glib2. Signed-off-by: Rosen Penev --- libs/liboil/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/liboil/Makefile b/libs/liboil/Makefile index ba2cf87f..a8ef2c49 100644 --- a/libs/liboil/Makefile +++ b/libs/liboil/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liboil PKG_VERSION:=0.3.17 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/ @@ -20,9 +20,9 @@ PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk define Package/liboil SECTION:=libs @@ -30,7 +30,7 @@ define Package/liboil TITLE:=simple functions optimized for various CPUs URL:=http://liboil.freedesktop.org/wiki/ MAINTAINER:=W. Michael Petullo - DEPENDS:=+librt $(ICONV_DEPENDS) $(INTL_DEPENDS) + DEPENDS:=+librt endef define Package/liboil/description @@ -43,10 +43,10 @@ define Package/liboil/description endef CONFIGURE_ARGS += \ + --with-pic \ --enable-shared \ --enable-static \ - -TARGET_CFLAGS += $(FPIC) $(if $(ICONV_FULL),-liconv) $(if $(INTL_FULL),-lintl) + --disable-glib # XXX: VFP_CFLAGS is set to '-mfpu=vfp' on arm by configure, but that breaks # final linking stages, so override it until we find why From bd97a2bde05a78ad3de316170b6e75b4c8be6c3e Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 9 Jul 2021 08:45:23 +0200 Subject: [PATCH 110/241] libopusenc: cherry-pick post-release crash fixes Fixes crashes like: daemon.err asterisk[5087]: Assertion failed: enc->streams == NULL (src/opusenc.c: ope_encoder_drain: 839) Signed-off-by: Andre Heider --- ...-ope_encoder_drain-assertion-failure.patch | 27 +++++++ ...0002-Fix-use-of-uninitialized-fields.patch | 78 +++++++++++++++++++ ...03-Fix-use-of-uninitialized-serialno.patch | 47 +++++++++++ 3 files changed, 152 insertions(+) create mode 100644 libs/libopusenc/patches/0001-Fix-ope_encoder_drain-assertion-failure.patch create mode 100644 libs/libopusenc/patches/0002-Fix-use-of-uninitialized-fields.patch create mode 100644 libs/libopusenc/patches/0003-Fix-use-of-uninitialized-serialno.patch diff --git a/libs/libopusenc/patches/0001-Fix-ope_encoder_drain-assertion-failure.patch b/libs/libopusenc/patches/0001-Fix-ope_encoder_drain-assertion-failure.patch new file mode 100644 index 00000000..7c0ba068 --- /dev/null +++ b/libs/libopusenc/patches/0001-Fix-ope_encoder_drain-assertion-failure.patch @@ -0,0 +1,27 @@ +From 205552370e058d99452fd34983942e10f2db6dff Mon Sep 17 00:00:00 2001 +From: Mark Harris +Date: Mon, 28 Dec 2020 12:58:17 -0800 +Subject: [PATCH] Fix ope_encoder_drain() assertion failure + +If the stream is drained without writing any audio and the frame size is +smaller than the encoder latency, the assertion (enc->streams == NULL) +would fail because pad_samples was computed using an incorrect value of +enc->global_granule_offset before it was set in init_stream(), causing +the padding to be insufficient to drain the stream. +--- + src/opusenc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/opusenc.c ++++ b/src/opusenc.c +@@ -808,9 +808,9 @@ int ope_encoder_drain(OggOpusEnc *enc) { + if (enc->unrecoverable) return enc->unrecoverable; + /* Check if it's already been drained. */ + if (enc->streams == NULL) return OPE_TOO_LATE; ++ if (!enc->streams->stream_is_init) init_stream(enc); + if (enc->re) resampler_drain = speex_resampler_get_output_latency(enc->re); + pad_samples = MAX(LPC_PADDING, enc->global_granule_offset + enc->frame_size + resampler_drain + 1); +- if (!enc->streams->stream_is_init) init_stream(enc); + shift_buffer(enc); + assert(enc->buffer_end + pad_samples <= BUFFER_SAMPLES); + memset(&enc->buffer[enc->channels*enc->buffer_end], 0, pad_samples*enc->channels*sizeof(enc->buffer[0])); diff --git a/libs/libopusenc/patches/0002-Fix-use-of-uninitialized-fields.patch b/libs/libopusenc/patches/0002-Fix-use-of-uninitialized-fields.patch new file mode 100644 index 00000000..8642e2ff --- /dev/null +++ b/libs/libopusenc/patches/0002-Fix-use-of-uninitialized-fields.patch @@ -0,0 +1,78 @@ +From 6d46f2d7f7617852bab7cbb2f7cae8350b99204e Mon Sep 17 00:00:00 2001 +From: Mark Harris +Date: Mon, 28 Dec 2020 17:01:39 -0800 +Subject: [PATCH] Fix use of uninitialized fields + +enc->streams->end_granule used uninitialized in encode_buffer() if the +stream contains no audio (opusenc_example /dev/null out.opus). + +enc->frame_size_request used uninitialized in encode_buffer() if the +frame size was not explicitly set. + +enc->callbacks used uninitialized if the encoder is created with +ope_encoder_create_callbacks() and callbacks is NULL. +--- + src/opusenc.c | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) + +--- a/src/opusenc.c ++++ b/src/opusenc.c +@@ -361,8 +361,7 @@ static void stream_destroy(EncStream *st + free(stream); + } + +-/* Create a new OggOpus file (callback-based). */ +-OggOpusEnc *ope_encoder_create_callbacks(const OpusEncCallbacks *callbacks, void *user_data, ++static OggOpusEnc *ope_encoder_create_callbacks_impl(const OpusEncCallbacks *callbacks, void *user_data, + OggOpusComments *comments, opus_int32 rate, int channels, int family, int *error) { + OggOpusEnc *enc=NULL; + int ret; +@@ -395,11 +394,11 @@ OggOpusEnc *ope_encoder_create_callbacks + enc->oggp = NULL; + /* Not initializing anything is an unrecoverable error. */ + enc->unrecoverable = family == -1 ? OPE_TOO_LATE : 0; +- enc->pull_api = 0; + enc->packet_callback = NULL; + enc->rate = rate; + enc->channels = channels; + enc->frame_size = 960; ++ enc->frame_size_request = OPUS_FRAMESIZE_20_MS; + enc->decision_delay = 96000; + enc->max_ogg_delay = 48000; + enc->chaining_keyframe = NULL; +@@ -447,8 +446,12 @@ OggOpusEnc *ope_encoder_create_callbacks + if (callbacks != NULL) + { + enc->callbacks = *callbacks; ++ enc->pull_api = 0; ++ } else { ++ enc->pull_api = 1; + } + enc->streams->user_data = user_data; ++ enc->streams->end_granule = 0; + if (error) *error = OPE_OK; + return enc; + fail: +@@ -462,11 +465,19 @@ fail: + return NULL; + } + ++/* Create a new OggOpus stream (callback-based). */ ++OggOpusEnc *ope_encoder_create_callbacks(const OpusEncCallbacks *callbacks, void *user_data, ++ OggOpusComments *comments, opus_int32 rate, int channels, int family, int *error) { ++ if (callbacks == NULL) { ++ if (error) *error = OPE_BAD_ARG; ++ return NULL; ++ } ++ return ope_encoder_create_callbacks_impl(callbacks, user_data, comments, rate, channels, family, error); ++} ++ + /* Create a new OggOpus stream, pulling one page at a time. */ + OggOpusEnc *ope_encoder_create_pull(OggOpusComments *comments, opus_int32 rate, int channels, int family, int *error) { +- OggOpusEnc *enc = ope_encoder_create_callbacks(NULL, NULL, comments, rate, channels, family, error); +- if (enc) enc->pull_api = 1; +- return enc; ++ return ope_encoder_create_callbacks_impl(NULL, NULL, comments, rate, channels, family, error); + } + + int ope_encoder_deferred_init_with_mapping(OggOpusEnc *enc, int family, int streams, diff --git a/libs/libopusenc/patches/0003-Fix-use-of-uninitialized-serialno.patch b/libs/libopusenc/patches/0003-Fix-use-of-uninitialized-serialno.patch new file mode 100644 index 00000000..cf5cf560 --- /dev/null +++ b/libs/libopusenc/patches/0003-Fix-use-of-uninitialized-serialno.patch @@ -0,0 +1,47 @@ +From 427d61131a1af5eed48d5428e723ab4602b56cc1 Mon Sep 17 00:00:00 2001 +From: Mark Harris +Date: Tue, 29 Dec 2020 01:43:37 -0800 +Subject: [PATCH] Fix use of uninitialized serialno + +Also do not crash if OPE_GET_SERIALNO_REQUEST is used after draining. +--- + src/opusenc.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +--- a/src/opusenc.c ++++ b/src/opusenc.c +@@ -356,6 +356,11 @@ fail: + return NULL; + } + ++static void stream_generate_serialno(EncStream *stream) { ++ stream->serialno = rand(); ++ stream->serialno_is_set = 1; ++} ++ + static void stream_destroy(EncStream *stream) { + if (stream->comment) free(stream->comment); + free(stream); +@@ -512,9 +517,7 @@ int ope_encoder_deferred_init_with_mappi + + static void init_stream(OggOpusEnc *enc) { + assert(!enc->streams->stream_is_init); +- if (!enc->streams->serialno_is_set) { +- enc->streams->serialno = rand(); +- } ++ if (!enc->streams->serialno_is_set) stream_generate_serialno(enc->streams); + + if (enc->oggp != NULL) oggp_chain(enc->oggp, enc->streams->serialno); + else { +@@ -1071,6 +1074,11 @@ int ope_encoder_ctl(OggOpusEnc *enc, int + case OPE_GET_SERIALNO_REQUEST: + { + opus_int32 *value = va_arg(ap, opus_int32*); ++ if (!enc->last_stream) { ++ ret = OPE_TOO_LATE; ++ break; ++ } ++ if (!enc->last_stream->serialno_is_set) stream_generate_serialno(enc->last_stream); + *value = enc->last_stream->serialno; + } + break; From 594a3fe3b610ff655a4fc3aa20ea1c5e217a2532 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Wed, 13 Jul 2022 17:50:17 +0200 Subject: [PATCH 111/241] liborcania: bump to 2.3.0 Signed-off-by: Toni Uhlig --- libs/liborcania/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/liborcania/Makefile b/libs/liborcania/Makefile index 7862670a..8ee31f1b 100644 --- a/libs/liborcania/Makefile +++ b/libs/liborcania/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liborcania -PKG_VERSION:=2.2.1 +PKG_VERSION:=2.3.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/babelouest/orcania/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a9f16856aa311b8926cba2075d5245e94f30436f8a762a7e897ee7c8d335c59e +PKG_HASH:=b1b5550523164eca0f59099e843177684c5017c6088284123880cffd4c6dbbde PKG_MAINTAINER:=Toni Uhlig PKG_LICENSE:=LGPL-2.1-or-later From ddcebbab35967417a7607c7c7ae21dfbb391e4d5 Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Mon, 31 Jan 2022 03:09:55 +0300 Subject: [PATCH 112/241] libowfat: fix build on macos libowfat target-build fails on macos due to using system `ar` and `ranlib` tools not compatible with the objects generated by OpenWrt GCC toolchain. This patch specifies CROSS= make flag that is used as a prefix for `ar` and `ranlib` tools. This patch also specifies CCC= make flag due to CCC= has invalid value after specifying CROSS= make flag (CCC=$(CROSS)$(CC)) Signed-off-by: Sergey V. Lobanov --- libs/libowfat/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/libowfat/Makefile b/libs/libowfat/Makefile index 7f7c4534..8e57a554 100644 --- a/libs/libowfat/Makefile +++ b/libs/libowfat/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libowfat PKG_VERSION:=0.32 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.fefe.de/libowfat @@ -37,6 +37,8 @@ endef TARGET_CFLAGS += $(FPIC) LOWFAT_MAKEOPTS = $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \ + CCC="$(TARGET_CC)" \ + CROSS="$(TARGET_CROSS)" \ DEBUG="$(DEBUG)" \ VERSION="$(PKG_VERSION)" \ OS="Linux" From c277dcb222377dc24f6b39984a441437e6d994da Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 8 Jun 2022 19:02:40 -0700 Subject: [PATCH 113/241] libowfat: try to fix compilation under ARC CFLAGS are not being passed. Signed-off-by: Rosen Penev --- libs/libowfat/Makefile | 2 +- libs/libowfat/patches/020-cflags.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 libs/libowfat/patches/020-cflags.patch diff --git a/libs/libowfat/Makefile b/libs/libowfat/Makefile index 8e57a554..325822ae 100644 --- a/libs/libowfat/Makefile +++ b/libs/libowfat/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libowfat PKG_VERSION:=0.32 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.fefe.de/libowfat diff --git a/libs/libowfat/patches/020-cflags.patch b/libs/libowfat/patches/020-cflags.patch new file mode 100644 index 00000000..78ff5832 --- /dev/null +++ b/libs/libowfat/patches/020-cflags.patch @@ -0,0 +1,13 @@ +--- a/Makefile ++++ b/Makefile +@@ -37,8 +37,8 @@ OPT_PLUS=-O3 $(NATIVE) + + DEFINE=-D_REENTRANT + +-CFLAGS=-pipe $(WARN) $(DEFINE) $(OPT_REG) +-CFLAGS_OPT=-pipe $(WARN) $(DEFINE) $(OPT_PLUS) ++CFLAGS+=-pipe $(WARN) $(DEFINE) $(OPT_REG) ++CFLAGS_OPT+=-pipe $(WARN) $(DEFINE) $(OPT_PLUS) + + #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall + From 44ac79ba6cbcf9bf21051e5a1ef37e2708d22a46 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 22 Sep 2022 16:51:17 -0700 Subject: [PATCH 114/241] libowfat: fix glibc compilation Ported Fedora patch. Signed-off-by: Rosen Penev --- libs/libowfat/Makefile | 2 +- libs/libowfat/patches/030-pure.patch | 291 +++++++++++++++++++++++++++ 2 files changed, 292 insertions(+), 1 deletion(-) create mode 100644 libs/libowfat/patches/030-pure.patch diff --git a/libs/libowfat/Makefile b/libs/libowfat/Makefile index 325822ae..e9326250 100644 --- a/libs/libowfat/Makefile +++ b/libs/libowfat/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libowfat PKG_VERSION:=0.32 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.fefe.de/libowfat diff --git a/libs/libowfat/patches/030-pure.patch b/libs/libowfat/patches/030-pure.patch new file mode 100644 index 00000000..690e4225 --- /dev/null +++ b/libs/libowfat/patches/030-pure.patch @@ -0,0 +1,291 @@ +--- a/byte.h ++++ b/byte.h +@@ -9,17 +9,24 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ ++#ifndef ATTR_PURE ++# if defined __has_attribute ++# if __has_attribute (pure) ++# define ATTR_PURE __attribute__ ((pure)) ++# endif ++# endif ++#endif ++#ifndef ATTR_PURE ++# define ATTR_PURE + #endif + + /* byte_chr returns the smallest integer i between 0 and len-1 + * inclusive such that one[i] equals needle, or len if not found. */ +-size_t byte_chr(const void* haystack, size_t len, char needle) __pure__; ++size_t byte_chr(const void* haystack, size_t len, char needle) ATTR_PURE; + + /* byte_rchr returns the largest integer i between 0 and len-1 inclusive + * such that one[i] equals needle, or len if not found. */ +-size_t byte_rchr(const void* haystack,size_t len,char needle) __pure__; ++size_t byte_rchr(const void* haystack,size_t len,char needle) ATTR_PURE; + + /* byte_copy copies in[0] to out[0], in[1] to out[1], ... and in[len-1] + * to out[len-1]. */ +@@ -34,14 +41,14 @@ void byte_copyr(void* out, size_t len, c + * than, equal to, or greater than the string b[0], b[1], ..., + * b[len-1]. When the strings are different, byte_diff does not read + * bytes past the first difference. */ +-int byte_diff(const void* a, size_t len, const void* b) __pure__; ++int byte_diff(const void* a, size_t len, const void* b) ATTR_PURE; + + /* byte_zero sets the bytes out[0], out[1], ..., out[len-1] to 0 */ + void byte_zero(void* out, size_t len); + + #define byte_equal(s,n,t) (!byte_diff((s),(n),(t))) + +-int byte_equal_notimingattack(const void* a, size_t len,const void* b) __pure__; ++int byte_equal_notimingattack(const void* a, size_t len,const void* b) ATTR_PURE; + + #if defined(__i386__) || defined(__x86_64__) + #define UNALIGNED_ACCESS_OK +--- a/critbit.h ++++ b/critbit.h +@@ -5,18 +5,25 @@ + extern "C" { + #endif + +-/* for __pure__ if we are compiling under dietlibc */ ++/* for ATTR_PURE if we are compiling under dietlibc */ + #include + +-#ifndef __pure__ +-#define __pure__ ++#ifndef ATTR_PURE ++# if defined __has_attribute ++# if __has_attribute (pure) ++# define ATTR_PURE __attribute__ ((pure)) ++# endif ++# endif ++#endif ++#ifndef ATTR_PURE ++# define ATTR_PURE + #endif + + typedef struct { + void *root; + } critbit0_tree; + +-int critbit0_contains(critbit0_tree *t, const char *u) __pure__; ++int critbit0_contains(critbit0_tree *t, const char *u) ATTR_PURE; + int critbit0_insert(critbit0_tree *t, const char *u); + int critbit0_delete(critbit0_tree *t, const char *u); + void critbit0_clear(critbit0_tree *t); +--- a/scan.h ++++ b/scan.h +@@ -15,8 +15,15 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ ++#ifndef ATTR_PURE ++# if defined __has_attribute ++# if __has_attribute (pure) ++# define ATTR_PURE __attribute__ ((pure)) ++# endif ++# endif ++#endif ++#ifndef ATTR_PURE ++# define ATTR_PURE + #endif + + /* This file declared functions used to decode / scan / unmarshal +@@ -84,18 +91,18 @@ size_t scan_double(const char *in, doubl + size_t scan_plusminus(const char *src,signed int *dest); + + /* return the highest integer n<=limit so that isspace(in[i]) for all 0<=i<=n */ +-size_t scan_whitenskip(const char *in,size_t limit) __pure__; ++size_t scan_whitenskip(const char *in,size_t limit) ATTR_PURE; + + /* return the highest integer n<=limit so that !isspace(in[i]) for all 0<=i<=n */ +-size_t scan_nonwhitenskip(const char *in,size_t limit) __pure__; ++size_t scan_nonwhitenskip(const char *in,size_t limit) ATTR_PURE; + + /* return the highest integer n<=limit so that in[i] is element of + * charset (ASCIIZ string) for all 0<=i<=n */ +-size_t scan_charsetnskip(const char *in,const char *charset,size_t limit) __pure__; ++size_t scan_charsetnskip(const char *in,const char *charset,size_t limit) ATTR_PURE; + + /* return the highest integer n<=limit so that in[i] is not element of + * charset (ASCIIZ string) for all 0<=i<=n */ +-size_t scan_noncharsetnskip(const char *in,const char *charset,size_t limit) __pure__; ++size_t scan_noncharsetnskip(const char *in,const char *charset,size_t limit) ATTR_PURE; + + /* try to parse ASCII GMT date; does not understand time zones. */ + /* example dates: +@@ -103,17 +110,17 @@ size_t scan_noncharsetnskip(const char * + * "Sunday, 06-Nov-94 08:49:37 GMT" + * "Sun Nov 6 08:49:37 1994" + */ +-size_t scan_httpdate(const char *in,time_t *t) __pure__; ++size_t scan_httpdate(const char *in,time_t *t) ATTR_PURE; + + /* try to parse ASCII ISO-8601 date; does not understand time zones. */ + /* example date: "2014-05-27T19:22:16Z" */ +-size_t scan_iso8601(const char* in,struct timespec* t) __pure__; ++size_t scan_iso8601(const char* in,struct timespec* t) ATTR_PURE; + + /* some variable length encodings for integers */ +-size_t scan_utf8(const char* in,size_t len,uint32_t* n) __pure__; +-size_t scan_utf8_sem(const char* in,size_t len,uint32_t* n) __pure__; +-size_t scan_asn1derlength(const char* in,size_t len,unsigned long long* n) __pure__; +-size_t scan_asn1dertag(const char* in,size_t len,unsigned long long* n) __pure__; ++size_t scan_utf8(const char* in,size_t len,uint32_t* n) ATTR_PURE; ++size_t scan_utf8_sem(const char* in,size_t len,uint32_t* n) ATTR_PURE; ++size_t scan_asn1derlength(const char* in,size_t len,unsigned long long* n) ATTR_PURE; ++size_t scan_asn1dertag(const char* in,size_t len,unsigned long long* n) ATTR_PURE; + + /* Google protocol buffers */ + /* A protocol buffer is a sequence of (tag,value). +@@ -122,15 +129,15 @@ size_t scan_asn1dertag(const char* in,si + * 0, double type 1, strings type 2 and floats type 5. However, you + * have to check this yourself. + */ +-size_t scan_varint(const char* in,size_t len, unsigned long long* n) __pure__; /* internal */ +-size_t scan_pb_tag(const char* in,size_t len, size_t* fieldno,unsigned char* type) __pure__; ++size_t scan_varint(const char* in,size_t len, unsigned long long* n) ATTR_PURE; /* internal */ ++size_t scan_pb_tag(const char* in,size_t len, size_t* fieldno,unsigned char* type) ATTR_PURE; + + /* Then, depending on the field number, validate the type and call the + * corresponding of these functions to parse the value */ +-size_t scan_pb_type0_int(const char* in,size_t len,unsigned long long* l) __pure__; +-size_t scan_pb_type0_sint(const char* in,size_t len,signed long long* l) __pure__; +-size_t scan_pb_type1_double(const char* in,size_t len,double* d) __pure__; +-size_t scan_pb_type1_fixed64(const char* in,size_t len,uint64_t* b) __pure__; ++size_t scan_pb_type0_int(const char* in,size_t len,unsigned long long* l) ATTR_PURE; ++size_t scan_pb_type0_sint(const char* in,size_t len,signed long long* l) ATTR_PURE; ++size_t scan_pb_type1_double(const char* in,size_t len,double* d) ATTR_PURE; ++size_t scan_pb_type1_fixed64(const char* in,size_t len,uint64_t* b) ATTR_PURE; + /* NOTE: scan_pb_type2_stringlen only parses the length of the string, + * not the string itself. It will return the number of bytes parsed in + * the length, then set slen to the value of the length integer it just +@@ -141,9 +148,9 @@ size_t scan_pb_type1_fixed64(const char* + * parsing early without having to read and allocate memory for the rest + * (potentially gigabytes) of the data announced by one unreasonable + * string length value. */ +-size_t scan_pb_type2_stringlen(const char* in,size_t len,const char** string, size_t* slen) __pure__; +-size_t scan_pb_type5_float(const char* in,size_t len,float* f) __pure__; +-size_t scan_pb_type5_fixed32(const char* in,size_t len,uint32_t* b) __pure__; ++size_t scan_pb_type2_stringlen(const char* in,size_t len,const char** string, size_t* slen) ATTR_PURE; ++size_t scan_pb_type5_float(const char* in,size_t len,float* f) ATTR_PURE; ++size_t scan_pb_type5_fixed32(const char* in,size_t len,uint32_t* b) ATTR_PURE; + + /* parse a netstring, input buffer is in (len bytes). + * if parsing is successful: +@@ -153,7 +160,7 @@ size_t scan_pb_type5_fixed32(const char* + * return 0 + * Note: *dest will point inside the input buffer! + */ +-size_t scan_netstring(const char* in,size_t len,char** dest,size_t* slen) __pure__; ++size_t scan_netstring(const char* in,size_t len,char** dest,size_t* slen) ATTR_PURE; + + /* internal function that might be useful independently */ + /* convert from hex ASCII, return 0 to 15 for success or -1 for failure */ +--- a/str.h ++++ b/str.h +@@ -8,8 +8,15 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ ++#ifndef ATTR_PURE ++# if defined __has_attribute ++# if __has_attribute (pure) ++# define ATTR_PURE __attribute__ ((pure)) ++# endif ++# endif ++#endif ++#ifndef ATTR_PURE ++# define ATTR_PURE + #endif + + /* str_copy copies leading bytes from in to out until \0. +@@ -21,7 +28,7 @@ size_t str_copy(char *out,const char *in + * equal to, or greater than the string b[0], b[1], ..., b[m-1]=='\0'. + * If the strings are different, str_diff does not read bytes past the + * first difference. */ +-int str_diff(const char *a,const char *b) __pure__; ++int str_diff(const char *a,const char *b) ATTR_PURE; + + /* str_diffn returns negative, 0, or positive, depending on whether the + * string a[0], a[1], ..., a[n]=='\0' is lexicographically smaller than, +@@ -29,24 +36,24 @@ int str_diff(const char *a,const char *b + * If the strings are different, str_diffn does not read bytes past the + * first difference. The strings will be considered equal if the first + * limit characters match. */ +-int str_diffn(const char *a,const char *b,size_t limit) __pure__; ++int str_diffn(const char *a,const char *b,size_t limit) ATTR_PURE; + + #ifdef __dietlibc__ + #include + #define str_len(foo) strlen(foo) + #else + /* str_len returns the index of \0 in s */ +-size_t str_len(const char *s) __pure__; ++size_t str_len(const char *s) ATTR_PURE; + #endif + + /* str_chr returns the index of the first occurance of needle or \0 in haystack */ +-size_t str_chr(const char *haystack,char needle) __pure__; ++size_t str_chr(const char *haystack,char needle) ATTR_PURE; + + /* str_rchr returns the index of the last occurance of needle or \0 in haystack */ +-size_t str_rchr(const char *haystack,char needle) __pure__; ++size_t str_rchr(const char *haystack,char needle) ATTR_PURE; + + /* str_start returns 1 if the b is a prefix of a, 0 otherwise */ +-int str_start(const char *a,const char *b) __pure__; ++int str_start(const char *a,const char *b) ATTR_PURE; + + /* convenience shortcut to test for string equality */ + #define str_equal(s,t) (!str_diff((s),(t))) +--- a/stralloc.h ++++ b/stralloc.h +@@ -8,8 +8,15 @@ + extern "C" { + #endif + +-#ifndef __pure__ +-#define __pure__ ++#ifndef ATTR_PURE ++# if defined __has_attribute ++# if __has_attribute (pure) ++# define ATTR_PURE __attribute__ ((pure)) ++# endif ++# endif ++#endif ++#ifndef ATTR_PURE ++# define ATTR_PURE + #endif + + /* stralloc is the internal data structure all functions are working on. +@@ -101,17 +108,17 @@ static inline int stralloc_APPEND(strall + /* stralloc_starts returns 1 if the \0-terminated string in "in", without + * the terminating \0, is a prefix of the string stored in sa. Otherwise + * it returns 0. sa must already be allocated. */ +-int stralloc_starts(stralloc* sa,const char* in) __pure__; ++int stralloc_starts(stralloc* sa,const char* in) ATTR_PURE; + + /* stralloc_diff returns negative, 0, or positive, depending on whether + * a is lexicographically smaller than, equal to, or greater than the + * string b. */ +-int stralloc_diff(const stralloc* a,const stralloc* b) __pure__; ++int stralloc_diff(const stralloc* a,const stralloc* b) ATTR_PURE; + + /* stralloc_diffs returns negative, 0, or positive, depending on whether + * a is lexicographically smaller than, equal to, or greater than the + * string b[0], b[1], ..., b[n]=='\0'. */ +-int stralloc_diffs(const stralloc* a,const char* b) __pure__; ++int stralloc_diffs(const stralloc* a,const char* b) ATTR_PURE; + + #define stralloc_equal(a,b) (!stralloc_diff((a),(b))) + #define stralloc_equals(a,b) (!stralloc_diffs((a),(b))) From 53023d0d4570d6d6fc39cd7a0bfe31940a98c3dd Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 6 Nov 2022 16:42:33 +0100 Subject: [PATCH 115/241] libowfat: Fix compile with glibc 2.36 This fixes the following error message seen when compiling against glibc 2.36: from scan/scan_httpdate.c:3: include/sys/cdefs.h:338:65: error: macro "__has_attribute" requires an identifier 338 | #if __GNUC_PREREQ (3,2) || __glibc_has_attribute (__deprecated__) Signed-off-by: Hauke Mehrtens --- libs/libowfat/Makefile | 2 +- .../libowfat/patches/012-remove-deprecated.patch | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 libs/libowfat/patches/012-remove-deprecated.patch diff --git a/libs/libowfat/Makefile b/libs/libowfat/Makefile index e9326250..9f9fc742 100644 --- a/libs/libowfat/Makefile +++ b/libs/libowfat/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libowfat PKG_VERSION:=0.32 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.fefe.de/libowfat diff --git a/libs/libowfat/patches/012-remove-deprecated.patch b/libs/libowfat/patches/012-remove-deprecated.patch new file mode 100644 index 00000000..49e3c824 --- /dev/null +++ b/libs/libowfat/patches/012-remove-deprecated.patch @@ -0,0 +1,16 @@ +--- a/scan/scan_iso8601.c ++++ b/scan/scan_iso8601.c +@@ -1,5 +1,4 @@ + #define _GNU_SOURCE +-#define __deprecated__ + #include "scan.h" + #include "byte.h" + #include "case.h" +--- a/scan/scan_httpdate.c ++++ b/scan/scan_httpdate.c +@@ -1,5 +1,4 @@ + #define _GNU_SOURCE +-#define __deprecated__ + #include "scan.h" + #include "byte.h" + #include "case.h" From bdce7df0b0cbe846fbb4c3011a64d59a29c9bd61 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 7 Sep 2022 19:49:34 +0100 Subject: [PATCH 116/241] libp11: update to version 0.4.12 Signed-off-by: Daniel Golle --- libs/libp11/Makefile | 4 ++-- libs/libp11/patches/001-fix-install.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/libp11/Makefile b/libs/libp11/Makefile index 4a49ed1b..2380db87 100644 --- a/libs/libp11/Makefile +++ b/libs/libp11/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libp11 -PKG_VERSION:=0.4.11 +PKG_VERSION:=0.4.12 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/OpenSC/libp11/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=57d47a12a76fd92664ae30032cf969284ebac1dfc25bf824999d74b016d51366 +PKG_HASH:=1e1a2533b3fcc45fde4da64c9c00261b1047f14c3f911377ebd1b147b3321cfd PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=LGPL-2.1-or-later diff --git a/libs/libp11/patches/001-fix-install.patch b/libs/libp11/patches/001-fix-install.patch index 06c1a4c3..302b7e34 100644 --- a/libs/libp11/patches/001-fix-install.patch +++ b/libs/libp11/patches/001-fix-install.patch @@ -16,7 +16,7 @@ mylibdir=$(libdir) --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -900,7 +900,7 @@ distdir-am: $(DISTFILES) +@@ -911,7 +911,7 @@ distdir-am: $(DISTFILES) fi; \ done check-am: all-am @@ -25,7 +25,7 @@ check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h installdirs: -@@ -989,7 +989,7 @@ install-dvi-am: +@@ -1000,7 +1000,7 @@ install-dvi-am: install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES @$(NORMAL_INSTALL) @@ -34,7 +34,7 @@ install-html: install-html-am install-html-am: -@@ -1052,14 +1052,14 @@ uninstall-am: uninstall-enginesexecLTLIB +@@ -1063,14 +1063,14 @@ uninstall-am: uninstall-enginesexecLTLIB .MAKE: all check-am install-am install-exec-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \ From b647d31b66f30a5917de016665294e45d7ff2db9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Nov 2022 20:37:44 -0700 Subject: [PATCH 117/241] libpng: update to 1.6.38 Remove upstream backports. Signed-off-by: Rosen Penev --- libs/libpng/Makefile | 6 +- libs/libpng/patches/010-png-exec.patch | 38 ----------- libs/libpng/patches/020-cmake-zlib.patch | 67 -------------------- libs/libpng/patches/030-pkgconfig-zlib.patch | 22 ------- 4 files changed, 3 insertions(+), 130 deletions(-) delete mode 100644 libs/libpng/patches/010-png-exec.patch delete mode 100644 libs/libpng/patches/020-cmake-zlib.patch delete mode 100644 libs/libpng/patches/030-pkgconfig-zlib.patch diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile index cc00e0c3..f900ddaa 100644 --- a/libs/libpng/Makefile +++ b/libs/libpng/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpng -PKG_VERSION:=1.6.37 -PKG_RELEASE:=11 +PKG_VERSION:=1.6.38 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/libpng -PKG_HASH:=505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca +PKG_HASH:=b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=Libpng GPL-2.0-or-later BSD-3-Clause diff --git a/libs/libpng/patches/010-png-exec.patch b/libs/libpng/patches/010-png-exec.patch deleted file mode 100644 index 43bfa0aa..00000000 --- a/libs/libpng/patches/010-png-exec.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 28c0f8895e4ac270b56b5c7e8089dd2417bc4e3c Mon Sep 17 00:00:00 2001 -From: Alex Gaynor -Date: Sun, 20 May 2018 18:46:32 -0400 -Subject: [PATCH] cmake: Add an option to enable/disable building of - executables - -Add the CMake option PNG_EXECUTABLES (on by default) in order to -allow or disallow the building of non-essential executable programs -associated with libpng. - -Contributed-by: Alex Gaynor -Contributed-by: Cosmin Truta -Signed-off-by: Cosmin Truta ---- - CMakeLists.txt | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,7 +53,8 @@ endif() - # COMMAND LINE OPTIONS - option(PNG_SHARED "Build shared lib" ON) - option(PNG_STATIC "Build static lib" ON) --option(PNG_TESTS "Build libpng tests" ON) -+option(PNG_EXECUTABLES "Build libpng executables" ON) -+option(PNG_TESTS "Build libpng tests" ON) - - # Many more configuration options could be added here - option(PNG_FRAMEWORK "Build OS X framework" OFF) -@@ -747,7 +748,7 @@ if(PNG_TESTS AND PNG_SHARED) - png_add_test(NAME pngimage-full COMMAND pngimage OPTIONS --exhaustive --list-combos --log FILES ${PNGSUITE_PNGS}) - endif() - --if(PNG_SHARED) -+if(PNG_SHARED AND PNG_EXECUTABLES) - add_executable(pngfix ${pngfix_sources}) - target_link_libraries(pngfix png) - set(PNG_BIN_TARGETS pngfix) diff --git a/libs/libpng/patches/020-cmake-zlib.patch b/libs/libpng/patches/020-cmake-zlib.patch deleted file mode 100644 index e6731c89..00000000 --- a/libs/libpng/patches/020-cmake-zlib.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 9f734b13f4ea062af98652c4c7678f667d2d85c7 Mon Sep 17 00:00:00 2001 -From: David Callu -Date: Thu, 4 Jul 2019 15:15:53 +0200 -Subject: [PATCH] cmake: Use the correct ZLIB_* variable names - -ZLIB_LIBRARIES and ZLIB_INCLUDE_DIRS are the official cmake variable -names. ---- - CMakeLists.txt | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,7 @@ option(PNG_BUILD_ZLIB "Custom zlib Locat - - if(NOT PNG_BUILD_ZLIB) - find_package(ZLIB REQUIRED) -- include_directories(${ZLIB_INCLUDE_DIR}) -+ include_directories(${ZLIB_INCLUDE_DIRS}) - endif() - - if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) -@@ -523,7 +523,7 @@ if(PNG_DEBUG) - endif() - - # NOW BUILD OUR TARGET --include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR}) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIRS}) - - unset(PNG_LIB_TARGETS) - -@@ -537,7 +537,7 @@ if(PNG_SHARED) - set_target_properties(png PROPERTIES PREFIX "lib") - set_target_properties(png PROPERTIES IMPORT_PREFIX "lib") - endif() -- target_link_libraries(png ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png ${ZLIB_LIBRARIES} ${M_LIBRARY}) - - if(UNIX AND AWK) - if(HAVE_LD_VERSION_SCRIPT) -@@ -572,7 +572,7 @@ if(PNG_STATIC) - # msvc does not append 'lib' - do it here to have consistent name - set_target_properties(png_static PROPERTIES PREFIX "lib") - endif() -- target_link_libraries(png_static ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png_static ${ZLIB_LIBRARIES} ${M_LIBRARY}) - endif() - - if(PNG_FRAMEWORK) -@@ -589,7 +589,7 @@ if(PNG_FRAMEWORK) - XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" - PUBLIC_HEADER "${libpng_public_hdrs}" - OUTPUT_NAME png) -- target_link_libraries(png_framework ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png_framework ${ZLIB_LIBRARIES} ${M_LIBRARY}) - endif() - - if(NOT PNG_LIB_TARGETS) -@@ -754,7 +754,7 @@ if(PNG_SHARED AND PNG_EXECUTABLES) - set(PNG_BIN_TARGETS pngfix) - - add_executable(png-fix-itxt ${png_fix_itxt_sources}) -- target_link_libraries(png-fix-itxt ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png-fix-itxt ${ZLIB_LIBRARIES} ${M_LIBRARY}) - list(APPEND PNG_BIN_TARGETS png-fix-itxt) - endif() - diff --git a/libs/libpng/patches/030-pkgconfig-zlib.patch b/libs/libpng/patches/030-pkgconfig-zlib.patch deleted file mode 100644 index 0b4fdfdd..00000000 --- a/libs/libpng/patches/030-pkgconfig-zlib.patch +++ /dev/null @@ -1,22 +0,0 @@ -From dbe3e0c43e549a1602286144d94b0666549b18e6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= -Date: Mon, 19 Mar 2018 12:41:47 -0300 -Subject: [PATCH] libpng.pc.in: zlib dependency is private - -zlib should be injected only when pkgconfig is ran with the --static -option. ---- - libpng.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/libpng.pc.in -+++ b/libpng.pc.in -@@ -6,7 +6,7 @@ includedir=@includedir@/libpng@PNGLIB_MA - Name: libpng - Description: Loads and saves PNG files - Version: @PNGLIB_VERSION@ --Requires: zlib -+Requires.private: zlib - Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ - Libs.private: @LIBS@ - Cflags: -I${includedir} From 64428e6abf2f12aa8f5e3a1a137a069ede353cf4 Mon Sep 17 00:00:00 2001 From: Igor Bezzubchenko Date: Mon, 15 Aug 2022 15:00:48 +0400 Subject: [PATCH 118/241] libpqxx: update to version 7.7.4 Signed-off-by: Igor Bezzubchenko --- libs/libpqxx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libpqxx/Makefile b/libs/libpqxx/Makefile index ae738a7e..82e8ca70 100644 --- a/libs/libpqxx/Makefile +++ b/libs/libpqxx/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpqxx -PKG_VERSION:=7.7.3 +PKG_VERSION:=7.7.4 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/jtv/libpqxx PKG_SOURCE_VERSION:=$(PKG_VERSION) -PKG_MIRROR_HASH:=e362388090b8e40078294b0671ff72a28f66ee137683fb1a128c670a83633220 +PKG_MIRROR_HASH:=471bc42a823eea9f807dd171d52c5f39688179fb925bd52fc2f27535e527fa1f, CMAKE_INSTALL:=1 From 4b08b5467fa885e1a9071a5b106f3328fe2f26ca Mon Sep 17 00:00:00 2001 From: Igor Bezzubchenko Date: Mon, 15 Aug 2022 21:18:32 +0400 Subject: [PATCH 119/241] libpqxx: fix makefile typo Signed-off-by: Igor Bezzubchenko --- libs/libpqxx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libpqxx/Makefile b/libs/libpqxx/Makefile index 82e8ca70..ef418a34 100644 --- a/libs/libpqxx/Makefile +++ b/libs/libpqxx/Makefile @@ -7,7 +7,7 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/jtv/libpqxx PKG_SOURCE_VERSION:=$(PKG_VERSION) -PKG_MIRROR_HASH:=471bc42a823eea9f807dd171d52c5f39688179fb925bd52fc2f27535e527fa1f, +PKG_MIRROR_HASH:=471bc42a823eea9f807dd171d52c5f39688179fb925bd52fc2f27535e527fa1f CMAKE_INSTALL:=1 From 91992b8cc68f8ef0812b50f3b629f2aa31aaaab6 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 9 Jun 2022 15:38:17 -0700 Subject: [PATCH 120/241] libpsl: use iconv dependency Removed need for manual iconv handling. Signed-off-by: Rosen Penev --- libs/libpsl/Makefile | 4 +--- libs/libpsl/patches/020-iconv.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 libs/libpsl/patches/020-iconv.patch diff --git a/libs/libpsl/Makefile b/libs/libpsl/Makefile index 53f57d73..92d2249c 100644 --- a/libs/libpsl/Makefile +++ b/libs/libpsl/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpsl PKG_VERSION:=0.21.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/rockdaboot/libpsl/releases/download/$(PKG_VERSION) @@ -38,8 +38,6 @@ MESON_ARGS += \ -Druntime=libidn2 \ -Dbuiltin=libidn2 -TARGET_LDFLAGS += -liconv - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/include/libpsl.h $(1)/usr/include/ diff --git a/libs/libpsl/patches/020-iconv.patch b/libs/libpsl/patches/020-iconv.patch new file mode 100644 index 00000000..63c9c752 --- /dev/null +++ b/libs/libpsl/patches/020-iconv.patch @@ -0,0 +1,29 @@ +--- a/meson.build ++++ b/meson.build +@@ -20,6 +20,7 @@ libicu_dep = notfound + libidn_dep = notfound + libunistring = notfound + networking_deps = notfound ++libiconv_dep = notfound + + # FIXME: Cleanup this when Meson gets 'feature-combo': + # https://github.com/mesonbuild/meson/issues/4566 +@@ -86,6 +87,7 @@ endif + if libidn2_dep.found() or libidn_dep.found() + # Check for libunistring, we need it for psl_str_to_utf8lower() + libunistring = cc.find_library('unistring') ++ libiconv_dep = dependency('iconv') + endif + + if host_machine.system() == 'windows' +--- a/src/meson.build ++++ b/src/meson.build +@@ -19,7 +19,7 @@ cargs = [ + libpsl = library('psl', sources, suffixes_dafsa_h, + include_directories : [configinc, includedir], + c_args : cargs, +- dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps], ++ dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps, libiconv_dep], + version: lt_version, + install: true, + ) From 3dd562d553447260463d0988d6cbc568a561b726 Mon Sep 17 00:00:00 2001 From: Maxim Anisimov Date: Mon, 12 Sep 2022 10:16:37 +0300 Subject: [PATCH 121/241] libqmi: bump to 1.30.8 Signed-off-by: Maxim Anisimov --- libs/libqmi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index 2fe4e58e..2224a33c 100644 --- a/libs/libqmi/Makefile +++ b/libs/libqmi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libqmi -PKG_SOURCE_VERSION:=1.30.6 +PKG_SOURCE_VERSION:=1.30.8 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git -PKG_MIRROR_HASH:=034dc3b9e5ddb1acd9bb8c2a07f3f8a576d47b7f70942b61b82c4dfc8f805186 +PKG_MIRROR_HASH:=a0fa33a89011bdb593f66fd0b674f2a7c31f87e43ffd7f3e9a515b00864c4a91 PKG_MAINTAINER:=Nicholas Smith From e4bfce4119645da888cef598efe68920b9ff8dcc Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 30 Jan 2022 22:50:31 -0800 Subject: [PATCH 122/241] libradiotap: fix bad format Found with -Wformat Signed-off-by: Rosen Penev --- libs/libradiotap/patches/010-format.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 libs/libradiotap/patches/010-format.patch diff --git a/libs/libradiotap/patches/010-format.patch b/libs/libradiotap/patches/010-format.patch new file mode 100644 index 00000000..e90e04f6 --- /dev/null +++ b/libs/libradiotap/patches/010-format.patch @@ -0,0 +1,16 @@ +--- a/parse.c ++++ b/parse.c +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include +@@ -39,7 +40,7 @@ static void print_radiotap_namespace(str + { + switch (iter->this_arg_index) { + case IEEE80211_RADIOTAP_TSFT: +- printf("\tTSFT: %llu\n", le64toh(*(unsigned long long *)iter->this_arg)); ++ printf("\tTSFT: %" PRIu64 "\n", le64toh(*(uint64_t *)iter->this_arg)); + break; + case IEEE80211_RADIOTAP_FLAGS: + printf("\tflags: %02x\n", *iter->this_arg); From 4bdedff1b337bf0042ce4e79cd2b724c82c2bf1d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 22 Jul 2021 15:25:50 -0700 Subject: [PATCH 123/241] librouteros: don't build docs Fixes compilation without host pod2man. Signed-off-by: Rosen Penev --- libs/librouteros/Makefile | 2 +- libs/librouteros/patches/010-no-doc.patch | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 libs/librouteros/patches/010-no-doc.patch diff --git a/libs/librouteros/Makefile b/libs/librouteros/Makefile index 2908de07..1d5a6b45 100644 --- a/libs/librouteros/Makefile +++ b/libs/librouteros/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=librouteros PKG_SOURCE_DATE:=2018-07-19 PKG_SOURCE_VERSION:=c485c777ffbbbd87c3d72d843af36ba016803cae -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Sven Roederer PKG_LICENSE:=ISC diff --git a/libs/librouteros/patches/010-no-doc.patch b/libs/librouteros/patches/010-no-doc.patch new file mode 100644 index 00000000..8a07e30b --- /dev/null +++ b/libs/librouteros/patches/010-no-doc.patch @@ -0,0 +1,7 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,3 +1,3 @@ +-SUBDIRS = src doc ++SUBDIRS = src + + README: README.md From e9e818cffc29d8cbdf0f17a8dda55d0d9689ae05 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Sep 2021 02:12:02 -0700 Subject: [PATCH 124/241] libseccomp: update to 2.5.2 Use AUTORELEASE for simplicity. Add libtool patch to fix compilation under some platforms. Signed-off-by: Rosen Penev --- libs/libseccomp/Makefile | 7 ++++--- libs/libseccomp/patches/010-no-code-coverage.patch | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 libs/libseccomp/patches/010-no-code-coverage.patch diff --git a/libs/libseccomp/Makefile b/libs/libseccomp/Makefile index e82ec751..0ab08a10 100644 --- a/libs/libseccomp/Makefile +++ b/libs/libseccomp/Makefile @@ -8,19 +8,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libseccomp -PKG_VERSION:=2.5.1 -PKG_RELEASE:=1 +PKG_VERSION:=2.5.2 +PKG_RELEASE:=$(AUTORELEASE) PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/seccomp/libseccomp/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=ee307e383c77aa7995abc5ada544d51c9723ae399768a97667d4cdb3c3a30d55 +PKG_HASH:=17a652dfb491d96be893960e9b791914936ee16c13b777a3caf562fe48cb87df PKG_MAINTAINER:=Nikos Mavrogiannopoulos PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:libseccomp_project:libseccomp +PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=gperf/host diff --git a/libs/libseccomp/patches/010-no-code-coverage.patch b/libs/libseccomp/patches/010-no-code-coverage.patch new file mode 100644 index 00000000..093bace2 --- /dev/null +++ b/libs/libseccomp/patches/010-no-code-coverage.patch @@ -0,0 +1,10 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -16,7 +16,6 @@ + # along with this library; if not, see . + # + +-@CODE_COVERAGE_RULES@ + + CODE_COVERAGE_OUTPUT_FILE = libseccomp.lcov.info + CODE_COVERAGE_OUTPUT_DIRECTORY = libseccomp.lcov.html.d From 394082afb5db2b9255c623997b24c1637f916689 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 4 Nov 2022 21:29:25 -0700 Subject: [PATCH 125/241] libseccomp: update to 2.5.4 Signed-off-by: Rosen Penev --- libs/libseccomp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libseccomp/Makefile b/libs/libseccomp/Makefile index 0ab08a10..4ed45f8c 100644 --- a/libs/libseccomp/Makefile +++ b/libs/libseccomp/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libseccomp -PKG_VERSION:=2.5.2 +PKG_VERSION:=2.5.4 PKG_RELEASE:=$(AUTORELEASE) PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/seccomp/libseccomp/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=17a652dfb491d96be893960e9b791914936ee16c13b777a3caf562fe48cb87df +PKG_HASH:=d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb PKG_MAINTAINER:=Nikos Mavrogiannopoulos PKG_LICENSE:=LGPL-2.1-or-later From bb7ea66625666e27d539f48a7dacdc26111c3bed Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 4 Nov 2022 21:29:48 -0700 Subject: [PATCH 126/241] libshout: update to 2.4.6 Signed-off-by: Rosen Penev --- libs/libshout/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libshout/Makefile b/libs/libshout/Makefile index e4f8fcd0..c76bdb3e 100644 --- a/libs/libshout/Makefile +++ b/libs/libshout/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libshout -PKG_VERSION:=2.4.5 +PKG_VERSION:=2.4.6 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.us.xiph.org/releases/libshout/ -PKG_HASH:=d9e568668a673994ebe3f1eb5f2bee06e3236a5db92b8d0c487e1c0f886a6890 +PKG_HASH:=39cbd4f0efdfddc9755d88217e47f8f2d7108fa767f9d58a2ba26a16d8f7c910 PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=LGPL-2.1-or-later From ed1765102d8e8b0d809b07f6569a2f8fc8383478 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 9 Oct 2021 01:25:21 +0100 Subject: [PATCH 127/241] libsodium: include ed25519_core in minimal build Functions from ed25519_core are needed for GNUnet to build. Include them in the minimal build of libsodium so we don't need to switch to the full build just for that. Signed-off-by: Daniel Golle --- libs/libsodium/Makefile | 2 +- .../100-minimal-build-with-ed25519-core.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 libs/libsodium/patches/100-minimal-build-with-ed25519-core.patch diff --git a/libs/libsodium/Makefile b/libs/libsodium/Makefile index 14abb172..2ab2bbdd 100644 --- a/libs/libsodium/Makefile +++ b/libs/libsodium/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsodium PKG_VERSION:=1.0.18 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://download.libsodium.org/libsodium/releases \ diff --git a/libs/libsodium/patches/100-minimal-build-with-ed25519-core.patch b/libs/libsodium/patches/100-minimal-build-with-ed25519-core.patch new file mode 100644 index 00000000..99d78095 --- /dev/null +++ b/libs/libsodium/patches/100-minimal-build-with-ed25519-core.patch @@ -0,0 +1,36 @@ +--- a/src/libsodium/Makefile.am ++++ b/src/libsodium/Makefile.am +@@ -12,6 +12,7 @@ libsodium_la_SOURCES = \ + crypto_box/crypto_box_easy.c \ + crypto_box/crypto_box_seal.c \ + crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c \ ++ crypto_core/ed25519/core_ed25519.c \ + crypto_core/ed25519/ref10/ed25519_ref10.c \ + crypto_core/hchacha20/core_hchacha20.c \ + crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c \ +@@ -152,7 +153,6 @@ if !MINIMAL + libsodium_la_SOURCES += \ + crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c \ + crypto_box/curve25519xchacha20poly1305/box_seal_curve25519xchacha20poly1305.c \ +- crypto_core/ed25519/core_ed25519.c \ + crypto_core/ed25519/core_ristretto255.c \ + crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c \ + crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h \ +--- a/src/libsodium/include/sodium.h ++++ b/src/libsodium/include/sodium.h +@@ -14,6 +14,7 @@ + #include "sodium/crypto_auth_hmacsha512256.h" + #include "sodium/crypto_box.h" + #include "sodium/crypto_box_curve25519xsalsa20poly1305.h" ++#include "sodium/crypto_core_ed25519.h" + #include "sodium/crypto_core_hsalsa20.h" + #include "sodium/crypto_core_hchacha20.h" + #include "sodium/crypto_core_salsa20.h" +@@ -56,7 +57,6 @@ + + #ifndef SODIUM_LIBRARY_MINIMAL + # include "sodium/crypto_box_curve25519xchacha20poly1305.h" +-# include "sodium/crypto_core_ed25519.h" + # include "sodium/crypto_core_ristretto255.h" + # include "sodium/crypto_scalarmult_ristretto255.h" + # include "sodium/crypto_secretbox_xchacha20poly1305.h" From 35de128a78b43833394e3be93c543c5bd7ab3c8e Mon Sep 17 00:00:00 2001 From: Damiano Renfer Date: Sat, 9 Oct 2021 15:13:14 +0200 Subject: [PATCH 128/241] libsodium: update maintainer email address Signed-off-by: Damiano Renfer --- libs/libsodium/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libsodium/Makefile b/libs/libsodium/Makefile index 2ab2bbdd..dbccb9d0 100644 --- a/libs/libsodium/Makefile +++ b/libs/libsodium/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://download.libsodium.org/libsodium/releases \ https://github.com/jedisct1/libsodium/releases/download/$(PKG_VERSION) PKG_HASH:=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 -PKG_MAINTAINER:=Damiano Renfer +PKG_MAINTAINER:=Damiano Renfer PKG_LICENSE:=ISC PKG_LICENSE_FILES:=LICENSE From 45e079cb0f6976594b76eff6c7de33fc3e1bec8f Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Mon, 5 Sep 2022 23:33:53 +0200 Subject: [PATCH 129/241] libssh: update to 0.10.3 Release notes: https://www.libssh.org/2022/09/05/libssh-0-10-3/ Signed-off-by: Nick Hainke --- libs/libssh/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libssh/Makefile b/libs/libssh/Makefile index 1a1c7d52..9fc9bf24 100644 --- a/libs/libssh/Makefile +++ b/libs/libssh/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libssh -PKG_VERSION:=0.10.2 +PKG_VERSION:=0.10.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.libssh.org/files/0.10/ -PKG_HASH:=15b83d7b74c8c67f758fb32faf1d9a35d5f8f50db523276a419e9876530f098a +PKG_HASH:=6e889dbe4f3eecd13a452ca868ec85525ab9c39d778519a9c141b83da738c8aa PKG_MAINTAINER:=Mislav Novakovic PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause From 0f1866e9da88bc904d05ab057b233fe4ce0cb2d4 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 6 Nov 2022 11:50:21 -0800 Subject: [PATCH 130/241] libssh: update to 0.10.4 Signed-off-by: Rosen Penev --- libs/libssh/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libssh/Makefile b/libs/libssh/Makefile index 9fc9bf24..b170f679 100644 --- a/libs/libssh/Makefile +++ b/libs/libssh/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libssh -PKG_VERSION:=0.10.3 +PKG_VERSION:=0.10.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.libssh.org/files/0.10/ -PKG_HASH:=6e889dbe4f3eecd13a452ca868ec85525ab9c39d778519a9c141b83da738c8aa +PKG_HASH:=07392c54ab61476288d1c1f0a7c557b50211797ad00c34c3af2bbc4dbc4bd97d PKG_MAINTAINER:=Mislav Novakovic PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause From 91e3713dc26639724f5b0ed3cc67873014a91615 Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Thu, 10 Feb 2022 02:03:57 +0300 Subject: [PATCH 131/241] libtalloc: fix build on macos This commit adds patch to fix the issue with 'echo -n' on macos Signed-off-by: Sergey V. Lobanov --- libs/libtalloc/Makefile | 2 +- ..._wafsamba-replace-echo-n-with-printf.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch diff --git a/libs/libtalloc/Makefile b/libs/libtalloc/Makefile index a1209784..71173504 100644 --- a/libs/libtalloc/Makefile +++ b/libs/libtalloc/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=talloc PKG_VERSION:=2.3.1 MAJOR_VERSION:=2 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.samba.org/ftp/talloc diff --git a/libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch b/libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch new file mode 100644 index 00000000..9b8aca00 --- /dev/null +++ b/libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch @@ -0,0 +1,25 @@ +From: https://gitlab.com/samba-team/samba/-/merge_requests/2374/diffs?commit_id=90bb371863d5a44845f47ebbceeb60842b46eda7 + +From 79b2f38c27c8df918d8260fe838f55bcf6d3eb73 Mon Sep 17 00:00:00 2001 +From: "Sergey V. Lobanov" +Date: Thu, 10 Feb 2022 00:02:17 +0300 +Subject: [PATCH] wafsamba: replace 'echo -n' with printf + +This patch makes samba_cross.py compatible with old bash (e.g. 3.2) + +Signed-off-by: Sergey V. Lobanov +--- + buildtools/wafsamba/samba_cross.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/buildtools/wafsamba/samba_cross.py ++++ b/buildtools/wafsamba/samba_cross.py +@@ -134,7 +134,7 @@ class cross_Popen(Utils.subprocess.Popen + cross_answers_incomplete = True + add_answer(ca_file, msg, ans) + (retcode, retstring) = ans +- args = ['/bin/sh', '-c', "echo -n '%s'; exit %d" % (retstring, retcode)] ++ args = ['/bin/sh', '-c', "printf '%s'; exit %d" % (retstring, retcode)] + real_Popen.__init__(*(obj, args), **kw) + + From d088587be86c8a21a54210f5f19ab909af790a97 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 6 Nov 2022 12:40:35 -0800 Subject: [PATCH 132/241] libtalloc: update to 2.3.4 Signed-off-by: Rosen Penev --- libs/libtalloc/Makefile | 7 +++--- .../100-Remove_libbsd_dependency_check.patch | 8 +++--- ..._wafsamba-replace-echo-n-with-printf.patch | 25 ------------------- 3 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch diff --git a/libs/libtalloc/Makefile b/libs/libtalloc/Makefile index 71173504..8972fa4c 100644 --- a/libs/libtalloc/Makefile +++ b/libs/libtalloc/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=talloc -PKG_VERSION:=2.3.1 +PKG_VERSION:=2.3.4 MAJOR_VERSION:=2 -PKG_RELEASE:=4 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.samba.org/ftp/talloc -PKG_HASH:=ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77 +PKG_HASH:=179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505 PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=LGPL-3.0-or-later @@ -59,6 +59,7 @@ define Build/Configure \nChecking uname version type: \"$(LINUX_UNAME_VERSION)\" \ \n" ; \ $(CONFIGURE_VARS) \ + PYTHONHASHSEED=1 \ ./buildtools/bin/waf configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/libs/libtalloc/patches/100-Remove_libbsd_dependency_check.patch b/libs/libtalloc/patches/100-Remove_libbsd_dependency_check.patch index 4fe2c663..3478c587 100644 --- a/libs/libtalloc/patches/100-Remove_libbsd_dependency_check.patch +++ b/libs/libtalloc/patches/100-Remove_libbsd_dependency_check.patch @@ -1,6 +1,6 @@ --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -416,22 +416,13 @@ def configure(conf): +@@ -429,22 +429,13 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') @@ -29,7 +29,7 @@ conf.CHECK_CODE(''' struct ucred cred; -@@ -808,9 +799,6 @@ def configure(conf): +@@ -827,9 +818,6 @@ syscall(SYS_copy_file_range,0,NULL,0,NUL # look for a method of finding the list of network interfaces for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: @@ -39,7 +39,7 @@ if conf.CHECK_CODE(''' #define %s 1 #define NO_CONFIG_H 1 -@@ -823,7 +811,7 @@ def configure(conf): +@@ -842,7 +830,7 @@ syscall(SYS_copy_file_range,0,NULL,0,NUL #include "tests/getifaddrs.c" ''' % method, method, @@ -48,7 +48,7 @@ addmain=False, execute=True): break -@@ -871,7 +859,6 @@ def build(bld): +@@ -890,7 +878,6 @@ def build(bld): break extra_libs = '' diff --git a/libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch b/libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch deleted file mode 100644 index 9b8aca00..00000000 --- a/libs/libtalloc/patches/101_wafsamba-replace-echo-n-with-printf.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: https://gitlab.com/samba-team/samba/-/merge_requests/2374/diffs?commit_id=90bb371863d5a44845f47ebbceeb60842b46eda7 - -From 79b2f38c27c8df918d8260fe838f55bcf6d3eb73 Mon Sep 17 00:00:00 2001 -From: "Sergey V. Lobanov" -Date: Thu, 10 Feb 2022 00:02:17 +0300 -Subject: [PATCH] wafsamba: replace 'echo -n' with printf - -This patch makes samba_cross.py compatible with old bash (e.g. 3.2) - -Signed-off-by: Sergey V. Lobanov ---- - buildtools/wafsamba/samba_cross.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/buildtools/wafsamba/samba_cross.py -+++ b/buildtools/wafsamba/samba_cross.py -@@ -134,7 +134,7 @@ class cross_Popen(Utils.subprocess.Popen - cross_answers_incomplete = True - add_answer(ca_file, msg, ans) - (retcode, retstring) = ans -- args = ['/bin/sh', '-c', "echo -n '%s'; exit %d" % (retstring, retcode)] -+ args = ['/bin/sh', '-c', "printf '%s'; exit %d" % (retstring, retcode)] - real_Popen.__init__(*(obj, args), **kw) - - From c2ccd864b9a41dfc4ef420db8bb9c2d1c2a9f3c2 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 18 Oct 2021 01:19:20 -0700 Subject: [PATCH 133/241] libtasn1: don't build host shared libs Avoids rpath hacks. Signed-off-by: Rosen Penev --- libs/libtasn1/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/libtasn1/Makefile b/libs/libtasn1/Makefile index e5bf554f..264a13a1 100644 --- a/libs/libtasn1/Makefile +++ b/libs/libtasn1/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtasn1 PKG_VERSION:=4.16.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) @@ -43,6 +43,10 @@ HOST_CFLAGS += -std=gnu99 TARGET_CFLAGS += -ffunction-sections -fdata-sections TARGET_LDFLAGS += -Wl,--gc-sections +HOST_CONFIGURE_ARGS += \ + --disable-shared \ + --with-pic + CONFIGURE_ARGS += \ --disable-doc \ --disable-gcc-warnings \ From 472c662211bc4643ea9d0b48ad9e05bd03ac7656 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Nov 2022 19:40:45 -0700 Subject: [PATCH 134/241] libtasn1: update to 4.19.0 Signed-off-by: Rosen Penev --- libs/libtasn1/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libtasn1/Makefile b/libs/libtasn1/Makefile index 264a13a1..b97a9cdb 100644 --- a/libs/libtasn1/Makefile +++ b/libs/libtasn1/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtasn1 -PKG_VERSION:=4.16.0 -PKG_RELEASE:=2 +PKG_VERSION:=4.19.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d +PKG_HASH:=1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a PKG_MAINTAINER:=Nikos Mavrogiannopoulos PKG_LICENSE:=LGPL-2.1-or-later From eaad6295e2da3ea76a0ccdfb90be2861945b008a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Nov 2022 20:42:02 -0700 Subject: [PATCH 135/241] libtins: update to 4.4 Signed-off-by: Rosen Penev --- libs/libtins/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libtins/Makefile b/libs/libtins/Makefile index 392ebfc6..11b7c2f1 100644 --- a/libs/libtins/Makefile +++ b/libs/libtins/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtins -PKG_VERSION:=4.2 -PKG_RELEASE:=4 +PKG_VERSION:=4.4 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mfontanini/libtins/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a9fed73e13f06b06a4857d342bb30815fa8c359d00bd69547e567eecbbb4c3a1 +PKG_HASH:=ff0121b4ec070407e29720c801b7e1a972042300d37560a62c57abadc9635634 PKG_MAINTAINER:= Steven Hessing PKG_LICENSE:=BSD-2-Clause From bd51363776c30df3d466f54391780f7fb9b8530a Mon Sep 17 00:00:00 2001 From: Andy Walsh Date: Sun, 27 Jun 2021 15:07:10 +0200 Subject: [PATCH 136/241] libtirpc: update to 1.3.2 update to 1.3.2 Signed-off-by: Andy Walsh --- libs/libtirpc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libtirpc/Makefile b/libs/libtirpc/Makefile index a9db32c7..4963e848 100644 --- a/libs/libtirpc/Makefile +++ b/libs/libtirpc/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtirpc -PKG_VERSION:=1.3.1 -PKG_RELEASE:=1 +PKG_VERSION:=1.3.2 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_URL:=@SF/libtirpc PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17 +PKG_HASH:=e24eb88b8ce7db3b7ca6eb80115dd1284abc5ec32a8deccfed2224fc2532b9fd PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING From 1475aef199c15c836aea0774c32e2fccd4f36035 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 5 Mar 2022 22:55:31 -0800 Subject: [PATCH 137/241] libtirpc: don't build host shared libraries Avoids having to use rpath hacks. Signed-off-by: Rosen Penev --- libs/libtirpc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libtirpc/Makefile b/libs/libtirpc/Makefile index 4963e848..8104dd6a 100644 --- a/libs/libtirpc/Makefile +++ b/libs/libtirpc/Makefile @@ -27,7 +27,7 @@ define Package/libtirpc endef CONFIGURE_ARGS += --disable-gssapi -HOST_CONFIGURE_ARGS += --disable-gssapi +HOST_CONFIGURE_ARGS += --disable-gssapi --disable-shared ifeq ($(HOST_OS),Darwin) HOST_CONFIGURE_ARGS += --disable-symvers From de1debc425d99c2757d7af2473c628ef49d91e77 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 29 Apr 2022 10:09:26 +0800 Subject: [PATCH 138/241] libtorrent-rasterbar: Update to 2.0.6 Added new dependency "libstdcpp". Removed an upstreamed patch. Signed-off-by: Tianling Shen --- libs/libtorrent-rasterbar/Makefile | 10 ++--- .../patches/010-update-boost-1780.patch | 44 ------------------- 2 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 libs/libtorrent-rasterbar/patches/010-update-boost-1780.patch diff --git a/libs/libtorrent-rasterbar/Makefile b/libs/libtorrent-rasterbar/Makefile index 12a43979..c64cec26 100644 --- a/libs/libtorrent-rasterbar/Makefile +++ b/libs/libtorrent-rasterbar/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtorrent-rasterbar -PKG_VERSION:=2.0.5 +PKG_VERSION:=2.0.6 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/arvidn/libtorrent/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=8879d233d81b9bc1b02fdac35f6e1f69509c74da9818c6a819d18b5e42983f56 +PKG_HASH:=75b17d9db3adf0da5896edeaff4db3879f38ee66be953dc9567089db83a070be PKG_MAINTAINER:=David Yang PKG_LICENSE:=BSD-3-Clause @@ -24,7 +24,7 @@ define Package/libtorrent-rasterbar $(call Package/libtorrent-rasterbar/Default) SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+boost-system +libopenssl +libatomic + DEPENDS:=+boost-system +libopenssl +libatomic +libstdcpp endef #define Package/python3-libtorrent @@ -47,11 +47,11 @@ endef #endef define Download/try_signal - VERSION:=334fd139e2bb387017b42d36753a03935e3bca75 + VERSION:=751a7e5a5be14892bcfdff1e63c653bcbf71cf39 SUBDIR:=deps/try_signal FILE:=$(PKG_NAME)-try_signal-$$(VERSION).tar.xz URL:=https://github.com/arvidn/try_signal.git - MIRROR_HASH:=c85d65352c20713cb6cfb005942b46ab7579dc7eef3b876666bff9347149d47f + MIRROR_HASH:=32a432e35e81c79f21c49744f00696c112e0deab45d15d91c61ceb63fe25a5f8 PROTO:=git endef $(eval $(call Download,try_signal)) diff --git a/libs/libtorrent-rasterbar/patches/010-update-boost-1780.patch b/libs/libtorrent-rasterbar/patches/010-update-boost-1780.patch deleted file mode 100644 index 47a729df..00000000 --- a/libs/libtorrent-rasterbar/patches/010-update-boost-1780.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 71d608fceca7e61c9d124f9ea83f71b06eda3b17 Mon Sep 17 00:00:00 2001 -From: arvidn -Date: Sun, 12 Dec 2021 21:52:15 +0100 -Subject: [PATCH] update allocator sizes for boost-1.78 - ---- - include/libtorrent/aux_/allocating_handler.hpp | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - ---- a/include/libtorrent/aux_/allocating_handler.hpp -+++ b/include/libtorrent/aux_/allocating_handler.hpp -@@ -77,11 +77,11 @@ namespace libtorrent { namespace aux { - constexpr std::size_t openssl_write_cost = 0; - #endif - -- constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 8 * sizeof(void*); -- constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 8 * sizeof(void*); -- constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 8 * sizeof(void*); -- constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 8 * sizeof(void*); -- constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 160; -+ constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 9 * sizeof(void*); -+ constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 9 * sizeof(void*); -+ constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 9 * sizeof(void*); -+ constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 9 * sizeof(void*); -+ constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 168; - constexpr std::size_t abort_handler_max_size = tracking + debug_tick + 104; - constexpr std::size_t submit_handler_max_size = tracking + debug_tick + 104; - constexpr std::size_t deferred_handler_max_size = tracking + debug_tick + 112; -@@ -124,12 +124,12 @@ namespace libtorrent { namespace aux { - #endif - constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168; - constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168; -- constexpr std::size_t udp_handler_max_size = tracking + 160; -- constexpr std::size_t utp_handler_max_size = tracking + 184; -+ constexpr std::size_t udp_handler_max_size = tracking + 168; -+ constexpr std::size_t utp_handler_max_size = tracking + 192; - constexpr std::size_t abort_handler_max_size = tracking + 72; - constexpr std::size_t submit_handler_max_size = tracking + 72; - constexpr std::size_t deferred_handler_max_size = tracking + 80; -- constexpr std::size_t tick_handler_max_size = tracking + 128; -+ constexpr std::size_t tick_handler_max_size = tracking + 136; - #endif - - enum HandlerName From fd3f83b085780386cf567c758a2203a03ca1df0c Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 3 Sep 2022 17:34:58 +0800 Subject: [PATCH 139/241] libtorrent-rasterbar: Update to 2.0.7 Signed-off-by: Tianling Shen --- libs/libtorrent-rasterbar/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libtorrent-rasterbar/Makefile b/libs/libtorrent-rasterbar/Makefile index c64cec26..fe99c342 100644 --- a/libs/libtorrent-rasterbar/Makefile +++ b/libs/libtorrent-rasterbar/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtorrent-rasterbar -PKG_VERSION:=2.0.6 +PKG_VERSION:=2.0.7 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/arvidn/libtorrent/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=75b17d9db3adf0da5896edeaff4db3879f38ee66be953dc9567089db83a070be +PKG_HASH:=1c8209fdf765be7bc989e9cbd1d9dc3d5a6a57cb979205e73e925c9c72ebe8ce PKG_MAINTAINER:=David Yang PKG_LICENSE:=BSD-3-Clause From 692e5bc8a40a98a64e5a504bf0847299ee2f9075 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Mon, 7 Jun 2021 13:26:38 +0200 Subject: [PATCH 140/241] libulfius: update to 2.7.3 Signed-off-by: Toni Uhlig --- libs/libulfius/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libulfius/Makefile b/libs/libulfius/Makefile index b1f77a6f..93c1ef81 100644 --- a/libs/libulfius/Makefile +++ b/libs/libulfius/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libulfius -PKG_VERSION:=2.7.2 +PKG_VERSION:=2.7.3 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/babelouest/ulfius/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=8d3456e85302d1218f83602f2166889d7e1a3d039fce579db7020d619f36c6e3 +PKG_HASH:=a20f575b3e81924c4ddb72c4ccdced134b5756a86b017f4a38b51608610628c5 PKG_MAINTAINER:=Toni Uhlig PKG_LICENSE:=LGPL-2.1-or-later From 85d973cfba74d6b6e366f5590b73b5571b526c45 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Thu, 14 Jul 2022 01:54:13 +0200 Subject: [PATCH 141/241] libulfius: update to 2.7.10 Signed-off-by: Toni Uhlig --- libs/liborcania/Makefile | 6 ------ libs/libulfius/Makefile | 11 +++-------- .../patches/0001-cmake-pc-orcania-found.patch | 11 +++++++++++ 3 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 libs/libulfius/patches/0001-cmake-pc-orcania-found.patch diff --git a/libs/liborcania/Makefile b/libs/liborcania/Makefile index 8ee31f1b..5dd3651f 100644 --- a/libs/liborcania/Makefile +++ b/libs/liborcania/Makefile @@ -35,10 +35,4 @@ define Package/liborcania/description Potluck with different functions for different purposes that can be shared among C programs. endef -define Package/liborcania/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liborcania.so.* \ - $(1)/usr/lib/ -endef - $(eval $(call BuildPackage,liborcania)) diff --git a/libs/libulfius/Makefile b/libs/libulfius/Makefile index 93c1ef81..07ba49cc 100644 --- a/libs/libulfius/Makefile +++ b/libs/libulfius/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libulfius -PKG_VERSION:=2.7.3 +PKG_VERSION:=2.7.10 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/babelouest/ulfius/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a20f575b3e81924c4ddb72c4ccdced134b5756a86b017f4a38b51608610628c5 +PKG_HASH:=616c5df99584071461a1285dd7155883f7d2b94abf0931038feeebd3da3a6def PKG_MAINTAINER:=Toni Uhlig PKG_LICENSE:=LGPL-2.1-or-later @@ -42,13 +42,8 @@ $(call Package/libulfius/default) PROVIDES:=libulfius endef -define Package/libulfius-$(BUILD_VARIANT)/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libulfius.so.* \ - $(1)/usr/lib/ -endef - CMAKE_OPTIONS += \ + -D_GNU_SOURCE=ON \ -DDOWNLOAD_DEPENDENCIES=OFF \ -DBUILD_WEBSOCKET=OFF \ -DSEARCH_ORCANIA_U=ON \ diff --git a/libs/libulfius/patches/0001-cmake-pc-orcania-found.patch b/libs/libulfius/patches/0001-cmake-pc-orcania-found.patch new file mode 100644 index 00000000..b95b8c07 --- /dev/null +++ b/libs/libulfius/patches/0001-cmake-pc-orcania-found.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -257,7 +257,7 @@ if (SEARCH_ORCANIA_U) + set(Orcania_FIND_QUIETLY ON) # force to find Orcania quietly + include(FindOrcania) + find_package(Orcania ${ORCANIA_VERSION_REQUIRED} QUIET) # try to find orcania +- if (NOT ORCANIA_FOUND) ++ if (NOT ORCANIA_FOUND AND NOT PC_ORCANIA_FOUND) + if (DOWNLOAD_DEPENDENCIES) + include(DownloadProject) + download_project(PROJ orcania # ... otherwise, download archive From 0933726e7b464184e2b517264703269f936d9a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Espen=20J=C3=BCrgensen?= Date: Mon, 31 Oct 2022 22:53:55 +0100 Subject: [PATCH 142/241] libunistring: Update to 1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Espen Jürgensen --- libs/libunistring/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libunistring/Makefile b/libs/libunistring/Makefile index 6fee61b0..595b5308 100644 --- a/libs/libunistring/Makefile +++ b/libs/libunistring/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libunistring -PKG_VERSION:=1.0 +PKG_VERSION:=1.1 PKG_RELEASE:=1 -PKG_HASH:=5bab55b49f75d77ed26b257997e919b693f29fd4a1bc22e0e6e024c246c72741 +PKG_HASH:=827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/libunistring From 6f163e303f3f0f2b3c55d826cfa31979334a078d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 15 Dec 2021 22:12:00 -0800 Subject: [PATCH 143/241] libupnp: update to 1.14.12 Signed-off-by: Rosen Penev --- libs/libupnp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile index f98fed51..d00859db 100644 --- a/libs/libupnp/Makefile +++ b/libs/libupnp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupnp -PKG_VERSION:=1.14.7 +PKG_VERSION:=1.14.12 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/pupnp -PKG_HASH:=7b66ac4a86bc0e218e2771ac274b2945bc4154bf9054e57b14afb67c26ac7c24 +PKG_HASH:=091c80aada1e939c2294245c122be2f5e337cc932af7f7d40504751680b5b5ac PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=BSD-3-Clause From 8b6912561bd9fef192bd822f0d6d310b503a7f7b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Nov 2022 20:05:33 -0700 Subject: [PATCH 144/241] libupnpp: update to 0.22.2 Signed-off-by: Rosen Penev --- libs/libupnpp/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/libupnpp/Makefile b/libs/libupnpp/Makefile index dbd066f3..5e1ce429 100644 --- a/libs/libupnpp/Makefile +++ b/libs/libupnpp/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupnpp -PKG_VERSION:=0.21.0 +PKG_VERSION:=0.22.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads -PKG_HASH:=e43dbe5020ed25152aaec71b325dd80498e72038da5aeb50ed7dd51e213cd903 +PKG_HASH:=90338c19383333fd4eeec8a866a8c4add1754ef9a6a720ddd9af97e6754ff849 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later @@ -37,8 +37,6 @@ libupnpp defines useful objects over libupnp and can be used to create both devi and control points. It is shared by upmpdcli and upplay. endef -TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lm) - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libupnpp $(1)/usr/include/ From 451cb016e7621b972ee9e4a421d471482c037647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=A1k?= Date: Mon, 22 Aug 2022 10:51:40 +0200 Subject: [PATCH 145/241] liburcu: update to version 0.13.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Hák --- libs/liburcu/Makefile | 6 +++--- libs/liburcu/patches/010-no-tests.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/liburcu/Makefile b/libs/liburcu/Makefile index 45661c1c..7d4d84d4 100644 --- a/libs/liburcu/Makefile +++ b/libs/liburcu/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liburcu -PKG_VERSION:=0.12.2 -PKG_RELEASE:=3 +PKG_VERSION:=0.13.2 +PKG_RELEASE:=1 PKG_MAINTAINER:=Daniel Salzman PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later MIT @@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=lgpl-2.1.txt gpl-2.0.txt lgpl-relicensing.txt PKG_SOURCE:=userspace-rcu-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://lttng.org/files/urcu/ -PKG_HASH:=4eefc11e4f6c212fc7d84d871e1cc139da0669a46ff3fda557a6fdd4d74ca67b +PKG_HASH:=1213fd9f1b0b74da7de2bb74335b76098db9738fec5d3cdc07c0c524f34fc032 PKG_BUILD_DIR:=$(BUILD_DIR)/userspace-rcu-$(PKG_VERSION) PKG_FIXUP:=autoreconf diff --git a/libs/liburcu/patches/010-no-tests.patch b/libs/liburcu/patches/010-no-tests.patch index 37cf8305..2efade11 100644 --- a/libs/liburcu/patches/010-no-tests.patch +++ b/libs/liburcu/patches/010-no-tests.patch @@ -3,7 +3,7 @@ @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS=-I m4 --SUBDIRS = include src doc tests +-SUBDIRS = include src doc tests extras +SUBDIRS = include src dist_doc_DATA = LICENSE \ From 22e832cc1380b753a94ec55b2dc117f561e7538d Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Sun, 12 Sep 2021 18:27:38 +0200 Subject: [PATCH 146/241] liburing: Update to v2.1 - Updated download URL and hash - Make use of $(AUTORELEASE) for PKG_RELEASE Signed-off-by: Christian Lachner --- libs/liburing/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/liburing/Makefile b/libs/liburing/Makefile index bf0f5089..2e5183e5 100644 --- a/libs/liburing/Makefile +++ b/libs/liburing/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liburing -PKG_VERSION:=2.0 -PKG_RELEASE:=1 +PKG_VERSION:=2.1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.dk/cgit/liburing/snapshot -PKG_HASH:=fcc29d6f00d0d1eca3d83d40cc7e9a2773ef98d4edbfe536b7317d65992f75f8 +PKG_HASH:=707faff561f6a57ddf4188a98737a80e460b24c1295cd303be39c819da0df1d1 PKG_MAINTAINER:=Christian Lachner PKG_LICENSE:=MIT From 0634cc377027ea3df046d78e3b79322f7b605b2a Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 4 Nov 2021 13:55:28 -0300 Subject: [PATCH 147/241] liburing: add KERNEL_IO_URING dependency This needs kernel io_uring support to work. Signed-off-by: Eneas U de Queiroz --- libs/liburing/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/liburing/Makefile b/libs/liburing/Makefile index 2e5183e5..5748cd3c 100644 --- a/libs/liburing/Makefile +++ b/libs/liburing/Makefile @@ -22,6 +22,7 @@ define Package/liburing CATEGORY:=Libraries TITLE:=io_uring library URL:=https://git.kernel.dk/cgit/liburing + DEPENDS:=@KERNEL_IO_URING endef define Package/liburing/description From 5eaf19f2a419f0056a3680cb12e83c000a81d697 Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Fri, 8 Jul 2022 07:32:19 +0200 Subject: [PATCH 148/241] liburing: Update to v2.2 - Updated download URL and hash Signed-off-by: Christian Lachner --- libs/liburing/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/liburing/Makefile b/libs/liburing/Makefile index 5748cd3c..93274a58 100644 --- a/libs/liburing/Makefile +++ b/libs/liburing/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liburing -PKG_VERSION:=2.1 +PKG_VERSION:=2.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.dk/cgit/liburing/snapshot -PKG_HASH:=707faff561f6a57ddf4188a98737a80e460b24c1295cd303be39c819da0df1d1 +PKG_HASH:=f52bad18e3ff11185165d52d2d7391e90a0fce8f33f2ee611ad9a8ce1feaf914 PKG_MAINTAINER:=Christian Lachner PKG_LICENSE:=MIT From 5fb312c12a9e7f60c1971405cc2500a10a26821f Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sat, 14 Aug 2021 21:51:17 +0300 Subject: [PATCH 149/241] v4l-utils: add libudev-zero dependency When libudev-zero is enabled, v4l-utils links against it, and the package build fails due to a missing dependency: Package v4l-utils is missing dependencies for the following libraries: libudev.so.1 As disabling udev doesn't seem to be supported in v4l-utils, simply add the dependency to fix the build. Signed-off-by: Stijn Tintel --- libs/libv4l/Makefile | 2 +- .../patches/010-remove-libudev-check.patch | 22 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 libs/libv4l/patches/010-remove-libudev-check.patch diff --git a/libs/libv4l/Makefile b/libs/libv4l/Makefile index 181fe529..c8615b46 100644 --- a/libs/libv4l/Makefile +++ b/libs/libv4l/Makefile @@ -64,7 +64,7 @@ define Package/v4l-utils SECTION:=utils CATEGORY:=Utilities TITLE+= utilities - DEPENDS:= +libv4l +libstdcpp $(ICONV_DEPENDS) $(INTL_DEPENDS) + DEPENDS:= +libudev-zero +libv4l +libstdcpp $(ICONV_DEPENDS) $(INTL_DEPENDS) LICENSE:=GPL-2.0-or-later LICENSE_FILES:=COPYING endef diff --git a/libs/libv4l/patches/010-remove-libudev-check.patch b/libs/libv4l/patches/010-remove-libudev-check.patch deleted file mode 100644 index 56e51fa7..00000000 --- a/libs/libv4l/patches/010-remove-libudev-check.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -291,16 +291,9 @@ else - AC_MSG_WARN(ALSA library not available) - fi - --PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no) --if test "x$have_libudev" = "xyes"; then -- AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev]) -- LIBUDEV_CFLAGS="$libudev_CFLAGS" -- LIBUDEV_LIBS="$libudev_LIBS" -- AC_SUBST(LIBUDEV_CFLAGS) -- AC_SUBST(LIBUDEV_LIBS) --else -- AC_MSG_WARN(udev library not available) --fi -+ -+# Force building without udev -+have_libudev=no - - AC_SUBST([JPEG_LIBS]) - From 38a8956f420b06c334a1cd37d97355fffa1755e3 Mon Sep 17 00:00:00 2001 From: Volodymyr Nazarchuk Date: Mon, 11 Jul 2022 12:00:12 +0300 Subject: [PATCH 150/241] libv4l: change dependence from libudev-zero to libudev Signed-off-by: Volodymyr Nazarchuk --- libs/libv4l/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libv4l/Makefile b/libs/libv4l/Makefile index c8615b46..60bac1d2 100644 --- a/libs/libv4l/Makefile +++ b/libs/libv4l/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v4l-utils PKG_VERSION:=1.20.0 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.linuxtv.org/downloads/v4l-utils @@ -64,7 +64,7 @@ define Package/v4l-utils SECTION:=utils CATEGORY:=Utilities TITLE+= utilities - DEPENDS:= +libudev-zero +libv4l +libstdcpp $(ICONV_DEPENDS) $(INTL_DEPENDS) + DEPENDS:= +libudev +libv4l +libstdcpp $(ICONV_DEPENDS) $(INTL_DEPENDS) LICENSE:=GPL-2.0-or-later LICENSE_FILES:=COPYING endef From 737417e632cc4f680f714ee97f272760f7ed9467 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 20 Jul 2021 20:18:11 -0700 Subject: [PATCH 151/241] libvpx: update to 1.10.0 Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev --- libs/libvpx/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libvpx/Makefile b/libs/libvpx/Makefile index 9cd671f9..5cea27e7 100644 --- a/libs/libvpx/Makefile +++ b/libs/libvpx/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libvpx -PKG_VERSION:=1.9.0 -PKG_RELEASE:=1 +PKG_VERSION:=1.10.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://chromium.googlesource.com/webm/libvpx -PKG_MIRROR_HASH:=0984f8c899b345f6be6f52f5e4888a6d654a45641b7b36de49e1aab22e1ecb58 +PKG_MIRROR_HASH:=2f4d342e8efe566449dc5b2211dac22df81ec28792804b34d47c7dadf5c8a136 PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_MAINTAINER:=Luiz Angelo Daros de Luca From 019f3d54b7312a5a1727ee9de666efddd7c3f62e Mon Sep 17 00:00:00 2001 From: Luiz Angelo Daros de Luca Date: Tue, 12 Oct 2021 03:38:01 -0300 Subject: [PATCH 152/241] libvpx: update to 1.11.0 2021-09-27 v1.11.0 "Smew Duck" This maintenance release adds support for VBR mode in VP9 rate control interface, new codec controls to get quantization parameters and loop filter levels, and includes several improvements to NEON and numerous bug fixes. - Upgrading: New codec control is added to get quantization parameters and loop filter levels. VBR mode is supported in VP9 rate control library. - Enhancement: Numerous improvements for Neon optimizations. Code clean-up and refactoring. Calculation of rd multiplier is changed with BDRATE gains. - Bug fixes: Fix to overflow on duration. Fix to several instances of -Wunused-but-set-variable. Fix to avoid chroma resampling for 420mpeg2 input. Fix to overflow in calc_iframe_target_size. Fix to disallow skipping transform and quantization. Fix some -Wsign-compare warnings in simple_encode. Fix input file path in simple_encode_test. Fix valid range for under/over_shoot pct. Signed-off-by: Luiz Angelo Daros de Luca --- libs/libvpx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libvpx/Makefile b/libs/libvpx/Makefile index 5cea27e7..03164af2 100644 --- a/libs/libvpx/Makefile +++ b/libs/libvpx/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libvpx -PKG_VERSION:=1.10.0 +PKG_VERSION:=1.11.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://chromium.googlesource.com/webm/libvpx -PKG_MIRROR_HASH:=2f4d342e8efe566449dc5b2211dac22df81ec28792804b34d47c7dadf5c8a136 +PKG_MIRROR_HASH:=495e1f6d389d1c3b613a97927df7750aa499c649fd11eec6e1c9dcf5f403f134 PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_MAINTAINER:=Luiz Angelo Daros de Luca From 54d36ebb70e85659794cc01e715ecc1f039fbe5d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 4 Nov 2022 21:30:29 -0700 Subject: [PATCH 153/241] libvpx: update to 1.12.0 Signed-off-by: Rosen Penev --- libs/libvpx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libvpx/Makefile b/libs/libvpx/Makefile index 03164af2..743ccadc 100644 --- a/libs/libvpx/Makefile +++ b/libs/libvpx/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libvpx -PKG_VERSION:=1.11.0 +PKG_VERSION:=1.12.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://chromium.googlesource.com/webm/libvpx -PKG_MIRROR_HASH:=495e1f6d389d1c3b613a97927df7750aa499c649fd11eec6e1c9dcf5f403f134 +PKG_MIRROR_HASH:=19d9bd55198f063875cc72bdfa5eb9fa7cc1ae8af33979f807d2c82b66349933 PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_MAINTAINER:=Luiz Angelo Daros de Luca From e6f02bdf6b0a57a716e3ddbd4edf51f03e1905cf Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Tue, 3 Aug 2021 15:25:00 +0000 Subject: [PATCH 154/241] libwebsockets: Bump to 4.2.1 Changelog at: https://libwebsockets.org/git/libwebsockets/tree/changelog?id=8a580b59b23d204ca72028370e97a8f6aa0c9202 Signed-off-by: Karl Palsson --- libs/libwebsockets/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 365e5412..fdfc3e55 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets -PKG_VERSION:=4.1.6 +PKG_VERSION:=4.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=402e9a8df553c9cd2aff5d7a9758e9e5285bf3070c82539082864633db3deb83 +PKG_HASH:=842da21f73ccba2be59e680de10a8cce7928313048750eb6ad73b6fa50763c51 PKG_SOURCE_VERSION:=v$(PKG_VERSION) From cffeaffb43fe6c7181741d35f20e2f8c3797de23 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Tue, 3 Aug 2021 15:26:26 +0000 Subject: [PATCH 155/241] libwebsockets: enable built in uloop support uloop is always available on OpenWrt, so build in LWS's uloop support by default. Size difference of .ipk is 683 bytes, or about 0.5%. No known applications use this at present, but it seems better to proactively offer it. Signed-off-by: Karl Palsson --- libs/libwebsockets/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index fdfc3e55..df1f0a4d 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -29,6 +29,7 @@ include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += -DLWS_IPV6=$(if $(CONFIG_IPV6),ON,OFF) CMAKE_OPTIONS += -DISABLE_WERROR=ON CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release +CMAKE_OPTIONS += -DLWS_WITH_ULOOP=ON # turn off all test apps CMAKE_OPTIONS += -DLWS_WITHOUT_TESTAPPS=ON From d948be2c5f2279626454d0943d80044fc4b20431 Mon Sep 17 00:00:00 2001 From: Ronny Kotzschmar Date: Wed, 18 Aug 2021 19:08:29 +0200 Subject: [PATCH 156/241] libwebsockets: avoid a compilation error due to a missing uloop With a clean build environment and at least two parallel jobs a compilation error may occur: ... -- Looking for uv/version.h - found libubox include dir: ULOOP_INCLUDE_DIRS-NOTFOUND libubox libraries: ULOOP_LIBRARIES-NOTFOUND ... CMake Error in lib/event-libs/uloop/CMakeLists.txt: Found relative path while evaluating include directories of "websockets-evlib_uloop": "ULOOP_INCLUDE_DIRS-NOTFOUND" ... Signed-off-by: Ronny Kotzschmar --- libs/libwebsockets/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index df1f0a4d..46460566 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -21,6 +21,8 @@ PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_DEPENDS:=libubox + CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk From bf47c2a1a23ab83a527d791d50957526182d1f30 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Wed, 25 Aug 2021 09:54:18 +0000 Subject: [PATCH 157/241] libwebsockets: enable external poll support This was removed and then re-added, but defaulted off upstream. It's still listed as "not recommended" but still absolutely essential for many apps for performance. Fixes: https://github.com/eclipse/mosquitto/issues/2284 Signed-off-by: Karl Palsson --- libs/libwebsockets/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 46460566..9c6f99f6 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -31,6 +31,7 @@ include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += -DLWS_IPV6=$(if $(CONFIG_IPV6),ON,OFF) CMAKE_OPTIONS += -DISABLE_WERROR=ON CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release +CMAKE_OPTIONS += -DLWS_WITH_EXTERNAL_POLL=ON CMAKE_OPTIONS += -DLWS_WITH_ULOOP=ON # turn off all test apps From 3aab10b8d2dfc3bd041d79dd1e410d0395c4795b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 29 Jan 2022 14:14:12 -0800 Subject: [PATCH 158/241] libwebsockets: fix compilation with newer GCC Errors on uninitialized variable. No idea why only on powerpc64. Signed-off-by: Rosen Penev --- libs/libwebsockets/Makefile | 2 +- libs/libwebsockets/patches/010-uninit.patch | 23 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 libs/libwebsockets/patches/010-uninit.patch diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 9c6f99f6..f4372799 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets PKG_VERSION:=4.2.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) diff --git a/libs/libwebsockets/patches/010-uninit.patch b/libs/libwebsockets/patches/010-uninit.patch new file mode 100644 index 00000000..7895bf60 --- /dev/null +++ b/libs/libwebsockets/patches/010-uninit.patch @@ -0,0 +1,23 @@ +From 1f9925b44379941065690f0dce8ca0c79414b9f1 Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Tue, 1 Feb 2022 09:13:11 +0000 +Subject: [PATCH] genec: show correct nid when not allowed + +As noticed by gcc11 warning + +https://github.com/warmcat/libwebsockets/pull/2551 +--- + lib/tls/lws-genec-common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/lib/tls/lws-genec-common.c ++++ b/lib/tls/lws-genec-common.c +@@ -94,7 +94,7 @@ lws_genec_confirm_curve_allowed_by_tls_i + } + } while (e > 0); + +- lwsl_err("%s: unsupported curve group nid %d\n", __func__, n); ++ lwsl_err("%s: unsupported curve group nid %d\n", __func__, id); + + return -1; + } From 1f0029fd9bc2c81469bcb538ea0d48f43bbae224 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 8 Jun 2022 18:12:08 -0700 Subject: [PATCH 159/241] libwebsockets: fix compilation with GCC12 Upstream backport. Signed-off-by: Rosen Penev --- libs/libwebsockets/Makefile | 2 +- libs/libwebsockets/patches/020-gcc12.patch | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 libs/libwebsockets/patches/020-gcc12.patch diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index f4372799..29c43ce9 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets PKG_VERSION:=4.2.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) diff --git a/libs/libwebsockets/patches/020-gcc12.patch b/libs/libwebsockets/patches/020-gcc12.patch new file mode 100644 index 00000000..ee6dfe5a --- /dev/null +++ b/libs/libwebsockets/patches/020-gcc12.patch @@ -0,0 +1,21 @@ +From 6352fee2194a41179a808e9e2b805e0f5c86f8cf Mon Sep 17 00:00:00 2001 +From: Andy Green +Date: Sun, 16 Jan 2022 06:49:38 +0000 +Subject: [PATCH] sort-dns: fix scope comparison + +https://github.com/warmcat/libwebsockets/issues/2537 +--- + lib/core-net/client/sort-dns.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/lib/core-net/client/sort-dns.c ++++ b/lib/core-net/client/sort-dns.c +@@ -406,7 +406,7 @@ lws_sort_dns_dcomp(const lws_dns_sort_t + */ + + scopea = lws_ipv6_unicast_scope(to_v6_sa(&da->dest)); +- scopeb = lws_ipv6_unicast_scope(to_v6_sa(&db)); ++ scopeb = lws_ipv6_unicast_scope(to_v6_sa(&db->dest)); + scope_srca = lws_ipv6_unicast_scope(to_v6_sa(&da->source)); + scope_srcb = lws_ipv6_unicast_scope(to_v6_sa(&db->source)); + From 26e7851f3dfe2dfc7138764f55767824a126b890 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Fri, 23 Sep 2022 12:15:56 +0000 Subject: [PATCH 160/241] libs/libwebsockets: Update to 4.3.x Changes since 4.2 are extensive, as always. https://libwebsockets.org/git/libwebsockets/tree/changelog?h=v4.3-stable#n4 Eg, Adds CBOR, support for reduced memory CA verification, cookie jars, mqtt client gains qos2, mbedtls v3, fault injection apis, better support for event loops. Signed-off-by: Karl Palsson --- libs/libwebsockets/Makefile | 6 +++--- libs/libwebsockets/patches/010-uninit.patch | 23 --------------------- libs/libwebsockets/patches/020-gcc12.patch | 21 ------------------- 3 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 libs/libwebsockets/patches/010-uninit.patch delete mode 100644 libs/libwebsockets/patches/020-gcc12.patch diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 29c43ce9..22eb9aa7 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets -PKG_VERSION:=4.2.1 -PKG_RELEASE:=3 +PKG_VERSION:=4.3.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=842da21f73ccba2be59e680de10a8cce7928313048750eb6ad73b6fa50763c51 +PKG_HASH:=6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1 PKG_SOURCE_VERSION:=v$(PKG_VERSION) diff --git a/libs/libwebsockets/patches/010-uninit.patch b/libs/libwebsockets/patches/010-uninit.patch deleted file mode 100644 index 7895bf60..00000000 --- a/libs/libwebsockets/patches/010-uninit.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1f9925b44379941065690f0dce8ca0c79414b9f1 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Tue, 1 Feb 2022 09:13:11 +0000 -Subject: [PATCH] genec: show correct nid when not allowed - -As noticed by gcc11 warning - -https://github.com/warmcat/libwebsockets/pull/2551 ---- - lib/tls/lws-genec-common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/lib/tls/lws-genec-common.c -+++ b/lib/tls/lws-genec-common.c -@@ -94,7 +94,7 @@ lws_genec_confirm_curve_allowed_by_tls_i - } - } while (e > 0); - -- lwsl_err("%s: unsupported curve group nid %d\n", __func__, n); -+ lwsl_err("%s: unsupported curve group nid %d\n", __func__, id); - - return -1; - } diff --git a/libs/libwebsockets/patches/020-gcc12.patch b/libs/libwebsockets/patches/020-gcc12.patch deleted file mode 100644 index ee6dfe5a..00000000 --- a/libs/libwebsockets/patches/020-gcc12.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 6352fee2194a41179a808e9e2b805e0f5c86f8cf Mon Sep 17 00:00:00 2001 -From: Andy Green -Date: Sun, 16 Jan 2022 06:49:38 +0000 -Subject: [PATCH] sort-dns: fix scope comparison - -https://github.com/warmcat/libwebsockets/issues/2537 ---- - lib/core-net/client/sort-dns.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/lib/core-net/client/sort-dns.c -+++ b/lib/core-net/client/sort-dns.c -@@ -406,7 +406,7 @@ lws_sort_dns_dcomp(const lws_dns_sort_t - */ - - scopea = lws_ipv6_unicast_scope(to_v6_sa(&da->dest)); -- scopeb = lws_ipv6_unicast_scope(to_v6_sa(&db)); -+ scopeb = lws_ipv6_unicast_scope(to_v6_sa(&db->dest)); - scope_srca = lws_ipv6_unicast_scope(to_v6_sa(&da->source)); - scope_srcb = lws_ipv6_unicast_scope(to_v6_sa(&db->source)); - From 4daa659e2ac5164aef33db3bee16f8900efef186 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Tue, 25 Oct 2022 07:52:15 +0200 Subject: [PATCH 161/241] libwebsockets: full variant provides OpenSSL For some time, it is not possible to install ttyd and mosquitto-ssl at the same time, so let's solve it that libwebsockets-full provides libwebsockets-openssl. This allows to install ttyd and mosquitto at the same time. Also, we need to add conflict, because we should not have installed libwebsockets-openssl and libwebsockets-full at the same time as they provides the same files. Signed-off-by: Josef Schlehofer --- libs/libwebsockets/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 22eb9aa7..49a4381f 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -56,6 +56,7 @@ define Package/libwebsockets-openssl TITLE += (OpenSSL) DEPENDS += +libopenssl VARIANT:=openssl + CONFLICTS:=libwebsockets-full endef define Package/libwebsockets-mbedtls @@ -70,6 +71,7 @@ define Package/libwebsockets-full TITLE += (Full - OpenSSL, libuv, plugins, CGI) DEPENDS += +libopenssl +libuv VARIANT:=full + PROVIDES:=libwebsockets-openssl endef ifeq ($(BUILD_VARIANT),openssl) From 7bec67e60005f3b894512c981fc8495a9fde1bce Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Tue, 25 Oct 2022 12:14:25 +0200 Subject: [PATCH 162/241] libwebsockets: OpenSSL and mbedTLS variants should conflict They provide the same files, but they don't conflict to each other, this means that users can install them side by side. Signed-off-by: Josef Schlehofer --- libs/libwebsockets/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 49a4381f..617523a2 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -64,6 +64,7 @@ define Package/libwebsockets-mbedtls TITLE += (mbedTLS) DEPENDS += +libmbedtls VARIANT:=mbedtls + CONFLICTS:=libwebsockets-openssl endef define Package/libwebsockets-full From e6d17c224bf5b3ff7e144b01f0f0da149a5256a6 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Wed, 26 Oct 2022 09:12:38 +0200 Subject: [PATCH 163/241] libwebsockets: fix recursive dependency While running `make menuconfig`, it was discovered then there is a recursive dependency like this: tmp/.config-package.in:59138:error: recursive dependency detected! tmp/.config-package.in:59138: symbol PACKAGE_libwebsockets-openssl is selected by PACKAGE_libwebsockets-mbedtls tmp/.config-package.in:59122: symbol PACKAGE_libwebsockets-mbedtls depends on PACKAGE_libwebsockets-openssl It is not possible with the recently added conflicts that two packages (OpenSSL and full variant, which uses OpenSSL as well), which are almost the same provides the same named package libwebsockets as their conflict - Mbed TLS. Fixes: 676c5c72b5eeb583da2603e399fac085fa442c59 ("libwebsockets: OpenSSL and mbedTLS variants should conflict") Signed-off-by: Josef Schlehofer --- libs/libwebsockets/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 617523a2..2920cb03 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -48,7 +48,6 @@ define Package/libwebsockets/Default DEPENDS:=+zlib +libcap URL:=https://libwebsockets.org MAINTAINER:=Karl Palsson - PROVIDES:= libwebsockets endef define Package/libwebsockets-openssl @@ -64,6 +63,7 @@ define Package/libwebsockets-mbedtls TITLE += (mbedTLS) DEPENDS += +libmbedtls VARIANT:=mbedtls + PROVIDES:=libwebsockets CONFLICTS:=libwebsockets-openssl endef @@ -72,7 +72,7 @@ define Package/libwebsockets-full TITLE += (Full - OpenSSL, libuv, plugins, CGI) DEPENDS += +libopenssl +libuv VARIANT:=full - PROVIDES:=libwebsockets-openssl + PROVIDES:=libwebsockets libwebsockets-openssl endef ifeq ($(BUILD_VARIANT),openssl) From 1da38350d8c1c0a580765c82722795398740621a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 8 Jul 2022 22:35:36 -0700 Subject: [PATCH 164/241] libxcrypt: update to 4.4.28 Build position independent to fix compilation. Signed-off-by: Rosen Penev --- libs/libxcrypt/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/libxcrypt/Makefile b/libs/libxcrypt/Makefile index 3f75b3df..fb1bc3c9 100644 --- a/libs/libxcrypt/Makefile +++ b/libs/libxcrypt/Makefile @@ -1,18 +1,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxcrypt -PKG_VERSION:=4.4.17 -PKG_RELEASE:=1 +PKG_VERSION:=4.4.28 +PKG_RELEASE:=$(AUTORELEASE) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/besser82/libxcrypt/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=7665168d0409574a03f7b484682e68334764c29c21ca5df438955a381384ca07 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://github.com/besser82/libxcrypt/releases/download/v$(PKG_VERSION) +PKG_HASH:=9e936811f9fad11dbca33ca19bd97c55c52eb3ca15901f27ade046cc79e69e87 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING.LIB -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 @@ -41,7 +40,8 @@ CONFIGURE_ARGS += \ --disable-failure-tokens \ --disable-xcrypt-compat-files \ --disable-obsolete-api \ - --enable-hashes=solaris + --enable-hashes=solaris \ + --with-pic define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include From 4986fd24716a13f35c37ceb0755194d01a85bfe6 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 6 Nov 2022 11:54:50 -0800 Subject: [PATCH 165/241] libxerces-c: update to 3.2.4 Signed-off-by: Rosen Penev --- libs/libxerces-c/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libxerces-c/Makefile b/libs/libxerces-c/Makefile index f32707b0..176b7d26 100644 --- a/libs/libxerces-c/Makefile +++ b/libs/libxerces-c/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xerces-c -PKG_VERSION:=3.2.3 -PKG_RELEASE:=3 +PKG_VERSION:=3.2.4 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@APACHE/xerces/c/3/sources -PKG_HASH:=12fc99a9fc1d1a79bd0e927b8b5637a576d6656f45b0d5e70ee3694d379cc149 +PKG_HASH:=075bc57940da0f9be6dd183c550c8ce0b9833e4550dc382048377a1a5e3b2bd9 PKG_MAINTAINER:=Álvaro Fernández Rojas PKG_LICENSE:=Apache-2.0 From 55e6f1573432dac83bcff0adda34d26e8f39fe7d Mon Sep 17 00:00:00 2001 From: Alin Nastac Date: Thu, 14 Jul 2022 13:20:07 +0200 Subject: [PATCH 166/241] libxml2: add libiconv path to pkg-config file Needed for applications that use libxml-2.0.pc Libs.private params to link with -liconv library. Signed-off-by: Alin Nastac --- libs/libxml2/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index 018134c9..c4bb78e4 100644 --- a/libs/libxml2/Makefile +++ b/libs/libxml2/Makefile @@ -98,6 +98,7 @@ CONFIGURE_ARGS += \ --with-xpath \ --with-xptr \ --with-zlib=$(STAGING_DIR)/usr \ + --with-iconv$(if $(ICONV_PREFIX),="$(ICONV_PREFIX)") \ --without-lzma HOST_CONFIGURE_ARGS += \ From c1ee6f757089e015945c68807c9365464bcbfd66 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sun, 16 Oct 2022 19:57:59 +0200 Subject: [PATCH 167/241] libxml2: update to 2.10.3 This fixes: - CVE-2022-40303 - CVE-2022-40304 Signed-off-by: Michael Heimpold --- libs/libxml2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index c4bb78e4..76f93052 100644 --- a/libs/libxml2/Makefile +++ b/libs/libxml2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxml2 -PKG_VERSION:=2.10.2 +PKG_VERSION:=2.10.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/libxml2/$(basename $(PKG_VERSION)) -PKG_HASH:=d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265 +PKG_HASH:=5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING From 83ebd11e486588abb94c40cce638558c0b0db4bf Mon Sep 17 00:00:00 2001 From: Maxim Anisimov Date: Tue, 3 Aug 2021 17:43:31 +0300 Subject: [PATCH 168/241] libxslt: fix compilation because of wrong libxml2 check in configure script More details: https://github.com/GNOME/libxslt/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Signed-off-by: Maxim Anisimov --- libs/libxslt/patches/010-fix-xml2-config-check.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 libs/libxslt/patches/010-fix-xml2-config-check.patch diff --git a/libs/libxslt/patches/010-fix-xml2-config-check.patch b/libs/libxslt/patches/010-fix-xml2-config-check.patch new file mode 100644 index 00000000..657705e9 --- /dev/null +++ b/libs/libxslt/patches/010-fix-xml2-config-check.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -546,7 +546,7 @@ dnl make sure xml2-config is executable, + dnl test version and init our variables + dnl + +-if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 ++if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 + then + AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) + XMLVERS=`$XML_CONFIG --version` From d268e7c6fed4fc5d6d7da3e0698ce77760c25a4f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 20 Jul 2021 20:12:45 -0700 Subject: [PATCH 169/241] libyaml-cpp: update to 0.7.0 Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev --- libs/libyaml-cpp/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/libyaml-cpp/Makefile b/libs/libyaml-cpp/Makefile index e50f6d70..829ec7dd 100644 --- a/libs/libyaml-cpp/Makefile +++ b/libs/libyaml-cpp/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libyaml-cpp -PKG_VERSION:=0.6.3 -PKG_RELEASE:=2 +PKG_VERSION:=0.7.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=yaml-cpp-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jbeder/yaml-cpp/tar.gz/yaml-cpp-$(PKG_VERSION)? -PKG_HASH:=77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed +PKG_HASH:=43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3 PKG_BUILD_DIR:=$(BUILD_DIR)/yaml-cpp-yaml-cpp-$(PKG_VERSION) PKG_MAINTAINER:= Steven Hessing @@ -32,7 +32,7 @@ define Package/libyaml-cpp TITLE:=libyaml-cpp URL:=https://github.com/jbeder/yaml-cpp DEPENDS:=+libstdcpp - ABI_VERSION:=0.6 + ABI_VERSION:=0.7 endef define Package/libyaml-cpp/description From b2124f4f0752128a3405dc74385bb6ecb89d2bec Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Mon, 21 Jun 2021 23:00:09 +0200 Subject: [PATCH 170/241] libzip: update to 1.8.0 Disable (new) support for zstd (Zstandard) compression for now. Signed-off-by: Michael Heimpold --- libs/libzip/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile index 818f64cc..faaec423 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libzip -PKG_VERSION:=1.7.3 +PKG_VERSION:=1.8.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://libzip.org/download/ -PKG_HASH:=a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132 +PKG_HASH:=f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e PKG_MAINTAINER:=Michael Heimpold @@ -101,6 +101,7 @@ endif CMAKE_OPTIONS += -DENABLE_BZIP2=OFF CMAKE_OPTIONS += -DENABLE_LZMA=OFF +CMAKE_OPTIONS += -DENABLE_ZSTD=OFF CMAKE_OPTIONS += -DBUILD_REGRESS=OFF CMAKE_OPTIONS += -DBUILD_EXAMPLES=OFF CMAKE_OPTIONS += -DBUILD_DOC=OFF From 775a568d27f8ec150f4f1466079f70a1505cb397 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Mon, 28 Jun 2021 22:09:01 +0200 Subject: [PATCH 171/241] libzip: fix pkgconfig paths (fixes #15943) We should use upstream patch here, which can be removed later, instead of maintaining our own one. Reported-by: Rosen Penev Signed-off-by: Michael Heimpold --- libs/libzip/Makefile | 2 +- ...ng-relative-paths-in-pkg-config-file.patch | 52 +++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile index faaec423..15c39548 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libzip PKG_VERSION:=1.8.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://libzip.org/download/ diff --git a/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch b/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch new file mode 100644 index 00000000..b6d69020 --- /dev/null +++ b/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch @@ -0,0 +1,52 @@ +From c4af9182efd9cbb127bb43486b55d9ddf4a521ca Mon Sep 17 00:00:00 2001 +From: Thomas Klausner +Date: Mon, 28 Jun 2021 11:52:15 +0200 +Subject: [PATCH] Try having relative paths in pkg-config file. + +Addresses #248 +--- + CMakeLists.txt | 11 ++++++----- + libzip.pc.in | 7 +++---- + 2 files changed, 9 insertions(+), 9 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -281,11 +281,12 @@ endif() + + + # pkgconfig file +-set(prefix ${CMAKE_INSTALL_PREFIX}) +-set(exec_prefix \${prefix}) +-SET(bindir ${CMAKE_INSTALL_FULL_BINDIR}) +-SET(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) +-SET(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) ++file(RELATIVE_PATH pc_relative_bindir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_BINDIR}) ++set(bindir "\${prefix}/${pc_relative_bindir}") ++file(RELATIVE_PATH pc_relative_libdir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR}) ++set(libdir "\${prefix)/${pc_relative_libdir}") ++file(RELATIVE_PATH pc_relative_includedir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR}) ++set(includedir "\${prefix}/${pc_relative_includedir}") + if(CMAKE_SYSTEM_NAME MATCHES BSD) + set(PKG_CONFIG_RPATH "-Wl,-R\${libdir}") + endif(CMAKE_SYSTEM_NAME MATCHES BSD) +--- a/libzip.pc.in ++++ b/libzip.pc.in +@@ -1,10 +1,10 @@ +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} + bindir=@bindir@ + libdir=@libdir@ + includedir=@includedir@ + +-zipcmp=@bindir@/zipcmp ++zipcmp=${bindir}/zipcmp + + Name: libzip + Description: library for handling zip archives +@@ -12,4 +12,3 @@ Version: @PROJECT_VERSION@ + Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip + Libs.private: @LIBS@ + Cflags: -I${includedir} +- From fa6f0c82d973ef1660bccf9af24bbe951352c7e6 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Fri, 2 Jul 2021 23:55:45 +0200 Subject: [PATCH 172/241] libzip: fix typo in patch (fixes #15992) This prevented expansion of libdir in pkgconfig. Signed-off-by: Michael Heimpold --- libs/libzip/Makefile | 2 +- .../0001-Try-having-relative-paths-in-pkg-config-file.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile index 15c39548..6d3f04a2 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libzip PKG_VERSION:=1.8.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://libzip.org/download/ diff --git a/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch b/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch index b6d69020..e49b6ab8 100644 --- a/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch +++ b/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch @@ -23,7 +23,7 @@ Addresses #248 +file(RELATIVE_PATH pc_relative_bindir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_BINDIR}) +set(bindir "\${prefix}/${pc_relative_bindir}") +file(RELATIVE_PATH pc_relative_libdir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR}) -+set(libdir "\${prefix)/${pc_relative_libdir}") ++set(libdir "\${prefix}/${pc_relative_libdir}") +file(RELATIVE_PATH pc_relative_includedir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR}) +set(includedir "\${prefix}/${pc_relative_includedir}") if(CMAKE_SYSTEM_NAME MATCHES BSD) From 0a1496f756e4278d02816bab033472b944291d0f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Sep 2021 21:31:03 -0700 Subject: [PATCH 173/241] libzip: fix compilation without SSL Linker error. No idea why. Signed-off-by: Rosen Penev --- libs/libzip/Makefile | 2 +- libs/libzip/patches/010-nossl.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 libs/libzip/patches/010-nossl.patch diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile index 6d3f04a2..6ea56214 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libzip PKG_VERSION:=1.8.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://libzip.org/download/ diff --git a/libs/libzip/patches/010-nossl.patch b/libs/libzip/patches/010-nossl.patch new file mode 100644 index 00000000..6a687521 --- /dev/null +++ b/libs/libzip/patches/010-nossl.patch @@ -0,0 +1,13 @@ +--- a/lib/zipint.h ++++ b/lib/zipint.h +@@ -180,8 +180,10 @@ zip_source_t *zip_source_pkware_decode(z + zip_source_t *zip_source_pkware_encode(zip_t *, zip_source_t *, zip_uint16_t, int, const char *); + int zip_source_remove(zip_source_t *); + zip_int64_t zip_source_supports(zip_source_t *src); ++#ifdef HAVE_CRYPTO + zip_source_t *zip_source_winzip_aes_decode(zip_t *, zip_source_t *, zip_uint16_t, int, const char *); + zip_source_t *zip_source_winzip_aes_encode(zip_t *, zip_source_t *, zip_uint16_t, int, const char *); ++#endif + zip_source_t *zip_source_buffer_with_attributes(zip_t *za, const void *data, zip_uint64_t len, int freep, zip_file_attributes_t *attributes); + zip_source_t *zip_source_buffer_with_attributes_create(const void *data, zip_uint64_t len, int freep, zip_file_attributes_t *attributes, zip_error_t *error); + From a51e6b22bf9f864c4a3edb939c68a9c892da6857 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Thu, 6 Oct 2022 21:06:05 +0200 Subject: [PATCH 174/241] libzip: update to 1.9.2 Also drop already mainlined patch. Signed-off-by: Michael Heimpold --- libs/libzip/Makefile | 6 +-- ...ng-relative-paths-in-pkg-config-file.patch | 52 ------------------- 2 files changed, 3 insertions(+), 55 deletions(-) delete mode 100644 libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile index 6ea56214..c4813872 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libzip -PKG_VERSION:=1.8.0 -PKG_RELEASE:=4 +PKG_VERSION:=1.9.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://libzip.org/download/ -PKG_HASH:=f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e +PKG_HASH:=c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937 PKG_MAINTAINER:=Michael Heimpold diff --git a/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch b/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch deleted file mode 100644 index e49b6ab8..00000000 --- a/libs/libzip/patches/0001-Try-having-relative-paths-in-pkg-config-file.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c4af9182efd9cbb127bb43486b55d9ddf4a521ca Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Mon, 28 Jun 2021 11:52:15 +0200 -Subject: [PATCH] Try having relative paths in pkg-config file. - -Addresses #248 ---- - CMakeLists.txt | 11 ++++++----- - libzip.pc.in | 7 +++---- - 2 files changed, 9 insertions(+), 9 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -281,11 +281,12 @@ endif() - - - # pkgconfig file --set(prefix ${CMAKE_INSTALL_PREFIX}) --set(exec_prefix \${prefix}) --SET(bindir ${CMAKE_INSTALL_FULL_BINDIR}) --SET(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) --SET(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) -+file(RELATIVE_PATH pc_relative_bindir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_BINDIR}) -+set(bindir "\${prefix}/${pc_relative_bindir}") -+file(RELATIVE_PATH pc_relative_libdir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR}) -+set(libdir "\${prefix}/${pc_relative_libdir}") -+file(RELATIVE_PATH pc_relative_includedir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR}) -+set(includedir "\${prefix}/${pc_relative_includedir}") - if(CMAKE_SYSTEM_NAME MATCHES BSD) - set(PKG_CONFIG_RPATH "-Wl,-R\${libdir}") - endif(CMAKE_SYSTEM_NAME MATCHES BSD) ---- a/libzip.pc.in -+++ b/libzip.pc.in -@@ -1,10 +1,10 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} - bindir=@bindir@ - libdir=@libdir@ - includedir=@includedir@ - --zipcmp=@bindir@/zipcmp -+zipcmp=${bindir}/zipcmp - - Name: libzip - Description: library for handling zip archives -@@ -12,4 +12,3 @@ Version: @PROJECT_VERSION@ - Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip - Libs.private: @LIBS@ - Cflags: -I${includedir} -- From c6c28a00b7519a51a995cd0638076477da878170 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 28 Oct 2021 17:30:16 -0700 Subject: [PATCH 175/241] lib4cplus: update to 2.0.7 Switch to static lib. Avoids rpath hacks. Signed-off-by: Rosen Penev --- libs/log4cplus/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/log4cplus/Makefile b/libs/log4cplus/Makefile index dcdd9f3e..ba03d9c0 100644 --- a/libs/log4cplus/Makefile +++ b/libs/log4cplus/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=log4cplus -PKG_VERSION:=2.0.6 +PKG_VERSION:=2.0.7 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=73519a5e47c40cf375aa6cd28a703b01908b5dcd3f4cb4290db2fef237c8180c +PKG_HASH:=8f74a0a5920ba044b24e2ebeb0f1e5e36d85d5c23ed48d9fe328882b16130db8 PKG_MAINTAINER:=BangLang Huang , Rosy Song PKG_LICENSE:=BSD-2-Clause Apache-2.0 @@ -43,11 +43,12 @@ endef OPTIONS:= \ -DLOG4CPLUS_BUILD_LOGGINGSERVER:BOOL=OFF \ -DLOG4CPLUS_BUILD_TESTING:BOOL=OFF \ + -DLOG4CPLUS_ENABLE_DECORATED_LIBRARY_NAME:BOOL=OFF \ -DUNICODE:BOOL=OFF \ -DWITH_ICONV:BOOL=OFF -CMAKE_HOST_OPTIONS += $(OPTIONS) -CMAKE_OPTIONS += $(OPTIONS) +CMAKE_HOST_OPTIONS += $(OPTIONS) -DBUILD_SHARED_LIBS=OFF +CMAKE_OPTIONS += $(OPTIONS) -DBUILD_SHARED_LIBS=ON TARGET_CFLAGS += -flto TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed From 08b721a28a008a2a4d3a1414f4f0cbc80275c2bb Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 4 Nov 2022 21:30:45 -0700 Subject: [PATCH 176/241] log4cplus: update to 2.0.8 Signed-off-by: Rosen Penev --- libs/log4cplus/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/log4cplus/Makefile b/libs/log4cplus/Makefile index ba03d9c0..accfeb5f 100644 --- a/libs/log4cplus/Makefile +++ b/libs/log4cplus/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=log4cplus -PKG_VERSION:=2.0.7 +PKG_VERSION:=2.0.8 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=8f74a0a5920ba044b24e2ebeb0f1e5e36d85d5c23ed48d9fe328882b16130db8 +PKG_HASH:=f5949e713cf8635fc554384ab99b04716e3430f28eed6dd7d71ad03d959b91a0 PKG_MAINTAINER:=BangLang Huang , Rosy Song PKG_LICENSE:=BSD-2-Clause Apache-2.0 From d82d5b4f8e5783bcd6b36c4c4217645d6d85dec5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 24 Jun 2021 01:11:27 -0700 Subject: [PATCH 177/241] msgpack-c: don't check for GTest Not available with OpenWrt. Fixes compilation when host GTest is present. Signed-off-by: Rosen Penev --- libs/msgpack-c/patches/010-no-gtest.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 libs/msgpack-c/patches/010-no-gtest.patch diff --git a/libs/msgpack-c/patches/010-no-gtest.patch b/libs/msgpack-c/patches/010-no-gtest.patch new file mode 100644 index 00000000..f9807e36 --- /dev/null +++ b/libs/msgpack-c/patches/010-no-gtest.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,7 +148,6 @@ FOREACH (F ${PREPROCESSOR_FILES}) + FILE (GENERATE OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/${F} CONTENT ${CONTENT}) + ENDFOREACH () + +-FIND_PACKAGE (GTest) + FIND_PACKAGE (ZLIB) + FIND_PACKAGE (Threads) + IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND AND NOT "${MSGPACK_FUZZ_REGRESSION}" STREQUAL "ON") From f0f0d03ee6f6f92191d23f9b692b51694d316614 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 12 Oct 2021 15:42:36 +0800 Subject: [PATCH 178/241] msgpack-c: Update to 4.0.0 - Fixed typo error in PKG_LICENSE_FILES. - Updated CMAKE_OPTIONS. - Refreshed the patch. Signed-off-by: Tianling Shen --- libs/msgpack-c/Makefile | 18 +++++++++++------- libs/msgpack-c/patches/010-no-gtest.patch | 8 ++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/libs/msgpack-c/Makefile b/libs/msgpack-c/Makefile index ab40fb36..c77fd1e2 100644 --- a/libs/msgpack-c/Makefile +++ b/libs/msgpack-c/Makefile @@ -5,16 +5,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=msgpack-c -PKG_VERSION:=3.3.0 +PKG_VERSION:=4.0.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/msgpack/msgpack-c/tar.gz/cpp-$(PKG_VERSION)? -PKG_HASH:=754c3ace499a63e45b77ef4bcab4ee602c2c414f58403bce826b76ffc2f77d0b -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-cpp-$(PKG_VERSION) +PKG_SOURCE_URL:=https://codeload.github.com/msgpack/msgpack-c/tar.gz/c-$(PKG_VERSION)? +PKG_HASH:=656ebe4566845e7bda9c097b625ba59ac72ddfd45df6017172d46d9ac7365aa3 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-c-$(PKG_VERSION) PKG_LICENSE:=BSL-1.0 -PKG_LICENSE_FILES:=LICENSE +PKG_LICENSE_FILES:=COPYING LICENSE_1_0.txt PKG_MAINTAINER:=Tianling Shen PKG_BUILD_PARALLEL:=1 @@ -23,12 +23,16 @@ CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -CMAKE_OPTIONS+= -DMSGPACK_BUILD_EXAMPLES:BOOL=OFF +CMAKE_OPTIONS+= \ + -DBUILD_SHARED_LIBS=ON \ + -DMSGPACK_BUILD_EXAMPLES=OFF \ + -DMSGPACK_BUILD_TESTS=OFF \ + -DMSGPACK_ENABLE_STATIC=OFF define Package/msgpack-c SECTION:=lib CATEGORY:=Libraries - TITLE:=MessagePack implementation for C and C++ + TITLE:=MessagePack implementation for C URL:=https://github.com/msgpack/msgpack-c endef diff --git a/libs/msgpack-c/patches/010-no-gtest.patch b/libs/msgpack-c/patches/010-no-gtest.patch index f9807e36..7bb4dbee 100644 --- a/libs/msgpack-c/patches/010-no-gtest.patch +++ b/libs/msgpack-c/patches/010-no-gtest.patch @@ -1,10 +1,10 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -148,7 +148,6 @@ FOREACH (F ${PREPROCESSOR_FILES}) - FILE (GENERATE OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/${F} CONTENT ${CONTENT}) - ENDFOREACH () +@@ -74,7 +74,6 @@ IF (MSGPACK_CHAR_SIGN) + SET (CMAKE_C_FLAGS "-f${MSGPACK_CHAR_SIGN}-char ${CMAKE_C_FLAGS}") + ENDIF () -FIND_PACKAGE (GTest) FIND_PACKAGE (ZLIB) FIND_PACKAGE (Threads) - IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND AND NOT "${MSGPACK_FUZZ_REGRESSION}" STREQUAL "ON") + IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND) From 4f618a2b7bbee01015c604a2f2224a6832fe8199 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 30 Jan 2022 22:51:22 -0800 Subject: [PATCH 179/241] mtdev: fix bad printf formats Easiest to just change the type. Signed-off-by: Rosen Penev --- libs/mtdev/Makefile | 2 +- libs/mtdev/patches/010-format.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 libs/mtdev/patches/010-format.patch diff --git a/libs/mtdev/Makefile b/libs/mtdev/Makefile index 60504102..3d49227c 100644 --- a/libs/mtdev/Makefile +++ b/libs/mtdev/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtdev PKG_VERSION:=1.1.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://bitmath.org/code/mtdev/ diff --git a/libs/mtdev/patches/010-format.patch b/libs/mtdev/patches/010-format.patch new file mode 100644 index 00000000..c456c4b8 --- /dev/null +++ b/libs/mtdev/patches/010-format.patch @@ -0,0 +1,11 @@ +--- a/test/mtdev-test.c ++++ b/test/mtdev-test.c +@@ -38,7 +38,7 @@ + #endif + + /* year-proof millisecond event time */ +-typedef uint64_t mstime_t; ++typedef unsigned long long mstime_t; + + static int use_event(const struct input_event *ev) + { From 1c5f3a45d145b149cd2f8945bfba47dc80f4a7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Espen=20J=C3=BCrgensen?= Date: Sun, 14 Nov 2021 23:05:35 +0100 Subject: [PATCH 180/241] mxml: update to 3.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Espen Jürgensen --- libs/mxml/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/mxml/Makefile b/libs/mxml/Makefile index 8a5cac5b..56e917e8 100644 --- a/libs/mxml/Makefile +++ b/libs/mxml/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mxml -PKG_VERSION:=3.2 +PKG_VERSION:=3.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/michaelrsweet/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=b894f6c64964f2e77902564c17ba00f5d077a7a24054e7c1937903b0bd42c974 +PKG_HASH:=7cf976366f9e8e4f8cff7d35a59bcf6201c769fce9e58015d64f4b6de1fe3dd8 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_FIXUP:=autoreconf From 067d8989cb642443a21761e78bfedf19a811d482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Espen=20J=C3=BCrgensen?= Date: Fri, 5 Aug 2022 12:46:11 +0200 Subject: [PATCH 181/241] mxml: update to 3.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Espen Jürgensen --- libs/mxml/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/mxml/Makefile b/libs/mxml/Makefile index 56e917e8..f67a1677 100644 --- a/libs/mxml/Makefile +++ b/libs/mxml/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mxml -PKG_VERSION:=3.3 +PKG_VERSION:=3.3.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/michaelrsweet/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=7cf976366f9e8e4f8cff7d35a59bcf6201c769fce9e58015d64f4b6de1fe3dd8 +PKG_HASH:=0c663ed1fe393b5619f80101798202eea43534abd7c8aff389022fd8c1dacc32 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_FIXUP:=autoreconf From 1e4f4ac017880fe3d6060b1a6a20f82eb4fba731 Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Sun, 9 Jan 2022 23:37:45 +0300 Subject: [PATCH 182/241] neon: fix build on macos neon detects Darwin on target build and fails due to darwin-specific build behaviour. OS detection is disable (as non required) via ne_cv_os_uname=Linux as a part of CONFIGURE_VARS Signed-off-by: Sergey V. Lobanov --- libs/neon/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/neon/Makefile b/libs/neon/Makefile index 281506c9..5d054d9f 100644 --- a/libs/neon/Makefile +++ b/libs/neon/Makefile @@ -47,6 +47,9 @@ define Package/libneon/description - WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify property manipulation. endef +CONFIGURE_VARS += \ + ne_cv_os_uname="Linux" + CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ From caef30c4cf53cff395901d1ef60069e173e4afb7 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Sun, 8 Aug 2021 21:38:24 +0200 Subject: [PATCH 183/241] nghttp2: update to 1.44 368014b8 Bump version number to v1.44.0, LT revision to 34:2:20 fa16e66a nghttpx: Fix max distance in weight group/address cycle comparison 40af31da nghttpx: Set connect_blocker and live_check after shuffling addresses 9e6c0685 Fix build failure ebad3d47 Port new ngtcp2 map implementation d4fd0681 Bump llhttp to 6.0.2 43a47aa0 Do not return HPE_USER from where it is prohibited 20079b4c Update bash_completions 2aeec770 Update manual pages cef458c3 Replace black-list with block-list 617a5766 Replace master with main f1d67335 Initialize Config rps field 5f3bcb1f Add precious variables for libev and jemalloc and use JEMALLOC_CFLAGS b419bfd9 Remove unused field e406a2c1 Update doc 962a75c4 Merge pull request #1559 from nghttp2/h2load-rps 6cdc13d6 h2load: Add --rps option 92944f78 h2load: Allow unit in -D option 276792a8 Remove unnecessary function 579fa6ea Add more --with-* configure flags 2f2b2117 Add LIBTOOL_LDFLAGS configure variable 88a3cb51 Bump llhttp to 4.0.0 40679cf6 Merge pull request #1553 from nghttp2/nghttpx-fix-accesslog-method 5b587e85 Merge pull request #1550 from jktjkt/docs-asio-fix-typos 50a1121d nghttpx: Remove trailing white space after $method log variable 3239c5ef Bump up version number to v1.44.0-DEV Signed-off-by: Hans Dedecker --- libs/nghttp2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/nghttp2/Makefile b/libs/nghttp2/Makefile index eb5d1a79..ab4c1cd5 100644 --- a/libs/nghttp2/Makefile +++ b/libs/nghttp2/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nghttp2 -PKG_VERSION:=1.43.0 +PKG_VERSION:=1.44.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/nghttp2/nghttp2/releases/download/v$(PKG_VERSION) -PKG_HASH:=f7d54fa6f8aed29f695ca44612136fa2359013547394d5dffeffca9e01a26b0f +PKG_HASH:=5699473b29941e8dafed10de5c8cb37a3581edf62ba7d04b911ca247d4de3c5d PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=MIT From 52e05c999c454fd9539c27eb93aa1d33867ccb98 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Sat, 9 Oct 2021 22:59:26 -0300 Subject: [PATCH 184/241] oniguruma: bump to 6.9.7.1 Changelog: * NEW API: ONIG_OPTION_CALLBACK_EACH_MATCH * NEW API: ONIG_OPTION_IGNORECASE_IS_ASCII * NEW API: ONIG_SYNTAX_PYTHON * Fixed some problems found by OSS-Fuzz * fix: replace UChar to OnigUChar in oniguruma.h Signed-off-by: Eneas U de Queiroz --- libs/oniguruma/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/oniguruma/Makefile b/libs/oniguruma/Makefile index 4ff3a662..eb07af83 100644 --- a/libs/oniguruma/Makefile +++ b/libs/oniguruma/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oniguruma -PKG_VERSION:=6.9.6 +PKG_VERSION:=6.9.7.1 PKG_RELEASE:=1 PKG_SOURCE:=onig-v$(subst _,-,$(PKG_VERSION)).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/kkos/oniguruma/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=aec9f6902ad8b7bb53b2c55d04686ea75da89a06694836b0362cb206578dfe89 +PKG_HASH:=8f9a75b7d90dde0942c30a8b3c17889b2fecf190690988cc381c4e525cbbd22b PKG_MAINTAINER:=Eneas U de Queiroz PKG_LICENSE:=BSD-2-Clause From 846a8025cb5fb9ba98bbc299f36d6efce5f7f2d8 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 10 May 2022 14:49:57 -0500 Subject: [PATCH 185/241] openldap: update to 2.6.2 Signed-off-by: W. Michael Petullo --- libs/openldap/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index cdf254d5..8871d537 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openldap -PKG_VERSION:=2.6.0 +PKG_VERSION:=2.6.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-r http://mirror.eu.oneandone.net/software/openldap/openldap-release/ \ http://mirror.switch.ch/ftp/software/mirror/OpenLDAP/openldap-release/ \ https://www.openldap.org/software/download/OpenLDAP/openldap-release/ -PKG_HASH:=b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f +PKG_HASH:=81d09345232eb62486ecf5acacd2c56c0c45b4a6c8c066612e7f421a23a1cf87 PKG_LICENSE:=OLDAP-2.8 PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:openldap:openldap From 504d86b5cfe722d03c4b307f664edf0580ed96b8 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 20 May 2022 08:14:33 -0500 Subject: [PATCH 186/241] openldap: drop use of HTTP in favor of HTTPS Signed-off-by: W. Michael Petullo --- libs/openldap/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index 8871d537..89f35dfc 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -13,8 +13,7 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/ \ - http://mirror.eu.oneandone.net/software/openldap/openldap-release/ \ - http://mirror.switch.ch/ftp/software/mirror/OpenLDAP/openldap-release/ \ + https://mirror.eu.oneandone.net/software/openldap/openldap-release/ \ https://www.openldap.org/software/download/OpenLDAP/openldap-release/ PKG_HASH:=81d09345232eb62486ecf5acacd2c56c0c45b4a6c8c066612e7f421a23a1cf87 PKG_LICENSE:=OLDAP-2.8 @@ -44,7 +43,7 @@ define Package/libopenldap/Default CATEGORY:=Network SUBMENU:=OpenLDAP TITLE:=LDAP directory suite - URL:=http://www.openldap.org/ + URL:=https://www.openldap.org/ MAINTAINER:=W. Michael Petullo endef From 47157a1c559230ccb79def55ce2f610e71b06d16 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 19 Jul 2022 22:14:50 -0700 Subject: [PATCH 187/241] opusfile: add autoreconf Fixes compilation under some hosts. Added PKG_BUILD_PARALLEL for faster compilation. Some small cleanups for consistency between packages. Signed-off-by: Rosen Penev --- libs/opusfile/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/opusfile/Makefile b/libs/opusfile/Makefile index c3b650b6..f5eb84c3 100644 --- a/libs/opusfile/Makefile +++ b/libs/opusfile/Makefile @@ -7,16 +7,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=opusfile PKG_VERSION:=0.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.xiph.org/releases/opus/ PKG_HASH:=118d8601c12dd6a44f52423e68ca9083cc9f2bfe72da7a8c1acb22a80ae3550b + +PKG_MAINTAINER:=Eduardo Abinader PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=COPYING -PKG_MAINTAINER:=Eduardo Abinader +PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk From f7744774ebead037a2f32d686efacfc9598ef31d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 4 Oct 2021 21:40:19 -0700 Subject: [PATCH 188/241] p11-kit: update to 0.24.1 explicitly disable NLS It seems it's only used for man pages, which are unused. Signed-off-by: Rosen Penev --- libs/p11-kit/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/p11-kit/Makefile b/libs/p11-kit/Makefile index c902e6aa..2eccfe3f 100644 --- a/libs/p11-kit/Makefile +++ b/libs/p11-kit/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=p11-kit -PKG_VERSION:=0.24.0 +PKG_VERSION:=0.24.1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/p11-glue/p11-kit/releases/download/$(PKG_VERSION) -PKG_HASH:=81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685 +PKG_HASH:=d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8 PKG_MAINTAINER:=Nikos Mavrogiannopoulos PKG_LICENSE:=BSD-3-Clause @@ -45,7 +45,8 @@ MESON_ARGS += \ -Dstrict=false \ -Dsystemd=disabled \ -Dgtk_doc=false \ - -Dman=false + -Dman=false \ + -Dnls=false define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/p11-kit-1/p11-kit/ From afce95583e69ae72d5b83eb42defe9e1d19f9811 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 20 Jul 2021 20:20:50 -0700 Subject: [PATCH 189/241] pcre2: update to 10.37 Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev --- libs/pcre2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/pcre2/Makefile b/libs/pcre2/Makefile index 4d4ffb11..4e75a1cd 100644 --- a/libs/pcre2/Makefile +++ b/libs/pcre2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcre2 -PKG_VERSION:=10.36 -PKG_RELEASE:=1 +PKG_VERSION:=10.37 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/pcre/$(PKG_NAME)/$(PKG_VERSION) -PKG_HASH:=a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c +PKG_HASH:=4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270 PKG_MAINTAINER:=Shane Peelar PKG_LICENSE:=BSD-3-Clause From 19572cd7d8bf59ac80ae828fd5f3bba267bccb29 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 8 Jul 2022 22:19:09 -0700 Subject: [PATCH 190/241] pcre2: add zlib build dependency Otherwise the host zlib gets picked up. Signed-off-by: Rosen Penev --- libs/pcre2/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/pcre2/Makefile b/libs/pcre2/Makefile index 4e75a1cd..1bd6d275 100644 --- a/libs/pcre2/Makefile +++ b/libs/pcre2/Makefile @@ -25,6 +25,8 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_PACKAGE_libpcre2-32 \ CONFIG_PCRE2_JIT_ENABLED +PKG_BUILD_DEPENDS:=zlib + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk From ebd365ee713405bfad6993191a0f93781ed17ed7 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 7 Aug 2021 20:52:51 -0700 Subject: [PATCH 191/241] poco: update to 1.11.0 Refresh patches and fix strerror one. uClibc also defines __GLIBC__. Signed-off-by: Rosen Penev --- libs/poco/Makefile | 6 +++--- libs/poco/patches/100-configure.patch | 2 +- libs/poco/patches/200-strerror.patch | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/poco/Makefile b/libs/poco/Makefile index adb6fa18..1f431db0 100644 --- a/libs/poco/Makefile +++ b/libs/poco/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=poco -PKG_VERSION:=1.10.1 +PKG_VERSION:=1.11.0 PKG_RELEASE:=$(AUTORELEASE) ifeq ($(BUILD_VARIANT),all) _PKG_VERSION:=${PKG_VERSION}-all -PKG_HASH:=2cde4b50778013ab3b7a522aa59bccaa7e85a8ccfc654a354c4d9611b6ce1758 +PKG_HASH:=b08cf73926fa92a6c8f3c712e8fb217d5d0c2fa5248ec0281f251fe1e925d2f1 else _PKG_VERSION:=${PKG_VERSION} -PKG_HASH:=cdab379d7d0394a763821d058eee1e7d4d8214a3caec05c775b60962b2f20762 +PKG_HASH:=06ddc4934ff0a11be425d697f861c15b43b77b610e3642a2f85d0c34d7425ea4 endif PKG_SOURCE:=$(PKG_NAME)-$(_PKG_VERSION).tar.bz2 diff --git a/libs/poco/patches/100-configure.patch b/libs/poco/patches/100-configure.patch index 01ceb676..389acb6a 100644 --- a/libs/poco/patches/100-configure.patch +++ b/libs/poco/patches/100-configure.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -237,9 +237,9 @@ while [ $# -ge 1 ]; do +@@ -249,9 +249,9 @@ while [ $# -ge 1 ]; do ;; *) diff --git a/libs/poco/patches/200-strerror.patch b/libs/poco/patches/200-strerror.patch index 4c780b34..b1cb708e 100644 --- a/libs/poco/patches/200-strerror.patch +++ b/libs/poco/patches/200-strerror.patch @@ -5,7 +5,7 @@ #if (_XOPEN_SOURCE >= 600) || POCO_OS == POCO_OS_ANDROID || __APPLE__ setMessage(strerror_r(err, _buffer, sizeof(_buffer))); -#elif _GNU_SOURCE -+#elif (_GNU_SOURCE && (defined __GLIBC__ || defined __UCLIBC__)) ++#elif (defined(_GNU_SOURCE) && defined(__GLIBC__)) setMessage(strerror_r(err, _buffer, sizeof(_buffer))); #else setMessage(strerror(err)); From 5183f9a56a223c2f736f3951b5b75f322b678920 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 17 Oct 2021 18:57:46 -0700 Subject: [PATCH 192/241] poco: switch to building with cmake Faster and works with mips64 targets. Removed all options as the defaults are updated. Added new dependencies. Signed-off-by: Rosen Penev --- libs/poco/Makefile | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/libs/poco/Makefile b/libs/poco/Makefile index 1f431db0..d14ed96b 100644 --- a/libs/poco/Makefile +++ b/libs/poco/Makefile @@ -22,18 +22,15 @@ endif PKG_SOURCE:=$(PKG_NAME)-$(_PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://pocoproject.org/releases/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(_PKG_VERSION) PKG_MAINTAINER:=Jean-Michel Julien PKG_LICENSE:=BSL-1.0 PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:pocoproject:poco -PKG_BUILD_DEPENDS:=postgresql -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(_PKG_VERSION) - include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk define Package/poco SECTION:=libs @@ -55,7 +52,7 @@ define Package/poco-all SECTION:=libs CATEGORY:=Libraries TITLE+=(Complete Edition) - DEPENDS+=+libopenssl + DEPENDS+=+libopenssl +libmariadb +libpq +unixodbc VARIANT:=all endef @@ -66,34 +63,14 @@ define Package/poco-all/description all libraries. endef -CONFIGURE_ARGS += \ - --config=Linux \ - --no-tests \ - --no-samples \ - --no-fpenvironment \ - --no-sharedmemory \ - --no-wstring \ - --shared - -ifeq ($(BUILD_VARIANT),all) - CONFIGURE_ARGS += \ - --typical - POCO_LIBS={Foundation,XML,JSON,Net,Util,Crypto,NetSSL,Encodings} -else - CONFIGURE_ARGS += \ - --poquito \ - --minimal - POCO_LIBS={Foundation,XML,JSON,Net,Util} -endif - define Package/poco/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco*.so* $(1)/usr/lib/ endef define Package/poco-all/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco*.so* $(1)/usr/lib/ endef define Build/InstallDev @@ -101,7 +78,7 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/Poco $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco*.so* $(1)/usr/lib/ endef From f9ded54fe73527286d32eda2a871c13ca5a4b238 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 6 Jul 2021 23:07:56 +0200 Subject: [PATCH 193/241] postgresql: prevent addition of ARM target flag configure.in checks for "ARMv8 CRC32C intrinsics" and goes as far as adding "-march=armv8-a+crc" to the target flags if the compiler allows it. This can clash with the OpenWrt target flags in CONFIG_TARGET_OPTIMIZATION. If for example the latter is set to "-mcpu=cortex-a9" the following warning is issued: cc1: warning: switch '-mcpu=cortex-a9' conflicts with '-march=armv5t' switch This commit prevents configure.in from adding the mentioned flag. The addition is unwanted when cross-compiling. An issue was raised for this recently, see [1]. [1] https://github.com/openwrt/packages/issues/16034 Signed-off-by: Sebastian Kemper --- .../patches/700-no-arm-crc-march-change.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 libs/postgresql/patches/700-no-arm-crc-march-change.patch diff --git a/libs/postgresql/patches/700-no-arm-crc-march-change.patch b/libs/postgresql/patches/700-no-arm-crc-march-change.patch new file mode 100644 index 00000000..ec0b152f --- /dev/null +++ b/libs/postgresql/patches/700-no-arm-crc-march-change.patch @@ -0,0 +1,15 @@ +--- a/configure.in ++++ b/configure.in +@@ -2019,9 +2019,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ + # flags. If not, check if adding -march=armv8-a+crc flag helps. + # CFLAGS_ARMV8_CRC32C is set if the extra flag is required. + PGAC_ARMV8_CRC32C_INTRINSICS([]) +-if test x"$pgac_armv8_crc32c_intrinsics" != x"yes"; then +- PGAC_ARMV8_CRC32C_INTRINSICS([-march=armv8-a+crc]) +-fi ++#if test x"$pgac_armv8_crc32c_intrinsics" != x"yes"; then ++# PGAC_ARMV8_CRC32C_INTRINSICS([-march=armv8-a+crc]) ++#fi + AC_SUBST(CFLAGS_ARMV8_CRC32C) + + # Select CRC-32C implementation. From 94e7da7704e1d277906a952e96c8ecd9a82683f9 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 1 Aug 2021 04:08:17 +0100 Subject: [PATCH 194/241] postgresql: update to version 13.3 Signed-off-by: Daniel Golle --- libs/postgresql/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index b94fd520..dd40d884 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql -PKG_VERSION:=13.2 +PKG_VERSION:=13.3 PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=PostgreSQL @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=\ http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \ ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION) -PKG_HASH:=5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc +PKG_HASH:=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1 PKG_USE_MIPS16:=0 PKG_FIXUP:=autoreconf From 7c37753174fd5f43f89f22d754ceb1e8ba2282d2 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 11 Aug 2021 00:48:15 +0100 Subject: [PATCH 195/241] postgresql: improve init script Use newly introduced procd_add_restart_mount_trigger to make sure postmaster gets started only once PGDATA becomes available. Relocate socket directory to /var/lib/postgresql to make it possible to run postgresql inside a ujail. Use signal for shutdown, so it works nicely with jail. Allow multiple script in UCI 'config postgres-db' to be a list and run them in order listed. User more silent methods to check for db or role existence and make it easy to create several databases owned by the same user by passing the same credentials multiple times. Remove disfunctional reload handler. Signed-off-by: Daniel Golle --- libs/postgresql/Makefile | 2 +- libs/postgresql/files/postgresql.init | 33 ++++++++++---- libs/postgresql/files/postgresql.sh | 63 ++++++++++++++++----------- 3 files changed, 64 insertions(+), 34 deletions(-) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index dd40d884..eb19b93c 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -70,7 +70,7 @@ endef define Package/pgsql-server SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+pgsql-cli + DEPENDS:=+pgsql-cli +blockd TITLE:=PostgreSQL databases Server URL:=http://www.postgresql.org/ SUBMENU:=Database diff --git a/libs/postgresql/files/postgresql.init b/libs/postgresql/files/postgresql.init index 3d3dbadf..57613364 100644 --- a/libs/postgresql/files/postgresql.init +++ b/libs/postgresql/files/postgresql.init @@ -32,40 +32,57 @@ start_service() { user_exists postgres 5432 || user_add postgres 5432 group_exists postgres 5432 || group_add postgres 5432 + [ "$_BOOT" = "1" ] && + [ "$(procd_get_mountpoints $pgdata)" ] && return 0 + fix_perms fix_hosts - if [ ! -d "${pgdata}" ]; then + if [ ! -e "${pgdata}/PG_VERSION" ]; then pg_init_data ${pgdata} [ $? -gt 0 ] && return 1 fi cleanup "${pgdata}" - procd_open_instance + mkdir -m 0755 -p /var/run/postgresql + chmod 0750 /var/run/postgresql + chown postgres:postgres /var/run/postgresql + procd_open_instance postmaster procd_set_param user postgres procd_set_param command $PROG procd_append_param command -D "${pgdata}" + procd_append_param command -k "/var/run/postgresql" [ -n "${pgopts}" ] && procd_append_param command -o "${pgopts}" procd_set_param respawn retry=60 + procd_add_jail postgresql log + procd_add_jail_mount /usr/lib/postgresql /usr/share/postgresql + procd_add_jail_mount_rw /var/run/postgresql "${pgdata}" + procd_add_jail_mount_rw /dev/shm + procd_set_param stderr 1 + procd_set_param stdout 1 procd_close_instance - procd_open_instance + procd_open_instance uci_dbinit procd_set_param user postgres procd_set_param command /lib/functions/postgresql.sh init "${pgdata}" + procd_set_param stdout 1 + procd_set_param stderr 1 procd_close_instance } -reload_service() { +boot() { + _BOOT=1 start +} + +service_triggers() { config_load "postgresql" config_get pgdata config PGDATA - /usr/bin/pg_ctl reload -U postgres -D "${pgdata}" -s + procd_add_restart_mount_trigger "${pgdata}" } stop_service() { - config_load "postgresql" - config_get pgdata config PGDATA - /usr/bin/pg_ctl stop -U postgres -D "${pgdata}" -s + procd_send_signal "postgresql" postmaster SIGTERM } status_service() { diff --git a/libs/postgresql/files/postgresql.sh b/libs/postgresql/files/postgresql.sh index 8d4e377a..e1076d54 100644 --- a/libs/postgresql/files/postgresql.sh +++ b/libs/postgresql/files/postgresql.sh @@ -5,21 +5,21 @@ PSQL="/usr/bin/psql" free_megs() { fsdir=$1 while [ ! -d "$fsdir" ]; do - fsdir=$(dirname $fsdir) + fsdir="$(dirname "$fsdir")" done df -m $fsdir | while read fs bl us av cap mnt; do [ "$av" = "Available" ] || echo $av; done } pg_init_data() { # make sure we got at least 50MB of free space - [ $(free_megs $1) -lt 50 ] && return 1 - pg_ctl initdb -U postgres -D $1 + [ $(free_megs "$1") -lt 50 ] && return 1 + pg_ctl initdb -U postgres -D "$1" } pg_server_ready() { t=0 while [ $t -le 90 ]; do - pg_ctl status -U postgres -D $1 2>/dev/null >/dev/null && return 0 + psql -h /var/run/postgresql/ -U postgres -c "\q" 1>/dev/null 2>/dev/null && return 0 t=$((t+1)) sleep 1 done @@ -28,21 +28,19 @@ pg_server_ready() { pg_test_db() { - if [ "$3" ]; then - echo "SHOW ALL;" | env PGPASSWORD="$3" $PSQL -U "$2" -d "$1" -q 2>/dev/null >/dev/null - return $? - else - echo "SHOW ALL;" | $PSQL -w -U "$2" -d "$1" -q 2>/dev/null >/dev/null - return $? - fi + echo "SELECT datname FROM pg_catalog.pg_database WHERE datname = '$1';" | + $PSQL -h /var/run/postgresql -w -U "postgres" -d "template1" -q | + grep -q "0 rows" && return 1 + + return 0 } pg_include_sql() { if [ "$3" ]; then - env PGPASSWORD="$3" $PSQL -U "$2" -d "$1" -e -f "$4" + env PGPASSWORD="$3" $PSQL -h /var/run/postgresql -U "$2" -d "$1" -e -f "$4" return $? else - $PSQL -w -U "$2" -d "$1" -e -f "$4" + $PSQL -w -h /var/run/postgresql -U "$2" -d "$1" -e -f "$4" return $? fi } @@ -50,22 +48,37 @@ pg_include_sql() { # $1: dbname, $2: username, $3: password, $4: sql populate script pg_require_db() { local ret + local dbname="$1" + local dbuser="$2" + local dbpass="$3" + local exuser pg_test_db $@ && return 0 - ( echo "CREATE DATABASE $1;" - echo -n "CREATE USER $2" - [ "$3" ] && echo -n " WITH PASSWORD '$3'" - echo " NOCREATEDB NOSUPERUSER NOCREATEROLE NOINHERIT;" - echo "GRANT ALL PRIVILEGES ON DATABASE \"$1\" TO $2;" ) | - $PSQL -U postgres -d template1 -e - ret=$? - [ "$ret" = "0" ] || return $ret - if [ "$4" ]; then - pg_include_sql "$@" - ret=$? + shift ; shift ; shift + + echo "CREATE DATABASE $dbname;" | + $PSQL -h /var/run/postgresql -U postgres -d template1 -e || return $? + + if [ "$dbuser" ]; then + echo "SELECT usename FROM pg_catalog.pg_user WHERE usename = '$dbuser';" | + $PSQL -h /var/run/postgresql -U postgres -d template1 -e | grep -q "0 rows" && + ( echo -n "CREATE USER $dbuser" + [ "$dbpass" ] && echo -n " WITH PASSWORD '$dbpass'" + echo " NOCREATEDB NOSUPERUSER NOCREATEROLE NOINHERIT;" ) | + $PSQL -h /var/run/postgresql -U postgres -d template1 -e + + echo "GRANT ALL PRIVILEGES ON DATABASE \"$dbname\" TO $dbuser;" | + $PSQL -h /var/run/postgresql -U postgres -d template1 -e fi + while [ "$1" ]; do + pg_include_sql "$dbname" "$dbuser" "$dbpass" "$1" + ret=$? + [ $ret != 0 ] && break + shift + done + return $ret } @@ -75,7 +88,7 @@ uci_require_db() { config_get dbuser $1 user config_get dbpass $1 pass config_get dbscript $1 script - pg_require_db "$dbname" "$dbuser" "$dbpass" "$dbscript" + pg_require_db "$dbname" "$dbuser" "$dbpass" $dbscript } [ "$1" = "init" ] && { From 11ce7cab7dd8daae3b414cc1b1d60d675e45fac4 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 16 Aug 2021 13:52:28 +0100 Subject: [PATCH 196/241] postgresql: update to version 13.4 Signed-off-by: Daniel Golle --- libs/postgresql/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index eb19b93c..aa0a04c3 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql -PKG_VERSION:=13.3 +PKG_VERSION:=13.4 PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=PostgreSQL @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=\ http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \ ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION) -PKG_HASH:=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1 +PKG_HASH:=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd PKG_USE_MIPS16:=0 PKG_FIXUP:=autoreconf From 5d34caac90ec4fb1165081151b7c6b44153d07e0 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 9 Oct 2021 04:06:57 +0100 Subject: [PATCH 197/241] postgresql: update to version 14.0 Signed-off-by: Daniel Golle --- libs/postgresql/Makefile | 16 ++++++++++++---- libs/postgresql/patches/050-build-contrib.patch | 4 ++-- libs/postgresql/patches/200-ranlib.patch | 2 +- libs/postgresql/patches/300-fix-pc-file.patch | 2 +- .../patches/700-no-arm-crc-march-change.patch | 6 +++--- libs/postgresql/patches/900-pg_ctl-setuid.patch | 10 +++++----- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index aa0a04c3..a6a2bc3f 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql -PKG_VERSION:=13.4 +PKG_VERSION:=14.0 PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=PostgreSQL @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=\ http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \ ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION) -PKG_HASH:=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd +PKG_HASH:=ee2ad79126a7375e9102c4db77c4acae6ae6ffe3e082403b88826d96d927a122 PKG_USE_MIPS16:=0 PKG_FIXUP:=autoreconf @@ -82,18 +82,23 @@ PostgreSQL databases Server. endef PGSQL_SERVER_BIN := \ + pg_amcheck \ pg_archivecleanup \ pg_basebackup \ + pg_checksums \ pg_controldata \ pg_ctl \ pg_dump \ pg_dumpall \ pg_isready \ pg_recvlogical \ + pg_receivewal \ pg_resetwal \ pg_restore \ - pg_standby \ + pg_rewind \ pg_upgrade \ + pg_verifybackup \ + pg_waldump \ postgres \ initdb @@ -103,14 +108,17 @@ PGSQL_CLI_EXTRA_BIN := \ createuser \ dropdb \ dropuser \ + oid2name \ pgbench \ reindexdb \ - vacuumdb + vacuumdb \ + vacuumlo PGSQL_CONFIG_VARS:= \ pgac_cv_snprintf_long_long_int_format="%lld" \ pgac_cv_snprintf_size_t_support=yes \ USE_DEV_URANDOM=1 \ + ac_cv_file__dev_urandom="/dev/urandom" \ ZIC=zic ifeq ($(CONFIG_USE_UCLIBC),y) diff --git a/libs/postgresql/patches/050-build-contrib.patch b/libs/postgresql/patches/050-build-contrib.patch index b127cf03..88a23f09 100644 --- a/libs/postgresql/patches/050-build-contrib.patch +++ b/libs/postgresql/patches/050-build-contrib.patch @@ -7,5 +7,5 @@ -$(call recurse,all install,src config) +$(call recurse,all install,src config contrib) - all: - +@echo "All of PostgreSQL successfully made. Ready to install." + docs: + $(MAKE) -C doc all diff --git a/libs/postgresql/patches/200-ranlib.patch b/libs/postgresql/patches/200-ranlib.patch index 35ce44f0..3bf02efe 100644 --- a/libs/postgresql/patches/200-ranlib.patch +++ b/libs/postgresql/patches/200-ranlib.patch @@ -1,6 +1,6 @@ --- a/src/port/Makefile +++ b/src/port/Makefile -@@ -82,6 +82,7 @@ uninstall: +@@ -84,6 +84,7 @@ uninstall: libpgport.a: $(OBJS) rm -f $@ $(AR) $(AROPT) $@ $^ diff --git a/libs/postgresql/patches/300-fix-pc-file.patch b/libs/postgresql/patches/300-fix-pc-file.patch index 413844cc..2d7eb97a 100644 --- a/libs/postgresql/patches/300-fix-pc-file.patch +++ b/libs/postgresql/patches/300-fix-pc-file.patch @@ -1,6 +1,6 @@ --- a/src/Makefile.shlib +++ b/src/Makefile.shlib -@@ -387,14 +387,27 @@ endif # PORTNAME == cygwin || PORTNAME = +@@ -391,14 +391,27 @@ endif # PORTNAME == cygwin || PORTNAME = %.pc: $(MAKEFILE_LIST) diff --git a/libs/postgresql/patches/700-no-arm-crc-march-change.patch b/libs/postgresql/patches/700-no-arm-crc-march-change.patch index ec0b152f..1d73f464 100644 --- a/libs/postgresql/patches/700-no-arm-crc-march-change.patch +++ b/libs/postgresql/patches/700-no-arm-crc-march-change.patch @@ -1,6 +1,6 @@ ---- a/configure.in -+++ b/configure.in -@@ -2019,9 +2019,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ +--- a/configure.ac ++++ b/configure.ac +@@ -2091,9 +2091,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ # flags. If not, check if adding -march=armv8-a+crc flag helps. # CFLAGS_ARMV8_CRC32C is set if the extra flag is required. PGAC_ARMV8_CRC32C_INTRINSICS([]) diff --git a/libs/postgresql/patches/900-pg_ctl-setuid.patch b/libs/postgresql/patches/900-pg_ctl-setuid.patch index 8203fbf1..8f86c35d 100644 --- a/libs/postgresql/patches/900-pg_ctl-setuid.patch +++ b/libs/postgresql/patches/900-pg_ctl-setuid.patch @@ -8,7 +8,7 @@ static char *argv0 = NULL; static bool allow_core_files = false; static time_t start_time; -@@ -2055,6 +2056,9 @@ do_help(void) +@@ -2049,6 +2050,9 @@ do_help(void) #endif printf(_(" -s, --silent only print errors, no informational messages\n")); printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n")); @@ -18,7 +18,7 @@ printf(_(" -V, --version output version information, then exit\n")); printf(_(" -w, --wait wait until operation completes (default)\n")); printf(_(" -W, --no-wait do not wait until operation completes\n")); -@@ -2267,6 +2271,7 @@ main(int argc, char **argv) +@@ -2261,6 +2265,7 @@ main(int argc, char **argv) {"options", required_argument, NULL, 'o'}, {"silent", no_argument, NULL, 's'}, {"timeout", required_argument, NULL, 't'}, @@ -26,7 +26,7 @@ {"core-files", no_argument, NULL, 'c'}, {"wait", no_argument, NULL, 'w'}, {"no-wait", no_argument, NULL, 'W'}, -@@ -2307,20 +2312,6 @@ main(int argc, char **argv) +@@ -2301,20 +2306,6 @@ main(int argc, char **argv) } } @@ -47,7 +47,7 @@ env_wait = getenv("PGCTLTIMEOUT"); if (env_wait != NULL) -@@ -2407,11 +2398,15 @@ main(int argc, char **argv) +@@ -2400,11 +2391,15 @@ main(int argc, char **argv) wait_seconds_arg = true; break; case 'U': @@ -63,7 +63,7 @@ break; case 'w': do_wait = true; -@@ -2493,6 +2488,41 @@ main(int argc, char **argv) +@@ -2486,6 +2481,41 @@ main(int argc, char **argv) exit(1); } From 9e2311b9414e1d5a123ba65a4d2b1ac3112ee3e8 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 15 Nov 2021 00:55:05 +0000 Subject: [PATCH 198/241] postgresql: update to version 14.1 Signed-off-by: Daniel Golle --- libs/postgresql/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index a6a2bc3f..c06fec8a 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql -PKG_VERSION:=14.0 +PKG_VERSION:=14.1 PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=PostgreSQL @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=\ http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \ ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION) -PKG_HASH:=ee2ad79126a7375e9102c4db77c4acae6ae6ffe3e082403b88826d96d927a122 +PKG_HASH:=4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f PKG_USE_MIPS16:=0 PKG_FIXUP:=autoreconf From 4e4d33b05daa61b25c87b2e8ae74c94a13823311 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 18 Mar 2022 18:54:00 +0000 Subject: [PATCH 199/241] postgresql: update to 14.2 Minor release with a large number of fixes and small changes. See release notes[1] for details. [1]: https://www.postgresql.org/docs/release/14.2/ Signed-off-by: Daniel Golle --- libs/postgresql/Makefile | 4 ++-- libs/postgresql/patches/700-no-arm-crc-march-change.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index c06fec8a..46639111 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql -PKG_VERSION:=14.1 +PKG_VERSION:=14.2 PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=PostgreSQL @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=\ http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \ ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION) -PKG_HASH:=4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f +PKG_HASH:=2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a PKG_USE_MIPS16:=0 PKG_FIXUP:=autoreconf diff --git a/libs/postgresql/patches/700-no-arm-crc-march-change.patch b/libs/postgresql/patches/700-no-arm-crc-march-change.patch index 1d73f464..1f444923 100644 --- a/libs/postgresql/patches/700-no-arm-crc-march-change.patch +++ b/libs/postgresql/patches/700-no-arm-crc-march-change.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2091,9 +2091,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ +@@ -2127,9 +2127,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ # flags. If not, check if adding -march=armv8-a+crc flag helps. # CFLAGS_ARMV8_CRC32C is set if the extra flag is required. PGAC_ARMV8_CRC32C_INTRINSICS([]) From 629ba13e76129793796ed018fbe89e19326fb65e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 7 Sep 2022 19:25:23 +0100 Subject: [PATCH 200/241] postgresql: update to version 14.5 Release date: 2022-08-11 Adresses CVE-2022-2625. For more details, please see the release notes[1]. [1]: https://www.postgresql.org/docs/release/14.5/ Signed-off-by: Daniel Golle --- libs/postgresql/Makefile | 4 ++-- .../patches/700-no-arm-crc-march-change.patch | 2 +- libs/postgresql/patches/900-pg_ctl-setuid.patch | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index 46639111..a4bba598 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql -PKG_VERSION:=14.2 +PKG_VERSION:=14.5 PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=PostgreSQL @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=\ http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \ ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION) -PKG_HASH:=2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a +PKG_HASH:=d4f72cb5fb857c9a9f75ec8cf091a1771272802f2178f0b2e65b7b6ff64f4a30 PKG_USE_MIPS16:=0 PKG_FIXUP:=autoreconf diff --git a/libs/postgresql/patches/700-no-arm-crc-march-change.patch b/libs/postgresql/patches/700-no-arm-crc-march-change.patch index 1f444923..05d3198c 100644 --- a/libs/postgresql/patches/700-no-arm-crc-march-change.patch +++ b/libs/postgresql/patches/700-no-arm-crc-march-change.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2127,9 +2127,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ +@@ -2141,9 +2141,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ # flags. If not, check if adding -march=armv8-a+crc flag helps. # CFLAGS_ARMV8_CRC32C is set if the extra flag is required. PGAC_ARMV8_CRC32C_INTRINSICS([]) diff --git a/libs/postgresql/patches/900-pg_ctl-setuid.patch b/libs/postgresql/patches/900-pg_ctl-setuid.patch index 8f86c35d..d114a820 100644 --- a/libs/postgresql/patches/900-pg_ctl-setuid.patch +++ b/libs/postgresql/patches/900-pg_ctl-setuid.patch @@ -8,7 +8,7 @@ static char *argv0 = NULL; static bool allow_core_files = false; static time_t start_time; -@@ -2049,6 +2050,9 @@ do_help(void) +@@ -2081,6 +2082,9 @@ do_help(void) #endif printf(_(" -s, --silent only print errors, no informational messages\n")); printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n")); @@ -18,7 +18,7 @@ printf(_(" -V, --version output version information, then exit\n")); printf(_(" -w, --wait wait until operation completes (default)\n")); printf(_(" -W, --no-wait do not wait until operation completes\n")); -@@ -2261,6 +2265,7 @@ main(int argc, char **argv) +@@ -2293,6 +2297,7 @@ main(int argc, char **argv) {"options", required_argument, NULL, 'o'}, {"silent", no_argument, NULL, 's'}, {"timeout", required_argument, NULL, 't'}, @@ -26,7 +26,7 @@ {"core-files", no_argument, NULL, 'c'}, {"wait", no_argument, NULL, 'w'}, {"no-wait", no_argument, NULL, 'W'}, -@@ -2301,20 +2306,6 @@ main(int argc, char **argv) +@@ -2333,20 +2338,6 @@ main(int argc, char **argv) } } @@ -47,7 +47,7 @@ env_wait = getenv("PGCTLTIMEOUT"); if (env_wait != NULL) -@@ -2400,11 +2391,15 @@ main(int argc, char **argv) +@@ -2432,11 +2423,15 @@ main(int argc, char **argv) wait_seconds_arg = true; break; case 'U': @@ -63,7 +63,7 @@ break; case 'w': do_wait = true; -@@ -2486,6 +2481,41 @@ main(int argc, char **argv) +@@ -2518,6 +2513,41 @@ main(int argc, char **argv) exit(1); } From 7997011b0f7d4e2a994a8f5c9919a7c944867e84 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 12 Jun 2021 20:53:53 -0700 Subject: [PATCH 201/241] protobuf: update to 3.17.2 Refreshed patch. Signed-off-by: Rosen Penev --- libs/protobuf/Makefile | 4 ++-- libs/protobuf/patches/010-rpath.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile index 47a10977..f9f1747c 100644 --- a/libs/protobuf/Makefile +++ b/libs/protobuf/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=protobuf -PKG_VERSION:=3.15.6 +PKG_VERSION:=3.17.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION) -PKG_HASH:=bbdfb7455431d7d58666e8a2996d14b236718ff238eecde10646581e4c87f168 +PKG_HASH:=13c5e07a8e2d6847794ac3f23947d9641cab7ded0c50854aad624d48f2821e60 PKG_MAINTAINER:=Ken Keys PKG_LICENSE:=BSD-3-Clause diff --git a/libs/protobuf/patches/010-rpath.patch b/libs/protobuf/patches/010-rpath.patch index b18864bf..ef3e98ab 100644 --- a/libs/protobuf/patches/010-rpath.patch +++ b/libs/protobuf/patches/010-rpath.patch @@ -11,9 +11,9 @@ elseif (APPLE) set_property(TARGET ${_library} PROPERTY INSTALL_RPATH "@loader_path") -@@ -32,8 +32,8 @@ if (protobuf_BUILD_PROTOC_BINARIES) - install(TARGETS protoc EXPORT protobuf-targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) +@@ -34,8 +34,8 @@ if (protobuf_BUILD_PROTOC_BINARIES) + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT protoc) if (UNIX AND NOT APPLE) - set_property(TARGET protoc - PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") From 07febba506bffe2bf05b0bf346b6e1e955c9a208 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Sep 2021 01:40:02 -0700 Subject: [PATCH 202/241] protobuf: update to 3.17.3 Signed-off-by: Rosen Penev --- libs/protobuf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile index f9f1747c..7bf304c8 100644 --- a/libs/protobuf/Makefile +++ b/libs/protobuf/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=protobuf -PKG_VERSION:=3.17.2 +PKG_VERSION:=3.17.3 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION) -PKG_HASH:=13c5e07a8e2d6847794ac3f23947d9641cab7ded0c50854aad624d48f2821e60 +PKG_HASH:=51cec99f108b83422b7af1170afd7aeb2dd77d2bcbb7b6bad1f92509e9ccf8cb PKG_MAINTAINER:=Ken Keys PKG_LICENSE:=BSD-3-Clause From 2ec5350c9dc7cd264f9c5419fbe73679ff32aac7 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 19 Oct 2021 00:47:16 -0700 Subject: [PATCH 203/241] protobuf-c: don't build shared host library No point and can avoid rpath hacks. Signed-off-by: Rosen Penev --- libs/protobuf-c/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/protobuf-c/Makefile b/libs/protobuf-c/Makefile index b197f3c5..8c79a888 100644 --- a/libs/protobuf-c/Makefile +++ b/libs/protobuf-c/Makefile @@ -46,7 +46,7 @@ define Package/libprotobuf-c/description endef CMAKE_HOST_OPTIONS += \ - -DBUILD_SHARED_LIBS=ON \ + -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_CXX_STANDARD=11 \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" From a795e58ba580204b779b878961350be286d20557 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 8 Mar 2022 21:02:35 -0800 Subject: [PATCH 204/241] pugixml: update to 1.12.1 Signed-off-by: Rosen Penev --- libs/pugixml/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/pugixml/Makefile b/libs/pugixml/Makefile index 1b5c779f..b80a3769 100644 --- a/libs/pugixml/Makefile +++ b/libs/pugixml/Makefile @@ -6,12 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pugixml -PKG_VERSION:=1.11.4 +PKG_VERSION:=1.12.1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/zeux/pugixml/releases/download/v$(PKG_VERSION) -PKG_HASH:=8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 +PKG_HASH:=dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.12 PKG_MAINTAINER:= PKG_LICENSE:=MIT From 4cf4c1005e91c8cb9e4b0a801024cd12aa43be54 Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Wed, 11 Aug 2021 08:38:50 +0200 Subject: [PATCH 205/241] redis: update to version 6.2.5 Fixes CVE-2021-32761 Signed-off-by: Jan Pavlinec --- libs/redis/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/redis/Makefile b/libs/redis/Makefile index 845a0cd7..cd23f3e4 100644 --- a/libs/redis/Makefile +++ b/libs/redis/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=redis -PKG_VERSION:=6.2.4 +PKG_VERSION:=6.2.5 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://download.redis.io/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=ba32c406a10fc2c09426e2be2787d74ff204eb3a2e496d87cff76a476b6ae16e +PKG_HASH:=4b9a75709a1b74b3785e20a6c158cab94cf52298aa381eea947a678a60d551ae PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From bcaac82707080184627441675ca4b26b2a4566ec Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Sun, 24 Oct 2021 14:41:47 +0200 Subject: [PATCH 206/241] redis: update to version 6.2.6 Fixes: - CVE-2021-41099 - CVE-2021-32762 - CVE-2021-32687 - CVE-2021-32675 - CVE-2021-32672 - CVE-2021-32628 - CVE-2021-32627 - CVE-2021-32626 Signed-off-by: Jan Pavlinec --- libs/redis/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/redis/Makefile b/libs/redis/Makefile index cd23f3e4..bde977c0 100644 --- a/libs/redis/Makefile +++ b/libs/redis/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=redis -PKG_VERSION:=6.2.5 +PKG_VERSION:=6.2.6 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://download.redis.io/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=4b9a75709a1b74b3785e20a6c158cab94cf52298aa381eea947a678a60d551ae +PKG_HASH:=5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From cad965f7224b19f08a16931885c3c3ee68501289 Mon Sep 17 00:00:00 2001 From: Georgi Valkov Date: Tue, 11 Jan 2022 20:40:18 +0200 Subject: [PATCH 207/241] rpcsvc-proto: bump to 1.4.3 Fixes: rpcgen build (host-compile) on macOS https://github.com/openwrt/packages/pull/17430 https://github.com/openwrt/openwrt/pull/4638 Signed-off-by: Georgi Valkov --- libs/rpcsvc-proto/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/rpcsvc-proto/Makefile b/libs/rpcsvc-proto/Makefile index 85ae9462..4a668d2b 100644 --- a/libs/rpcsvc-proto/Makefile +++ b/libs/rpcsvc-proto/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rpcsvc-proto -PKG_VERSION:=1.4.2 +PKG_VERSION:=1.4.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/thkukuk/rpcsvc-proto/releases/download/v$(PKG_VERSION) -PKG_HASH:=678851b9f7ddf4410d2859c12016b65a6dd1a0728d478f18aeb54d165352f17c +PKG_HASH:=69315e94430f4e79c74d43422f4a36e6259e97e67e2677b2c7d7060436bd99b1 PKG_LICENSE:=BSD-3-clause PKG_LICENSE_FILES:=COPYING From af6b3cf250a51941f4290f053ecdd0c1cce7ac2c Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Wed, 12 Jan 2022 16:25:40 +0300 Subject: [PATCH 208/241] serdisplib: fix build on macos ./configure script detects if serdisplib is built on non-linux build host and disables framebuffer driver. It blocks touchscreen_tool compilation. This detection is not required on cross-compile build so it is disabled via ac_cv_build=$(GNU_TARGET_NAME) in Makefile Signed-off-by: Sergey V. Lobanov --- libs/serdisplib/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile index 07978d01..8b36a4a5 100644 --- a/libs/serdisplib/Makefile +++ b/libs/serdisplib/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=serdisplib PKG_VERSION:=2.02 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/serdisplib @@ -51,6 +51,9 @@ define Package/serdisplib-tools/description * touchscreen_tool endef +CONFIGURE_VARS += \ + ac_cv_build=$(GNU_TARGET_NAME) + CONFIGURE_ARGS += \ --enable-dynloading \ --disable-statictools From d8600382c829304b28dd155a24a6365f3ae536b1 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 15 Jul 2022 19:39:39 -0700 Subject: [PATCH 209/241] slang2: try to fix compilation without BUILD_NLS Using --with-iconv like this causes -liconv to get added, which is not desirable. Signed-off-by: Rosen Penev --- libs/slang2/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/slang2/Makefile b/libs/slang2/Makefile index fcb0793e..28affd96 100644 --- a/libs/slang2/Makefile +++ b/libs/slang2/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=slang PKG_VERSION:=2.3.2 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.jedsoft.org/releases/slang \ @@ -23,6 +23,7 @@ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Jeffery To PKG_BUILD_PARALLEL:=0 +PKG_CONFIG_DEPENDS:=CONFIG_BUILD_NLS SLANG_MODULES:= base64 chksum csv fcntl fork histogram iconv json onig pcre \ png rand select slsmg socket stats sysconf termios varray zlib @@ -114,7 +115,7 @@ CONFIGURE_ARGS+= \ --enable-warnings \ --with-terminfo=default \ --with-readline=slang \ - --with-iconv="$(ICONV_PREFIX)" \ + $(if $(CONFIG_BUILD_NLS),--with-iconv=$(ICONV_PREFIX)) \ --with-onig="$(STAGING_DIR)/usr" \ --with-pcre="$(STAGING_DIR)/usr" \ --with-png="$(STAGING_DIR)/usr" \ From 1f6713bbef4a1b17d87d8d1e79eb350703aae53d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 21 Aug 2021 11:42:04 -0700 Subject: [PATCH 210/241] spdlog: update to 1.9.2 Signed-off-by: Rosen Penev --- libs/spdlog/Makefile | 4 ++-- libs/spdlog/patches/010-fmt8.patch | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 libs/spdlog/patches/010-fmt8.patch diff --git a/libs/spdlog/Makefile b/libs/spdlog/Makefile index b3ee4e08..94001690 100644 --- a/libs/spdlog/Makefile +++ b/libs/spdlog/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=spdlog -PKG_VERSION:=1.8.5 +PKG_VERSION:=1.9.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/gabime/spdlog/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=944d0bd7c763ac721398dca2bb0f3b5ed16f67cef36810ede5061f35a543b4b8 +PKG_HASH:=6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38 PKG_MAINTAINER:= PKG_LICENSE:=MIT diff --git a/libs/spdlog/patches/010-fmt8.patch b/libs/spdlog/patches/010-fmt8.patch deleted file mode 100644 index a9c0df59..00000000 --- a/libs/spdlog/patches/010-fmt8.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/spdlog/common-inl.h -+++ b/include/spdlog/common-inl.h -@@ -60,7 +60,7 @@ SPDLOG_INLINE spdlog_ex::spdlog_ex(std:: - SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) - { - memory_buf_t outbuf; -- fmt::format_system_error(outbuf, last_errno, msg); -+ fmt::format_system_error(outbuf, last_errno, msg.data()); - msg_ = fmt::to_string(outbuf); - } - From 9805b2b68c0bfa2ac2b62dd72dd352cc582a70e9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 6 Nov 2022 12:50:55 -0800 Subject: [PATCH 211/241] speex: update to 1.2.1 Signed-off-by: Rosen Penev --- libs/speex/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/speex/Makefile b/libs/speex/Makefile index 63180ff4..9f493ee1 100644 --- a/libs/speex/Makefile +++ b/libs/speex/Makefile @@ -8,15 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=speex -PKG_VERSION:=1.2.0 +PKG_VERSION:=1.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/speex/ -PKG_HASH:=eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094 +PKG_HASH:=4b44d4f2b38a370a2d98a78329fefc56a0cf93d1c1be70029217baae6628feea PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 PKG_CPE_ID:=cpe:/a:xiph:speex From 873606e7daadb84faa176a95043294473992b7a2 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Wed, 16 Mar 2022 11:11:34 +0000 Subject: [PATCH 212/241] spice-protocol: bump to version 0.14.4 Signed-off-by: Yousong Zhou --- libs/spice-protocol/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/spice-protocol/Makefile b/libs/spice-protocol/Makefile index b4ba7dd7..213de0d0 100644 --- a/libs/spice-protocol/Makefile +++ b/libs/spice-protocol/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=spice-protocol -PKG_VERSION:=0.14.3 +PKG_VERSION:=0.14.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.spice-space.org/download/releases -PKG_HASH:=f986e5bc2a1598532c4897f889afb0df9257ac21c160c083703ae7c8de99487a +PKG_HASH:=04ffba610d9fd441cfc47dfaa135d70096e60b1046d2119d8db2f8ea0d17d912 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Yousong Zhou From aa14be9c0bfc36da5acc9d7e7bf8b2c4c9df710c Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Thu, 10 Feb 2022 01:43:04 +0300 Subject: [PATCH 213/241] tdb: fix build on macos This commit adds patch to the issue with 'echo -n' on macos Signed-off-by: Sergey V. Lobanov --- libs/tdb/Makefile | 2 +- ..._wafsamba-replace-echo-n-with-printf.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 libs/tdb/patches/101_wafsamba-replace-echo-n-with-printf.patch diff --git a/libs/tdb/Makefile b/libs/tdb/Makefile index a783b3fa..d78043da 100644 --- a/libs/tdb/Makefile +++ b/libs/tdb/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tdb PKG_VERSION:=1.4.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/libs/tdb/patches/101_wafsamba-replace-echo-n-with-printf.patch b/libs/tdb/patches/101_wafsamba-replace-echo-n-with-printf.patch new file mode 100644 index 00000000..9b8aca00 --- /dev/null +++ b/libs/tdb/patches/101_wafsamba-replace-echo-n-with-printf.patch @@ -0,0 +1,25 @@ +From: https://gitlab.com/samba-team/samba/-/merge_requests/2374/diffs?commit_id=90bb371863d5a44845f47ebbceeb60842b46eda7 + +From 79b2f38c27c8df918d8260fe838f55bcf6d3eb73 Mon Sep 17 00:00:00 2001 +From: "Sergey V. Lobanov" +Date: Thu, 10 Feb 2022 00:02:17 +0300 +Subject: [PATCH] wafsamba: replace 'echo -n' with printf + +This patch makes samba_cross.py compatible with old bash (e.g. 3.2) + +Signed-off-by: Sergey V. Lobanov +--- + buildtools/wafsamba/samba_cross.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/buildtools/wafsamba/samba_cross.py ++++ b/buildtools/wafsamba/samba_cross.py +@@ -134,7 +134,7 @@ class cross_Popen(Utils.subprocess.Popen + cross_answers_incomplete = True + add_answer(ca_file, msg, ans) + (retcode, retstring) = ans +- args = ['/bin/sh', '-c', "echo -n '%s'; exit %d" % (retstring, retcode)] ++ args = ['/bin/sh', '-c', "printf '%s'; exit %d" % (retstring, retcode)] + real_Popen.__init__(*(obj, args), **kw) + + From e5bd37ab9f58feb65d6e9ba7d63975e60729b0d4 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 1 Jun 2021 18:21:22 -0700 Subject: [PATCH 214/241] tiff: update to 4.2.3 Remove automake patch as it's not used. Remove ftell patch as it seems to not be needed anymore. Signed-off-by: Rosen Penev --- libs/tiff/Makefile | 6 ++-- libs/tiff/patches/001-autoconf-compat.patch | 31 --------------------- libs/tiff/patches/005-fix-ftell-macro.patch | 11 -------- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 libs/tiff/patches/001-autoconf-compat.patch delete mode 100644 libs/tiff/patches/005-fix-ftell-macro.patch diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 98f96aa0..704f9197 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tiff -PKG_VERSION:=4.2.0 -PKG_RELEASE:=2 +PKG_VERSION:=4.3.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://download.osgeo.org/libtiff -PKG_HASH:=eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb +PKG_HASH:=0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 PKG_MAINTAINER:=Jiri Slachta PKG_LICENSE:=BSD-3-Clause diff --git a/libs/tiff/patches/001-autoconf-compat.patch b/libs/tiff/patches/001-autoconf-compat.patch deleted file mode 100644 index fd779ea1..00000000 --- a/libs/tiff/patches/001-autoconf-compat.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,7 +25,7 @@ - - docdir = $(LIBTIFF_DOCDIR) - --AUTOMAKE_OPTIONS = 1.12 dist-zip foreign -+AUTOMAKE_OPTIONS = dist-zip foreign - ACLOCAL_AMFLAGS = -I m4 - - docfiles = \ -@@ -60,7 +60,7 @@ distcheck-hook: - rm -rf $(distdir)/_build/cmake - rm -rf $(distdir)/_inst/cmake - --SUBDIRS = port libtiff tools build contrib test man html -+SUBDIRS = port libtiff tools build contrib - - release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -23,7 +23,7 @@ - - # Process this file with automake to produce Makefile.in. - --AUTOMAKE_OPTIONS = 1.12 color-tests parallel-tests foreign -+AUTOMAKE_OPTIONS = color-tests parallel-tests foreign - - LIBTIFF = $(top_builddir)/libtiff/libtiff.la - diff --git a/libs/tiff/patches/005-fix-ftell-macro.patch b/libs/tiff/patches/005-fix-ftell-macro.patch deleted file mode 100644 index d5acde92..00000000 --- a/libs/tiff/patches/005-fix-ftell-macro.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libtiff/tiffiop.h -+++ b/libtiff/tiffiop.h -@@ -302,7 +302,7 @@ struct tiff { - */ - #if defined(HAVE_FSEEKO) - # define fseek(stream,offset,whence) fseeko(stream,offset,whence) --# define ftell(stream,offset,whence) ftello(stream,offset,whence) -+# define ftell(stream) ftello(stream) - #endif - #endif - #if defined(__WIN32__) && \ From 49fcb2a6511ebc520a105c5caac2802ea3032cf7 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 6 Nov 2022 12:53:35 -0800 Subject: [PATCH 215/241] tiff: update to 4.4.0 Signed-off-by: Rosen Penev --- libs/tiff/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 704f9197..37539d94 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tiff -PKG_VERSION:=4.3.0 +PKG_VERSION:=4.4.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://download.osgeo.org/libtiff -PKG_HASH:=0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 +PKG_HASH:=917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed PKG_MAINTAINER:=Jiri Slachta PKG_LICENSE:=BSD-3-Clause From d8ad8a54716df88adf55fb8e54a2267152e6acf1 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Wed, 23 Feb 2022 22:21:28 +0100 Subject: [PATCH 216/241] totem-pl-parser: disable libarchive If the libarchive is present within the build environment, it is automatically detected and enabled [1]. This causes that totem-pl-parser is not compiled with this error: Package totem-pl-parser is missing dependencies for the following libraries: libarchive.so.18 [1] https://gitlab.gnome.org/GNOME/totem-pl-parser/-/blob/c6c1c51aefeac28499da9fe5cec4af2278ed1564/meson_options.txt#L1 Signed-off-by: Josef Schlehofer --- libs/totem-pl-parser/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/totem-pl-parser/Makefile b/libs/totem-pl-parser/Makefile index 0e7880e3..0465e5ef 100644 --- a/libs/totem-pl-parser/Makefile +++ b/libs/totem-pl-parser/Makefile @@ -35,7 +35,8 @@ define Package/totem-pl-parser/decription totem-pl-parser is a simple GObject-based library to parse a host of playlist formats endef -MESON_ARGS += -Dintrospection=false +MESON_ARGS += -Dintrospection=false \ + -Denable-libarchive=no define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/ From b79cb4e1c20f96f1d0f9a482c93fbcfb99cd6b6a Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Wed, 23 Feb 2022 22:32:53 +0100 Subject: [PATCH 217/241] totem-pl-parser: disable libgcrypt If libgcrypt is compiled first, then it is automatically picked up during the building totem-pl-parser [1]. Let's disable AmazonAMZ decoding for now. [1] https://gitlab.gnome.org/GNOME/totem-pl-parser/-/blob/c6c1c51aefeac28499da9fe5cec4af2278ed1564/meson_options.txt#L3 Signed-off-by: Josef Schlehofer --- libs/totem-pl-parser/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/totem-pl-parser/Makefile b/libs/totem-pl-parser/Makefile index 0465e5ef..d5ac6dc5 100644 --- a/libs/totem-pl-parser/Makefile +++ b/libs/totem-pl-parser/Makefile @@ -36,7 +36,8 @@ define Package/totem-pl-parser/decription endef MESON_ARGS += -Dintrospection=false \ - -Denable-libarchive=no + -Denable-libarchive=no \ + -Denable-libgcrypt=no define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/ From 1087b042070048731d39e6d90b56f546f20f1dd3 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 1 Jul 2022 15:25:21 -0500 Subject: [PATCH 218/241] totem-pl-parser: depend on shared-mime-info The totem-pl-parser library seems to rely on freedesktop.org's MIME-type definitions to parse playlist files. Without them, parsing will produce a TOTEM_PL_PARSER_RESULT_IGNORED error. Signed-off-by: W. Michael Petullo --- libs/totem-pl-parser/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/totem-pl-parser/Makefile b/libs/totem-pl-parser/Makefile index d5ac6dc5..08a56b66 100644 --- a/libs/totem-pl-parser/Makefile +++ b/libs/totem-pl-parser/Makefile @@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/meson.mk define Package/totem-pl-parser SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+glib2 +libxml2 + DEPENDS:=+glib2 +libxml2 +shared-mime-info TITLE:=totem-pl-parser URL:=https://gitlab.gnome.org/GNOME/totem-pl-parser endef From fcb12619f0f937c754c393af6fca38236252585b Mon Sep 17 00:00:00 2001 From: Jakov Petrina Date: Mon, 28 Jun 2021 09:25:58 +0200 Subject: [PATCH 219/241] uci2: bump to revision v1.0-5606418 Pull in latest API changes from upstream. Signed-off-by: Jakov Petrina --- libs/uci2/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/uci2/Makefile b/libs/uci2/Makefile index 456701c4..c876a84a 100644 --- a/libs/uci2/Makefile +++ b/libs/uci2/Makefile @@ -2,12 +2,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uci2 PKG_VERSION:=1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://github.com/sartura/uci2.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=24b7471a0aead99115c189f04236f5fe52492579 -PKG_MIRROR_HASH:=ea8f4627163ce40f62393a87a0155869f034bb78c9f7fb644f18461cbdaf5333 +PKG_SOURCE_DATE:=2021-07-12 +PKG_SOURCE_VERSION:=56064182acdd8fa522abab67fdbaa10c2a28165c +PKG_MIRROR_HASH:=94059a5cf110ecc04cfb9a8ffc160f9bd6a03518d4c4b195500d8eff001be9aa +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_DATE).tar.gz PKG_MAINTAINER:=Jakov Petrina PKG_LICENSE:=BSD-3-Clause From f9fd614f3d0d6c976bd317f73f4e77139a2899d5 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 11 Aug 2021 11:04:50 -0300 Subject: [PATCH 220/241] unixodbc: use 'install' when copying host binaries 'cp' fails with a text file busy error if it tries to overwrite an executable file that is running. 'install' unlinks the file first, so it will not cause the problem. Signed-off-by: Eneas U de Queiroz --- libs/unixodbc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/unixodbc/Makefile b/libs/unixodbc/Makefile index 603b9337..f2600432 100644 --- a/libs/unixodbc/Makefile +++ b/libs/unixodbc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unixodbc PKG_VERSION:=2.3.9 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=unixODBC-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.unixodbc.org @@ -152,7 +152,7 @@ endef define Host/Install $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin - $(CP) $(HOST_BUILD_DIR)/exe/odbc_config $(STAGING_DIR_HOST)/bin + $(INSTALL_BIN) $(HOST_BUILD_DIR)/exe/odbc_config $(STAGING_DIR_HOST)/bin endef $(eval $(call BuildPackage,unixodbc)) From a8c6856581813ae44c50061ced685ce18a74a57e Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Sun, 12 Dec 2021 14:31:17 -0600 Subject: [PATCH 221/241] vips: update to 8.12.1 Signed-off-by: W. Michael Petullo --- libs/vips/Makefile | 4 +- libs/vips/patches/001-no_introspection.patch | 71 ------------------- .../vips/patches/010-reproducible-build.patch | 6 +- 3 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 libs/vips/patches/001-no_introspection.patch diff --git a/libs/vips/Makefile b/libs/vips/Makefile index a8eb4c7a..2f794921 100644 --- a/libs/vips/Makefile +++ b/libs/vips/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vips -PKG_VERSION:=8.10.6 +PKG_VERSION:=8.12.1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION) -PKG_HASH:=2468088d958e0e2de1be2991ff8940bf45664a826c0dad12342e1804e2805a6e +PKG_HASH:=474d8439244cd26c504812fd623259f806c32553b38d2a54798c9766135f5a5c PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later diff --git a/libs/vips/patches/001-no_introspection.patch b/libs/vips/patches/001-no_introspection.patch deleted file mode 100644 index f66fbaf5..00000000 --- a/libs/vips/patches/001-no_introspection.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -53,9 +53,6 @@ AC_SUBST(LIBRARY_CURRENT) - AC_SUBST(LIBRARY_REVISION) - AC_SUBST(LIBRARY_AGE) - --# init introspection support --GOBJECT_INTROSPECTION_CHECK([1.30.0]) -- - # remove the '(disabled, use --enable-introspection to enable)' - # suffix from the found_introspection variable - if test "x$found_introspection" != x"yes"; then ---- a/libvips/Makefile.am -+++ b/libvips/Makefile.am -@@ -67,56 +67,3 @@ install-exec-hook: - echo "#define VIPS_SONAME \"$$dlname\"" >> soname.h && \ - cp soname.h $(DESTDIR)$(pkgincludedir) && \ - rm soname.h -- ---include $(INTROSPECTION_MAKEFILE) --INTROSPECTION_GIRS = --INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) -- --if HAVE_INTROSPECTION -- --AM_CPPFLAGS = \ -- -I${top_srcdir}/libvips/include \ -- @VIPS_CFLAGS@ \ -- @VIPS_INCLUDES@ \ -- @INTROSPECTION_CFLAGS@ --AM_LDFLAGS = \ -- @INTROSPECTION_LIBS@ \ -- @LDFLAGS@ --LDADD = @INTROSPECTION_LIBS@ @VIPS_CFLAGS@ libvips.la @VIPS_LIBS@ -- --noinst_PROGRAMS = \ -- introspect$(EXEEXT) --introspect_SOURCES = \ -- introspect.c -- --# we can't get the _SOURCES lists from the subdirs directly, we get passed it --# by configure instead --introspection_sources = @vips_introspection_sources@ -- --# we make the vips8 API --Vips-8.0.gir: introspect$(EXEEXT) --Vips_8_0_gir_INCLUDES = GObject-2.0 --Vips_8_0_gir_CFLAGS = $(INCLUDES) -I${top_srcdir}/libvips/include --Vips_8_0_gir_LIBS = libvips.la --Vips_8_0_gir_FILES = $(introspection_sources) --INTROSPECTION_GIRS += Vips-8.0.gir -- --# don't use --# --warn-all --verbose --# too annoying --Vips_8_0_gir_SCANNERFLAGS = \ -- --program=./introspect$(EXEEXT) \ -- --identifier-prefix=Vips \ -- --identifier-prefix=vips \ -- --symbol-prefix=vips \ -- --c-include=vips/vips.h -- --girdir = $(datadir)/gir-1.0 --gir_DATA = $(INTROSPECTION_GIRS) -- --typelibdir = $(libdir)/girepository-1.0 --typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) -- --CLEANFILES += $(gir_DATA) $(typelib_DATA) --endif diff --git a/libs/vips/patches/010-reproducible-build.patch b/libs/vips/patches/010-reproducible-build.patch index 883db7dd..c6e99021 100644 --- a/libs/vips/patches/010-reproducible-build.patch +++ b/libs/vips/patches/010-reproducible-build.patch @@ -4,12 +4,12 @@ VIPS_MINOR_VERSION=vips_minor_version() VIPS_MICRO_VERSION=vips_micro_version() VIPS_VERSION=vips_version() --VIPS_VERSION_STRING=$VIPS_VERSION-`date -u -r $srcdir/ChangeLog` +-VIPS_VERSION_STRING="$VIPS_VERSION-$(date -u -r $srcdir/ChangeLog)" +if test "x$SOURCE_DATE_EPOCH" = "x"; then + VIPS_VERSION_STRING=$VIPS_VERSION-`date -u -r ChangeLog` +else + VIPS_VERSION_STRING=$VIPS_VERSION-`LC_ALL=C date --utc --date="@$SOURCE_DATE_EPOCH"` +fi - # libtool library versioning ... not user-visible (except as part of the - # library file name) and does not correspond to major/minor/micro above + # packages add to these as we find them + VIPS_CFLAGS="" From 747c147d461318a708145df0da9b519a258379e1 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 10 May 2022 14:51:04 -0500 Subject: [PATCH 222/241] vips: update to 8.12.2 Signed-off-by: W. Michael Petullo --- libs/vips/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vips/Makefile b/libs/vips/Makefile index 2f794921..c6477edb 100644 --- a/libs/vips/Makefile +++ b/libs/vips/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vips -PKG_VERSION:=8.12.1 +PKG_VERSION:=8.12.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION) -PKG_HASH:=474d8439244cd26c504812fd623259f806c32553b38d2a54798c9766135f5a5c +PKG_HASH:=565252992aff2c7cd10c866c7a58cd57bc536e03924bde29ae0f0cb9e074010b PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later From c266f9d9b085607156ee23dddce4f13b86d56e8f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 25 Jul 2022 18:24:01 -0700 Subject: [PATCH 223/241] zmq: remove libbsd dependency Not really needed for anything. Patch taken from upstream. Remove obsolete libpthread and librt dependencies. Signed-off-by: Rosen Penev --- libs/zmq/Makefile | 7 +- libs/zmq/patches/020-no-libbsd.patch | 232 +++++++++++++++++++++++++++ 2 files changed, 235 insertions(+), 4 deletions(-) create mode 100644 libs/zmq/patches/020-no-libbsd.patch diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile index 3803544b..d483ea70 100644 --- a/libs/zmq/Makefile +++ b/libs/zmq/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zeromq PKG_VERSION:=4.3.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/zeromq/libzmq/releases/download/v$(PKG_VERSION) @@ -32,7 +32,7 @@ define Package/libzmq/default URL:=http://www.zeromq.org/ SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libuuid +libpthread +librt +libstdcpp +USE_GLIBC:libbsd + DEPENDS:=+libuuid +libstdcpp PROVIDES:=libzmq endef @@ -88,8 +88,7 @@ CMAKE_OPTIONS += \ -DENABLE_EVENTFD=ON \ -DPOLLER=epoll \ -DRT_LIBRARY=OFF \ - -DZMQ_BUILD_TESTS=OFF \ - -DWITH_LIBBSD=O$(if $(CONFIG_USE_GLIBC),N,FF) + -DZMQ_BUILD_TESTS=OFF ifeq ($(BUILD_VARIANT),curve) CMAKE_OPTIONS += -DWITH_LIBSODIUM=ON diff --git a/libs/zmq/patches/020-no-libbsd.patch b/libs/zmq/patches/020-no-libbsd.patch new file mode 100644 index 00000000..0ed00394 --- /dev/null +++ b/libs/zmq/patches/020-no-libbsd.patch @@ -0,0 +1,232 @@ +From 872a773fac1e2880428d82e9f589ff16a5fde727 Mon Sep 17 00:00:00 2001 +From: Guilherme Janczak +Date: Fri, 6 May 2022 18:42:52 +0000 +Subject: [PATCH] remove libbsd + +libbsd is only used once and as part of a larger, incorrect function. +I rewrote the code that used it without the need for it. +--- + CMakeLists.txt | 41 ++++++----------------------- + Makefile.am | 12 ++++----- + builds/cmake/platform.hpp.in | 2 -- + configure.ac | 39 +-------------------------- + packaging/debian/control | 2 -- + packaging/debian/zeromq.dsc | 2 +- + packaging/redhat/zeromq.spec | 2 +- + src/compat.hpp | 51 +++++++++++++++++++++++------------- + 8 files changed, 50 insertions(+), 101 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -240,19 +240,6 @@ if(NOT ZMQ_USE_GNUTLS) + endif() + endif() + +-if(NOT MSVC) +- option(WITH_LIBBSD "Use libbsd instead of builtin strlcpy" ON) +- if(WITH_LIBBSD) +- pkg_check_modules(LIBBSD "libbsd") +- if(LIBBSD_FOUND) +- message(STATUS "Using libbsd") +- set(pkg_config_names_private "${pkg_config_names_private} libbsd") +- set(ZMQ_HAVE_LIBBSD 1) +- endif() +- endif() +- check_cxx_symbol_exists(strlcpy string.h ZMQ_HAVE_STRLCPY) +-endif() +- + # Select curve encryption library, defaults to tweetnacl To use libsodium instead, use --with-libsodium(must be + # installed) To disable curve, use --disable-curve + +@@ -1437,10 +1424,6 @@ if(BUILD_SHARED) + target_link_libraries(libzmq ${NSS3_LIBRARIES}) + endif() + +- if(LIBBSD_FOUND) +- target_link_libraries(libzmq ${LIBBSD_LIBRARIES}) +- endif() +- + if(SODIUM_FOUND) + target_link_libraries(libzmq ${SODIUM_LIBRARIES}) + # On Solaris, libsodium depends on libssp +@@ -1482,10 +1465,6 @@ if(BUILD_STATIC) + target_link_libraries(libzmq-static ${GNUTLS_LIBRARIES}) + endif() + +- if(LIBBSD_FOUND) +- target_link_libraries(libzmq-static ${LIBBSD_LIBRARIES}) +- endif() +- + if(NSS3_FOUND) + target_link_libraries(libzmq-static ${NSS3_LIBRARIES}) + endif() +@@ -1550,10 +1529,6 @@ if(BUILD_SHARED) + target_link_libraries(${perf-tool} ${GNUTLS_LIBRARIES}) + endif() + +- if(LIBBSD_FOUND) +- target_link_libraries(${perf-tool} ${LIBBSD_LIBRARIES}) +- endif() +- + if(NSS3_FOUND) + target_link_libraries(${perf-tool} ${NSS3_LIBRARIES}) + endif() +--- a/Makefile.am ++++ b/Makefile.am +@@ -351,11 +351,11 @@ if HAVE_VSCRIPT_COMPLEX + src_libzmq_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(srcdir)/src/libzmq.vers + endif + +-src_libzmq_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) $(LIBUNWIND_CFLAGS) $(LIBBSD_CFLAGS) +-src_libzmq_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(LIBUNWIND_CFLAGS) $(LIBBSD_CFLAGS) ++src_libzmq_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) $(LIBUNWIND_CFLAGS) ++src_libzmq_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(LIBUNWIND_CFLAGS) + src_libzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@ $(CODE_COVERAGE_CXXFLAGS) \ +- $(LIBUNWIND_CFLAGS) $(LIBBSD_CFLAGS) +-src_libzmq_la_LIBADD = $(CODE_COVERAGE_LDFLAGS) $(LIBUNWIND_LIBS) $(LIBBSD_LIBS) ++ $(LIBUNWIND_CFLAGS) ++src_libzmq_la_LIBADD = $(CODE_COVERAGE_LDFLAGS) $(LIBUNWIND_LIBS) + + if USE_NSS + src_libzmq_la_CPPFLAGS += ${NSS3_CFLAGS} +@@ -849,10 +849,10 @@ tests_test_security_curve_SOURCES += \ + endif + + tests_test_security_curve_LDADD = \ +- ${TESTUTIL_LIBS} src/libzmq.la $(LIBUNWIND_LIBS) $(LIBBSD_LIBS) ++ ${TESTUTIL_LIBS} src/libzmq.la $(LIBUNWIND_LIBS) + tests_test_security_curve_CPPFLAGS = \ + ${TESTUTIL_CPPFLAGS} \ +- ${LIBUNWIND_CFLAGS} ${LIBBSD_CFLAGS} ++ ${LIBUNWIND_CFLAGS} + + if USE_LIBSODIUM + tests_test_security_curve_CPPFLAGS += \ +--- a/builds/cmake/platform.hpp.in ++++ b/builds/cmake/platform.hpp.in +@@ -52,8 +52,6 @@ + #cmakedefine ZMQ_HAVE_PTHREAD_SET_AFFINITY + #cmakedefine HAVE_ACCEPT4 + #cmakedefine HAVE_STRNLEN +-#cmakedefine ZMQ_HAVE_STRLCPY +-#cmakedefine ZMQ_HAVE_LIBBSD + + #cmakedefine ZMQ_HAVE_IPC + +--- a/configure.ac ++++ b/configure.ac +@@ -12,7 +12,7 @@ AC_CONFIG_AUX_DIR(config) + AC_CONFIG_MACRO_DIR(config) + AC_CONFIG_HEADERS([src/platform.hpp]) + AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar dist-zip) +-# Allow "configure --disable-maintainer-mode" to disable timestamp checking ++# Allow "configure --disable-maintainer-mode" to disable timestamp checking + AM_MAINTAINER_MODE([enable]) + + m4_pattern_allow([AC_PROG_CC_C99]) +@@ -806,43 +806,6 @@ AC_COMPILE_IFELSE( + ],[ + AC_MSG_RESULT([no]) + ]) +- +-AC_ARG_ENABLE([libbsd], +- [AS_HELP_STRING([--enable-libbsd], +- [enable libbsd [default=auto]])], +- [enable_libbsd=$enableval], +- [enable_libbsd="auto"]) +- +-if test "x$enable_libbsd" != "xno"; then +- PKG_CHECK_MODULES(LIBBSD, [libbsd], +- [ +- AC_DEFINE(ZMQ_HAVE_LIBBSD, 1, [The libbsd library is to be used]) +- AC_SUBST([LIBBSD_CFLAGS]) +- AC_SUBST([LIBBSD_LIBS]) +- PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE libbsd" +- found_libbsd="yes" +- ], +- [ +- found_libbsd="no" +- if test "x$enable_libbsd" = "xyes"; then +- AC_MSG_ERROR([Cannot find libbsd]) +- else +- AC_MSG_WARN([Cannot find libbsd]) +- fi +- ]) +-fi +-AC_MSG_CHECKING([whether strlcpy is available]) +-AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include ]], +- [[char buf [100]; size_t bar = strlcpy (buf, "foo", 100); (void)bar; return 0;]]) +- ],[ +- AC_MSG_RESULT([yes]) +- AC_DEFINE(ZMQ_HAVE_STRLCPY, [1], +- [strlcpy is available]) +- ],[ +- AC_MSG_RESULT([no]) +-]) + + # pthread_setname is non-posix, and there are at least 4 different implementations + AC_MSG_CHECKING([whether signature of pthread_setname_np() has 1 argument]) +--- a/src/compat.hpp ++++ b/src/compat.hpp +@@ -37,26 +37,41 @@ + #define strcasecmp _stricmp + #define strtok_r strtok_s + #else +-#ifndef ZMQ_HAVE_STRLCPY +-#ifdef ZMQ_HAVE_LIBBSD +-#include +-#else +-static inline size_t +-strlcpy (char *dest_, const char *src_, const size_t dest_size_) +-{ +- size_t remain = dest_size_; +- for (; remain && *src_; --remain, ++src_, ++dest_) { +- *dest_ = *src_; +- } +- return dest_size_ - remain; +-} +-#endif +-#endif ++/* ++ * https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/strcpy-s-wcscpy-s-mbscpy-s?view=msvc-170 ++ */ + template +-static inline int strcpy_s (char (&dest_)[size], const char *const src_) ++static inline int strcpy_s (char (&dst)[size], const char *const src) + { +- const size_t res = strlcpy (dest_, src_, size); +- return res >= size ? ERANGE : 0; ++ size_t i; ++ ++ if (src == NULL) { ++ /* ++ * XXX: ++ * Microsoft's documentation is ambiguous. ++ * ++ * How does Microsoft handle size == 0 when src is NULL? ++ * Do they return ERANGE? ++ * ++ * How does Microsoft handle size == 0 when src is non-NULL? ++ * Do they write a '\0' to *dst anyway? ++ */ ++ if (size > 0) ++ *dst = '\0'; ++ return (errno = EINVAL); ++ } ++ ++ for (i = 0;; i++) { ++ if (i >= size) { ++ if (size > 0) ++ *dst = '\0'; ++ return (errno = ERANGE); ++ } ++ dst[i] = src[i]; ++ if (src[i] == '\0') ++ return 0; ++ } ++ /* NOTREACHED */ + } + #endif + From b5e759f049d9bb6f9e6ca9afa9d2067d229354be Mon Sep 17 00:00:00 2001 From: Martin Schneider Date: Fri, 11 Jun 2021 07:53:37 +0800 Subject: [PATCH 224/241] boringssl: Add boringssl library Add boringssl library. BoringSSL is Google's fork of OpenSSL. Amongst other features, it adds support for QUIC. Signed-off-by: Martin Schneider --- libs/boringssl/Makefile | 52 +++++++++++++++++++ .../patches/300-support-mipsel-arch.patch | 21 ++++++++ .../patches/900-add-install-target.patch | 18 +++++++ 3 files changed, 91 insertions(+) create mode 100644 libs/boringssl/Makefile create mode 100644 libs/boringssl/patches/300-support-mipsel-arch.patch create mode 100644 libs/boringssl/patches/900-add-install-target.patch diff --git a/libs/boringssl/Makefile b/libs/boringssl/Makefile new file mode 100644 index 00000000..9c38a70e --- /dev/null +++ b/libs/boringssl/Makefile @@ -0,0 +1,52 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Copyright (C) 2021 Martin Schneider + +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 +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)) diff --git a/libs/boringssl/patches/300-support-mipsel-arch.patch b/libs/boringssl/patches/300-support-mipsel-arch.patch new file mode 100644 index 00000000..2d44be7c --- /dev/null +++ b/libs/boringssl/patches/300-support-mipsel-arch.patch @@ -0,0 +1,21 @@ +From 425b44bc6f6abcd4c12e2fb72f42622e825ad700 Mon Sep 17 00:00:00 2001 +From: Martin Schneider +Date: Mon, 25 Oct 2021 09:53:33 +0800 +Subject: [PATCH] Support mipsel architecture. + +Signed-off-by: Martin Schneider +--- + 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") diff --git a/libs/boringssl/patches/900-add-install-target.patch b/libs/boringssl/patches/900-add-install-target.patch new file mode 100644 index 00000000..2dd12506 --- /dev/null +++ b/libs/boringssl/patches/900-add-install-target.patch @@ -0,0 +1,18 @@ +From 8f62d432745a65671332281363409229c238cd1e Mon Sep 17 00:00:00 2001 +From: Martin Schneider +Date: Mon, 25 Oct 2021 10:53:01 +0800 +Subject: [PATCH] Add install target to CMakeLists.txt + +Signed-off-by: Martin Schneider +--- + 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) From ce8723a74933a4d2af21c80afb24cd0d83770c54 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Thu, 7 Jul 2022 01:46:56 +0200 Subject: [PATCH 225/241] libcli: Add new package This package is a dependency for building mausezahn as part of the netsniff-ng sources. mausezahn is a multicast traffic generator used by the upcoming kernel-selftests-net-forwarding package. Signed-off-by: Martin Blumenstingl --- libs/libcli/Makefile | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 libs/libcli/Makefile diff --git a/libs/libcli/Makefile b/libs/libcli/Makefile new file mode 100644 index 00000000..145087de --- /dev/null +++ b/libs/libcli/Makefile @@ -0,0 +1,57 @@ +# Copyright (C) 2022 Martin Blumenstingl +# +# 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 +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)) From 5123a018225535813f0d01447335a902943d6afa Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 15 Feb 2021 13:00:33 +0100 Subject: [PATCH 226/241] libmspack: initial checkin libmspack is a library for some loosely related Microsoft compression formats: CAB, CHM, HLP, LIT, KWAJ and SZDD Signed-off-by: Florian Eckert --- libs/libmspack/Makefile | 62 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 libs/libmspack/Makefile diff --git a/libs/libmspack/Makefile b/libs/libmspack/Makefile new file mode 100644 index 00000000..2693d149 --- /dev/null +++ b/libs/libmspack/Makefile @@ -0,0 +1,62 @@ +# +# Copyright (C) 2021 TDT AG +# +# 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 +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)) From 2b3b22c8f053d5bb5e4e1df01301dde83160f896 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 8 Jun 2022 18:06:38 -0700 Subject: [PATCH 227/241] libsoup3: add Signed-off-by: Rosen Penev --- libs/libsoup3/Makefile | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 libs/libsoup3/Makefile diff --git a/libs/libsoup3/Makefile b/libs/libsoup3/Makefile new file mode 100644 index 00000000..bb7f235b --- /dev/null +++ b/libs/libsoup3/Makefile @@ -0,0 +1,76 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libsoup3 +PKG_VERSION:=3.0.6 +PKG_RELEASE:=$(AUTORELEASE) + +PKG_SOURCE:=libsoup-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@GNOME/libsoup/3.0 +PKG_HASH:=b45d59f840b9acf9bb45fd45854e3ef672f57e3ab957401c3ad8d7502ac23da6 +PKG_BUILD_DIR:=$(BUILD_DIR)/libsoup-$(PKG_VERSION) + +PKG_MAINTAINER:= +PKG_LICENSE:=LGPL-2.1-or-later +PKG_LICENSE_FILES:=COPYING +PKG_CPE_ID:=cpe:/a:gnome:libsoup + +PKG_BUILD_DEPENDS:=glib2/host +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +include $(INCLUDE_DIR)/meson.mk + +define Package/libsoup3 + SECTION:=libs + CATEGORY:=Libraries + TITLE:=libsoup3 + URL:=https://wiki.gnome.org/Projects/libsoup + DEPENDS:=+glib2 +libxml2 +libgnutls +libsqlite3 +libpsl +libnghttp2 +endef + +MESON_ARGS += \ + -Dgssapi=disabled \ + -Dntlm=disabled \ + -Dbrotli=disabled \ + -Dtls_check=false \ + -Dintrospection=disabled \ + -Dvapi=disabled \ + -Dgtk_doc=false \ + -Dtests=false \ + -Dinstalled_tests=false \ + -Dsysprof=disabled + +define package/libsoup3/decription +Libsoup is an HTTP library implementation in C +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/libsoup-3.0/libsoup} + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libsoup-3.0.so* \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/libsoup-3.0/libsoup/*.h \ + $(1)/usr/include/libsoup-3.0/libsoup/ +endef + +define Package/libsoup3/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libsoup-3.0.* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libsoup3)) From 61f7c719b088aa92f0cbe1eec046e0b3bbd5ccb0 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 22 Sep 2022 15:48:52 -0700 Subject: [PATCH 228/241] libsoup3: update maintainer Signed-off-by: Rosen Penev --- libs/libsoup3/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/libsoup3/Makefile b/libs/libsoup3/Makefile index bb7f235b..5b071fd5 100644 --- a/libs/libsoup3/Makefile +++ b/libs/libsoup3/Makefile @@ -14,13 +14,12 @@ PKG_SOURCE_URL:=@GNOME/libsoup/3.0 PKG_HASH:=b45d59f840b9acf9bb45fd45854e3ef672f57e3ab957401c3ad8d7502ac23da6 PKG_BUILD_DIR:=$(BUILD_DIR)/libsoup-$(PKG_VERSION) -PKG_MAINTAINER:= +PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gnome:libsoup PKG_BUILD_DEPENDS:=glib2/host -PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk From 2391355216b3095aafba9f4fd7b73ed2458fdeba Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Fri, 26 Feb 2021 13:19:41 +0200 Subject: [PATCH 229/241] openblas: add initial package Initial draft PR is: https://github.com/openwrt/packages/pull/11894 This one is a bit more complete, and follows packaging practices. For now, disabling builds on ARC and PowerPC. Will require more work to get them going. Explicitly disabling OpenMP support, so that it doesn't get picked by accident. Later we may use the `CPU_TYPE` parameter to tweak things a little further. Signed-off-by: Alexandru Ardelean --- libs/openblas/Makefile | 106 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 libs/openblas/Makefile diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile new file mode 100644 index 00000000..4fc8eb2a --- /dev/null +++ b/libs/openblas/Makefile @@ -0,0 +1,106 @@ +# +# Copyright (C) 2021 Alexandru Ardelean +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=OpenBLAS +PKG_VERSION:=0.3.15 +PKG_RELEASE:=$(AUTORELEASE) + +PKG_SOURCE:=OpenBLAS-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/xianyi/OpenBLAS/releases/download/v$(PKG_VERSION)/ +PKG_HASH:=30a99dec977594b387a17f49904523e6bc8dd88bd247266e83485803759e4bbe +PKG_LICENSE:=BSD 3-Clause +PKG_MAINTAINER:=Alexandru Ardelean + +PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/openblas + SECTION:=libs + CATEGORY:=Libraries + TITLE:=An optimized library for BLAS (Basic Linear Algebra Subprograms) + URL:=https://www.openblas.net/ + DEPENDS:= \ + @!arc \ + @!powerpc \ + +INSTALL_GFORTRAN:libgfortran +endef + +define Package/openblas/description + OpenBLAS is an optimized BLAS (Basic Linear Algebra Subprograms) library + based on GotoBLAS2 1.13 BSD version. +endef + +define Package/openblas/config +menu "Configuration" +depends on PACKAGE_openblas + +config OPENBLAS_TARGET_OVERRIDE + string + prompt "Manual CPU target override (from the OpenBLAS TargetList.txt file)" + +endmenu +endef + +OPENBLAS_TARGET=$(call qstrip,$(CONFIG_OPENBLAS_TARGET_OVERRIDE)) + +ifeq ($(OPENBLAS_TARGET),) +ifeq ($(ARCH),aarch64) + OPENBLAS_TARGET:=ARMV8 +else ifeq ($(ARCH),arm) + OPENBLAS_TARGET:=ARMV5 +else ifeq ($(ARCH),mips) + OPENBLAS_TARGET:=MIPS24K +else ifeq ($(ARCH),mipsel) + OPENBLAS_TARGET:=MIPS24K +else ifeq ($(ARCH),powerpc) + OPENBLAS_TARGET:=PPC440 +else ifeq ($(ARCH),mips64) + OPENBLAS_TARGET:=I6400 +else ifeq ($(ARCH),mips64el) + OPENBLAS_TARGET:=I6400 +else ifeq ($(ARCH),i386) + OPENBLAS_TARGET:=GENERIC +else ifeq ($(ARCH),x86_64) + OPENBLAS_TARGET:=GENERIC +endif +endif # ifeq ($(OPENBLAS_TARGET),) + +ifeq ($(CONFIG_ARCH_64BIT),y) +OPENBLAS_BINARY:=64 +else +OPENBLAS_BINARY:=32 +endif + +MAKE_FLAGS += \ + CROSS=1 \ + HOSTCC=$(HOSTCC) \ + CROSS_SUFFIX=$(TARGET_CROSS) \ + BINARY=$(OPENBLAS_BINARY) \ + NUM_THREADS=2 \ + PREFIX=/usr \ + COMMON_OPT="" \ + TARGET=$(call qstrip,$(OPENBLAS_TARGET)) + +ifneq ($(CONFIG_INSTALL_GFORTRAN),y) +MAKE_FLAGS += NOFORTRAN=1 +endif + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ +endef + +define Package/openblas/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopenblas*.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,openblas)) From 9d28482d344fb8921b1c5683e66fd55c1284ea4b Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 2 Aug 2021 10:33:23 +0300 Subject: [PATCH 230/241] openblas: bump to version 0.3.17 and fix ccache build Fixes: https://github.com/openwrt/packages/issues/16271 Signed-off-by: Alexandru Ardelean --- libs/openblas/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile index 4fc8eb2a..1bc6d817 100644 --- a/libs/openblas/Makefile +++ b/libs/openblas/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=OpenBLAS -PKG_VERSION:=0.3.15 +PKG_VERSION:=0.3.17 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=OpenBLAS-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/xianyi/OpenBLAS/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=30a99dec977594b387a17f49904523e6bc8dd88bd247266e83485803759e4bbe +PKG_HASH:=df2934fa33d04fd84d839ca698280df55c690c86a5a1133b3f7266fce1de279f PKG_LICENSE:=BSD 3-Clause PKG_MAINTAINER:=Alexandru Ardelean @@ -78,7 +78,7 @@ endif MAKE_FLAGS += \ CROSS=1 \ - HOSTCC=$(HOSTCC) \ + HOSTCC=$(HOSTCC_NOCACHE) \ CROSS_SUFFIX=$(TARGET_CROSS) \ BINARY=$(OPENBLAS_BINARY) \ NUM_THREADS=2 \ From 368f24a8f9d3acd4c821fa80c166f012f9a075da Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sun, 26 Sep 2021 12:24:38 +0300 Subject: [PATCH 231/241] libs: openblas: use GENERIC target for MIPS64 archs and as default The GENERIC target for OpenBLAS seems good enough for most configs, so try to use it for MIPS64 and as default for other archs. This was already being used for x86{_64} archs. Signed-off-by: Alexandru Ardelean --- libs/openblas/Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile index 1bc6d817..c3228d14 100644 --- a/libs/openblas/Makefile +++ b/libs/openblas/Makefile @@ -49,6 +49,9 @@ endef OPENBLAS_TARGET=$(call qstrip,$(CONFIG_OPENBLAS_TARGET_OVERRIDE)) ifeq ($(OPENBLAS_TARGET),) +# initialize to GENERIC as default +OPENBLAS_TARGET:=GENERIC + ifeq ($(ARCH),aarch64) OPENBLAS_TARGET:=ARMV8 else ifeq ($(ARCH),arm) @@ -59,14 +62,6 @@ else ifeq ($(ARCH),mipsel) OPENBLAS_TARGET:=MIPS24K else ifeq ($(ARCH),powerpc) OPENBLAS_TARGET:=PPC440 -else ifeq ($(ARCH),mips64) - OPENBLAS_TARGET:=I6400 -else ifeq ($(ARCH),mips64el) - OPENBLAS_TARGET:=I6400 -else ifeq ($(ARCH),i386) - OPENBLAS_TARGET:=GENERIC -else ifeq ($(ARCH),x86_64) - OPENBLAS_TARGET:=GENERIC endif endif # ifeq ($(OPENBLAS_TARGET),) From eb3fa3d71882561586f606579c5eda121df7edb5 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sun, 26 Sep 2021 12:28:06 +0300 Subject: [PATCH 232/241] libs: openblas: patch openblas to handle mips{64}el arch names Related to PR: https://github.com/xianyi/OpenBLAS/pull/3387 Signed-off-by: Alexandru Ardelean --- libs/openblas/patches/001-adjust-mips-el-arch.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 libs/openblas/patches/001-adjust-mips-el-arch.patch diff --git a/libs/openblas/patches/001-adjust-mips-el-arch.patch b/libs/openblas/patches/001-adjust-mips-el-arch.patch new file mode 100644 index 00000000..62e736ea --- /dev/null +++ b/libs/openblas/patches/001-adjust-mips-el-arch.patch @@ -0,0 +1,13 @@ +--- a/Makefile.system ++++ b/Makefile.system +@@ -33,6 +33,10 @@ else ifeq ($(ARCH), armv7) + override ARCH=arm + else ifeq ($(ARCH), aarch64) + override ARCH=arm64 ++else ifeq ($(ARCH), mipsel) ++override ARCH=mips ++else ifeq ($(ARCH), mips64el) ++override ARCH=mips64 + else ifeq ($(ARCH), zarch) + override ARCH=zarch + endif From a3e6332555da23425d3a1d50ede7e6e37d999d17 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sun, 26 Sep 2021 12:58:12 +0300 Subject: [PATCH 233/241] libs: openblas: use GENERIC for MIPS{EL} and MIPS24K for CPU_TYPE == 24kc Up until now, we were defaulting to MIPS24K for all MIPS archs. But, we should use the GENERIC target for MIPS{EL} and the MIPS24K target for the 24kc CPU_TYPE. Signed-off-by: Alexandru Ardelean --- libs/openblas/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile index c3228d14..2faf6998 100644 --- a/libs/openblas/Makefile +++ b/libs/openblas/Makefile @@ -47,6 +47,7 @@ endmenu endef OPENBLAS_TARGET=$(call qstrip,$(CONFIG_OPENBLAS_TARGET_OVERRIDE)) +CPU_TYPE=$(call qstrip,$(CONFIG_CPU_TYPE)) ifeq ($(OPENBLAS_TARGET),) # initialize to GENERIC as default @@ -57,9 +58,13 @@ ifeq ($(ARCH),aarch64) else ifeq ($(ARCH),arm) OPENBLAS_TARGET:=ARMV5 else ifeq ($(ARCH),mips) - OPENBLAS_TARGET:=MIPS24K + ifeq ($(CPU_TYPE),24kc) + OPENBLAS_TARGET:=MIPS24K + endif # CPU_TYPE == 24kc else ifeq ($(ARCH),mipsel) - OPENBLAS_TARGET:=MIPS24K + ifeq ($(CPU_TYPE),24kc) + OPENBLAS_TARGET:=MIPS24K + endif # CPU_TYPE == 24kc else ifeq ($(ARCH),powerpc) OPENBLAS_TARGET:=PPC440 endif From eb8830af43e3b653626c54ca692a4edcdb0bc3eb Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 4 Oct 2021 13:41:50 +0300 Subject: [PATCH 234/241] openblas: bump to 0.3.18 Drops patch, which was upstreamed. Signed-off-by: Alexandru Ardelean --- libs/openblas/Makefile | 4 ++-- libs/openblas/patches/001-adjust-mips-el-arch.patch | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 libs/openblas/patches/001-adjust-mips-el-arch.patch diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile index 2faf6998..9ad78b37 100644 --- a/libs/openblas/Makefile +++ b/libs/openblas/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=OpenBLAS -PKG_VERSION:=0.3.17 +PKG_VERSION:=0.3.18 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=OpenBLAS-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/xianyi/OpenBLAS/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=df2934fa33d04fd84d839ca698280df55c690c86a5a1133b3f7266fce1de279f +PKG_HASH:=1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb PKG_LICENSE:=BSD 3-Clause PKG_MAINTAINER:=Alexandru Ardelean diff --git a/libs/openblas/patches/001-adjust-mips-el-arch.patch b/libs/openblas/patches/001-adjust-mips-el-arch.patch deleted file mode 100644 index 62e736ea..00000000 --- a/libs/openblas/patches/001-adjust-mips-el-arch.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.system -+++ b/Makefile.system -@@ -33,6 +33,10 @@ else ifeq ($(ARCH), armv7) - override ARCH=arm - else ifeq ($(ARCH), aarch64) - override ARCH=arm64 -+else ifeq ($(ARCH), mipsel) -+override ARCH=mips -+else ifeq ($(ARCH), mips64el) -+override ARCH=mips64 - else ifeq ($(ARCH), zarch) - override ARCH=zarch - endif From cb23f5f3273a5b35214729ca4546b121e88f0c93 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 6 Oct 2021 12:06:32 -0300 Subject: [PATCH 235/241] openblas: fix compilation with mips x4k series CPU Anything later than MIPS 24k can run MIPS 24k code. Set OPENBLAS_TARGET to MIPS24K in those cases. Signed-off-by: Eneas U de Queiroz --- libs/openblas/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile index 9ad78b37..bc28e79f 100644 --- a/libs/openblas/Makefile +++ b/libs/openblas/Makefile @@ -58,13 +58,13 @@ ifeq ($(ARCH),aarch64) else ifeq ($(ARCH),arm) OPENBLAS_TARGET:=ARMV5 else ifeq ($(ARCH),mips) - ifeq ($(CPU_TYPE),24kc) + ifneq ($(filter 24k% 74k%,$(CPU_TYPE)),) OPENBLAS_TARGET:=MIPS24K - endif # CPU_TYPE == 24kc + endif # CPU_TYPE == 24k* or 74k* else ifeq ($(ARCH),mipsel) - ifeq ($(CPU_TYPE),24kc) + ifneq ($(filter 24k% 74k%,$(CPU_TYPE)),) OPENBLAS_TARGET:=MIPS24K - endif # CPU_TYPE == 24kc + endif # CPU_TYPE == 24k* or 74k* else ifeq ($(ARCH),powerpc) OPENBLAS_TARGET:=PPC440 endif From eb134948ac4902d60ecdce3f879035e6985d15b2 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 6 Oct 2021 16:26:23 -0300 Subject: [PATCH 236/241] openblas: avoid using make -j when building Set MAKE_NB_JOBS=-1 so that no -j parameter is passed to make when building the package, honoring the parent make's setting. Signed-off-by: Eneas U de Queiroz --- libs/openblas/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile index bc28e79f..86c50790 100644 --- a/libs/openblas/Makefile +++ b/libs/openblas/Makefile @@ -81,6 +81,7 @@ MAKE_FLAGS += \ HOSTCC=$(HOSTCC_NOCACHE) \ CROSS_SUFFIX=$(TARGET_CROSS) \ BINARY=$(OPENBLAS_BINARY) \ + MAKE_NB_JOBS=-1 \ NUM_THREADS=2 \ PREFIX=/usr \ COMMON_OPT="" \ From 0f0b840f23d9460f2f9429370bf44dc1708b61a4 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Fri, 5 Nov 2021 14:01:28 +0200 Subject: [PATCH 237/241] openblas: default to MIPS24K target for all mips32 targets Reported via: https://github.com/openwrt/packages/pull/16823#issuecomment-945312460 This fails in mips_mip32 targets with the output listed below. Using the MIPS24K target works fine. ``` mips-openwrt-linux-musl-gcc -c -Os -pipe -mno-branch-likely -mips32 -mtune=mips32 -fno-caller-saves -fno-plt -fhonour-copts -Wno-error=unused-but-set-variable -Wno-error=unused-result -msoft-float -ffile-prefix-map=/builder/shared-workdir/build/sdk/build_dir/target-mips_mips32_musl/OpenBLAS-0.3.18=OpenBLAS-0.3.18 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -I/builder/shared-workdir/build/sdk/staging_dir/toolchain-mips_mips32_gcc-11.2.0_musl/usr/include -I/builder/shared-workdir/build/sdk/staging_dir/toolchain-mips_mips32_gcc-11.2.0_musl/include/fortify -I/builder/shared-workdir/build/sdk/staging_dir/toolchain-mips_mips32_gcc-11.2.0_musl/include -DMAX_STACK_ALLOC=2048 -Wall -mabi=32 -DF_INTERFACE_GFORT -fPIC -DNO_LAPACK -DNO_LAPACKE -DNO_AVX512 -DSMP_SERVER -DNO_WARMUP -DMAX_CPU_NUMBER=2 -DMAX_PARALLEL_NUMBER=1 -DBUILD_SINGLE=1 -DBUILD_DOUBLE=1 -DBUILD_COMPLEX=1 -DBUILD_COMPLEX16=1 -DVERSION=\"0.3.18\" -UASMNAME -UASMFNAME -UNAME -UCNAME -UCHAR_NAME -UCHAR_CNAME -DASMNAME= -DASMFNAME=_ -DNAME=_ -DCNAME= -DCHAR_NAME=\"_\" -DCHAR_CNAME=\"\" -DNO_AFFINITY -I. -DMAX_STACK_ALLOC=2048 -Wall -mabi=32 -DF_INTERFACE_GFORT -fPIC -DNO_LAPACK -DNO_LAPACKE -DNO_AVX512 -DSMP_SERVER -DNO_WARMUP -DMAX_CPU_NUMBER=2 -DMAX_PARALLEL_NUMBER=1 -DBUILD_SINGLE=1 -DBUILD_DOUBLE=1 -DBUILD_COMPLEX=1 -DBUILD_COMPLEX16=1 -DVERSION=\"0.3.18\" -UASMNAME -UASMFNAME -UNAME -UCNAME -UCHAR_NAME -UCHAR_CNAME -DASMNAME=sgemm -DASMFNAME=sgemm_ -DNAME=sgemm_ -DCNAME=sgemm -DCHAR_NAME=\"sgemm_\" -DCHAR_CNAME=\"sgemm\" -DNO_AFFINITY -I.. -I. -UDOUBLE -UCOMPLEX gemm.c -o sgemm.o In file included from ../common.h:581, from gemm.c:41: gemm.c: In function 'sgemm_': ../param.h:3477:25: error: 'sgemm_p' undeclared (first use in this function); did you mean 'sgemm_'? 3477 | #define SGEMM_DEFAULT_P sgemm_p | ^~~~~~~ ../common_param.h:1334:25: note: in expansion of macro 'SGEMM_DEFAULT_P' 1334 | #define SGEMM_P SGEMM_DEFAULT_P | ^~~~~~~~~~~~~~~ ../common_param.h:1482:33: note: in expansion of macro 'SGEMM_P' 1482 | #define GEMM_P SGEMM_P | ^~~~~~~ gemm.c:494:37: note: in expansion of macro 'GEMM_P' 494 | sb = (XFLOAT *)(((BLASLONG)sa + ((GEMM_P * GEMM_Q * COMPSIZE * SIZE + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B); | ^~~~~~ ../param.h:3477:25: note: each undeclared identifier is reported only once for each function it appears in 3477 | #define SGEMM_DEFAULT_P sgemm_p | ^~~~~~~ ../common_param.h:1334:25: note: in expansion of macro 'SGEMM_DEFAULT_P' 1334 | #define SGEMM_P SGEMM_DEFAULT_P | ^~~~~~~~~~~~~~~ ../common_param.h:1482:33: note: in expansion of macro 'SGEMM_P' 1482 | #define GEMM_P SGEMM_P | ^~~~~~~ gemm.c:494:37: note: in expansion of macro 'GEMM_P' 494 | sb = (XFLOAT *)(((BLASLONG)sa + ((GEMM_P * GEMM_Q * COMPSIZE * SIZE + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B); | ^~~~~~ make[5]: *** [Makefile:1295: sgemm.o] Error 1 make[5]: Leaving directory '/builder/shared-workdir/ ``` Signed-off-by: Alexandru Ardelean --- libs/openblas/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile index 86c50790..c0fc50df 100644 --- a/libs/openblas/Makefile +++ b/libs/openblas/Makefile @@ -58,13 +58,9 @@ ifeq ($(ARCH),aarch64) else ifeq ($(ARCH),arm) OPENBLAS_TARGET:=ARMV5 else ifeq ($(ARCH),mips) - ifneq ($(filter 24k% 74k%,$(CPU_TYPE)),) - OPENBLAS_TARGET:=MIPS24K - endif # CPU_TYPE == 24k* or 74k* + OPENBLAS_TARGET:=MIPS24K else ifeq ($(ARCH),mipsel) - ifneq ($(filter 24k% 74k%,$(CPU_TYPE)),) - OPENBLAS_TARGET:=MIPS24K - endif # CPU_TYPE == 24k* or 74k* + OPENBLAS_TARGET:=MIPS24K else ifeq ($(ARCH),powerpc) OPENBLAS_TARGET:=PPC440 endif From 56f2a8be5a3407058e3e58b92fa83d0ce5aa1db7 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 27 Dec 2021 12:16:12 +0200 Subject: [PATCH 238/241] libs: openblas: bump to version v0.3.19 Signed-off-by: Alexandru Ardelean --- libs/openblas/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile index c0fc50df..153de54a 100644 --- a/libs/openblas/Makefile +++ b/libs/openblas/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=OpenBLAS -PKG_VERSION:=0.3.18 +PKG_VERSION:=0.3.19 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=OpenBLAS-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/xianyi/OpenBLAS/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb +PKG_HASH:=947f51bfe50c2a0749304fbe373e00e7637600b0a47b78a51382aeb30ca08562 PKG_LICENSE:=BSD 3-Clause PKG_MAINTAINER:=Alexandru Ardelean From 013be35ba6488075bcabbd02e07b0f41b979005d Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Mon, 23 May 2022 23:25:55 +0200 Subject: [PATCH 239/241] libs: openblas: compile with RISCV64_GENERIC target on riscv64 arch Signed-off-by: Zoltan HERPAI --- libs/openblas/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile index 153de54a..0b352d9d 100644 --- a/libs/openblas/Makefile +++ b/libs/openblas/Makefile @@ -63,6 +63,8 @@ else ifeq ($(ARCH),mipsel) OPENBLAS_TARGET:=MIPS24K else ifeq ($(ARCH),powerpc) OPENBLAS_TARGET:=PPC440 +else ifeq ($(ARCH),riscv64) + OPENBLAS_TARGET:=RISCV64_GENERIC endif endif # ifeq ($(OPENBLAS_TARGET),) From c495f5f6c47ef3c0f2a400248591f254bfee52db Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sun, 25 Sep 2022 17:44:00 +0300 Subject: [PATCH 240/241] openblas: bump to version 0.3.21 Signed-off-by: Alexandru Ardelean --- libs/openblas/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile index 0b352d9d..7dd5ed9f 100644 --- a/libs/openblas/Makefile +++ b/libs/openblas/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=OpenBLAS -PKG_VERSION:=0.3.19 +PKG_VERSION:=0.3.21 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=OpenBLAS-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/xianyi/OpenBLAS/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=947f51bfe50c2a0749304fbe373e00e7637600b0a47b78a51382aeb30ca08562 +PKG_HASH:=f36ba3d7a60e7c8bcc54cd9aaa9b1223dd42eaf02c811791c37e8ca707c241ca PKG_LICENSE:=BSD 3-Clause PKG_MAINTAINER:=Alexandru Ardelean From e1ccb783aba4807e3d9f82795476bb9785d0f745 Mon Sep 17 00:00:00 2001 From: Marcus Schref Date: Wed, 7 Sep 2022 13:15:55 +0200 Subject: [PATCH 241/241] sx1302_hal: initial check-in The SX1302 hardware abstraction layer is required by the basicstation to control the concentrator based on SX1302/SX1303 chip. Signed-off-by: Marcus Schref --- libs/sx1302_hal/Makefile | 109 ++++++++++++++++++ libs/sx1302_hal/patches/000-edit_cflags.patch | 35 ++++++ ...-add_compatibility_with_basicstation.patch | 22 ++++ libs/sx1302_hal/test.sh | 7 ++ 4 files changed, 173 insertions(+) create mode 100644 libs/sx1302_hal/Makefile create mode 100644 libs/sx1302_hal/patches/000-edit_cflags.patch create mode 100644 libs/sx1302_hal/patches/001-add_compatibility_with_basicstation.patch create mode 100644 libs/sx1302_hal/test.sh diff --git a/libs/sx1302_hal/Makefile b/libs/sx1302_hal/Makefile new file mode 100644 index 00000000..6fc3c4d6 --- /dev/null +++ b/libs/sx1302_hal/Makefile @@ -0,0 +1,109 @@ +# +# Copyright (C) 2022 TDT AG +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=sx1302_hal +PKG_VERSION:=2.1.0 +PKG_RELEASE:=$(AUTORELEASE) + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/Lora-net/sx1302_hal/tar.gz/V$(PKG_VERSION)? +PKG_HASH:=4b62aa6a83ad449c68fdd844fc35024586c9faabca3c5a90a2544735b380de5b + +PKG_MAINTAINER:=Marcus Schref +PKG_LICENSE:=MIT BSD-3-Clause +PKG_LICENSE_FILES:=LICENSE.TXT + +include $(INCLUDE_DIR)/package.mk + +define Package/sx1302_hal/Default + SECTION:=libs + CATEGORY:=Libraries + SUBMENU:=IoT + TITLE:=SX1302/SX1303 HAL +endef + +define Package/sx1302_hal-tests + $(call Package/sx1302_hal/Default) + TITLE+=(Tests) + DEPENDS:=+kmod-usb-acm +endef + +define Package/sx1302_hal-tests/description + Tests for SX1302/SX1303 Hardware Abstraction Layer +endef + +define Package/sx1302_hal-utils + $(call Package/sx1302_hal/Default) + TITLE+=(Utilities) + DEPENDS:=+kmod-usb-acm +endef + +define Package/sx1302_hal-utils/description + Utilities for SX1302/SX1303 Hardware Abstraction Layer +endef + +CFLAGS = $(TARGET_CFLAGS) + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/libtools \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + ARCH="$(ARCH)" + + $(MAKE) -C $(PKG_BUILD_DIR)/libloragw \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + ARCH="$(ARCH)" + + $(MAKE) -C $(PKG_BUILD_DIR)/util_boot \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + ARCH="$(ARCH)" + + $(MAKE) -C $(PKG_BUILD_DIR)/util_chip_id \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + ARCH="$(ARCH)" + + $(MAKE) -C $(PKG_BUILD_DIR)/util_net_downlink \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + ARCH="$(ARCH)" + + $(MAKE) -C $(PKG_BUILD_DIR)/util_spectral_scan \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + ARCH="$(ARCH)" +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/libtools/inc/tinymt32.h $(1)/usr/include + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libtools/libtinymt32.a $(1)/usr/lib + + $(INSTALL_DIR) $(1)/usr/include/lgw + $(CP) $(PKG_BUILD_DIR)/libloragw/inc/*.h $(1)/usr/include/lgw + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libloragw/*.a $(1)/usr/lib +endef + +define Package/sx1302_hal-tests/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/libloragw/test* $(1)/usr/bin +endef + +define Package/sx1302_hal-utils/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/util_boot/boot $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/util_chip_id/chip_id $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/util_net_downlink/net_downlink \ + $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/util_spectral_scan/spectral_scan \ + $(1)/usr/bin +endef + +$(eval $(call BuildPackage,sx1302_hal-tests)) +$(eval $(call BuildPackage,sx1302_hal-utils)) diff --git a/libs/sx1302_hal/patches/000-edit_cflags.patch b/libs/sx1302_hal/patches/000-edit_cflags.patch new file mode 100644 index 00000000..9a6fde2f --- /dev/null +++ b/libs/sx1302_hal/patches/000-edit_cflags.patch @@ -0,0 +1,35 @@ +From 389e8138f543baf334442ca52edf5f7b4cfe13dc Mon Sep 17 00:00:00 2001 +From: Marcus Schref +Date: Mon, 22 Aug 2022 10:02:13 +0200 +Subject: [PATCH] sx1302_hal: edit cflags + +Enable use of TARGET_CFLAGS in addition to specified CFLAGS + +Signed-off-by: Marcus Schref +--- + libloragw/Makefile | 2 +- + libtools/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/libloragw/Makefile ++++ b/libloragw/Makefile +@@ -11,7 +11,7 @@ CROSS_COMPILE ?= + CC := $(CROSS_COMPILE)gcc + AR := $(CROSS_COMPILE)ar + +-CFLAGS := -O2 -Wall -Wextra -std=c99 -Iinc -I. -I../libtools/inc ++CFLAGS += -O2 -Wall -Wextra -std=c99 -Iinc -I. -I../libtools/inc + + OBJDIR = obj + INCLUDES = $(wildcard inc/*.h) $(wildcard ../libtools/inc/*.h) +--- a/libtools/Makefile ++++ b/libtools/Makefile +@@ -7,7 +7,7 @@ CROSS_COMPILE ?= + CC := $(CROSS_COMPILE)gcc + AR := $(CROSS_COMPILE)ar + +-CFLAGS := -O2 -Wall -Wextra -std=c99 -Iinc -I. ++CFLAGS += -O2 -Wall -Wextra -std=c99 -Iinc -I. + + OBJDIR = obj + INCLUDES = $(wildcard inc/*.h) diff --git a/libs/sx1302_hal/patches/001-add_compatibility_with_basicstation.patch b/libs/sx1302_hal/patches/001-add_compatibility_with_basicstation.patch new file mode 100644 index 00000000..4d93a595 --- /dev/null +++ b/libs/sx1302_hal/patches/001-add_compatibility_with_basicstation.patch @@ -0,0 +1,22 @@ +From a6ae15dc6709e32f0604b6eeb0f07cc50bde18b1 Mon Sep 17 00:00:00 2001 +From: Marcus Schref +Date: Mon, 22 Aug 2022 10:06:03 +0200 +Subject: [PATCH] sx1302_hal: add compatibility with basicstation + +Add LGW_LBT_ISSUE define used by Basicstation + +Signed-off-by: Marcus Schref +--- + libloragw/inc/loragw_hal.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/libloragw/inc/loragw_hal.h ++++ b/libloragw/inc/loragw_hal.h +@@ -45,6 +45,7 @@ License: Revised BSD License, see LICENS + #define LGW_HAL_SUCCESS 0 + #define LGW_HAL_ERROR -1 + #define LGW_LBT_NOT_ALLOWED 1 ++#define LGW_LBT_ISSUE 1 + + /* radio-specific parameters */ + #define LGW_XTAL_FREQU 32000000 /* frequency of the RF reference oscillator */ diff --git a/libs/sx1302_hal/test.sh b/libs/sx1302_hal/test.sh new file mode 100644 index 00000000..3958edc0 --- /dev/null +++ b/libs/sx1302_hal/test.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ "$1" = 'sx1302_hal-tests' ]; then + test_loragw_com -h 2>&1 | grep "$2" +elif [ "$1" = 'sx1302_hal-utils' ]; then + chip_id -h 2>&1 | grep "$2" +fi