diff options
Diffstat (limited to 'meta/recipes-support')
216 files changed, 3264 insertions, 3113 deletions
diff --git a/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch new file mode 100644 index 0000000000..bc811d67b0 --- /dev/null +++ b/meta/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch @@ -0,0 +1,32 @@ +From fe9ebb8c0fa7b84a9c5c667386b8fbb3baea2fad Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 12 Dec 2022 15:42:42 +0100 +Subject: [PATCH] remove hardcoded path + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Dont include hardcoded path. This fixes: +| cc1: error: include location "/usr/include" is unsafe for cross-compilation [-Werror=poison-system-directories] + +Upstream-Status: Inappropriate [oe-specific] +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index fa171d5..79d5168 100644 +--- a/meson.build ++++ b/meson.build +@@ -185,10 +185,10 @@ endif + stemmer_inc_dirs = include_directories() + if get_option('stemming') + stemmer_lib = cc.find_library('stemmer', required: true) +- stemmer_inc_dirs = include_directories(['/usr/include']) ++ stemmer_inc_dirs = include_directories(['']) + if not cc.has_header('libstemmer.h') + if cc.has_header('libstemmer/libstemmer.h') +- stemmer_inc_dirs = include_directories('/usr/include/libstemmer') ++ stemmer_inc_dirs = include_directories('') + else + error('Unable to find Snowball header "libstemmer.h". Please ensure libstemmer/Snowball is installed properly in order to continue.') + endif diff --git a/meta/recipes-support/appstream/appstream_1.0.2.bb b/meta/recipes-support/appstream/appstream_1.0.2.bb new file mode 100644 index 0000000000..7eb12a04c5 --- /dev/null +++ b/meta/recipes-support/appstream/appstream_1.0.2.bb @@ -0,0 +1,44 @@ +SUMMARY = "AppStream is a collaborative effort for making machine-readable software metadata easily available." +HOMEPAGE = "https://github.com/ximion/appstream" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da" + +DEPENDS = " \ + appstream-native \ + curl-native \ + curl \ + docbook-xml-dtd4-native \ + gperf-native \ + glib-2.0 \ + libyaml \ + libxml2 \ + libxmlb \ + libxslt-native \ + itstool-native \ + docbook-xsl-stylesheets-native \ + python3-pygments-native \ +" + +inherit meson gobject-introspection gettext gi-docgen pkgconfig vala + +GIR_MESON_OPTION = "gir" +GIDOCGEN_MESON_OPTION = "apidocs" + +SRC_URI = " \ + https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz \ + file://0001-remove-hardcoded-path.patch \ +" +SRC_URI[sha256sum] = "1a5148ca97dcbf5eb6e9c380278bb0d20938569292ea8652df1b3cac8bd2736b" + +S = "${WORKDIR}/AppStream-${PV}" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[stemming] = "-Dstemming=true,-Dstemming=false,libstemmer" + +FILES:${PN} += "${datadir}" + +EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch b/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch deleted file mode 100644 index 6f27876a7f..0000000000 --- a/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 6b638fa9afbeb54dfa19378e391465a5284ce1ad Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 12 Sep 2018 17:16:36 +0800 -Subject: [PATCH] Fix error handling in gdbm - -Only check for gdbm_errno if the return value of the called gdbm_* -function says so. This fixes apr-util with gdbm 1.14, which does not -seem to always reset gdbm_errno. - -Also make the gdbm driver return error codes starting with -APR_OS_START_USEERR instead of always returning APR_EGENERAL. This is -what the berkleydb driver already does. - -Also ensure that dsize is 0 if dptr == NULL. - -Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1825311] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - dbm/apr_dbm_gdbm.c | 47 +++++++++++++++++++++++++++++------------------ - 1 file changed, 29 insertions(+), 18 deletions(-) - -diff --git a/dbm/apr_dbm_gdbm.c b/dbm/apr_dbm_gdbm.c -index 749447a..1c86327 100644 ---- a/dbm/apr_dbm_gdbm.c -+++ b/dbm/apr_dbm_gdbm.c -@@ -36,13 +36,25 @@ - static apr_status_t g2s(int gerr) - { - if (gerr == -1) { -- /* ### need to fix this */ -- return APR_EGENERAL; -+ if (gdbm_errno == GDBM_NO_ERROR) -+ return APR_SUCCESS; -+ return APR_OS_START_USEERR + gdbm_errno; - } - - return APR_SUCCESS; - } - -+static apr_status_t gdat2s(datum d) -+{ -+ if (d.dptr == NULL) { -+ if (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == GDBM_ITEM_NOT_FOUND) -+ return APR_SUCCESS; -+ return APR_OS_START_USEERR + gdbm_errno; -+ } -+ -+ return APR_SUCCESS; -+} -+ - static apr_status_t datum_cleanup(void *dptr) - { - if (dptr) -@@ -53,22 +65,15 @@ static apr_status_t datum_cleanup(void *dptr) - - static apr_status_t set_error(apr_dbm_t *dbm, apr_status_t dbm_said) - { -- apr_status_t rv = APR_SUCCESS; - -- /* ### ignore whatever the DBM said (dbm_said); ask it explicitly */ -+ dbm->errcode = dbm_said; - -- if ((dbm->errcode = gdbm_errno) == GDBM_NO_ERROR) { -+ if (dbm_said == APR_SUCCESS) - dbm->errmsg = NULL; -- } -- else { -- dbm->errmsg = gdbm_strerror(gdbm_errno); -- rv = APR_EGENERAL; /* ### need something better */ -- } -- -- /* captured it. clear it now. */ -- gdbm_errno = GDBM_NO_ERROR; -+ else -+ dbm->errmsg = gdbm_strerror(dbm_said - APR_OS_START_USEERR); - -- return rv; -+ return dbm_said; - } - - /* -------------------------------------------------------------------------- -@@ -107,7 +112,7 @@ static apr_status_t vt_gdbm_open(apr_dbm_t **pdb, const char *pathname, - NULL); - - if (file == NULL) -- return APR_EGENERAL; /* ### need a better error */ -+ return APR_OS_START_USEERR + gdbm_errno; /* ### need a better error */ - - /* we have an open database... return it */ - *pdb = apr_pcalloc(pool, sizeof(**pdb)); -@@ -141,10 +146,12 @@ static apr_status_t vt_gdbm_fetch(apr_dbm_t *dbm, apr_datum_t key, - if (pvalue->dptr) - apr_pool_cleanup_register(dbm->pool, pvalue->dptr, datum_cleanup, - apr_pool_cleanup_null); -+ else -+ pvalue->dsize = 0; - - /* store the error info into DBM, and return a status code. Also, note - that *pvalue should have been cleared on error. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static apr_status_t vt_gdbm_store(apr_dbm_t *dbm, apr_datum_t key, -@@ -201,9 +208,11 @@ static apr_status_t vt_gdbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey) - if (pkey->dptr) - apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup, - apr_pool_cleanup_null); -+ else -+ pkey->dsize = 0; - - /* store any error info into DBM, and return a status code. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey) -@@ -221,9 +230,11 @@ static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey) - if (pkey->dptr) - apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup, - apr_pool_cleanup_null); -+ else -+ pkey->dsize = 0; - - /* store any error info into DBM, and return a status code. */ -- return set_error(dbm, APR_SUCCESS); -+ return set_error(dbm, gdat2s(rd)); - } - - static void vt_gdbm_freedatum(apr_dbm_t *dbm, apr_datum_t data) --- -2.7.4 - diff --git a/meta/recipes-support/apr/apr-util/0001-test_transformation-Check-if-transform-is-supported-.patch b/meta/recipes-support/apr/apr-util/0001-test_transformation-Check-if-transform-is-supported-.patch new file mode 100644 index 0000000000..261b78736f --- /dev/null +++ b/meta/recipes-support/apr/apr-util/0001-test_transformation-Check-if-transform-is-supported-.patch @@ -0,0 +1,37 @@ +From 3a97f58cfb40fc1911bbfd067e8457a472613d75 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 18 Apr 2023 22:58:00 -0700 +Subject: [PATCH] test_transformation: Check if transform is supported before + using it + +This helps in excluding these tests on systems where these are not +available e.g. musl + +Upstream-Status: Submitted [https://bz.apache.org/bugzilla/show_bug.cgi?id=66570] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/testxlate.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/test/testxlate.c b/test/testxlate.c +index 6981eff..de00fa4 100644 +--- a/test/testxlate.c ++++ b/test/testxlate.c +@@ -116,8 +116,12 @@ static void test_transformation(abts_case *tc, void *data) + } + + /* 4. Transformation using charset aliases */ +- one_test(tc, "UTF-8", "UTF-7", test_utf8, test_utf7, p); +- one_test(tc, "UTF-7", "UTF-8", test_utf7, test_utf8, p); ++ if (is_transform_supported(tc, "UTF-8", "UTF-7", p)) { ++ one_test(tc, "UTF-8", "UTF-7", test_utf8, test_utf7, p); ++ } ++ if (is_transform_supported(tc, "UTF-7", "UTF-8", p)) { ++ one_test(tc, "UTF-7", "UTF-8", test_utf7, test_utf8, p); ++ } + } + + #endif /* APR_HAS_XLATE */ +-- +2.40.0 + diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb b/meta/recipes-support/apr/apr-util_1.6.3.bb index b851d46351..1371e262dd 100644 --- a/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/meta/recipes-support/apr/apr-util_1.6.3.bb @@ -12,12 +12,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=158aa0b1efe0c12f23d4b007ddb9a5db \ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://configfix.patch \ file://configure_fixes.patch \ + file://0001-test_transformation-Check-if-transform-is-supported-.patch \ file://run-ptest \ - file://0001-Fix-error-handling-in-gdbm.patch \ -" + " -SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" -SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" +SRC_URI[sha256sum] = "2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ diff --git a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch index abff4e9331..b46dc76a86 100644 --- a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch +++ b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch @@ -1,14 +1,15 @@ -From 2bbe20b4f69e84e7a18bc79d382486953f479328 Mon Sep 17 00:00:00 2001 +From 225abf37cd0b49960664b59f08e515a4c4ea5ad0 Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <jpuhlman@mvista.com> Date: Thu, 26 Mar 2020 18:30:36 +0000 Subject: [PATCH] Add option to disable timed dependant tests -The disabled tests rely on timing to pass correctly. On a virtualized +The disabled tests rely on timing to pass correctly. On a virtualized system under heavy load, these tests randomly fail because they miss a timer or other timing related issues. -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/apache/apr/pull/54] Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> + --- configure.in | 6 ++++++ include/apr.h.in | 1 + @@ -16,10 +17,10 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index d9f32d6..f0c5661 100644 +index bfd488b..3663220 100644 --- a/configure.in +++ b/configure.in -@@ -2886,6 +2886,12 @@ AC_ARG_ENABLE(timedlocks, +@@ -3023,6 +3023,12 @@ AC_ARG_ENABLE(timedlocks, ) AC_SUBST(apr_has_timedlocks) @@ -45,10 +46,10 @@ index ee99def..c46a5f4 100644 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@ diff --git a/test/testlock.c b/test/testlock.c -index a43f477..6233d0b 100644 +index e3437c1..04e01b9 100644 --- a/test/testlock.c +++ b/test/testlock.c -@@ -396,13 +396,13 @@ abts_suite *testlock(abts_suite *suite) +@@ -535,7 +535,7 @@ abts_suite *testlock(abts_suite *suite) abts_run_test(suite, threads_not_impl, NULL); #else abts_run_test(suite, test_thread_mutex, NULL); @@ -56,6 +57,8 @@ index a43f477..6233d0b 100644 +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS abts_run_test(suite, test_thread_timedmutex, NULL); #endif + abts_run_test(suite, test_thread_nestedmutex, NULL); +@@ -543,7 +543,7 @@ abts_suite *testlock(abts_suite *suite) abts_run_test(suite, test_thread_rwlock, NULL); abts_run_test(suite, test_cond, NULL); abts_run_test(suite, test_timeoutcond, NULL); @@ -63,7 +66,4 @@ index a43f477..6233d0b 100644 +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS abts_run_test(suite, test_timeoutmutex, NULL); #endif - #endif --- -2.23.0 - + #ifdef WIN32 diff --git a/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch b/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch new file mode 100644 index 0000000000..a78b16284f --- /dev/null +++ b/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch @@ -0,0 +1,58 @@ +From 316b81c462f065927d7fec56aadd5c8cb94d1cf0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 Aug 2022 00:28:08 -0700 +Subject: [PATCH] configure: Remove runtime test for mmap that can map + /dev/zero + +This never works for cross-compile moreover it ends up disabling +ac_cv_file__dev_zero which then results in compiler errors in shared +mutexes + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + configure.in | 30 ------------------------------ + 1 file changed, 30 deletions(-) + +diff --git a/configure.in b/configure.in +index 3663220..dce9789 100644 +--- a/configure.in ++++ b/configure.in +@@ -1303,36 +1303,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ + APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) + AC_CHECK_FILE(/dev/zero) + +-# Not all systems can mmap /dev/zero (such as HP-UX). Check for that. +-if test "$ac_cv_func_mmap" = "yes" && +- test "$ac_cv_file__dev_zero" = "yes"; then +- AC_CACHE_CHECK([for mmap that can map /dev/zero], +- [ac_cv_mmap__dev_zero], +- [AC_TRY_RUN([#include <sys/types.h> +-#include <sys/stat.h> +-#include <fcntl.h> +-#ifdef HAVE_SYS_MMAN_H +-#include <sys/mman.h> +-#endif +- int main() +- { +- int fd; +- void *m; +- fd = open("/dev/zero", O_RDWR); +- if (fd < 0) { +- return 1; +- } +- m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); +- if (m == (void *)-1) { /* aka MAP_FAILED */ +- return 2; +- } +- if (munmap(m, sizeof(void*)) < 0) { +- return 3; +- } +- return 0; +- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])]) +-fi +- + # Now we determine which one is our anonymous shmem preference. + haveshmgetanon="0" + havemmapzero="0" diff --git a/meta/recipes-support/apr/apr/0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch b/meta/recipes-support/apr/apr/0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch new file mode 100644 index 0000000000..8ba181b887 --- /dev/null +++ b/meta/recipes-support/apr/apr/0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch @@ -0,0 +1,37 @@ +From a25be1aaa92a6d2e7f4cc3fdfbb92e5a10b63035 Mon Sep 17 00:00:00 2001 +From: Greg Beard <gmbeard@googlemail.com> +Date: Sat, 25 Mar 2023 08:31:36 +0000 +Subject: [PATCH] dso: Check for NULL handle in apr_dso_sym + +Upstream-Status: Backport [https://github.com/apache/apr/pull/40/commits/0efce00093b1ba405d91c7f0eab9755c8527eead] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dso/unix/dso.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/dso/unix/dso.c b/dso/unix/dso.c +index fdd56f1..583d5de 100644 +--- a/dso/unix/dso.c ++++ b/dso/unix/dso.c +@@ -173,6 +173,18 @@ APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, + apr_dso_handle_t *handle, + const char *symname) + { ++ /* This is necessary for `testdso.c`. For some reason, musl ++ * builds fail the `test_unload_library` test if the below ++ * check isn't in place. `test_unload_library` unloads the ++ * library and then immediately calls this function. Maybe ++ * musl's `dlsym()` assumes the handle is never NULL and ++ * some UB is being invoked here... ++ */ ++ if (handle->handle == NULL) { ++ handle->errormsg = "library not loaded"; ++ return APR_ESYMNOTFOUND; ++ } ++ + #if defined(DSO_USE_SHL) + void *symaddr = NULL; + int status; +-- +2.42.0 + diff --git a/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch index 72e706f966..d63423f3a1 100644 --- a/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch +++ b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch @@ -1,8 +1,7 @@ -From 5925b20da8bbc34d9bf5a5dca123ef38864d43c6 Mon Sep 17 00:00:00 2001 +From 689a8db96a6d1e1cae9cbfb35d05ac82140a6555 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 30 Jan 2018 09:39:06 +0800 -Subject: [PATCH 2/7] apr: Remove workdir path references from installed apr - files +Subject: [PATCH] apr: Remove workdir path references from installed apr files Upstream-Status: Inappropriate [configuration] @@ -14,20 +13,23 @@ packages at target run time, the workdir path caused confusion. Rebase to 1.6.3 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- - apr-config.in | 26 ++------------------------ - 1 file changed, 2 insertions(+), 24 deletions(-) + apr-config.in | 32 ++------------------------------ + 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/apr-config.in b/apr-config.in -index 84b4073..bbbf651 100644 +index bed47ca..47874e5 100644 --- a/apr-config.in +++ b/apr-config.in -@@ -152,14 +152,7 @@ while test $# -gt 0; do +@@ -164,16 +164,7 @@ while test $# -gt 0; do flags="$flags $LDFLAGS" ;; --includes) - if test "$location" = "installed"; then flags="$flags -I$includedir $EXTRA_INCLUDES" +- elif test "$location" = "crosscompile"; then +- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES" - elif test "$location" = "source"; then - flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" - else @@ -37,13 +39,15 @@ index 84b4073..bbbf651 100644 ;; --srcdir) echo $APR_SOURCE_DIR -@@ -181,29 +174,14 @@ while test $# -gt 0; do +@@ -197,33 +188,14 @@ while test $# -gt 0; do exit 0 ;; --link-ld) - if test "$location" = "installed"; then - ### avoid using -L if libdir is a "standard" location like /usr/lib - flags="$flags -L$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" - else - ### this surely can't work since the library is in .libs? - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" @@ -62,6 +66,8 @@ index 84b4073..bbbf651 100644 - # Since the user is specifying they are linking with libtool, we - # *know* that -R will be recognized by libtool. - flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" - else - flags="$flags $LA_FILE" - fi @@ -69,6 +75,3 @@ index 84b4073..bbbf651 100644 ;; --shlib-path-var) echo "$SHLIBPATH_VAR" --- -1.8.3.1 - diff --git a/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch b/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch deleted file mode 100644 index 4dd53bd8eb..0000000000 --- a/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d5028c10f156c224475b340cfb1ba025d6797243 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 2 Feb 2018 15:51:42 +0800 -Subject: [PATCH 3/7] Makefile.in/configure.in: support cross compiling - -While cross compiling, the tools/gen_test_char could not -be executed at build time, use AX_PROG_CC_FOR_BUILD to -build native tools/gen_test_char - -Upstream-Status: Submitted [https://github.com/apache/apr/pull/8] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 10 +++------- - configure.in | 3 +++ - 2 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 5fb760e..8675f90 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -46,7 +46,7 @@ LT_VERSION = @LT_VERSION@ - - CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ - build/apr_rules.out tools/gen_test_char@EXEEXT@ \ -- tools/gen_test_char.o tools/gen_test_char.lo \ -+ tools/gen_test_char.o \ - include/private/apr_escape_test_char.h - DISTCLEAN_TARGETS = config.cache config.log config.status \ - include/apr.h include/arch/unix/apr_private.h \ -@@ -131,13 +131,9 @@ check: $(TARGET_LIB) - etags: - etags `find . -name '*.[ch]'` - --OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) --tools/gen_test_char.lo: tools/gen_test_char.c -+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c - $(APR_MKDIR) tools -- $(LT_COMPILE) -- --tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) -- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@ - - include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ - $(APR_MKDIR) include/private -diff --git a/configure.in b/configure.in -index 719f331..361120f 100644 ---- a/configure.in -+++ b/configure.in -@@ -183,6 +183,9 @@ dnl can only be used once within a configure script, so this prevents a - dnl preload section from invoking the macro to get compiler info. - AC_PROG_CC - -+dnl Check build CC for gen_test_char compiling which is executed at build time. -+AX_PROG_CC_FOR_BUILD -+ - dnl AC_PROG_SED is only avaliable in recent autoconf versions. - dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present. - ifdef([AC_PROG_SED], --- -1.8.3.1 - diff --git a/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch deleted file mode 100644 index d1a2ebe881..0000000000 --- a/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 49661ea3858cf8494926cccf57d3e8c6dcb47117 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Wed, 14 Dec 2016 18:13:08 +0800 -Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross - compiling - -In configure.in, it contains the following: - - APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8) - -the macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4, -it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross -compiling enable. - -So it was hardcoded for cross compiling, we should detect it dynamic based on -the sysroot's glibc. We change it to the following: - - AC_CHECK_SIZEOF(off_t) - -The same for the following hardcoded types for cross compiling: - - pid_t 8 - ssize_t 8 - size_t 8 - off_t 8 - -Change the above correspondingly. - -Signed-off-by: Dengke Du <dengke.du@windriver.com> - -Upstream-Status: Pending - ---- - configure.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index 27b8539..fb408d1 100644 ---- a/configure.in -+++ b/configure.in -@@ -1801,7 +1801,7 @@ else - socklen_t_value="int" - fi - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8) -+AC_CHECK_SIZEOF(pid_t) - - if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then - pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1873,7 +1873,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned long, lu, [size_t_fmt="lu"], [ - APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"]) - ]) - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8) -+AC_CHECK_SIZEOF(ssize_t) - - dnl the else cases below should no longer occur; - AC_MSG_CHECKING([which format to use for apr_ssize_t]) -@@ -1891,7 +1891,7 @@ fi - - ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8) -+AC_CHECK_SIZEOF(size_t) - - # else cases below should no longer occur; - AC_MSG_CHECKING([which format to use for apr_size_t]) -@@ -1909,7 +1909,7 @@ fi - - size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8) -+AC_CHECK_SIZEOF(off_t) - - if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then - # Enable LFS diff --git a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch b/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch deleted file mode 100644 index 8760b0140c..0000000000 --- a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c6afc4a4a766478cb6aa6b43a50051881b6318d7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 3 Mar 2017 22:24:17 +0100 -Subject: [PATCH 7/7] explicitly link libapr against phtread to make gold happy - on test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_init' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_settype' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_destroy' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutex_trylock' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_attr_setstacksize' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_create' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_join' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_detach' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_sigmask' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_once' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_create' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_getspecific' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_delete' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_setspecific' -| collect2: error: ld returned 1 exit status -| Makefile:114: recipe for target 'globalmutexchild' failed -| make[1]: *** [globalmutexchild] Error 1 -| make[1]: Leaving directory '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/apr/1.5.2-r0/apr-1.5.2/test' - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.in b/configure.in -index a227e72..cbc0f90 100644 ---- a/configure.in -+++ b/configure.in -@@ -784,6 +784,7 @@ else - APR_PTHREADS_CHECK_RESTORE ] ) - fi - if test "$pthreadh" = "1"; then -+ APR_ADDTO(LIBS,[-lpthread]) - APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS - APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG - APR_CHECK_PTHREAD_RECURSIVE_MUTEX --- -1.8.3.1 - diff --git a/meta/recipes-support/apr/apr/CVE-2021-35940.patch b/meta/recipes-support/apr/apr/CVE-2021-35940.patch deleted file mode 100644 index 00befdacee..0000000000 --- a/meta/recipes-support/apr/apr/CVE-2021-35940.patch +++ /dev/null @@ -1,58 +0,0 @@ - -SECURITY: CVE-2021-35940 (cve.mitre.org) - -Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though -was addressed in 1.6.x in 1.6.3 and later via r1807976. - -The fix was merged back to 1.7.x in r1891198. - -Since this was a regression in 1.7.0, a new CVE name has been assigned -to track this, CVE-2021-35940. - -Thanks to Iveta Cesalova <icesalov redhat.com> for reporting this issue. - -https://svn.apache.org/viewvc?view=revision&revision=1891198 - -Upstream-Status: Backport -CVE: CVE-2021-35940 -Signed-off-by: Armin Kuster <akuster@mvista.com> - - -Index: time/unix/time.c -=================================================================== ---- a/time/unix/time.c (revision 1891197) -+++ b/time/unix/time.c (revision 1891198) -@@ -142,6 +142,9 @@ - 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) -Index: time/win32/time.c -=================================================================== ---- a/time/win32/time.c (revision 1891197) -+++ b/time/win32/time.c (revision 1891198) -@@ -54,6 +54,9 @@ - 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 @@ - 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) diff --git a/meta/recipes-support/apr/apr/autoconf-2.73.patch b/meta/recipes-support/apr/apr/autoconf-2.73.patch new file mode 100644 index 0000000000..a8b7a77566 --- /dev/null +++ b/meta/recipes-support/apr/apr/autoconf-2.73.patch @@ -0,0 +1,26 @@ +To work with autoconf 2.73, tweak the macro ordering in configure.in. + +Upstream-Status: Pending +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: apr-1.7.2/configure.in +=================================================================== +--- apr-1.7.2.orig/configure.in ++++ apr-1.7.2/configure.in +@@ -430,6 +430,8 @@ if test "$host" = "i586-pc-beos"; then + ) dnl + fi + ++APR_CHECK_DEFINE(LOCK_EX, sys/file.h) ++ + # this is the place to put specific options for platform/compiler + # combinations + case "$host:$CC" in +@@ -2384,7 +2386,6 @@ AC_MSG_RESULT([$msg]) + AC_SUBST(have_union_semun) + + dnl Checks for libraries. +-APR_CHECK_DEFINE(LOCK_EX, sys/file.h) + APR_CHECK_DEFINE(F_SETLK, fcntl.h) + APR_CHECK_DEFINE(SEM_UNDO, sys/sem.h) + diff --git a/meta/recipes-support/apr/apr/autoconf270.patch b/meta/recipes-support/apr/apr/autoconf270.patch deleted file mode 100644 index 9f7b5c624c..0000000000 --- a/meta/recipes-support/apr/apr/autoconf270.patch +++ /dev/null @@ -1,22 +0,0 @@ -With autoconf 2.70 confdefs.h is already included. Including it twice generates -compiler warnings and since this macros is to error on warnings, it breaks. - -Fix by not including the file. - -Upstream-Status: Pending -RP - 2021/1/28 - -Index: apr-1.7.0/build/apr_common.m4 -=================================================================== ---- apr-1.7.0.orig/build/apr_common.m4 -+++ apr-1.7.0/build/apr_common.m4 -@@ -505,8 +505,7 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - fi - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( -- [#include "confdefs.h" -- ] -+ [] - [[$1]] - [int main(int argc, const char *const *argv) {] - [[$2]] diff --git a/meta/recipes-support/apr/apr/libtoolize_check.patch b/meta/recipes-support/apr/apr/libtoolize_check.patch index 740792e6b0..80ce43caa4 100644 --- a/meta/recipes-support/apr/apr/libtoolize_check.patch +++ b/meta/recipes-support/apr/apr/libtoolize_check.patch @@ -1,6 +1,7 @@ +From 17835709bc55657b7af1f7c99b3f572b819cf97e Mon Sep 17 00:00:00 2001 From: Helmut Grohne <helmut@subdivi.de> -Subject: check for libtoolize rather than libtool -Last-Update: 2014-09-19 +Date: Tue, 7 Feb 2023 07:04:00 +0000 +Subject: [PATCH] check for libtoolize rather than libtool libtool is now in package libtool-bin, but apr only needs libtoolize. @@ -8,14 +9,22 @@ Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/a Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- apr.orig/build/buildcheck.sh -+++ apr/build/buildcheck.sh -@@ -39,11 +39,11 @@ fi +--- + build/buildcheck.sh | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/build/buildcheck.sh b/build/buildcheck.sh +index 44921b5..08bc8a8 100755 +--- a/build/buildcheck.sh ++++ b/build/buildcheck.sh +@@ -39,13 +39,11 @@ fi # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a # output is multiline from 1.5 onwards -# Require libtool 1.4 or newer --libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` +-if test -z "$libtool"; then +- libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` +-fi -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` +# Require libtoolize 1.4 or newer +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.4.bb index 9c826d4380..4df741c766 100644 --- a/meta/recipes-support/apr/apr_1.7.0.bb +++ b/meta/recipes-support/apr/apr_1.7.4.bb @@ -16,19 +16,16 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://run-ptest \ file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ - file://0003-Makefile.in-configure.in-support-cross-compiling.patch \ file://0004-Fix-packet-discards-HTTP-redirect.patch \ file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ - file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ - file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ file://libtoolize_check.patch \ file://0001-Add-option-to-disable-timed-dependant-tests.patch \ - file://autoconf270.patch \ - file://CVE-2021-35940.patch \ + file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ + file://autoconf-2.73.patch \ + file://0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch \ " -SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7" -SRC_URI[sha256sum] = "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea" +SRC_URI[sha256sum] = "fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577" inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script @@ -36,17 +33,30 @@ OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" # Added to fix some issues with cmake. Refer to https://github.com/bmwcarit/meta-ros/issues/68#issuecomment-19896928 CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes" - +# Enable largefile +CACHED_CONFIGUREVARS += "apr_cv_use_lfs64=yes" +# Additional AC_TRY_RUN tests which will need to be cached for cross compile +CACHED_CONFIGUREVARS += "apr_cv_epoll=yes epoll_create1=yes apr_cv_sock_cloexec=yes \ + ac_cv_struct_rlimit=yes \ + ac_cv_func_sem_open=yes \ + apr_cv_process_shared_works=yes \ + apr_cv_mutex_robust_shared=yes \ + " # Also suppress trying to use sctp. # CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sctp_uio_h=no" -CACHED_CONFIGUREVARS += "ac_cv_sizeof_struct_iovec=yes" +# ac_cv_sizeof_struct_iovec is deduced using runtime check which will fail during cross-compile +CACHED_CONFIGUREVARS += "${@['ac_cv_sizeof_struct_iovec=16','ac_cv_sizeof_struct_iovec=8'][d.getVar('SITEINFO_BITS') != '32']}" + CACHED_CONFIGUREVARS += "ac_cv_file__dev_zero=yes" +CACHED_CONFIGUREVARS:append:libc-musl = " ac_cv_strerror_r_rc_int=yes" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG:append:libc-musl = " xsi-strerror" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGECONFIG[timed-tests] = "--enable-timed-tests,--disable-timed-tests," +PACKAGECONFIG[xsi-strerror] = "ac_cv_strerror_r_rc_int=yes,ac_cv_strerror_r_rc_int=no," do_configure:prepend() { # Avoid absolute paths for grep since it causes failures diff --git a/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb b/meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb index e7599d69d6..00b6036502 100644 --- a/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb +++ b/meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb @@ -3,24 +3,22 @@ SUMMARY = "Glibc hierarchical argument parsing standalone library" DESCRIPTION = "Standalone version of arguments parsing functions from GLIBC" -HOMEPAGE = "http://www.lysator.liu.se/~nisse/misc/" +HOMEPAGE = "https://github.com/ericonr/argp-standalone" LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://argp.h;beginline=1;endline=20;md5=008b7e53dea6f9e1d9fdef0d9cf3184a" +LIC_FILES_CHKSUM = "file://argp.h;beginline=1;endline=20;md5=464f2cfb1c35a5123f9e309d7afd79f8" SECTION = "libs" -SRC_URI = "http://www.lysator.liu.se/~nisse/misc/argp-standalone-${PV}.tar.gz \ - file://0001-throw-in-funcdef.patch \ - file://0002-isprint.patch \ +SRC_URI = "git://github.com/ericonr/argp-standalone;branch=master;protocol=https \ file://out_of_tree_build.patch \ " -SRC_URI[md5sum] = "720704bac078d067111b32444e24ba69" -SRC_URI[sha256sum] = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be" +SRCREV = "e5fe9ad9e83e6765cf8fa787f903d4c6792338b5" +S = "${WORKDIR}/git" inherit autotools CFLAGS += "-fPIC -U__OPTIMIZE__" -RDEPENDS:${PN}-dev = "" +DEV_PKG_DEPENDENCY = "" RDEPENDS:${PN}-staticdev = "" do_install() { diff --git a/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch b/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch deleted file mode 100644 index a6e2759c5d..0000000000 --- a/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch +++ /dev/null @@ -1,84 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - - -No __THROW in function implementation. - --jsaw - -Taken from buildroot - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100 -+++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100 -@@ -560,17 +560,17 @@ - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# define ARGP_EI extern inline - # endif - - ARGP_EI void --__argp_usage (__const struct argp_state *__state) __THROW -+__argp_usage (__const struct argp_state *__state) - { - __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); - } - - ARGP_EI int --__option_is_short (__const struct argp_option *__opt) __THROW -+__option_is_short (__const struct argp_option *__opt) - { - if (__opt->flags & OPTION_DOC) - return 0; -@@ -582,7 +582,7 @@ - } - - ARGP_EI int --__option_is_end (__const struct argp_option *__opt) __THROW -+__option_is_end (__const struct argp_option *__opt) - { - return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; - } ---- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100 -+++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100 -@@ -1290,13 +1290,13 @@ - /* Defined here, in case a user is not inlining the definitions in - * argp.h */ - void --__argp_usage (__const struct argp_state *__state) __THROW -+__argp_usage (__const struct argp_state *__state) - { - __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); - } - - int --__option_is_short (__const struct argp_option *__opt) __THROW -+__option_is_short (__const struct argp_option *__opt) - { - if (__opt->flags & OPTION_DOC) - return 0; -@@ -1310,7 +1310,7 @@ - } - - int --__option_is_end (__const struct argp_option *__opt) __THROW -+__option_is_end (__const struct argp_option *__opt) - { - return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; - } diff --git a/meta/recipes-support/argp-standalone/files/0002-isprint.patch b/meta/recipes-support/argp-standalone/files/0002-isprint.patch deleted file mode 100644 index 1c07eea3c1..0000000000 --- a/meta/recipes-support/argp-standalone/files/0002-isprint.patch +++ /dev/null @@ -1,51 +0,0 @@ -Subject: restrict value range passed to isprint function - -According to C standards isprint argument shall be representable as an -unsigned char or be equal to EOF, otherwise the behaviour is undefined. - -Passing arbitrary ints leads to segfault in nm program from elfutils. - -Restrict isprint argument range to values representable by unsigned char. - -Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> - -Taken from buildroot - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- -Index: b/argp.h -=================================================================== ---- a/argp.h -+++ b/argp.h -@@ -23,6 +23,7 @@ - - #include <stdio.h> - #include <ctype.h> -+#include <limits.h> - - #define __need_error_t - #include <errno.h> -@@ -577,7 +578,7 @@ - else - { - int __key = __opt->key; -- return __key > 0 && isprint (__key); -+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key); - } - } - -Index: b/argp-parse.c -=================================================================== ---- a/argp-parse.c -+++ b/argp-parse.c -@@ -1292,7 +1292,7 @@ - int __key = __opt->key; - /* FIXME: whether or not a particular key implies a short option - * ought not to be locale dependent. */ -- return __key > 0 && isprint (__key); -+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key); - } - } - diff --git a/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch b/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch index b7777cbd91..c863104430 100644 --- a/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch +++ b/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch @@ -2,7 +2,7 @@ Fix the testsuite to built out of tree in OE S != B Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/ericonr/argp-standalone/pull/9] Index: argp-standalone-1.3/testsuite/Makefile.am =================================================================== --- argp-standalone-1.3.orig/testsuite/Makefile.am diff --git a/meta/recipes-support/aspell/aspell_0.60.8.bb b/meta/recipes-support/aspell/aspell_0.60.8.1.bb index 39b55f4ff2..0ea9b063e0 100644 --- a/meta/recipes-support/aspell/aspell_0.60.8.bb +++ b/meta/recipes-support/aspell/aspell_0.60.8.1.bb @@ -13,11 +13,8 @@ HOMEPAGE = "http://aspell.net/" LICENSE = "LGPL-2.0-only | LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \ - file://CVE-2019-25051.patch \ -" -SRC_URI[md5sum] = "012fa9209203ae4e5a61c2a668fd10e3" -SRC_URI[sha256sum] = "f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2" +SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz" +SRC_URI[sha256sum] = "d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b" PACKAGECONFIG ??= "" PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses" diff --git a/meta/recipes-support/aspell/files/CVE-2019-25051.patch b/meta/recipes-support/aspell/files/CVE-2019-25051.patch deleted file mode 100644 index 8513f6de79..0000000000 --- a/meta/recipes-support/aspell/files/CVE-2019-25051.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001 -From: Kevin Atkinson <kevina@gnu.org> -Date: Sat, 21 Dec 2019 20:32:47 +0000 -Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk - to prevent a buffer overflow - -Bug found using OSS-Fuze. - -Upstream-Status: Backport -[https://github.com/gnuaspell/aspell/commit/0718b375425aad8e54e1150313b862e4c6fd324a] -CVE: CVE-2019-25051 -Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> ---- - common/objstack.hpp | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/common/objstack.hpp b/common/objstack.hpp -index 3997bf7..bd97ccd 100644 ---- a/common/objstack.hpp -+++ b/common/objstack.hpp -@@ -5,6 +5,7 @@ - #include "parm_string.hpp" - #include <stdlib.h> - #include <assert.h> -+#include <stddef.h> - - namespace acommon { - -@@ -26,6 +27,12 @@ class ObjStack - byte * temp_end; - void setup_chunk(); - void new_chunk(); -+ bool will_overflow(size_t sz) const { -+ return offsetof(Node,data) + sz > chunk_size; -+ } -+ void check_size(size_t sz) { -+ assert(!will_overflow(sz)); -+ } - - ObjStack(const ObjStack &); - void operator=(const ObjStack &); -@@ -56,7 +63,7 @@ class ObjStack - void * alloc_bottom(size_t size) { - byte * tmp = bottom; - bottom += size; -- if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;} -+ if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;} - return tmp; - } - // This alloc_bottom will insure that the object is aligned based on the -@@ -66,7 +73,7 @@ class ObjStack - align_bottom(align); - byte * tmp = bottom; - bottom += size; -- if (bottom > top) {new_chunk(); goto loop;} -+ if (bottom > top) {check_size(size); new_chunk(); goto loop;} - return tmp; - } - char * dup_bottom(ParmString str) { -@@ -79,7 +86,7 @@ class ObjStack - // always be aligned as such. - void * alloc_top(size_t size) { - top -= size; -- if (top < bottom) {new_chunk(); top -= size;} -+ if (top < bottom) {check_size(size); new_chunk(); top -= size;} - return top; - } - // This alloc_top will insure that the object is aligned based on -@@ -88,7 +95,7 @@ class ObjStack - {loop: - top -= size; - align_top(align); -- if (top < bottom) {new_chunk(); goto loop;} -+ if (top < bottom) {check_size(size); new_chunk(); goto loop;} - return top; - } - char * dup_top(ParmString str) { -@@ -117,6 +124,7 @@ class ObjStack - void * alloc_temp(size_t size) { - temp_end = bottom + size; - if (temp_end > top) { -+ check_size(size); - new_chunk(); - temp_end = bottom + size; - } -@@ -131,6 +139,7 @@ class ObjStack - } else { - size_t s = temp_end - bottom; - byte * p = bottom; -+ check_size(size); - new_chunk(); - memcpy(bottom, p, s); - temp_end = bottom + size; -@@ -150,6 +159,7 @@ class ObjStack - } else { - size_t s = temp_end - bottom; - byte * p = bottom; -+ check_size(size); - new_chunk(); - memcpy(bottom, p, s); - temp_end = bottom + size; diff --git a/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb deleted file mode 100644 index 87f7b83c7d..0000000000 --- a/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "AT-SPI 2 Toolkit Bridge" -DESCRIPTION = "Contains a library that bridges ATK to At-Spi2 D-Bus service. Toolkit widgets use it to provide their content to screen readers such as Orca." -HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -BUGTRACKER = "http://bugzilla.gnome.org/" -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.sha256sum] = "cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f" - -DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase upstream-version-is-even - -PACKAGES =+ "${PN}-gnome ${PN}-gtk2" - -FILES:${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" -FILES:${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/atk/at-spi2-core_2.44.1.bb b/meta/recipes-support/atk/at-spi2-core_2.44.1.bb deleted file mode 100644 index 95a6c619f0..0000000000 --- a/meta/recipes-support/atk/at-spi2-core_2.44.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" - -DESCRIPTION = "It provides a Service Provider Interface for the Assistive Technologies available on the GNOME platform and a library against which applications can be linked." - -HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -BUGTRACKER = "http://bugzilla.gnome.org/" -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" - -SRC_URI[sha256sum] = "4beb23270ba6cf7caf20b597354d75194d89afb69d2efcf15f4271688ba6f746" - -X11DEPENDS = "virtual/libx11 libxi libxtst" - -DEPENDS = "dbus glib-2.0" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" - -inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject-introspection - -EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ - -Ddbus_daemon=${bindir}/dbus-daemon \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-Dx11=yes', '-Dx11=no', d)} \ -" - -GTKDOC_MESON_OPTION = "docs" - -GIR_MESON_OPTION = 'introspection' -GIR_MESON_ENABLE_FLAG = 'yes' -GIR_MESON_DISABLE_FLAG = 'no' - -FILES:${PN} += "${datadir}/dbus-1/services/*.service \ - ${datadir}/dbus-1/accessibility-services/*.service \ - ${datadir}/defaults/at-spi2 \ - ${systemd_user_unitdir}/at-spi-dbus-bus.service \ - " -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/atk/at-spi2-core_2.52.0.bb b/meta/recipes-support/atk/at-spi2-core_2.52.0.bb new file mode 100644 index 0000000000..913b408403 --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-core_2.52.0.bb @@ -0,0 +1,50 @@ +SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" + +DESCRIPTION = "It provides a Service Provider Interface for the Assistive Technologies available on the GNOME platform and a library against which applications can be linked." + +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +BUGTRACKER = "http://bugzilla.gnome.org/" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +CVE_PRODUCT += "at-spi2-atk" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" + +SRC_URI[sha256sum] = "0ac3fc8320c8d01fa147c272ba7fa03806389c6b03d3c406d0823e30e35ff5ab" + +DEPENDS = " \ + dbus \ + glib-2.0 \ + glib-2.0-native \ + libxml2 \ + ${@'python3-sphinx-native' if d.getVar('GIDOCGEN_ENABLED') == 'True' else ''} \ +" + +# For backwards compatibility +PROVIDES += "atk at-spi2-atk" +RPROVIDES:${PN} += "atk at-spi2-atk" + +inherit meson gi-docgen gettext systemd pkgconfig upstream-version-is-even gobject-introspection + +EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ + -Ddbus_daemon=${bindir}/dbus-daemon" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libxi libxtst" + +GIDOCGEN_MESON_OPTION = "docs" +GIR_MESON_OPTION = 'introspection' +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +FILES:${PN} += "${libdir}/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop \ + ${libdir}/gtk-2.0/modules/libatk-bridge.so \ + ${datadir}/dbus-1/services/*.service \ + ${datadir}/dbus-1/accessibility-services/*.service \ + ${datadir}/defaults/at-spi2 \ + ${systemd_user_unitdir}/at-spi-dbus-bus.service \ + " +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/atk/atk_2.38.0.bb b/meta/recipes-support/atk/atk_2.38.0.bb deleted file mode 100644 index 62fec9abf8..0000000000 --- a/meta/recipes-support/atk/atk_2.38.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Accessibility toolkit for GNOME" -DESCRIPTION = "Provides application programming interfaces (APIs) for implementing accessibility support in software." -HOMEPAGE = "https://wiki.gnome.org/Accessibility" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/atk/-/issues" -SECTION = "x11/libs" - -LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ - file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" - -# Need gettext-native as Meson can't turn off i18n -DEPENDS = "gettext-native glib-2.0" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection - -SRC_URI[archive.sha256sum] = "ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch index ba2ffee5d2..219feaccd0 100644 --- a/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch +++ b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch @@ -1,4 +1,4 @@ -From 9e08219e0e99ee2589cf35fa8d52cef3515accce Mon Sep 17 00:00:00 2001 +From 7dec6fa3b3494a55120402ff1ea3eb96b67138e8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 12 Dec 2019 15:47:49 +0100 Subject: [PATCH] test: patch out failing bits @@ -58,6 +58,3 @@ index 8f8f825..21e8a95 100644 $ : > f $ : <> f >~ .*f: Permission denied$ --- -2.17.1 - diff --git a/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch index 57ef0bb728..748f37f3e7 100644 --- a/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch +++ b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch @@ -1,4 +1,4 @@ -From 39d332a8801de5d9ef09dacb3dba85c208b7b2ad Mon Sep 17 00:00:00 2001 +From 42ae3f8a5e32ba0681ccd1552a203ddad8748a6e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 12 Dec 2019 13:45:52 +0100 Subject: [PATCH] tests: do not hardcode the build path into a helper library @@ -10,7 +10,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makemodule.am b/test/Makemodule.am -index 17d4927..015de7f 100644 +index e1d715d..cffe732 100644 --- a/test/Makemodule.am +++ b/test/Makemodule.am @@ -30,7 +30,7 @@ EXTRA_DIST += \ @@ -21,4 +21,4 @@ index 17d4927..015de7f 100644 +libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\" libtestlookup_la_LDFLAGS = -rpath $(abs_builddir) - AM_TESTS_ENVIRONMENT = PATH="$(abs_top_builddir):$$PATH"; + # Make sure translations don't break tests when matching output. diff --git a/meta/recipes-support/attr/acl/run-ptest b/meta/recipes-support/attr/acl/run-ptest index 4312823365..3af75c84fe 100644 --- a/meta/recipes-support/attr/acl/run-ptest +++ b/meta/recipes-support/attr/acl/run-ptest @@ -7,4 +7,10 @@ mkdir -p /tmp/acl-ptest/test cp test/test.* /tmp/acl-ptest/test +set +e make test-suite.log +exitcode=$? +if [ $exitcode -ne 0 -a -e test-suite.log ]; then + cat test-suite.log +fi +exit $exitcode diff --git a/meta/recipes-support/attr/acl_2.3.1.bb b/meta/recipes-support/attr/acl_2.3.2.bb index aca04a9aac..6178473873 100644 --- a/meta/recipes-support/attr/acl_2.3.1.bb +++ b/meta/recipes-support/attr/acl_2.3.2.bb @@ -21,10 +21,12 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \ file://0001-test-patch-out-failing-bits.patch \ " -SRC_URI[sha256sum] = "760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af" +SRC_URI[sha256sum] = "5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c" inherit autotools gettext ptest +EXTRA_OECONF += "--enable-largefile" + PACKAGES =+ "lib${BPN}" FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" @@ -58,10 +60,15 @@ do_install_ptest() { rm ${D}${PTEST_PATH}/.libs/libtestlookup.lai } +do_install_ptest:append:libc-musl() { + sed -i -e '/test\/misc.test/d' ${D}${PTEST_PATH}/Makefile +} + RDEPENDS:${PN}-ptest = "acl \ bash \ coreutils \ perl \ + perl-module-constant \ perl-module-filehandle \ perl-module-getopt-std \ perl-module-posix \ diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc index a4e38f2b19..75d616893a 100644 --- a/meta/recipes-support/attr/attr.inc +++ b/meta/recipes-support/attr/attr.inc @@ -16,13 +16,14 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \ file://run-ptest \ + file://0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch \ " inherit ptest update-alternatives autotools gettext PACKAGES =+ "lib${BPN}" -FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" +FILES:lib${BPN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE:${PN} = "setfattr" @@ -48,8 +49,14 @@ do_install_ptest() { cp -rf ${S}/test/ ${D}${PTEST_PATH} } +do_install_ptest:append:libc-musl() { + sed -i -e 's|f: Operation n|f: N|g' ${D}${PTEST_PATH}/test/attr.test +} + RDEPENDS:${PN}-ptest = "attr \ + bash \ coreutils \ + perl-module-constant \ perl-module-filehandle \ perl-module-getopt-std \ perl-module-posix \ diff --git a/meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch b/meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch new file mode 100644 index 0000000000..1e2bea5067 --- /dev/null +++ b/meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch @@ -0,0 +1,35 @@ +From 6d9e827bcacf387bb3cfae64bd4fe520168ccad4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 3 Dec 2023 19:29:27 -0800 +Subject: [PATCH] attr.c: Include libgen.h for posix version of basename API + +Musl has removed the definition from string.h [1] which results in +compile failures with clang + +| ../attr-2.5.1/tools/attr.c:69:13: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +| 69 | progname = basename(argv[0]); +| | ^ + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Submitted [https://savannah.nongnu.org/bugs/index.php?64972] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tools/attr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/attr.c b/tools/attr.c +index 312aef1..90dab83 100644 +--- a/tools/attr.c ++++ b/tools/attr.c +@@ -26,6 +26,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <errno.h> ++#include <libgen.h> + #include <string.h> + #include <locale.h> + +-- +2.43.0 + diff --git a/meta/recipes-support/attr/attr/run-ptest b/meta/recipes-support/attr/attr/run-ptest index f64244f239..3e7a3a17a0 100644 --- a/meta/recipes-support/attr/attr/run-ptest +++ b/meta/recipes-support/attr/attr/run-ptest @@ -1,3 +1,10 @@ #!/bin/sh +set +e make test-suite.log +exitcode=$? +if [ $exitcode -ne 0 -a -e test-suite.log ]; then + cat test-suite.log +fi +exit $exitcode + diff --git a/meta/recipes-support/attr/attr_2.5.1.bb b/meta/recipes-support/attr/attr_2.5.1.bb deleted file mode 100644 index 5c5f7bcffb..0000000000 --- a/meta/recipes-support/attr/attr_2.5.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require attr.inc - -SRC_URI[sha256sum] = "bae1c6949b258a0d68001367ce0c741cebdacdd3b62965d17e5eb23cd78adaf8" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/attr/attr_2.5.2.bb b/meta/recipes-support/attr/attr_2.5.2.bb new file mode 100644 index 0000000000..2110c6d885 --- /dev/null +++ b/meta/recipes-support/attr/attr_2.5.2.bb @@ -0,0 +1,5 @@ +require attr.inc + +SRC_URI[sha256sum] = "39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/bash-completion/bash-completion_2.11.bb b/meta/recipes-support/bash-completion/bash-completion_2.13.0.bb index d981dd0c3a..f75d61e219 100644 --- a/meta/recipes-support/bash-completion/bash-completion_2.11.bb +++ b/meta/recipes-support/bash-completion/bash-completion_2.13.0.bb @@ -8,20 +8,18 @@ HOMEPAGE = "https://github.com/scop/bash-completion" BUGTRACKER = "https://github.com/scop/bash-completion/issues" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SECTION = "console/utils" -SRC_URI = "https://github.com/scop/bash-completion/releases/download/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "2514c6772d0de6254758b98c53f91861" -SRC_URI[sha256sum] = "73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac" -UPSTREAM_CHECK_REGEX = "bash-completion-(?P<pver>(?!2008).+)\.tar" -UPSTREAM_CHECK_URI = "https://github.com/scop/bash-completion/releases" +SRC_URI[sha256sum] = "c5f99a39e40f0d154c03ff15438e87ece1f5ac666336a4459899e2ff4bedf3d1" +GITHUB_BASE_URI = "https://github.com/scop/bash-completion/releases" PARALLEL_MAKE = "" -inherit autotools +inherit autotools github-releases do_install:append() { # compatdir diff --git a/meta/recipes-support/bmap-tools/bmap-tools_git.bb b/meta/recipes-support/bmap-tools/bmap-tools_git.bb deleted file mode 100644 index 78c51e7731..0000000000 --- a/meta/recipes-support/bmap-tools/bmap-tools_git.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Tools to generate block map (AKA bmap) and flash images using bmap" -DESCRIPTION = "Bmap-tools - tools to generate block map (AKA bmap) and flash images using \ -bmap. Bmaptool is a generic tool for creating the block map (bmap) for a file, \ -and copying files using the block map. The idea is that large file containing \ -unused blocks, like raw system image files, can be copied or flashed a lot \ -faster with bmaptool than with traditional tools like "dd" or "cp"." -HOMEPAGE = "https://github.com/01org/bmap-tools" -SECTION = "console/utils" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "git://github.com/intel/${BPN};branch=master;protocol=https" - -SRCREV = "c0673962a8ec1624b5189dc1d24f33fe4f06785a" -S = "${WORKDIR}/git" -BASEVER = "3.6" -PV = "${BASEVER}+git${SRCPV}" - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" - -# Need df from coreutils -RDEPENDS:${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl python3-six coreutils" - -inherit setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/bmaptool/bmaptool_git.bb b/meta/recipes-support/bmaptool/bmaptool_git.bb new file mode 100644 index 0000000000..fd53c21c06 --- /dev/null +++ b/meta/recipes-support/bmaptool/bmaptool_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "Tools to generate block map (AKA bmap) and flash images using bmap" +DESCRIPTION = "bmaptool - tools to generate block map (AKA bmap) and flash images using \ +bmap. bmaptool is a generic tool for creating the block map (bmap) for a file, \ +and copying files using the block map. The idea is that large file containing \ +unused blocks, like raw system image files, can be copied or flashed a lot \ +faster with bmaptool than with traditional tools like "dd" or "cp"." +HOMEPAGE = "https://github.com/yoctoproject/bmaptool" +SECTION = "console/utils" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/yoctoproject/${BPN};branch=main;protocol=https" +SRCREV = "2ff5750b8a3e0b36a9993c20e2ea10a07bc62085" +S = "${WORKDIR}/git" +BASEVER = "3.8.0" +PV = "${BASEVER}+git" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +# Need df from coreutils +RDEPENDS:${PN} = "python3-core python3-compression python3-misc python3-mmap python3-setuptools python3-fcntl python3-six coreutils" + +inherit setuptools3 + +# For compatibility with layers before scarthgap +RREPLACES:${PN} = "bmap-tools" +RCONFLICTS:${PN} = "bmap-tools" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/boost/boost-1.79.0.inc b/meta/recipes-support/boost/boost-1.84.0.inc index f90c463931..5bbea2ba5b 100644 --- a/meta/recipes-support/boost/boost-1.79.0.inc +++ b/meta/recipes-support/boost/boost-1.84.0.inc @@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[sha256sum] = "475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39" +SRC_URI[sha256sum] = "cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" diff --git a/meta/recipes-support/boost/boost-build-native_4.4.1.bb b/meta/recipes-support/boost/boost-build-native_1.84.0.bb index de566eeb82..a345bac499 100644 --- a/meta/recipes-support/boost/boost-build-native_4.4.1.bb +++ b/meta/recipes-support/boost/boost-build-native_1.84.0.bb @@ -7,9 +7,10 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master" -SRCREV = "76da80f33187a3d9e5336157cdfae12ce82e37eb" +SRCREV = "8d86b9a85407d73d6e8c631771f18c2a237d2d71" +PE = "1" -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+){2,}))" +UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P<pver>(\d+(\.\d+)+))" inherit native diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 402f1592cf..77105aa1fa 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -40,6 +40,7 @@ BOOST_LIBS = "\ thread \ timer \ type_erasure \ + url \ wave \ " @@ -151,6 +152,7 @@ BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d')}" BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ ${BJAM_TOOLS} \ -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ + -sICU_PATH=${STAGING_EXECPREFIXDIR} \ --build-dir=${B} \ --disable-icu \ ${BJAM_EXTRA}' diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index 67d5dff125..9ba5d5cc33 100644 --- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch @@ -1,4 +1,4 @@ -From 4d2a8fc8117e56bc283349e5f7f889ebbfc55c71 Mon Sep 17 00:00:00 2001 +From 18185e939ca121335a6172c8e50872af8122a759 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 18 Dec 2018 15:42:57 +0100 Subject: [PATCH] Don't set up arch/instruction-set flags, we do that @@ -8,16 +8,15 @@ ourselves Upstream-Status: Inappropriate Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- - tools/build/src/tools/gcc.jam | 144 ---------------------------------- - 1 file changed, 144 deletions(-) + tools/build/src/tools/gcc.jam | 153 ---------------------------------- + 1 file changed, 153 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index 47a113223..d77525724 100644 +index 834f5e1bf..493a43e6d 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -1122,147 +1122,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : +@@ -1113,156 +1113,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : <architecture>$(architecture)/<instruction-set>$(instruction-set) : $(values) ; } @@ -72,6 +71,9 @@ index 47a113223..d77525724 100644 -cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ; -cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ; -cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ; +-cpu-flags gcc OPTIONS : x86 : rocketlake : -march=rocketlake ; +-cpu-flags gcc OPTIONS : x86 : alderlake : -march=alderlake ; +-cpu-flags gcc OPTIONS : x86 : sapphirerapids : -march=sapphirerapids ; -cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; -cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; -cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; @@ -98,6 +100,7 @@ index 47a113223..d77525724 100644 -cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; -cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ; -cpu-flags gcc OPTIONS : x86 : znver2 : -march=znver2 ; +-cpu-flags gcc OPTIONS : x86 : znver3 : -march=znver3 ; -cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; -cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; -cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; @@ -165,3 +168,8 @@ index 47a113223..d77525724 100644 -cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ; -# AIX variant of RS/6000 & PowerPC -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; +- +-# Enable response file control +-toolset.flags gcc RESPONSE_FILE_SUB <response-file>auto : a ; +-toolset.flags gcc RESPONSE_FILE_SUB <response-file>file : f ; +-toolset.flags gcc RESPONSE_FILE_SUB <response-file>contents : c ; diff --git a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch index 78b19225d4..913810a340 100644 --- a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch +++ b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch @@ -1,4 +1,4 @@ -From 59402e3a61d14eb7ce8c2019ea1a87ad4bd28605 Mon Sep 17 00:00:00 2001 +From bbb0845c0a79238fb2e84cca41826a0944b6ce7e Mon Sep 17 00:00:00 2001 From: Anuj Mittal <anuj.mittal@intel.com> Date: Thu, 14 Nov 2019 10:13:53 +0800 Subject: [PATCH] dont setup compiler flags -m32/-m64 @@ -13,13 +13,14 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 1 file changed, 14 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index c7e3cf3..24486e0 100644 +index 493a43e6d..42dccbdfe 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -430,20 +430,6 @@ local rule compile-link-flags ( * ) +@@ -360,20 +360,6 @@ local rule compile-link-flags ( * ) + compile-link-flags <link>shared/<target-os>$(non-windows) : -fPIC ; } - { +-{ - # Handle address-model - compile-link-flags <target-os>aix/<address-model>32 : -maix32 ; - compile-link-flags <target-os>aix/<address-model>64 : -maix64 ; @@ -33,10 +34,6 @@ index c7e3cf3..24486e0 100644 - compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>64 : -m64 ; -} - --{ + { # Handle threading local rule threading-flags ( * ) - { --- -2.7.4 - diff --git a/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch b/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch deleted file mode 100644 index 917617a044..0000000000 --- a/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch +++ /dev/null @@ -1,112 +0,0 @@ -Reference - -https://svn.boost.org/trac/boost/changeset/78326 - -Upstream-Status: Backport -CVE: CVE-2012-2677 -Signed-off-by: Yue Tao <yue.tao@windriver.com> - -diff --git a/boost/pool/pool.hpp.old b/boost/pool/pool.hpp -index c47b11f..417a1e0 100644 ---- a/boost/pool/pool.hpp.old -+++ b/boost/pool/pool.hpp -@@ -26,6 +26,8 @@ - - #include <boost/pool/poolfwd.hpp> - -+// std::numeric_limits -+#include <boost/limits.hpp> - // boost::integer::static_lcm - #include <boost/integer/common_factor_ct.hpp> - // boost::simple_segregated_storage -@@ -355,6 +357,15 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t - return s; - } - -+ size_type max_chunks() const -+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. -+ size_type partition_size = alloc_size(); -+ size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type); -+ size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size(); -+ -+ return max_chunks; -+ } -+ - static void * & nextof(void * const ptr) - { //! \returns Pointer dereferenced. - //! (Provided and used for the sake of code readability :) -@@ -375,6 +386,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t - //! the first time that object needs to allocate system memory. - //! The default is 32. This parameter may not be 0. - //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ set_next_size(nnext_size); -+ set_max_size(nmax_size); - } - - ~pool() -@@ -398,8 +411,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t - } - void set_next_size(const size_type nnext_size) - { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. -- //! \returns nnext_size. -- next_size = start_size = nnext_size; -+ BOOST_USING_STD_MIN(); -+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); - } - size_type get_max_size() const - { //! \returns max_size. -@@ -407,7 +420,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t - } - void set_max_size(const size_type nmax_size) - { //! Set max_size. -- max_size = nmax_size; -+ BOOST_USING_STD_MIN(); -+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); - } - size_type get_requested_size() const - { //! \returns the requested size passed into the constructor. -@@ -708,9 +722,9 @@ void * pool<UserAllocator>::malloc_need_resize() - - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, - store().add_block(node.begin(), node.element_size(), partition_size); -@@ -748,9 +762,9 @@ void * pool<UserAllocator>::ordered_malloc_need_resize() - - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, - // (we can use "add_block" here because we know that -@@ -792,6 +806,8 @@ void * pool<UserAllocator>::ordered_malloc(const size_type n) - { //! Gets address of a chunk n, allocating new memory if not already available. - //! \returns Address of chunk n if allocated ok. - //! \returns 0 if not enough memory for n chunks. -+ if (n > max_chunks()) -+ return 0; - - const size_type partition_size = alloc_size(); - const size_type total_req_size = n * requested_size; -@@ -840,9 +856,9 @@ void * pool<UserAllocator>::ordered_malloc(const size_type n) - - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // insert it into the list, - // handle border case. diff --git a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch index 595ba17865..9b6fcc6358 100644 --- a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch +++ b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch @@ -1,4 +1,4 @@ -From cabfcba1ff7511ffd6b91ca244288d44f585aad2 Mon Sep 17 00:00:00 2001 +From d6864bd78c01c5e8578805a7b67555c70a0e99a2 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Fri, 23 Sep 2016 01:04:50 -0700 Subject: [PATCH] boost-math: disable pch for gcc @@ -14,10 +14,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/math/build/Jamfile.v2 b/libs/math/build/Jamfile.v2 -index e19fb2e..82472a7 100644 +index fd840287e..5aff7d724 100644 --- a/libs/math/build/Jamfile.v2 +++ b/libs/math/build/Jamfile.v2 -@@ -13,7 +13,7 @@ project +@@ -14,7 +14,7 @@ project #<toolset>intel-linux:<pch>off <toolset>intel-darwin:<pch>off <toolset>msvc-7.1:<pch>off @@ -26,6 +26,3 @@ index e19fb2e..82472a7 100644 #<toolset>gcc:<cxxflags>-fvisibility=hidden <toolset>intel-linux:<cxxflags>-fvisibility=hidden #<toolset>sun:<cxxflags>-xldscope=hidden --- -2.7.4 - diff --git a/meta/recipes-support/boost/boost_1.79.0.bb b/meta/recipes-support/boost/boost_1.84.0.bb index dd5d6eadd6..4b580d078b 100644 --- a/meta/recipes-support/boost/boost_1.79.0.bb +++ b/meta/recipes-support/boost/boost_1.84.0.bb @@ -1,8 +1,7 @@ require boost-${PV}.inc require boost.inc -SRC_URI += "file://boost-CVE-2012-2677.patch \ - file://boost-math-disable-pch-for-gcc.patch \ +SRC_URI += "file://boost-math-disable-pch-for-gcc.patch \ file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ file://0001-dont-setup-compiler-flags-m32-m64.patch \ " diff --git a/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch b/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch new file mode 100644 index 0000000000..98f7db93e8 --- /dev/null +++ b/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch @@ -0,0 +1,64 @@ +From 721941aadf4adf4f6aeb3f4c0ab489bb89610c36 Mon Sep 17 00:00:00 2001 +From: Stefan Eissing <stefan@eissing.org> +Date: Mon, 1 Apr 2024 15:41:18 +0200 +Subject: [PATCH] http: with chunked POST forced, disable length check on read + callback + +- when an application forces HTTP/1.1 chunked transfer encoding + by setting the corresponding header and instructs curl to use + the CURLOPT_READFUNCTION, disregard any POST length information. +- this establishes backward compatibility with previous curl versions + +Applications are encouraged to not force "chunked", but rather +set length information for a POST. By setting -1, curl will +auto-select chunked on HTTP/1.1 and work properly on other HTTP +versions. + +Reported-by: Jeff King +Fixes #13229 +Closes #13257 +Upstream-Status: Backport +--- + lib/http.c | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/lib/http.c b/lib/http.c +index 92c04e69cd8373..a764d3c4403c39 100644 +--- a/lib/http.c ++++ b/lib/http.c +@@ -2046,8 +2046,19 @@ static CURLcode set_reader(struct Curl_easy *data, Curl_HttpReq httpreq) + else + result = Curl_creader_set_null(data); + } +- else { /* we read the bytes from the callback */ +- result = Curl_creader_set_fread(data, postsize); ++ else { ++ /* we read the bytes from the callback. In case "chunked" encoding ++ * is forced by the application, we disregard `postsize`. This is ++ * a backward compatibility decision to earlier versions where ++ * chunking disregarded this. See issue #13229. */ ++ bool chunked = FALSE; ++ char *ptr = Curl_checkheaders(data, STRCONST("Transfer-Encoding")); ++ if(ptr) { ++ /* Some kind of TE is requested, check if 'chunked' is chosen */ ++ chunked = Curl_compareheader(ptr, STRCONST("Transfer-Encoding:"), ++ STRCONST("chunked")); ++ } ++ result = Curl_creader_set_fread(data, chunked? -1 : postsize); + } + return result; + +@@ -2115,6 +2126,13 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data, + data->req.upload_chunky = + Curl_compareheader(ptr, + STRCONST("Transfer-Encoding:"), STRCONST("chunked")); ++ if(data->req.upload_chunky && ++ Curl_use_http_1_1plus(data, data->conn) && ++ (data->conn->httpversion >= 20)) { ++ infof(data, "suppressing chunked transfer encoding on connection " ++ "using HTTP version 2 or higher"); ++ data->req.upload_chunky = FALSE; ++ } + } + else { + curl_off_t req_clen = Curl_creader_total_length(data); diff --git a/meta/recipes-support/curl/curl/disable-tests b/meta/recipes-support/curl/curl/disable-tests new file mode 100644 index 0000000000..259576fd01 --- /dev/null +++ b/meta/recipes-support/curl/curl/disable-tests @@ -0,0 +1,41 @@ +# Intermittently fails e.g. https://autobuilder.yocto.io/pub/non-release/20231220-28/testresults/qemux86-64-ptest/curl.log +# https://autobuilder.yocto.io/pub/non-release/20231220-27/testresults/qemux86-64-ptest/curl.log +337 +# These CRL test (alt-avc) are failing +356 +412 +413 +# These CRL tests are scanning docs +971 +# Intermittently hangs e.g http://autobuilder.yocto.io/pub/non-release/20231228-18/testresults/qemux86-64-ptest/curl.log +1091 +# Intermittently hangs e.g https://autobuilder.yocto.io/pub/non-release/20231220-27/testresults/qemux86-64-ptest/curl.log +1096 +# These CRL tests are scanning docs +1119 +1132 +1135 +1478 +# These CRL tests are scanning headers +1167 +1477 +# These CRL tests are scanning man pages +1139 +1140 +1173 +1177 +# This CRL test is looking for m4 files +1165 +# This CRL test is looking for src files +1185 +# This test is scanning the source tree +1222 +# These CRL tests need --libcurl option to be enabled +1279 +1400 +1401 +1402 +1403 +1404 +1405 +1465 diff --git a/meta/recipes-support/curl/curl/no-test-timeout.patch b/meta/recipes-support/curl/curl/no-test-timeout.patch new file mode 100644 index 0000000000..7122b6f043 --- /dev/null +++ b/meta/recipes-support/curl/curl/no-test-timeout.patch @@ -0,0 +1,25 @@ +From 42cddb52e821cfc2f09f1974742714e5f2f1856e Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Fri, 15 Mar 2024 14:37:37 +0000 +Subject: [PATCH] Set the max-time timeout to 600 so the timeout is 10 minutes + instead of 13 seconds. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + tests/servers.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/servers.pm b/tests/servers.pm +index d4472d5..9999938 100644 +--- a/tests/servers.pm ++++ b/tests/servers.pm +@@ -120,7 +120,7 @@ my $sshdverstr; # for socks server, ssh daemon version string + my $sshderror; # for socks server, ssh daemon version error + my %doesntrun; # servers that don't work, identified by pidfile + my %PORT = (nolisten => 47); # port we use for a local non-listening service +-my $server_response_maxtime=13; ++my $server_response_maxtime=600; + my $httptlssrv = find_httptlssrv(); + my %run; # running server + my %runcert; # cert file currently in use by an ssl running server diff --git a/meta/recipes-support/curl/curl/run-ptest b/meta/recipes-support/curl/curl/run-ptest new file mode 100644 index 0000000000..3d25f3d90b --- /dev/null +++ b/meta/recipes-support/curl/curl/run-ptest @@ -0,0 +1,11 @@ +#!/bin/sh + +cd tests + +# Run all tests, don't stop on first failure +# Don't use valgrind if it is found +# Use automake-style output +# Run four tests in parallel +# Print log output on failure +# Don't run the flaky or timing dependent tests +./runtests.pl -a -n -am -j4 -p !flaky !timing-dependent diff --git a/meta/recipes-support/curl/curl_7.83.0.bb b/meta/recipes-support/curl/curl_8.7.1.bb index 07027a2f31..c74416d7e9 100644 --- a/meta/recipes-support/curl/curl_7.83.0.bb +++ b/meta/recipes-support/curl/curl_8.7.1.bb @@ -6,41 +6,55 @@ HTTP post, SSL connections, proxy support, FTP uploads, and more!" HOMEPAGE = "https://curl.se/" BUGTRACKER = "https://github.com/curl/curl/issues" SECTION = "console/network" -LICENSE = "MIT-open-group" -LIC_FILES_CHKSUM = "file://COPYING;md5=190c514872597083303371684954f238" +LICENSE = "curl" +LIC_FILES_CHKSUM = "file://COPYING;md5=eed2e5088e1ac619c9a1c747da291d75" -SRC_URI = "https://curl.se/download/${BP}.tar.xz" -SRC_URI[sha256sum] = "bbff0e6b5047e773f3c3b084d80546cc1be4e354c09e419c2d0ef6116253511a" +SRC_URI = " \ + https://curl.se/download/${BP}.tar.xz \ + file://721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch \ + file://run-ptest \ + file://disable-tests \ + file://no-test-timeout.patch \ +" +SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" -inherit autotools pkgconfig binconfig multilib_header +inherit autotools pkgconfig binconfig multilib_header ptest # Entropy source for random PACKAGECONFIG option RANDOM ?= "/dev/urandom" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} libidn openssl proxy random threaded-resolver verbose zlib" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws basic-auth bearer-auth digest-auth negotiate-auth libidn openssl proxy random threaded-resolver verbose zlib" PACKAGECONFIG:class-native = "ipv6 openssl proxy random threaded-resolver verbose zlib" PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" +PACKAGECONFIG[aws] = "--enable-aws,--disable-aws" +PACKAGECONFIG[basic-auth] = "--enable-basic-auth,--disable-basic-auth" +PACKAGECONFIG[bearer-auth] = "--enable-bearer-auth,--disable-bearer-auth" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" +# Don't use this in production +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," +PACKAGECONFIG[digest-auth] = "--enable-digest-auth,--disable-digest-auth" PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," PACKAGECONFIG[imap] = "--enable-imap,--disable-imap," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[kerberos-auth] = "--enable-kerberos-auth,--disable-kerberos-auth" PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap," -PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps," +PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap" +PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps,openldap" PACKAGECONFIG[libgsasl] = "--with-libgsasl,--without-libgsasl,libgsasl" PACKAGECONFIG[libidn] = "--with-libidn2,--without-libidn2,libidn2" PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" PACKAGECONFIG[mbedtls] = "--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls" PACKAGECONFIG[mqtt] = "--enable-mqtt,--disable-mqtt," +PACKAGECONFIG[negotiate-auth] = "--enable-negotiate-auth,--disable-negotiate-auth" PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," @@ -50,7 +64,6 @@ PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp," PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp," -PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" @@ -61,16 +74,13 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" EXTRA_OECONF = " \ --disable-libcurl-option \ --disable-ntlm-wb \ - --enable-crypto-auth \ --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ --without-libpsl \ - --enable-debug \ --enable-optimize \ - --disable-curldebug \ - ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls nss openssl', d) == '') else ''} \ + ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls openssl', d) == '') else ''} \ " -do_install:append:class-target() { +fix_absolute_paths () { # cleanup buildpaths from curl-config sed -i \ -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ @@ -80,6 +90,53 @@ do_install:append:class-target() { ${D}${bindir}/curl-config } +do_install:append:class-target() { + fix_absolute_paths +} + +do_install:append:class-nativesdk() { + fix_absolute_paths +} + +do_compile_ptest() { + oe_runmake -C ${B}/tests +} + +do_install_ptest() { + cat ${WORKDIR}/disable-tests >> ${S}/tests/data/DISABLED + rm -f ${B}/tests/configurehelp.pm + cp -rf ${B}/tests ${D}${PTEST_PATH} + rm -f ${D}${PTEST_PATH}/tests/libtest/.libs/libhostname.la + rm -f ${D}${PTEST_PATH}/tests/libtest/libhostname.la + mv ${D}${PTEST_PATH}/tests/libtest/.libs/* ${D}${PTEST_PATH}/tests/libtest/ + mv ${D}${PTEST_PATH}/tests/libtest/libhostname.so ${D}${PTEST_PATH}/tests/libtest/.libs/ + mv ${D}${PTEST_PATH}/tests/http/clients/.libs/* ${D}${PTEST_PATH}/tests/http/clients/ + cp -rf ${S}/tests ${D}${PTEST_PATH} + find ${D}${PTEST_PATH}/ -type f -name Makefile.am -o -name Makefile.in -o -name Makefile -delete + install -d ${D}${PTEST_PATH}/src + ln -sf ${bindir}/curl ${D}${PTEST_PATH}/src/curl + cp -rf ${D}${bindir}/curl-config ${D}${PTEST_PATH} +} + +RDEPENDS:${PN}-ptest += " \ + bash \ + perl-module-b \ + perl-module-base \ + perl-module-cwd \ + perl-module-digest \ + perl-module-digest-md5 \ + perl-module-file-basename \ + perl-module-file-spec \ + perl-module-file-temp \ + perl-module-io-socket \ + perl-module-ipc-open2 \ + perl-module-list-util \ + perl-module-memoize \ + perl-module-storable \ + perl-module-time-hires \ +" +RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us" + PACKAGES =+ "lib${BPN}" FILES:lib${BPN} = "${libdir}/lib*.so.*" diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb index c5427f54eb..a99d5cea62 100644 --- a/meta/recipes-support/db/db_5.3.28.bb +++ b/meta/recipes-support/db/db_5.3.28.bb @@ -18,7 +18,6 @@ RCONFLICTS:${PN} = "db3" CVE_PRODUCT = "oracle_berkeley_db berkeley_db" CVE_VERSION = "11.2.${PV}" -PR = "r1" PE = "1" SRC_URI = "https://download.oracle.com/berkeley-db/db-${PV}.tar.gz" diff --git a/meta/recipes-support/debianutils/debianutils_5.7.bb b/meta/recipes-support/debianutils/debianutils_5.17.bb index 7d705c6ff4..c5f25bae40 100644 --- a/meta/recipes-support/debianutils/debianutils_5.7.bb +++ b/meta/recipes-support/debianutils/debianutils_5.17.bb @@ -6,12 +6,12 @@ HOMEPAGE = "https://packages.debian.org/sid/debianutils" BUGTRACKER = "https://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=debianutils;dist=unstable" SECTION = "base" LICENSE = "GPL-2.0-only & SMAIL_GPL" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=9b912cd0cc654134c0ef3424a0705b94" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=4b667f30411d21bc8fd7db85d502a8e9" SRC_URI = "git://salsa.debian.org/debian/debianutils.git;protocol=https;branch=master \ " -SRCREV = "de14223e5bffe15e374a441302c528ffc1cbed57" +SRCREV = "baf12e98a02883d1b76081e32f2185ee3497570b" inherit autotools update-alternatives @@ -31,6 +31,7 @@ do_install:append() { mv ${D}${bindir}/$app ${D}${base_bindir}/$app done fi + mv ${D}${bindir}/which.debianutils ${D}${bindir}/which } # Note that we package the update-alternatives name. @@ -47,9 +48,6 @@ ALTERNATIVE:${PN} = "add-shell installkernel remove-shell savelog which" ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" ALTERNATIVE:${PN}-run-parts = "run-parts" -ALTERNATIVE:${PN}-doc = "which.1" -ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1" - ALTERNATIVE_LINK_NAME[add-shell] = "${sbindir}/add-shell" ALTERNATIVE_LINK_NAME[installkernel] = "${sbindir}/installkernel" ALTERNATIVE_LINK_NAME[remove-shell] = "${sbindir}/remove-shell" diff --git a/meta/recipes-support/diffoscope/diffoscope_211.bb b/meta/recipes-support/diffoscope/diffoscope_265.bb index c634ab44cb..6af5abc974 100644 --- a/meta/recipes-support/diffoscope/diffoscope_211.bb +++ b/meta/recipes-support/diffoscope/diffoscope_265.bb @@ -12,9 +12,22 @@ PYPI_PACKAGE = "diffoscope" inherit pypi setuptools3 -SRC_URI[sha256sum] = "8e75f3acb181096632e43935ba7a85304703ac54739810b4523919188367ec03" +SRC_URI[sha256sum] = "7bdcbd7fc5bc4c821bf6ab5ffbbeb265103b04e6908ea4bb12144d7e5ca002ff" -RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm" +RDEPENDS:${PN} += "\ + binutils \ + python3-curses \ + python3-difflib \ + python3-fcntl \ + python3-json \ + python3-libarchive-c \ + python3-magic \ + python3-multiprocessing \ + python3-pprint \ + python3-rpm \ + squashfs-tools \ + vim \ + " # Dependencies don't build for musl COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb b/meta/recipes-support/dos2unix/dos2unix_7.5.2.bb index 509a0a0ddc..06338dd62f 100644 --- a/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb +++ b/meta/recipes-support/dos2unix/dos2unix_7.5.2.bb @@ -6,12 +6,12 @@ HOMEPAGE = "http://waterlan.home.xs4all.nl/dos2unix.html" SECTION = "support" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=8a7c3499a1142df819e727253cd53a12" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=49ec74e0139712398b9ddb06d824929a" -SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix;branch=master" +SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix;branch=master;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "dos2unix-(?P<pver>(\d+(\.\d+)+))" -SRCREV = "72596f0ae21faa25a07a872d4843bc885475115d" +SRCREV = "c16a0b31a64c7eb6b2d76960e5144732b57f2993" S = "${WORKDIR}/git/dos2unix" diff --git a/meta/recipes-support/enchant/enchant2_2.3.3.bb b/meta/recipes-support/enchant/enchant2_2.6.9.bb index 96d56c2ea4..aaf3525ad8 100644 --- a/meta/recipes-support/enchant/enchant2_2.3.3.bb +++ b/meta/recipes-support/enchant/enchant2_2.6.9.bb @@ -7,19 +7,17 @@ BUGTRACKER = "https://github.com/AbiWord/enchant/issues/" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "glib-2.0" +DEPENDS = "glib-2.0 groff-native" -inherit autotools pkgconfig +inherit autotools pkgconfig github-releases -SRC_URI = "https://github.com/AbiWord/enchant/releases/download/v${PV}/enchant-${PV}.tar.gz" -SRC_URI[sha256sum] = "3da12103f11cf49c3cf2fd2ce3017575c5321a489e5b9bfa81dd91ec413f3891" +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/enchant-${PV}.tar.gz" +SRC_URI[sha256sum] = "d9a5a10dc9b38a43b3a0fa22c76ed6ebb7e09eb535aff62954afcdbd40efff6b" -UPSTREAM_CHECK_URI = "https://github.com/AbiWord/enchant/releases" +GITHUB_BASE_URI = "https://github.com/AbiWord/enchant/releases" S = "${WORKDIR}/enchant-${PV}" -EXTRA_OEMAKE = "pkgdatadir=${datadir}/enchant-2" - PACKAGECONFIG ??= "aspell" PACKAGECONFIG[aspell] = "--with-aspell,--without-aspell,aspell,aspell" PACKAGECONFIG[hunspell] = "--with-hunspell,--without-hunspell,hunspell,hunspell" diff --git a/meta/recipes-support/fribidi/fribidi_1.0.12.bb b/meta/recipes-support/fribidi/fribidi_1.0.13.bb index b29c47822f..5d0476a375 100644 --- a/meta/recipes-support/fribidi/fribidi_1.0.12.bb +++ b/meta/recipes-support/fribidi/fribidi_1.0.13.bb @@ -9,13 +9,11 @@ BUGTRACKER = "https://github.com/fribidi/fribidi/issues" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.xz \ +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.xz \ " -SRC_URI[sha256sum] = "0cd233f97fc8c67bb3ac27ce8440def5d3ffacf516765b91c2cc654498293495" +SRC_URI[sha256sum] = "7fa16c80c81bd622f7b198d31356da139cc318a63fc7761217af4130903f54a2" -UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" - -inherit meson lib_package pkgconfig +inherit meson lib_package pkgconfig github-releases CVE_PRODUCT = "gnu_fribidi fribidi" diff --git a/meta/recipes-support/gdbm/files/run-ptest b/meta/recipes-support/gdbm/files/run-ptest index 615da8444b..8d6481185d 100755 --- a/meta/recipes-support/gdbm/files/run-ptest +++ b/meta/recipes-support/gdbm/files/run-ptest @@ -4,4 +4,4 @@ cd tests -./testsuite AUTOTEST_PATH=$PWD abs_builddir=$PWD COMPAT=1 | sed 's/^[^0-9]*\([0-9]\+\): \(.*\)\(ok\|pass\|skipped\|fail\|FAILED\)\(.*\)$/\3: \2 \4/;s/ \+/ /g;s/^ok/PASS/;s/^skipped/SKIP/;s/^fail/FAIL/;s/^FAILED/FAIL/' +./testsuite --am-fmt AUTOTEST_PATH=$PWD abs_builddir=$PWD COMPAT=1 diff --git a/meta/recipes-support/gmp/gmp/cve-2021-43618.patch b/meta/recipes-support/gmp/gmp/cve-2021-43618.patch deleted file mode 100644 index 095fb21eaa..0000000000 --- a/meta/recipes-support/gmp/gmp/cve-2021-43618.patch +++ /dev/null @@ -1,27 +0,0 @@ -CVE: CVE-2021-43618 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -# HG changeset patch -# User Marco Bodrato <bodrato@mail.dm.unipi.it> -# Date 1634836009 -7200 -# Node ID 561a9c25298e17bb01896801ff353546c6923dbd -# Parent e1fd9db13b475209a864577237ea4b9105b3e96e -mpz/inp_raw.c: Avoid bit size overflows - -diff -r e1fd9db13b47 -r 561a9c25298e mpz/inp_raw.c ---- a/mpz/inp_raw.c Tue Dec 22 23:49:51 2020 +0100 -+++ b/mpz/inp_raw.c Thu Oct 21 19:06:49 2021 +0200 -@@ -88,8 +88,11 @@ - - abs_csize = ABS (csize); - -+ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8)) -+ return 0; /* Bit size overflows */ -+ - /* round up to a multiple of limbs */ -- abs_xsize = BITS_TO_LIMBS (abs_csize*8); -+ abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8); - - if (abs_xsize != 0) - { diff --git a/meta/recipes-support/gmp/gmp_6.2.1.bb b/meta/recipes-support/gmp/gmp_6.3.0.bb index 29055492c2..fd4aec92fd 100644 --- a/meta/recipes-support/gmp/gmp_6.2.1.bb +++ b/meta/recipes-support/gmp/gmp_6.3.0.bb @@ -14,10 +14,8 @@ SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ file://use-includedir.patch \ file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \ - file://cve-2021-43618.patch \ " -SRC_URI[md5sum] = "28971fc21cf028042d4897f02fd355ea" -SRC_URI[sha256sum] = "eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c" +SRC_URI[sha256sum] = "ac28211a7cfb609bae2e2c8d6058d66c8fe96434f740cf6fe2e47b000d1c20cb" acpaths = "" @@ -31,13 +29,21 @@ do_install:append() { oe_multilib_header gmp.h } -do_install:prepend:class-target() { +fix_absolute_paths () { sed -i \ -e "s|--sysroot=${STAGING_DIR_HOST}||g" \ -e "s|${DEBUG_PREFIX_MAP}||g" \ ${B}/gmp.h } +do_install:prepend:class-target() { + fix_absolute_paths +} + +do_install:prepend:class-nativesdk() { + fix_absolute_paths +} + SSTATE_SCAN_FILES += "gmp.h" # Doesn't compile in MIPS16e mode due to use of hand-written diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb index 0cc7cd7b67..1173dd4af3 100644 --- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb +++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb @@ -9,7 +9,7 @@ LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://src/gnome-desktop-testing-runner.c;beginline=1;endline=20;md5=7ef3ad9da2ffcf7707dc11151fe007f4" -SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http;branch=master \ +SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=https;branch=master \ file://0001-fix-non-literal-format-string-issue-with-clang.patch \ " SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7" diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index c4ede9ea5e..f957f6b55e 100644 --- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -1,4 +1,4 @@ -From 89b98553084fbefe1ef2c7cbff9e72cf43144c49 Mon Sep 17 00:00:00 2001 +From 6b581c43bd01f815db78a410fd3814fc5994171e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d86c60e..65c22b2 100644 +index 26d7f7b..e953c2e 100644 --- a/configure.ac +++ b/configure.ac -@@ -1955,7 +1955,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1921,7 +1921,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) diff --git a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch index d3790ac782..0e58fd4c4d 100644 --- a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch +++ b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch @@ -1,4 +1,4 @@ -From 15668161c351aee5f29152db2972b1648da11210 Mon Sep 17 00:00:00 2001 +From d9048788d906774b1475c3bb1b17e22455c2add4 Mon Sep 17 00:00:00 2001 From: Saul Wold <sgw@linux.intel.com> Date: Wed, 16 Aug 2017 11:16:30 +0800 Subject: [PATCH] use pkgconfig instead of npth config @@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/m4/npth.m4 b/m4/npth.m4 -index 06cdaee..4adda01 100644 +index 619ed89..0cb354d 100644 --- a/m4/npth.m4 +++ b/m4/npth.m4 @@ -19,25 +19,10 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG], @@ -25,7 +25,7 @@ index 06cdaee..4adda01 100644 + AC_PATH_PROG(PKGCONFIG, pkg-config, no) - use_gpgrt_config="" -- if test x"$NPTH_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then - if $GPGRT_CONFIG npth --exists; then - NPTH_CONFIG="$GPGRT_CONFIG npth" - AC_MSG_NOTICE([Use gpgrt-config as npth-config]) diff --git a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch index dcd8582ca6..d664c36a1b 100644 --- a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch +++ b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch @@ -1,7 +1,7 @@ -From 914ae4a3f7529fb069467bf0ded57dd24ee2e763 Mon Sep 17 00:00:00 2001 +From 6a7f9b71d936847dcaeeac7d1b69d8299be4dd85 Mon Sep 17 00:00:00 2001 From: Wenzong Fan <wenzong.fan@windriver.com> Date: Wed, 16 Aug 2017 11:23:22 +0800 -Subject: [PATCH 4/4] autogen.sh: fix find-version for beta checking +Subject: [PATCH] autogen.sh: fix find-version for beta checking find-version always assumes that gnupg is beta if autogen.sh is run out of git-repo. This doesn't work for users whom just take release @@ -13,15 +13,16 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Rebase to 2.1.23 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- autogen.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/autogen.sh b/autogen.sh -index e5ba5bf..05e0e11 100755 +index 0abf103..78753b5 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -245,7 +245,6 @@ if [ "$myhost" = "find-version" ]; then +@@ -237,7 +237,6 @@ if [ "$myhost" = "find-version" ]; then rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) else ingit=no @@ -29,6 +30,3 @@ index e5ba5bf..05e0e11 100755 tmp="-unknown" rev="0000000" rvd="0" --- -1.8.3.1 - diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index 43999b8a6d..ea0252026a 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From 89ae4f03307104689e1857d9857d452af6b35ac4 Mon Sep 17 00:00:00 2001 +From c50d0a95fcf8f96c272fadd4ba85f3eeac39fcaf Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 260aeb2..1aeb08d 100644 +index 6f99f3e..f22aa9e 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -1143,7 +1143,7 @@ gnupg_socketdir (void) +@@ -1284,7 +1284,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy; @@ -26,7 +26,7 @@ index 260aeb2..1aeb08d 100644 gpgrt_annotate_leaked_object (name); } -@@ -1175,7 +1175,7 @@ gnupg_sysconfdir (void) +@@ -1316,7 +1316,7 @@ gnupg_sysconfdir (void) if (dir) return dir; else @@ -35,7 +35,7 @@ index 260aeb2..1aeb08d 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1211,7 +1211,7 @@ gnupg_bindir (void) +@@ -1352,7 +1352,7 @@ gnupg_bindir (void) return name; } else @@ -44,7 +44,7 @@ index 260aeb2..1aeb08d 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1238,7 +1238,7 @@ gnupg_libexecdir (void) +@@ -1379,7 +1379,7 @@ gnupg_libexecdir (void) return name; } else @@ -53,7 +53,7 @@ index 260aeb2..1aeb08d 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1268,7 +1268,7 @@ gnupg_libdir (void) +@@ -1409,7 +1409,7 @@ gnupg_libdir (void) return name; } else @@ -62,7 +62,7 @@ index 260aeb2..1aeb08d 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1299,7 +1299,7 @@ gnupg_datadir (void) +@@ -1440,7 +1440,7 @@ gnupg_datadir (void) return name; } else @@ -71,7 +71,7 @@ index 260aeb2..1aeb08d 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1331,7 +1331,7 @@ gnupg_localedir (void) +@@ -1472,7 +1472,7 @@ gnupg_localedir (void) return name; } else diff --git a/meta/recipes-support/gnupg/gnupg_2.3.6.bb b/meta/recipes-support/gnupg/gnupg_2.4.5.bb index f35eb8c75a..99996968b1 100644 --- a/meta/recipes-support/gnupg/gnupg_2.3.6.bb +++ b/meta/recipes-support/gnupg/gnupg_2.4.5.bb @@ -23,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "21f7fe2fc5c2f214184ab050977ec7a8e304e58bfae2ab098fec69f8fabda9c1" +SRC_URI[sha256sum] = "f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ @@ -32,7 +32,10 @@ EXTRA_OECONF = "--disable-ldap \ --with-readline=${STAGING_LIBDIR}/.. \ --with-mailprog=${sbindir}/sendmail \ --enable-gpg-is-gpg2 \ + --disable-tests \ " +# yat2m can be found from recipe-sysroot-native non-deterministically with different versioning otherwise +CACHED_CONFIGUREVARS += "ac_cv_path_YAT2M=./yat2m" # A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg) PACKAGES =+ "${PN}-gpg" diff --git a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch new file mode 100644 index 0000000000..d13bfee8ef --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch @@ -0,0 +1,26 @@ +From 7be8ec59a53e93c2bd453b3ba2d63d1b300ef11f Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Mon, 23 May 2022 10:44:43 +0900 +Subject: [PATCH] Creating .hmac file should be excuted in target environment, + so deleted it from build process. + +Upstream-Status: Inappropriate [https://gitlab.com/gnutls/gnutls/-/issues/1373] +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + lib/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index a50d311..193ea19 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -198,8 +198,7 @@ hmac_file = .libs/.$(gnutls_so).hmac + + all-local: $(hmac_file) + +-$(hmac_file): libgnutls.la fipshmac +- $(AM_V_GEN) $(builddir)/fipshmac > $@-t && mv $@-t $@ ++.libs/.$(gnutls_so).hmac: + + CLEANFILES = $(hmac_file) + endif diff --git a/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch b/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch new file mode 100644 index 0000000000..cc39f5c9a5 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch @@ -0,0 +1,269 @@ +From 2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d Mon Sep 17 00:00:00 2001 +From: Zoltan Fridrich <zfridric@redhat.com> +Date: Wed, 10 Apr 2024 12:51:33 +0200 +Subject: [PATCH] Fix RSAES-PKCS1-v1_5 system-wide configuration + +Upstream-Status: Backport [expected for 3.8.6 https://gitlab.com/gnutls/gnutls/-/merge_requests/1830?commit_id=2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d] + +Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com> +Signed-off-by: Zoltan Fridrich <zfridric@redhat.com> +--- + lib/priority.c | 125 +++++++++++------- + ...system-override-allow-rsa-pkcs1-encrypt.sh | 27 +++- + 2 files changed, 96 insertions(+), 56 deletions(-) + +diff --git a/lib/priority.c b/lib/priority.c +index 8abe00d1ff..3434619aad 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -1018,6 +1018,12 @@ struct cfg { + bool force_ext_master_secret_set; + }; + ++static inline void cfg_init(struct cfg *cfg) ++{ ++ memset(cfg, 0, sizeof(*cfg)); ++ cfg->allow_rsa_pkcs1_encrypt = true; ++} ++ + static inline void cfg_deinit(struct cfg *cfg) + { + if (cfg->priority_strings) { +@@ -1095,6 +1101,12 @@ struct ini_ctx { + size_t curves_size; + }; + ++static inline void ini_ctx_init(struct ini_ctx *ctx) ++{ ++ memset(ctx, 0, sizeof(*ctx)); ++ cfg_init(&ctx->cfg); ++} ++ + static inline void ini_ctx_deinit(struct ini_ctx *ctx) + { + cfg_deinit(&ctx->cfg); +@@ -1423,9 +1435,6 @@ static inline int cfg_apply(struct cfg *cfg, struct ini_ctx *ctx) + _gnutls_default_priority_string = cfg->default_priority_string; + } + +- /* enable RSA-PKCS1-V1_5 by default */ +- cfg->allow_rsa_pkcs1_encrypt = true; +- + if (cfg->allowlisting) { + /* also updates `flags` of global `hash_algorithms[]` */ + ret = cfg_hashes_set_array(cfg, ctx->hashes, ctx->hashes_size); +@@ -2217,22 +2226,73 @@ update_system_wide_priority_string(void) + return 0; + } + ++/* Returns false on parse error, otherwise true. ++ * The system_wide_config must be locked for writing. ++ */ ++static inline bool load_system_priority_file(void) ++{ ++ int err; ++ FILE *fp; ++ struct ini_ctx ctx; ++ ++ cfg_init(&system_wide_config); ++ ++ fp = fopen(system_priority_file, "re"); ++ if (fp == NULL) { ++ _gnutls_debug_log("cfg: unable to open: %s: %d\n", ++ system_priority_file, errno); ++ return true; ++ } ++ ++ /* Parsing the configuration file needs to be done in 2 phases: ++ * first parsing the [global] section ++ * and then the other sections, ++ * because the [global] section modifies the parsing behavior. ++ */ ++ ini_ctx_init(&ctx); ++ err = ini_parse_file(fp, global_ini_handler, &ctx); ++ if (!err) { ++ if (fseek(fp, 0L, SEEK_SET) < 0) { ++ _gnutls_debug_log("cfg: unable to rewind: %s\n", ++ system_priority_file); ++ if (fail_on_invalid_config) ++ exit(1); ++ } ++ err = ini_parse_file(fp, cfg_ini_handler, &ctx); ++ } ++ fclose(fp); ++ if (err) { ++ ini_ctx_deinit(&ctx); ++ _gnutls_debug_log("cfg: unable to parse: %s: %d\n", ++ system_priority_file, err); ++ return false; ++ } ++ cfg_apply(&system_wide_config, &ctx); ++ ini_ctx_deinit(&ctx); ++ return true; ++} ++ + static int _gnutls_update_system_priorities(bool defer_system_wide) + { +- int ret, err = 0; ++ int ret; ++ bool config_parse_error = false; + struct stat sb; +- FILE *fp; + gnutls_buffer_st buf; +- struct ini_ctx ctx; + + ret = gnutls_rwlock_rdlock(&system_wide_config_rwlock); +- if (ret < 0) { ++ if (ret < 0) + return gnutls_assert_val(ret); +- } + + if (stat(system_priority_file, &sb) < 0) { + _gnutls_debug_log("cfg: unable to access: %s: %d\n", + system_priority_file, errno); ++ ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock); ++ if (ret < 0) ++ goto out; ++ /* If system-wide config is unavailable, apply the defaults */ ++ cfg_init(&system_wide_config); + goto out; + } + +@@ -2240,63 +2300,27 @@ static int _gnutls_update_system_priorities(bool defer_system_wide) + system_priority_last_mod == sb.st_mtime) { + _gnutls_debug_log("cfg: system priority %s has not changed\n", + system_priority_file); +- if (system_wide_config.priority_string) { ++ if (system_wide_config.priority_string) + goto out; /* nothing to do */ +- } + } + + (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + + ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock); +- if (ret < 0) { ++ if (ret < 0) + return gnutls_assert_val(ret); +- } + + /* Another thread could have successfully re-read system-wide config, + * skip re-reading if the mtime it has used is exactly the same. + */ +- if (system_priority_file_loaded) { ++ if (system_priority_file_loaded) + system_priority_file_loaded = + (system_priority_last_mod == sb.st_mtime); +- } + + if (!system_priority_file_loaded) { +- _name_val_array_clear(&system_wide_config.priority_strings); +- +- gnutls_free(system_wide_config.priority_string); +- system_wide_config.priority_string = NULL; +- +- fp = fopen(system_priority_file, "re"); +- if (fp == NULL) { +- _gnutls_debug_log("cfg: unable to open: %s: %d\n", +- system_priority_file, errno); ++ config_parse_error = !load_system_priority_file(); ++ if (config_parse_error) + goto out; +- } +- /* Parsing the configuration file needs to be done in 2 phases: +- * first parsing the [global] section +- * and then the other sections, +- * because the [global] section modifies the parsing behavior. +- */ +- memset(&ctx, 0, sizeof(ctx)); +- err = ini_parse_file(fp, global_ini_handler, &ctx); +- if (!err) { +- if (fseek(fp, 0L, SEEK_SET) < 0) { +- _gnutls_debug_log("cfg: unable to rewind: %s\n", +- system_priority_file); +- if (fail_on_invalid_config) +- exit(1); +- } +- err = ini_parse_file(fp, cfg_ini_handler, &ctx); +- } +- fclose(fp); +- if (err) { +- ini_ctx_deinit(&ctx); +- _gnutls_debug_log("cfg: unable to parse: %s: %d\n", +- system_priority_file, err); +- goto out; +- } +- cfg_apply(&system_wide_config, &ctx); +- ini_ctx_deinit(&ctx); + _gnutls_debug_log("cfg: loaded system config %s mtime %lld\n", + system_priority_file, + (unsigned long long)sb.st_mtime); +@@ -2332,9 +2356,8 @@ static int _gnutls_update_system_priorities(bool defer_system_wide) + out: + (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + +- if (err && fail_on_invalid_config) { ++ if (config_parse_error && fail_on_invalid_config) + exit(1); +- } + + return ret; + } +diff --git a/tests/system-override-allow-rsa-pkcs1-encrypt.sh b/tests/system-override-allow-rsa-pkcs1-encrypt.sh +index b7d477c96e..714d0af946 100755 +--- a/tests/system-override-allow-rsa-pkcs1-encrypt.sh ++++ b/tests/system-override-allow-rsa-pkcs1-encrypt.sh +@@ -19,9 +19,8 @@ + # You should have received a copy of the GNU Lesser General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/> + +-: ${srcdir=.} +-TEST=${srcdir}/rsaes-pkcs1-v1_5 +-CONF=${srcdir}/config.$$.tmp ++TEST=${builddir}/rsaes-pkcs1-v1_5 ++CONF=config.$$.tmp + export GNUTLS_SYSTEM_PRIORITY_FILE=${CONF} + export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 + +@@ -38,15 +37,33 @@ cat <<_EOF_ > ${CONF} + allow-rsa-pkcs1-encrypt = true + _EOF_ + +-${TEST} && fail "RSAES-PKCS1-v1_5 expected to succeed" ++${TEST} ++if [ $? != 0 ]; then ++ echo "${TEST} expected to succeed" ++ exit 1 ++fi ++echo "RSAES-PKCS1-v1_5 successfully enabled" + + cat <<_EOF_ > ${CONF} + [overrides] + allow-rsa-pkcs1-encrypt = false + _EOF_ + +-${TEST} || fail "RSAES-PKCS1-v1_5 expected to fail" ++${TEST} ++if [ $? = 0 ]; then ++ echo "${TEST} expected to fail" ++ exit 1 ++fi ++echo "RSAES-PKCS1-v1_5 successfully disabled" + + unset GNUTLS_SYSTEM_PRIORITY_FILE + unset GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID ++ ++${TEST} ++if [ $? != 0 ]; then ++ echo "${TEST} expected to succeed by default" ++ exit 1 ++fi ++echo "RSAES-PKCS1-v1_5 successfully enabled by default" ++ + exit 0 +-- +GitLab + + diff --git a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch new file mode 100644 index 0000000000..8edd31d6b9 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch @@ -0,0 +1,57 @@ +From bfa70adcbda4e505cf2e597907852e78e0439ee2 Mon Sep 17 00:00:00 2001 +From: Ravineet Singh <ravineet.a.singh@est.tech> +Date: Tue, 10 Jan 2023 16:11:10 +0100 +Subject: [PATCH] gnutls: add ptest support + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech> +--- + Makefile.am | 3 +++ + configure.ac | 2 ++ + tests/Makefile.am | 6 ++++++ + 3 files changed, 11 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 843193f..816b09f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -191,6 +191,9 @@ dist-hook: + mv ChangeLog $(distdir) + touch -c $(distdir)/doc/*.html $(distdir)/doc/*.pdf $(distdir)/doc/*.info + ++install-ptest: ++ $(MAKE) -C tests DESTDIR=$(DESTDIR)/tests $@ ++ + .PHONY: abi-check abi-dump-versioned abi-dump-latest pic-check symbol-check local-code-coverage-output files-update AUTHORS + + include $(top_srcdir)/cligen/cligen.mk +diff --git a/configure.ac b/configure.ac +index 934377e..4406eae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1213,6 +1213,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS) + + AM_CONDITIONAL(NEEDS_LIBRT, test "$gnutls_needs_librt" = "yes") + ++AM_EXTRA_RECURSIVE_TARGETS([buildtest-TESTS]) ++ + AC_DEFINE([GNUTLS_INTERNAL_BUILD], 1, [We allow temporarily usage of deprecated functions - until they are removed.]) + + hw_features= +diff --git a/tests/Makefile.am b/tests/Makefile.am +index e39a3b3..861dd63 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -663,6 +663,12 @@ SH_LOG_COMPILER = $(SHELL) + AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind + LOG_COMPILER = $(LOG_VALGRIND) + ++install-ptest: $(check_PROGRAMS) ++ @$(INSTALL) -d $(DESTDIR) ++ @for file in $^; do \ ++ $(INSTALL_PROGRAM) $$file $(DESTDIR) ; \ ++ done ++ + distclean-local: + rm -rf softhsm-*.db softhsm-*.config *.tmp tmp-* x509-crt-list-import-url.config.db port.lock.d + diff --git a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch index 6eb1edbdb1..883d0123db 100644 --- a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch +++ b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch @@ -1,4 +1,4 @@ -From 8a5c96057cf305bbeac0d6e0e59ee24fbb9497fe Mon Sep 17 00:00:00 2001 +From d17ae0ef31c3c186766a338e8c40c87d1b98820e Mon Sep 17 00:00:00 2001 From: Joe Slater <jslater@windriver.com> Date: Wed, 25 Jan 2017 13:52:59 -0800 Subject: [PATCH] gnutls: account for ARM_EABI @@ -9,16 +9,15 @@ reference to them. Upstream-Status: Pending Signed-off-by: Joe Slater <jslater@windriver.com> - --- tests/seccomp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/seccomp.c b/tests/seccomp.c -index ed14d00..3c5b726 100644 +index 881f0bb..5f9204a 100644 --- a/tests/seccomp.c +++ b/tests/seccomp.c -@@ -53,7 +53,9 @@ int disable_system_calls(void) +@@ -55,7 +55,9 @@ int disable_system_calls(void) ADD_SYSCALL(nanosleep, 0); ADD_SYSCALL(clock_nanosleep, 0); diff --git a/meta/recipes-support/gnutls/gnutls/run-ptest b/meta/recipes-support/gnutls/gnutls/run-ptest new file mode 100644 index 0000000000..17e26eae70 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/run-ptest @@ -0,0 +1,100 @@ +#!/bin/sh + +rjob() { + local job=$1 + local log=$2 + + # TODO: Output will be garbled + ./${job} >> ${log} 2>&1 + + ret=$? + case $ret in + 0) + echo "PASS: $t" >> ${log} + echo "PASS: $t" + ;; + 77) + echo "SKIP: $t" >> ${log} + echo "SKIP: $t" + ;; + *) + echo "FAIL: $t" >> ${log} + echo "FAIL: $t" + ;; + esac +} + +is_disallowed() { + local key=$1 + $(echo ${test_disallowlist} | grep -w -q ${key}) + return $? +} + +# TODO +# This list should probably be in a external file +# Testcases defined here either take very long time (dtls-stress) +# or are dependent on local files (certs, etc) in local file system +# currently not exported to target. + +test_disallowlist="" +test_disallowlist="${test_disallowlist} dtls-stress" +test_disallowlist="${test_disallowlist} handshake-large-cert" +test_disallowlist="${test_disallowlist} id-on-xmppAddr" +test_disallowlist="${test_disallowlist} mini-x509-cas" +test_disallowlist="${test_disallowlist} pkcs12_simple" +test_disallowlist="${test_disallowlist} protocol-set-allowlist" +test_disallowlist="${test_disallowlist} psk-file" +test_disallowlist="${test_disallowlist} rawpk-api" +test_disallowlist="${test_disallowlist} set_pkcs12_cred" +test_disallowlist="${test_disallowlist} system-override-curves-allowlist" +test_disallowlist="${test_disallowlist} system-override-hash" +test_disallowlist="${test_disallowlist} system-override-sig" +test_disallowlist="${test_disallowlist} system-override-sig-tls" +test_disallowlist="${test_disallowlist} system-prio-file" +test_disallowlist="${test_disallowlist} x509cert-tl" + +LOG=${PWD}/tests.log +cd tests +max_njobs=$(grep -c ^processor /proc/cpuinfo) +njobs=0 + +set +e + +for t in *; do + [ -x $t ] || continue + [ -f $t ] || continue + + is_disallowed ${t} + [ $? -eq 0 ] && continue + + rjob ${t} ${LOG} & + one=1 + njobs=$(expr ${njobs} + ${one}) + if [ ${njobs} -eq ${max_njobs} ]; then + wait + njobs=0 + fi +done +wait + +skipped=$(grep -c SKIP ${LOG}) +passed=$(grep -c PASS ${LOG}) +failed=$(grep -c FAIL ${LOG}) +total=$(expr ${passed} + ${failed} + ${skipped}) + +if [ ${failed} -ne 0 ]; then + echo + echo "Tests failed for gnutls, log is:" + echo "--------------------" + cat ${LOG} + echo +fi + +echo +echo "gnutls test summary:" +echo "--------------------" +echo "total: ${total}" +echo "pass : ${passed}" +echo "fail : ${failed}" +echo "skip : ${skipped}" +echo diff --git a/meta/recipes-support/gnutls/gnutls_3.7.4.bb b/meta/recipes-support/gnutls/gnutls_3.7.4.bb deleted file mode 100644 index b34eb7f5f0..0000000000 --- a/meta/recipes-support/gnutls/gnutls_3.7.4.bb +++ /dev/null @@ -1,68 +0,0 @@ -SUMMARY = "GNU Transport Layer Security Library" -DESCRIPTION = "a secure communications library implementing the SSL, \ -TLS and DTLS protocols and technologies around them." -HOMEPAGE = "https://gnutls.org/" -BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" - -LICENSE = "GPL-3.0-or-later & LGPL-2.1-or-later" -LICENSE:${PN} = "LGPL-2.1-or-later" -LICENSE:${PN}-xx = "LGPL-2.1-or-later" -LICENSE:${PN}-bin = "GPL-3.0-or-later" -LICENSE:${PN}-OpenSSL = "GPL-3.0-or-later" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ - file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ - file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" - -DEPENDS = "nettle gmp virtual/libiconv libunistring" -DEPENDS:append:libc-musl = " argp-standalone" - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" - -SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ - file://arm_eabi.patch \ - " - -SRC_URI[sha256sum] = "e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f" - -inherit autotools texinfo pkgconfig gettext lib_package gtk-doc - -PACKAGECONFIG ??= "libidn ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)}" - -# You must also have CONFIG_SECCOMP enabled in the kernel for -# seccomp to work. -PACKAGECONFIG[seccomp] = "--with-libseccomp-prefix=${STAGING_EXECPREFIXDIR},ac_cv_libseccomp=no,libseccomp" -PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2" -PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" -PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" -PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" - -EXTRA_OECONF = " \ - --enable-doc \ - --disable-libdane \ - --disable-guile \ - --disable-rpath \ - --enable-openssl-compatibility \ - --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ - --with-librt-prefix=${STAGING_DIR_HOST}${prefix} \ - --with-default-trust-store-file=${sysconfdir}/ssl/certs/ca-certificates.crt \ -" - -# Otherwise the tools try and use HOSTTOOLS_DIR/bash as a shell. -export POSIX_SHELL="${base_bindir}/sh" - -LDFLAGS:append:libc-musl = " -largp" - -do_configure:prepend() { - for dir in . lib; do - rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 - done -} - -PACKAGES =+ "${PN}-openssl ${PN}-xx" - -FILES:${PN}-dev += "${bindir}/gnutls-cli-debug" -FILES:${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" -FILES:${PN}-xx = "${libdir}/libgnutlsxx.so.*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/gnutls/gnutls_3.8.5.bb b/meta/recipes-support/gnutls/gnutls_3.8.5.bb new file mode 100644 index 0000000000..52a1c00c4a --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls_3.8.5.bb @@ -0,0 +1,101 @@ +SUMMARY = "GNU Transport Layer Security Library" +DESCRIPTION = "a secure communications library implementing the SSL, \ +TLS and DTLS protocols and technologies around them." +HOMEPAGE = "https://gnutls.org/" +BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" + +LICENSE = "GPL-3.0-or-later & LGPL-2.1-or-later" +LICENSE:${PN} = "LGPL-2.1-or-later" +LICENSE:${PN}-xx = "LGPL-2.1-or-later" +LICENSE:${PN}-bin = "GPL-3.0-or-later" +LICENSE:${PN}-openssl = "GPL-3.0-or-later" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ + file://doc/COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ + file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "nettle gmp virtual/libiconv libunistring" + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" + +SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ + file://arm_eabi.patch \ + file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \ + file://0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch \ + file://run-ptest \ + file://Add-ptest-support.patch \ + " + +SRC_URI[sha256sum] = "66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc" + +inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest + +PACKAGECONFIG ??= "libidn libtasn1 ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)}" + +# You must also have CONFIG_SECCOMP enabled in the kernel for +# seccomp to work. +PACKAGECONFIG[seccomp] = "--with-libseccomp-prefix=${STAGING_EXECPREFIXDIR},ac_cv_libseccomp=no,libseccomp" +PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2" +PACKAGECONFIG[libtasn1] = "--without-included-libtasn1,--with-included-libtasn1,libtasn1" +PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" +PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" +PACKAGECONFIG[fips] = "--enable-fips140-mode --with-libdl-prefix=${STAGING_BASELIBDIR}" +PACKAGECONFIG[dane] = "--enable-libdane,--disable-libdane,unbound" +# Certificate compression +PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" +PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" + +EXTRA_OECONF = " \ + --enable-doc \ + --disable-rpath \ + --enable-openssl-compatibility \ + --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ + --with-librt-prefix=${STAGING_DIR_HOST}${prefix} \ + --with-default-trust-store-file=${sysconfdir}/ssl/certs/ca-certificates.crt \ +" + +# Otherwise the tools try and use HOSTTOOLS_DIR/bash as a shell. +export POSIX_SHELL="${base_bindir}/sh" + +do_configure:prepend() { + for dir in . lib; do + rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 + done +} + +do_compile_ptest() { + oe_runmake -C tests buildtest-TESTS +} + +do_install:append:class-target() { + if ${@bb.utils.contains('PACKAGECONFIG', 'fips', 'true', 'false', d)}; then + install -d ${D}${bindir}/bin + install -m 0755 ${B}/lib/.libs/fipshmac ${D}/${bindir}/ + fi +} + +PACKAGES =+ "${PN}-dane ${PN}-openssl ${PN}-xx ${PN}-fips" + +FILES:${PN}-dev += "${bindir}/gnutls-cli-debug" + +FILES:${PN}-dane = "${libdir}/libgnutls-dane.so.*" +FILES:${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" +FILES:${PN}-xx = "${libdir}/libgnutlsxx.so.*" +FILES:${PN}-fips = "${bindir}/fipshmac" + +RDEPENDS:${PN}-ptest += "python3" + +BBCLASSEXTEND = "native nativesdk" + +pkg_postinst_ontarget:${PN}-fips () { + if test -x ${bindir}/fipshmac + then + mkdir ${sysconfdir}/gnutls + touch ${sysconfdir}/gnutls/config + ${bindir}/fipshmac ${libdir}/libgnutls.so.30.*.* > ${libdir}/.libgnutls.so.30.hmac + ${bindir}/fipshmac ${libdir}/libnettle.so.8.* > ${libdir}/.libnettle.so.8.hmac + ${bindir}/fipshmac ${libdir}/libgmp.so.10.*.* > ${libdir}/.libgmp.so.10.hmac + ${bindir}/fipshmac ${libdir}/libhogweed.so.6.* > ${libdir}/.libhogweed.so.6.hmac + fi +} diff --git a/meta/recipes-support/gnutls/libtasn1_4.18.0.bb b/meta/recipes-support/gnutls/libtasn1_4.19.0.bb index db49adc1c2..5fb8b54c06 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.18.0.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.19.0.bb @@ -16,7 +16,7 @@ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ DEPENDS = "bison-native" -SRC_URI[sha256sum] = "4365c154953563d64c67a024b607d1ee75c6db76e0d0f65709ea80a334cd1898" +SRC_URI[sha256sum] = "1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a" inherit autotools texinfo lib_package gtk-doc diff --git a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch index 0c15cc7c38..8ed39280ca 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch @@ -1,4 +1,4 @@ -From a001b3c23bf80fd752044615b9bba6b926ff9666 Mon Sep 17 00:00:00 2001 +From ee1421f7a7a9f31400ba992a5be52b88d20170c9 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Fri, 10 May 2019 14:18:04 +0800 Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc." @@ -10,36 +10,21 @@ The oe-core does not support gpgrt-config, so revert it Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- - src/gpgme.m4 | 58 +++++++++------------------------------------------- - 1 file changed, 10 insertions(+), 48 deletions(-) + src/gpgme.m4 | 54 ++++++++-------------------------------------------- + 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/src/gpgme.m4 b/src/gpgme.m4 -index c749a5d..8579146 100644 +index f2906c1..8cc2898 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 -@@ -1,5 +1,5 @@ - # gpgme.m4 - autoconf macro to detect GPGME. --# Copyright (C) 2002, 2003, 2004, 2014, 2018 g10 Code GmbH -+# Copyright (C) 2002, 2003, 2004, 2014 g10 Code GmbH - # - # This file is free software; as a special exception the author gives - # unlimited permission to copy and/or distribute it, with or without -@@ -9,7 +9,7 @@ - # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - # --# Last-changed: 2020-11-20 -+# Last-changed: 2014-10-02 - - - AC_DEFUN([_AM_PATH_GPGME_CONFIG], -@@ -36,24 +36,10 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], +@@ -125,24 +125,10 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl fi fi - use_gpgrt_config="" -- if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then - if $GPGRT_CONFIG gpgme --exists; then - GPGME_CONFIG="$GPGRT_CONFIG gpgme" - AC_MSG_NOTICE([Use gpgrt-config as gpgme-config]) @@ -61,7 +46,7 @@ index c749a5d..8579146 100644 fi gpgme_version_major=`echo $gpgme_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` -@@ -66,16 +52,12 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], +@@ -155,16 +141,12 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK], [ @@ -80,7 +65,7 @@ index c749a5d..8579146 100644 *** built for $gpgme_config_host and thus may not match the *** used host $host. *** You may want to use the configure option --with-gpgme-prefix -@@ -136,11 +118,7 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -225,11 +207,7 @@ AC_DEFUN([AM_PATH_GPGME], # If we have a recent GPGME, we should also check that the # API is compatible. if test "$req_gpgme_api" -gt 0 ; then @@ -93,7 +78,7 @@ index c749a5d..8579146 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -280,11 +258,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -372,11 +350,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], # If we have a recent GPGME, we should also check that the # API is compatible. if test "$req_gpgme_api" -gt 0 ; then @@ -106,7 +91,7 @@ index c749a5d..8579146 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -293,20 +267,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -385,20 +359,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], fi fi if test $ok = yes; then @@ -129,6 +114,3 @@ index c749a5d..8579146 100644 AC_MSG_RESULT(yes) ifelse([$2], , :, [$2]) _AM_PATH_GPGME_CONFIG_HOST_CHECK --- -2.25.1 - diff --git a/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch new file mode 100644 index 0000000000..6d67e6d6c9 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch @@ -0,0 +1,32 @@ +From acc4750ffa79a5c2ef3c95cf31ef51352a68837b Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Tue, 28 Feb 2023 13:43:51 +0800 +Subject: [PATCH] autogen.sh: remove '-unknown' in version + +python setuptools >=66.0.0 treats '-unknown' as an invalid version. +The error message is as below: + pkg_resources.extern.packaging.version.InvalidVersion: Invalid version: '1.18.0-unknown' + +Remove the '-unknown' suffix to fix this issue. + +Upstream-Status: Submitted [https://lists.gnupg.org/pipermail/gnupg-devel/2023-February/035293.html] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + +--- + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autogen.sh b/autogen.sh +index 4e1665b..a55326d 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -269,7 +269,7 @@ if [ "$myhost" = "find-version" ]; then + else + ingit=no + beta=yes +- tmp="-unknown" ++ tmp="" + rev="0000000" + rvd="0" + fi diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 35c6b4056c..831771ca2d 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,4 +1,4 @@ -From 98ce65902b197faa8f660564613ca2e504c2f8f8 Mon Sep 17 00:00:00 2001 +From 7b3a00cb0fc27c896dd85c9afc474bd9c2aea30d Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Fri, 10 May 2019 14:23:55 +0800 Subject: [PATCH] pkgconfig @@ -15,20 +15,21 @@ Rebase to 1.13.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Rebase to 1.17.0 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> + --- configure.ac | 1 + src/Makefile.am | 4 +- - src/gpgme-pthread.pc.in | 15 ++++++ - src/gpgme.m4 | 114 +++------------------------------------- + src/gpgme-pthread.pc.in | 15 +++++ + src/gpgme.m4 | 119 +++------------------------------------- src/gpgme.pc.in | 4 +- - 5 files changed, 28 insertions(+), 110 deletions(-) + 5 files changed, 29 insertions(+), 114 deletions(-) create mode 100644 src/gpgme-pthread.pc.in diff --git a/configure.ac b/configure.ac -index 80ce79c..d7c0ac1 100644 +index ae4c7da..df892c9 100644 --- a/configure.ac +++ b/configure.ac -@@ -905,6 +905,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -1112,6 +1112,7 @@ AC_CONFIG_FILES(Makefile src/Makefile src/gpgme-glib.pc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) @@ -37,7 +38,7 @@ index 80ce79c..d7c0ac1 100644 AC_CONFIG_FILES(lang/cpp/tests/Makefile) AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) diff --git a/src/Makefile.am b/src/Makefile.am -index 39c341f..3aca716 100644 +index ca70950..bda5498 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,11 +20,11 @@ @@ -52,8 +53,8 @@ index 39c341f..3aca716 100644 - gpgme.pc.in gpgme-glib.pc.in + gpgme.pc.in gpgme-glib.pc.in gpgme-pthread.pc.in - bin_SCRIPTS = gpgme-config - m4datadir = $(datadir)/aclocal + if USE_GPGRT_CONFIG + noinst_SCRIPTS = gpgme-config diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in new file mode 100644 index 0000000..074bbf6 @@ -76,10 +77,10 @@ index 0000000..074bbf6 +Cflags: -I${includedir} +Requires: libassuan gpg-error diff --git a/src/gpgme.m4 b/src/gpgme.m4 -index 71b0010..30ec151 100644 +index 8cc2898..0ff550e 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 -@@ -79,7 +79,7 @@ dnl config script does not match the host specification the script +@@ -168,7 +168,7 @@ dnl config script does not match the host specification the script dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPGME], @@ -88,7 +89,7 @@ index 71b0010..30ec151 100644 tmp=ifelse([$1], ,1:0.4.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -89,36 +89,12 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -178,36 +178,12 @@ AC_DEFUN([AM_PATH_GPGME], min_gpgme_version="$tmp" fi @@ -127,7 +128,7 @@ index 71b0010..30ec151 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -127,19 +103,11 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -216,19 +192,11 @@ AC_DEFUN([AM_PATH_GPGME], fi fi if test $ok = yes; then @@ -147,44 +148,45 @@ index 71b0010..30ec151 100644 ]) dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, -@@ -148,7 +116,7 @@ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS +@@ -236,9 +204,8 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) + dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS dnl and GPGME_PTHREAD_LIBS. dnl - AC_DEFUN([AM_PATH_GPGME_PTHREAD], --[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl +-AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ +- AC_OBSOLETE([$0], [; use AM_PATH_GPGME instead to use GPGME_CFLAGS and GPGME_LIBS])dnl +- AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl ++AC_DEFUN([AM_PATH_GPGME_PTHREAD], +[ tmp=ifelse([$1], ,1:0.4.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -158,38 +126,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], +@@ -248,40 +215,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ min_gpgme_version="$tmp" fi - AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version) - ok=no - if test "$GPGME_CONFIG" != "no" ; then -- if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then -- req_major=`echo $min_gpgme_version | \ +- req_major=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -- req_minor=`echo $min_gpgme_version | \ +- req_minor=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -- req_micro=`echo $min_gpgme_version | \ +- req_micro=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -- if test "$gpgme_version_major" -gt "$req_major"; then +- if test "$gpgme_version_major" -gt "$req_major"; then - ok=yes -- else +- else - if test "$gpgme_version_major" -eq "$req_major"; then -- if test "$gpgme_version_minor" -gt "$req_minor"; then -- ok=yes -- else -- if test "$gpgme_version_minor" -eq "$req_minor"; then -- if test "$gpgme_version_micro" -ge "$req_micro"; then -- ok=yes -- fi +- if test "$gpgme_version_minor" -gt "$req_minor"; then +- ok=yes +- else +- if test "$gpgme_version_minor" -eq "$req_minor"; then +- if test "$gpgme_version_micro" -ge "$req_micro"; then +- ok=yes +- fi +- fi - fi -- fi - fi -- fi - fi - fi + PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no]) @@ -192,17 +194,21 @@ index 71b0010..30ec151 100644 # If we have a recent GPGME, we should also check that the # API is compatible. if test "$req_gpgme_api" -gt 0 ; then -- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` +- if test -z "$use_gpgrt_config"; then +- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` +- else +- tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0` +- fi + tmp=`$PKG_CONFIG --variable=api_version gpgme-pthread 2>/dev/null || echo 0` if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -198,19 +140,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], +@@ -290,19 +229,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ fi fi if test $ok = yes; then -- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags` -- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` +- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --cflags` +- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --libs` - AC_MSG_RESULT(yes) ifelse([$2], , :, [$2]) _AM_PATH_GPGME_CONFIG_HOST_CHECK @@ -217,7 +223,7 @@ index 71b0010..30ec151 100644 ]) -@@ -229,36 +163,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -321,36 +252,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], min_gpgme_version="$tmp" fi @@ -256,7 +262,7 @@ index 71b0010..30ec151 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -267,17 +177,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -359,17 +266,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], fi fi if test $ok = yes; then @@ -275,18 +281,15 @@ index 71b0010..30ec151 100644 - AC_SUBST(GPGME_GLIB_LIBS) ]) diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in -index 80d59de..932645b 100644 +index 9ddef5c..932645b 100644 --- a/src/gpgme.pc.in +++ b/src/gpgme.pc.in @@ -9,6 +9,6 @@ Name: gpgme Description: GnuPG Made Easy to access GnuPG Requires.private: gpg-error, libassuan Version: @PACKAGE_VERSION@ --Cflags: -I${includedir} @GPGME_CONFIG_CFLAGS@ --Libs: -L${libdir} @GPGME_CONFIG_LIBS@ +-Cflags: @GPGME_CONFIG_CFLAGS@ +-Libs: @GPGME_CONFIG_LIBS@ +Cflags: -I${includedir} +Libs: -L${libdir} -lgpgme URL: https://www.gnupg.org/software/gpgme/index.html --- -2.25.1 - diff --git a/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch b/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch new file mode 100644 index 0000000000..be58c42128 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch @@ -0,0 +1,42 @@ +From be33cf1812b4c2a3ed85fb2532992bfb2b27b3be Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 15 Dec 2022 08:44:13 -0800 +Subject: [PATCH] posix-io.c: Use off_t instead of off64_t + +configure.ac checks for largefile support via AC_SYS_LARGEFILE already, +therefore use off_t and ino_t instead of 64bit variants. Musl e.g. does +not define them without _LARGEFILE64_SOURCE and error is not seen on +glibc because _GNU_SOURCE defines _LARGEFILE64_SOURCE + +Fixes errors like below on 32-bit musl systems + +../../../../../../../../workspace/sources/gpgme/src/posix-io.c:77:3: error: unknown type name 'ino64_t'; did you mean 'int64_t'? + ino64_t d_ino; + ^~~~~~~ + int64_t + ^ +../../../../../../../../workspace/sources/gpgme/src/posix-io.c:78:3: error: unknown type name 'off64_t'; did you mean 'off_t'? + off64_t d_off; + ^~~~~~~ + +Upstream-Status: Submitted [https://lists.gnupg.org/pipermail/gnupg-devel/2022-December/035222.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/posix-io.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/posix-io.c b/src/posix-io.c +index 0d0a98b..286a626 100644 +--- a/src/posix-io.c ++++ b/src/posix-io.c +@@ -74,8 +74,8 @@ + * define it ourselves. */ + struct linux_dirent64 + { +- ino64_t d_ino; +- off64_t d_off; ++ ino_t d_ino; ++ off_t d_off; + unsigned short d_reclen; + unsigned char d_type; + char d_name[]; diff --git a/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch index f3de55f7b3..3d05808d63 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch @@ -1,4 +1,4 @@ -From adb1d4e5498a19e9d591ac8f42f9ddfdb23a1354 Mon Sep 17 00:00:00 2001 +From e1fc4b06dcb62e1c2d85ae99f39ef1a8860570e1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 15 Jul 2021 12:33:13 -0700 Subject: [PATCH] use closefrom() on linux and glibc 2.34+ @@ -8,15 +8,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Rebase to 1.17.0 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> + --- src/posix-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/posix-io.c b/src/posix-io.c -index 5c6cf1d..52e513a 100644 +index a422d8f..0d0a98b 100644 --- a/src/posix-io.c +++ b/src/posix-io.c -@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags, +@@ -577,7 +577,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags, if (fd_list[i].fd > fd) fd = fd_list[i].fd; fd++; @@ -25,6 +26,3 @@ index 5c6cf1d..52e513a 100644 closefrom (fd); max_fds = fd; #else /*!__sun */ --- -2.25.1 - diff --git a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch index ecd1793ab9..0d2692912f 100644 --- a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +++ b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch @@ -1,7 +1,7 @@ -From 52f8fd2010b900c7d382a7c4e6c1a317d8160585 Mon Sep 17 00:00:00 2001 +From 9fce0689bc04506e5758444efa24ea99fe1ff5ef Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Fri, 10 May 2019 14:30:36 +0800 -Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used +Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used gpg-error-config was modified by OE to always return an error. So we want to find an alternative way to retrieve whatever it @@ -14,39 +14,23 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Rebase to 1.13.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- - lang/python/setup.py.in | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) + lang/python/setup.py.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in -index 9785a28..006216d 100755 +index 6f36861..1d9058b 100755 --- a/lang/python/setup.py.in +++ b/lang/python/setup.py.in -@@ -30,7 +30,6 @@ import subprocess - import sys - - # Out-of-tree build of the gpg bindings. --gpg_error_config = ['gpg-error-config'] - gpgme_config_flags = ['--thread=pthread'] - gpgme_config = ['gpgme-config'] + gpgme_config_flags - gpgme_h = '' -@@ -182,15 +181,9 @@ class BuildExtFirstHack(build): +@@ -169,9 +169,8 @@ class BuildExtFirstHack(build): def _generate_errors_i(self): -- try: -- subprocess.check_call( -- gpg_error_config + ['--version'], stdout=devnull) -- except: -- sys.exit('Could not find gpg-error-config. ' + -- 'Please install the libgpg-error development package.') - +- ge_cflags='@GPG_ERROR_CFLAGS@' gpg_error_content = self._read_header( -- 'gpg-error.h', getconfig('cflags', config=gpg_error_config)) +- 'gpg-error.h', ge_cflags.split(' ') if ge_cflags else []) + "gpg-error.h", os.environ.get('CFLAGS').split()) filter_re = re.compile(r'GPG_ERR_[^ ]* =') rewrite_re = re.compile(r' *(.*) = .*') --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch index de1689ec05..204fe5934d 100644 --- a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +++ b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch @@ -1,7 +1,7 @@ -From f632148fcc8757bb9a9601a6dab275e88cd309d2 Mon Sep 17 00:00:00 2001 +From 8c850aa109c42d0c193bccc7af45dbc2689b23f6 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 30 Jan 2018 15:28:49 +0800 -Subject: [PATCH 3/7] Correctly install python modules +Subject: [PATCH] Correctly install python modules Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> @@ -12,15 +12,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Rebase to 1.10.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- lang/python/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 6988faf..36c6f7b 100644 +index 68b98e8..bbb9111 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -93,6 +93,7 @@ install-exec-local: +@@ -97,6 +97,7 @@ install-exec-local: --build-base="$$(basename "$${PYTHON}")-gpg" \ install \ --prefix "$(DESTDIR)$(prefix)" \ @@ -28,6 +29,3 @@ index 6988faf..36c6f7b 100644 --verbose ; \ done --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch index 50bf21463f..7fe0c9538a 100644 --- a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch +++ b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch @@ -1,7 +1,7 @@ -From 8d9613c34ae495bbcbd725a2e7ac48138ba53c30 Mon Sep 17 00:00:00 2001 +From 57475742b0288b4ee53c01c59c3ab03c1ef7932e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 13 Apr 2017 16:40:27 +0300 -Subject: [PATCH 5/7] gpgme-config: skip all /lib* or /usr/lib* directories in +Subject: [PATCH] gpgme-config: skip all /lib* or /usr/lib* directories in output The logic was not working in multilib setups which use other @@ -9,15 +9,16 @@ directory names than plain /lib or /usr/lib. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- src/gpgme-config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gpgme-config.in b/src/gpgme-config.in -index a4d152e..8342865 100644 +index 56b98f8..e96f3c3 100644 --- a/src/gpgme-config.in +++ b/src/gpgme-config.in -@@ -154,7 +154,7 @@ while test $# -gt 0; do +@@ -157,7 +157,7 @@ while test $# -gt 0; do for i in $libs $tmp_l $assuan_libs $gpg_error_libs $tmp_x; do skip=no case $i in @@ -26,6 +27,3 @@ index a4d152e..8342865 100644 skip=yes ;; -L*|-l*) --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch index 1471184d67..8d48db2feb 100644 --- a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch +++ b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch @@ -1,7 +1,7 @@ -From ef920688bfe1c7328c9e97229d62ccd35304ad84 Mon Sep 17 00:00:00 2001 +From 7938a5a760827aec737ea49d2f8719051abda188 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Wed, 31 Jan 2018 11:01:09 +0800 -Subject: [PATCH 6/7] fix build path issue +Subject: [PATCH] fix build path issue Get the "--root" directory supplied to the "install" command, and use it as a prefix to strip off the purported filename @@ -12,15 +12,16 @@ to use relative path. Upstream-Status: Submitted [gnupg-devel@gnupg.org] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- lang/python/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 36c6f7b..ce9a108 100644 +index bbb9111..cee499e 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -92,8 +92,9 @@ install-exec-local: +@@ -96,8 +96,9 @@ install-exec-local: build \ --build-base="$$(basename "$${PYTHON}")-gpg" \ install \ @@ -32,6 +33,3 @@ index 36c6f7b..ce9a108 100644 --verbose ; \ done --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch b/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch deleted file mode 100644 index 4c97f63cc2..0000000000 --- a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 093c88817397425ee4c2333c469467229a46c9e1 Mon Sep 17 00:00:00 2001 -From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> -Date: Mon, 5 Aug 2019 01:00:58 +0900 -Subject: [PATCH 7/7] python: Add variables to tests - -* configure.ac, lang/python/Makefile.am: - New variable to `lang/python', set to `lang/python' if RUN_LANG_PYTHON_TESTS - -Upstream-Status: Submitted [gnupg-devel@gnupg.org] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - -Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> ---- - configure.ac | 5 +++++ - lang/python/Makefile.am | 3 +++ - 2 files changed, 8 insertions(+) - -diff --git a/configure.ac b/configure.ac -index bd85886..b5ae42e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -533,6 +533,11 @@ AC_ARG_ENABLE(g13-test, - run_g13_test=$enableval) - AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes") - -+run_lang_python_test="yes" -+AC_ARG_ENABLE(lang-python-test, -+ AC_HELP_STRING([--disable-lang-python-test], [disable Python regression test]), -+ run_lang_python_test=$enableval) -+AM_CONDITIONAL(RUN_LANG_PYTHON_TESTS, test "$run_lang_python_test" = "yes") - - # Checks for header files. - AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h stdint.h -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 551deee..0fd555e 100644 ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -23,7 +23,10 @@ EXTRA_DIST = \ - gpgme.i \ - helpers.c helpers.h private.h - -+SUBDIRS = . examples doc src -+if RUN_LANG_PYTHON_TESTS - SUBDIRS = . tests examples doc src -+endif - - .PHONY: prepare - prepare: copystamp --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch index dfea1bf78a..a11621ed64 100644 --- a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch +++ b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch @@ -1,4 +1,4 @@ -From 5bbf7a048b6d81d23186340e839f9f65b5b514b6 Mon Sep 17 00:00:00 2001 +From 84c389705e7742d2b68e144a5733e618441d293e Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Fri, 10 May 2019 16:19:54 +0800 Subject: [PATCH] do not auto check var-PYTHON @@ -14,18 +14,19 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + configure.ac | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 5ef00c0..bbcff93 100644 +index df892c9..8c6194e 100644 --- a/configure.ac +++ b/configure.ac -@@ -425,8 +425,8 @@ if test "$found_py" = "1"; then +@@ -590,9 +590,8 @@ if test "$found_py" = "1"; then if test "$found_py" = "1" -o "$found_py3" = "1"; then # Reset everything, so that we can look for another Python. m4_foreach([mym4pythonver], -- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[all]], +- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10], +- [3.11],[3.12],[all]], - [unset PYTHON + [[2.7],[3.7]], + [ diff --git a/meta/recipes-support/gpgme/gpgme_1.17.1.bb b/meta/recipes-support/gpgme/gpgme_1.23.2.bb index d95ed6c299..d8807b3af2 100644 --- a/meta/recipes-support/gpgme/gpgme_1.17.1.bb +++ b/meta/recipes-support/gpgme/gpgme_1.23.2.bb @@ -18,26 +18,23 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://0004-python-import.patch \ file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ file://0006-fix-build-path-issue.patch \ - file://0007-python-Add-variables-to-tests.patch \ file://0008-do-not-auto-check-var-PYTHON.patch \ file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ + file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \ + file://0001-autogen.sh-remove-unknown-in-version.patch \ " -SRC_URI[sha256sum] = "711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f" +SRC_URI[sha256sum] = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224" -DEPENDS = "libgpg-error libassuan" +PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}" + +DEPENDS = "libgpg-error libassuan ${PYTHON_DEPS}" RDEPENDS:${PN}-cpp += "libstdc++" -RDEPENDS:python2-gpg += "python-unixadmin" RDEPENDS:python3-gpg += "python3-unixadmin" BINCONFIG = "${bindir}/gpgme-config" -# Note select python2 or python3, but you can't select both at the same time -PACKAGECONFIG ??= "python3" -PACKAGECONFIG[python2] = ",,python swig-native," -PACKAGECONFIG[python3] = ",,python3 swig-native," - # Default in configure.ac: "cl cpp python qt" # Supported: "cl cpp python python2 python3 qt" # python says 'search and find python2 or python3' @@ -46,35 +43,33 @@ PACKAGECONFIG[python3] = ",,python3 swig-native," # support. Since these bindings are currently not needed, we can disable them. DEFAULT_LANGUAGES = "" DEFAULT_LANGUAGES:class-target = "cpp" -LANGUAGES ?= "${DEFAULT_LANGUAGES} python" +LANGUAGES ?= "${DEFAULT_LANGUAGES}" -PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" -PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native python3targetconfig', '', d)}" +PYTHON_INHERIT = "${@bb.utils.contains('LANGUAGES', 'python', 'setuptools3-base', '', d)}" EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ --disable-gpgconf-test \ --disable-gpg-test \ --disable-gpgsm-test \ --disable-g13-test \ - --disable-lang-python-test \ ' -inherit autotools texinfo binconfig-disabled pkgconfig setuptools3-base ${PYTHON_INHERIT} multilib_header +inherit autotools texinfo binconfig-disabled pkgconfig multilib_header +inherit_defer ${PYTHON_INHERIT} python3native export PKG_CONFIG='pkg-config' BBCLASSEXTEND = "native nativesdk" -PACKAGES =+ "${PN}-cpp" -PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python2-gpg ', '', d)}" -PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-gpg ', '', d)}" +PACKAGES =+ "${PN}-cpp python3-gpg" FILES:${PN}-cpp = "${libdir}/libgpgmepp.so.*" -FILES:python2-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" FILES:python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" FILES:${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" CFLAGS:append:libc-musl = " -D__error_t_defined " +CACHED_CONFIGUREVARS:libc-musl = "ac_cv_sys_file_offset_bits=no" + do_configure:prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/gpg-error.m4 diff --git a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch index 2968d571bb..c0e9e2806b 100644 --- a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch @@ -1,4 +1,4 @@ -From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001 +From 0f4e9eee64bd4220aa4fae1ab4f7bbf10b87cd69 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 15 Feb 2014 21:06:42 +0000 Subject: [PATCH] Disable LDFLAGSICUDT for Linux @@ -7,14 +7,14 @@ Upstream-Status: Inappropriate [ OE Configuration ] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - source/config/mh-linux | 2 +- + config/mh-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mh-linux b/config/mh-linux -index 366f0cc..2689aab 100644 +index 53d6780..b622513 100644 --- a/config/mh-linux +++ b/config/mh-linux -@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN +@@ -23,7 +23,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN LD_RPATH_PRE = -Wl,-rpath, ## These are the library specific LDFLAGS @@ -23,6 +23,3 @@ index 366f0cc..2689aab 100644 ## Compiler switch to embed a library name # The initial tab in the next line is to prevent icu-config from reading it. --- -1.7.10.4 - diff --git a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch index 578517b57f..a25285fb54 100644 --- a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch +++ b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch @@ -1,4 +1,4 @@ -From e3c25af4b40d64f098e7b8ae5a91fdc3c90163c4 Mon Sep 17 00:00:00 2001 +From cf55c077b77b7a219502364eaadf12c074ab005e Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Wed, 8 May 2019 14:42:30 +0900 Subject: [PATCH] icu: Added armeb support. @@ -8,16 +8,15 @@ Make icu support arm32 BE. Upstream-Status: Pending Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> - --- i18n/double-conversion-utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h -index 7f23e0a..7f89094 100644 +diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h +index 303668f..7d859dc 100644 --- a/i18n/double-conversion-utils.h +++ b/i18n/double-conversion-utils.h -@@ -115,7 +115,7 @@ int main(int argc, char** argv) { +@@ -146,7 +146,7 @@ int main(int argc, char** argv) { // // If it prints "correct" then the architecture should be here, in the "correct" section. #if defined(_M_X64) || defined(__x86_64__) || \ diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/meta/recipes-support/icu/icu/fix-install-manx.patch index 925b064ebd..16cabc8264 100644 --- a/meta/recipes-support/icu/icu/fix-install-manx.patch +++ b/meta/recipes-support/icu/icu/fix-install-manx.patch @@ -1,4 +1,4 @@ -From a6ddabc8cadb76bfe2d2e374a6702442cfe51cce Mon Sep 17 00:00:00 2001 +From 2d544cac238eccbfc32cafc9502ddf6e00994211 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Fri, 9 Oct 2015 17:50:41 +0100 Subject: [PATCH] icu: fix install race @@ -11,15 +11,16 @@ and one process tries to chown a file that the other process has just deleted. Also install-manx should be a phony target, and for clarity use $^ instead of $? in the install command. -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> +Upstream ticket: https://unicode-org.atlassian.net/jira/software/c/projects/ICU/issues/ICU-21172 +Upstream-Status: Submitted [https://github.com/unicode-org/icu/pull/2966] +Signed-off-by: Ross Burton <ross.burton@intel.com> --- - source/Makefile.in | 8 ++++---- + Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index be9435b..ada20d7 100644 +index 8366f01..79b91c9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,7 +77,7 @@ EXTRA_DATA = diff --git a/meta/recipes-support/icu/icu_71.1.bb b/meta/recipes-support/icu/icu_74-2.bb index d8ef2a3746..8352bf2a5b 100644 --- a/meta/recipes-support/icu/icu_71.1.bb +++ b/meta/recipes-support/icu/icu_74-2.bb @@ -6,8 +6,7 @@ same results on all platforms." HOMEPAGE = "http://site.icu-project.org/" LICENSE = "ICU" -DEPENDS = "icu-native autoconf-archive" -DEPENDS:class-native = "autoconf-archive-native" +DEPENDS = "icu-native autoconf-archive-native" CVE_PRODUCT = "international_components_for_unicode" @@ -15,20 +14,16 @@ S = "${WORKDIR}/icu/source" SPDX_S = "${WORKDIR}/icu" STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" -BINCONFIG = "${bindir}/icu-config" +ICU_MAJOR_VER = "${@d.getVar('PV').split('-')[0]}" -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" +inherit autotools pkgconfig github-releases # ICU needs the native build directory as an argument to its --with-cross-build option when # cross-compiling. Taken the situation that different builds may share a common sstate-cache # into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF:class-native = "" -EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" +EXTRA_OECONF:class-native = "--disable-icu-config" +EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" @@ -58,8 +53,8 @@ do_install:append:class-target() { # The native pkgdata can not generate the correct data file. # Use icupkg to re-generate it. if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + rm -f ${D}/${datadir}/${BPN}/${@icu_install_folder(d)}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${@icu_install_folder(d)}/icudt${ICU_MAJOR_VER}b.dat fi # Remove build host references... @@ -67,8 +62,8 @@ do_install:append:class-target() { -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's|${DEBUG_PREFIX_MAP}||g' \ -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc + ${D}/${libdir}/${BPN}/${@icu_install_folder(d)}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${@icu_install_folder(d)}/pkgdata.inc } PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" @@ -83,16 +78,20 @@ FILES:libicuio = "${libdir}/libicuio.so.*" BBCLASSEXTEND = "native nativesdk" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=a89d03060ff9c46552434dbd1fe3ed1f" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=08dc3852df8fffa807301902ad899ff8" def icu_download_version(d): - pvsplit = d.getVar('PV').split('.') + pvsplit = d.getVar('PV').split('-') return pvsplit[0] + "_" + pvsplit[1] def icu_download_folder(d): - pvsplit = d.getVar('PV').split('.') + pvsplit = d.getVar('PV').split('-') return pvsplit[0] + "-" + pvsplit[1] +def icu_install_folder(d): + pvsplit = d.getVar('PV').split('-') + return pvsplit[0] + "." + pvsplit[1] + ICU_PV = "${@icu_download_version(d)}" ICU_FOLDER = "${@icu_download_folder(d)}" @@ -100,8 +99,8 @@ ICU_FOLDER = "${@icu_download_folder(d)}" ARM_INSTRUCTION_SET:armv4 = "arm" ARM_INSTRUCTION_SET:armv5 = "arm" -BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" -DATA_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip" +BASE_SRC_URI = "${GITHUB_BASE_URI}/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" +DATA_SRC_URI = "${GITHUB_BASE_URI}/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip" SRC_URI = "${BASE_SRC_URI};name=code \ ${DATA_SRC_URI};name=data \ file://filter.json \ @@ -112,11 +111,11 @@ SRC_URI = "${BASE_SRC_URI};name=code \ SRC_URI:append:class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[code.sha256sum] = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf" -SRC_URI[data.sha256sum] = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804" +SRC_URI[code.sha256sum] = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c" +SRC_URI[data.sha256sum] = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6" -UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src" -UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" +GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" EXTRA_OECONF:append:libc-musl = " ac_cv_func_strtod_l=no" diff --git a/meta/recipes-support/iso-codes/iso-codes_4.9.0.bb b/meta/recipes-support/iso-codes/iso-codes_4.16.0.bb index f51edf09a4..f33cce1a9d 100644 --- a/meta/recipes-support/iso-codes/iso-codes_4.9.0.bb +++ b/meta/recipes-support/iso-codes/iso-codes_4.16.0.bb @@ -9,7 +9,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://salsa.debian.org/iso-codes-team/iso-codes.git;protocol=https;branch=main;" -SRCREV = "35ae2024024eb8e6603d3034dbbc406594f3874c" +SRCREV = "c2fcaadc832ed9f858950a43994973442d85ef4f" # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which # are inhibited by allarch @@ -20,3 +20,5 @@ S = "${WORKDIR}/git" inherit allarch autotools FILES:${PN} += "${datadir}/xml/" + +BBCLASSEXTEND += "native" diff --git a/meta/recipes-support/libassuan/libassuan_2.5.5.bb b/meta/recipes-support/libassuan/libassuan_2.5.7.bb index 2bab3ac955..d1e622635f 100644 --- a/meta/recipes-support/libassuan/libassuan_2.5.5.bb +++ b/meta/recipes-support/libassuan/libassuan_2.5.7.bb @@ -20,7 +20,7 @@ SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \ file://libassuan-add-pkgconfig-support.patch \ " -SRC_URI[sha256sum] = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4" +SRC_URI[sha256sum] = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76" BINCONFIG = "${bindir}/libassuan-config" diff --git a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.12.bb b/meta/recipes-support/libatomic-ops/libatomic-ops_7.8.2.bb index 8ea8436977..824400e743 100644 --- a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.12.bb +++ b/meta/recipes-support/libatomic-ops/libatomic-ops_7.8.2.bb @@ -5,18 +5,18 @@ SECTION = "optional" PROVIDES += "libatomics-ops" LICENSE = "GPL-2.0-only & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \ + file://LICENSE;md5=5700d28353dfa2f191ca9b1bd707865e \ " -SRC_URI = "https://github.com/ivmai/libatomic_ops/releases/download/v${PV}/libatomic_ops-${PV}.tar.gz" -UPSTREAM_CHECK_URI = "https://github.com/ivmai/libatomic_ops/releases" +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libatomic_ops-${PV}.tar.gz" +GITHUB_BASE_URI = "https://github.com/ivmai/libatomic_ops/releases" -SRC_URI[sha256sum] = "f0ab566e25fce08b560e1feab6a3db01db4a38e5bc687804334ef3920c549f3e" +SRC_URI[sha256sum] = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51" S = "${WORKDIR}/libatomic_ops-${PV}" ALLOW_EMPTY:${PN} = "1" -inherit autotools pkgconfig +inherit autotools pkgconfig github-releases BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libbsd/libbsd_0.11.6.bb b/meta/recipes-support/libbsd/libbsd_0.12.2.bb index 74fc8ef4e5..7d5e88f293 100644 --- a/meta/recipes-support/libbsd/libbsd_0.11.6.bb +++ b/meta/recipes-support/libbsd/libbsd_0.12.2.bb @@ -1,6 +1,3 @@ -# Copyright (C) 2013 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - SUMMARY = "Library of utility functions from BSD systems" DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ and lacking on others like GNU systems, thus making it easier to port \ @@ -29,12 +26,19 @@ HOMEPAGE = "https://libbsd.freedesktop.org/wiki/" # License: public-domain-Colin-Plumb LICENSE = "BSD-3-Clause & BSD-4-Clause & ISC & PD" LICENSE:${PN} = "BSD-3-Clause & ISC & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=c2c635b94c8dcd3593f53e10fa8a499e" +LICENSE:${PN}-dbg = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-dev = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-doc = "BSD-3-Clause & BSD-4-Clause & ISC & PD" +LICENSE:${PN}-locale = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-src = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-staticdev = "BSD-3-Clause & ISC & PD" + +LIC_FILES_CHKSUM = "file://COPYING;md5=9b087a0981a1fcad42efbba6d4925a0f" SECTION = "libs" SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "19b38f3172eaf693e6e1c68714636190c7e48851e45224d720b3b5bc0499b5df" +SRC_URI[sha256sum] = "b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014" inherit autotools pkgconfig diff --git a/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch b/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch new file mode 100644 index 0000000000..fb424fe725 --- /dev/null +++ b/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch @@ -0,0 +1,32 @@ +From 355eada2d20886287cffc16e304087dd6f66ae37 Mon Sep 17 00:00:00 2001 +From: Steve Grubb <ausearch.1@gmail.com> +Date: Thu, 4 Jan 2024 15:06:29 -0500 +Subject: [PATCH] Remove python global exception handler since its deprecated + +Upstream-Status: Backport [https://github.com/stevegrubb/libcap-ng/commit/30453b6553948cd05c438f9f509013e3bb84f25b] +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + bindings/src/capng_swig.i | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/bindings/src/capng_swig.i b/bindings/src/capng_swig.i +index fcdaf18..fa85e13 100644 +--- a/bindings/src/capng_swig.i ++++ b/bindings/src/capng_swig.i +@@ -30,13 +30,6 @@ + + %varargs(16, signed capability = 0) capng_updatev; + +-%except(python) { +- $action +- if (result < 0) { +- PyErr_SetFromErrno(PyExc_OSError); +- return NULL; +- } +-} + #endif + + %define __signed__ +-- +2.43.2 + diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.3.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.4.bb index 1240589d00..4790134ae9 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.3.bb +++ b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.4.bb @@ -6,11 +6,12 @@ SUMMARY .= " - python" inherit lib_package autotools python3targetconfig -DEPENDS += "libcap-ng python3 swig-native" +# drop setuptools when version > 0.8.3 is released; it's needed only for distutils +DEPENDS += "libcap-ng python3 swig-native python3-setuptools-native" S = "${WORKDIR}/libcap-ng-${PV}" -EXTRA_OECONF += "--with-python --with-python3" +EXTRA_OECONF += "--with-python3" do_install:append() { rm -rf ${D}${bindir} diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc index 55e3287396..845b7c2f0a 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -7,9 +7,11 @@ LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" -SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz" +SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ + file://fix-issues-with-swig-4-2.patch \ + " -SRC_URI[sha256sum] = "bed6f6848e22bb2f83b5f764b2aef0ed393054e803a8e3a8711cb2a39e6b492d" +SRC_URI[sha256sum] = "68581d3b38e7553cb6f6ddf7813b1fc99e52856f21421f7b477ce5abd2605a8a" EXTRA_OECONF:append:class-target = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h" EXTRA_OECONF:append:class-nativesdk = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h" diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.3.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.8.4.bb index 6e16e886b9..3dbe3e2ffd 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng_0.8.3.bb +++ b/meta/recipes-support/libcap-ng/libcap-ng_0.8.4.bb @@ -2,7 +2,7 @@ require libcap-ng.inc inherit lib_package autotools -EXTRA_OECONF += "--without-python --without-python3" +EXTRA_OECONF += "--without-python3" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch b/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch index 9884fb5641..2ac1e6e560 100644 --- a/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch +++ b/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch @@ -1,4 +1,4 @@ -From fc60e000169618a4adced845b9462d36ced1efdd Mon Sep 17 00:00:00 2001 +From 709aa8e156415215b0bb034d05b2aa2f44be044e Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 14 Oct 2021 15:57:36 +0800 Subject: [PATCH] nativesdk-libcap: Raise the size of arrays containing dl diff --git a/meta/recipes-support/libcap/libcap_2.64.bb b/meta/recipes-support/libcap/libcap_2.69.bb index 7690d3e9a5..92fa766d37 100644 --- a/meta/recipes-support/libcap/libcap_2.64.bb +++ b/meta/recipes-support/libcap/libcap_2.69.bb @@ -5,11 +5,10 @@ users, without giving them full root permissions." HOMEPAGE = "http://sites.google.com/site/fullycapable/" # no specific GPL version required LICENSE = "BSD-3-Clause | GPL-2.0-only" -LIC_FILES_CHKSUM_PAM = "file://pam_cap/License;md5=0ad4c9c052b9719ee4fce1bfc7c7dee4" -LIC_FILES_CHKSUM = "\ - file://License;md5=e2370ba375efe9e1a095c26d37e483b8 \ - ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${LIC_FILES_CHKSUM_PAM}', '', d)} \ -" +LIC_FILES_CHKSUM_PAM = "file://pam_cap/License;md5=905326f41d3d1f8df21943f9a4ed6b50" +LIC_FILES_CHKSUM = "file://License;md5=2965a646645b72ecee859b43c592dcaa \ + ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${LIC_FILES_CHKSUM_PAM}', '', d)} \ + " DEPENDS = "hostperl-runtime-native gperf-native" @@ -20,7 +19,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ SRC_URI:append:class-nativesdk = " \ file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \ " -SRC_URI[sha256sum] = "c8465e1f0b068d5fc06199231135ccac7adb56d662b1de93589252e8cd071e13" +SRC_URI[sha256sum] = "f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" diff --git a/meta/recipes-support/libcheck/libcheck/automake-output.patch b/meta/recipes-support/libcheck/libcheck/automake-output.patch new file mode 100644 index 0000000000..c860f0cc0f --- /dev/null +++ b/meta/recipes-support/libcheck/libcheck/automake-output.patch @@ -0,0 +1,82 @@ +Add optional output in automake style, for integration with ptest. +Export CK_AUTOMAKE=1 when running a test suite and you'll get +PASS/FAIL lines on standard output. + +Marking this as Inappropriate right now as it's a little rough on the +edges. Filed https://github.com/libcheck/check/issues/349 to discuss +with upstream. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/src/check_log.c b/src/check_log.c +index 0844661..ad23c65 100644 +--- a/src/check_log.c ++++ b/src/check_log.c +@@ -26,6 +26,7 @@ + #if ENABLE_SUBUNIT + #include <subunit/child.h> + #endif ++#include <libgen.h> + + #include "check_error.h" + #include "check_list.h" +@@ -381,6 +382,34 @@ void tap_lfun(SRunner * sr CK_ATTRIBUTE_UNUSED, FILE * file, + } + } + ++void am_lfun(SRunner * sr CK_ATTRIBUTE_UNUSED, FILE * file, ++ enum print_output printmode CK_ATTRIBUTE_UNUSED, void *obj, ++ enum cl_event evt) ++{ ++ TestResult *tr; ++ const char* types[] = { "INVALID", "PASS", "FAIL", "ERROR"}; ++ ++ switch (evt) ++ { ++ case CLINITLOG_SR: ++ case CLENDLOG_SR: ++ case CLSTART_SR: ++ case CLSTART_S: ++ case CLEND_SR: ++ case CLEND_S: ++ case CLSTART_T: ++ break; ++ case CLEND_T: ++ tr = (TestResult *)obj; ++ fprintf(file, "%s: %s:%s:%s %s\n", ++ types[tr->rtype], basename(tr->file), tr->tcname, tr->tname, tr->msg); ++ fflush(file); ++ break; ++ default: ++ eprintf("Bad event type received in am_lfun", __FILE__, __LINE__); ++ } ++} ++ + #if ENABLE_SUBUNIT + void subunit_lfun(SRunner * sr, FILE * file, enum print_output printmode, + void *obj, enum cl_event evt) +@@ -527,6 +556,9 @@ void srunner_init_logging(SRunner * sr, enum print_output print_mode) + { + srunner_register_lfun(sr, f, f != stdout, tap_lfun, print_mode); + } ++ if (getenv("CK_AUTOMAKE")) ++ srunner_register_lfun(sr, stdout, 0, am_lfun, print_mode); ++ + srunner_send_evt(sr, NULL, CLINITLOG_SR); + } + +diff --git a/src/check_log.h b/src/check_log.h +index 7223b98..bfe1de3 100644 +--- a/src/check_log.h ++++ b/src/check_log.h +@@ -40,6 +40,9 @@ void xml_lfun(SRunner * sr, FILE * file, enum print_output, + void tap_lfun(SRunner * sr, FILE * file, enum print_output, + void *obj, enum cl_event evt); + ++void am_lfun(SRunner * sr, FILE * file, enum print_output, ++ void *obj, enum cl_event evt); ++ + void subunit_lfun(SRunner * sr, FILE * file, enum print_output, + void *obj, enum cl_event evt); + diff --git a/meta/recipes-support/libcheck/libcheck_0.15.2.bb b/meta/recipes-support/libcheck/libcheck_0.15.2.bb index 188d689cc3..5ab67b8728 100644 --- a/meta/recipes-support/libcheck/libcheck_0.15.2.bb +++ b/meta/recipes-support/libcheck/libcheck_0.15.2.bb @@ -10,19 +10,23 @@ SECTION = "devel" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" -SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/check-${PV}.tar.gz \ + file://automake-output.patch \ file://not-echo-compiler-info-to-check_stdint.h.patch" SRC_URI[sha256sum] = "a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a" -UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" +GITHUB_BASE_URI = "https://github.com/libcheck/check/releases/" S = "${WORKDIR}/check-${PV}" -inherit autotools pkgconfig texinfo +inherit autotools pkgconfig texinfo github-releases CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk" RREPLACES:${PN} = "check (<= 0.9.5)" +do_install:append:class-native() { + create_cmdline_shebang_wrapper ${D}${bindir}/checkmk +} BBCLASSEXTEND = "native nativesdk" PACKAGES =+ "checkmk" @@ -30,4 +34,3 @@ PACKAGES =+ "checkmk" FILES:checkmk = "${bindir}/checkmk" RDEPENDS:checkmk = "gawk" - diff --git a/meta/recipes-support/libcroco/files/CVE-2020-12825.patch b/meta/recipes-support/libcroco/files/CVE-2020-12825.patch deleted file mode 100644 index 42f92e3607..0000000000 --- a/meta/recipes-support/libcroco/files/CVE-2020-12825.patch +++ /dev/null @@ -1,192 +0,0 @@ -From fdf78a4877afa987ba646a8779b513f258e6d04c Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@gnome.org> -Date: Fri, 31 Jul 2020 15:21:53 -0500 -Subject: [PATCH] libcroco: Limit recursion in block and any productions - - (CVE-2020-12825) - -If we don't have any limits, we can recurse forever and overflow the -stack. - -Fixes #8 -This is per https://gitlab.gnome.org/Archive/libcroco/-/issues/8 - -https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1404 - -CVE: CVE-2020-12825 -Upstream-Status: Backport [https://gitlab.gnome.org/Archive/libcroco/-/commit/6eb257e5c731c691eb137fca94e916ca73941a5a] -Comment: No refreshing changes done. -Signed-off-by: Saloni Jain <Saloni.Jain@kpit.com> - ---- - src/cr-parser.c | 44 +++++++++++++++++++++++++++++--------------- - 1 file changed, 29 insertions(+), 15 deletions(-) - -diff --git a/src/cr-parser.c b/src/cr-parser.c -index 18c9a01..f4a62e3 100644 ---- a/src/cr-parser.c -+++ b/src/cr-parser.c -@@ -136,6 +136,8 @@ struct _CRParserPriv { - - #define CHARS_TAB_SIZE 12 - -+#define RECURSIVE_CALLERS_LIMIT 100 -+ - /** - * IS_NUM: - *@a_char: the char to test. -@@ -344,9 +346,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this); - - static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this); - --static enum CRStatus cr_parser_parse_any_core (CRParser * a_this); -+static enum CRStatus cr_parser_parse_any_core (CRParser * a_this, -+ guint n_calls); - --static enum CRStatus cr_parser_parse_block_core (CRParser * a_this); -+static enum CRStatus cr_parser_parse_block_core (CRParser * a_this, -+ guint n_calls); - - static enum CRStatus cr_parser_parse_value_core (CRParser * a_this); - -@@ -784,7 +788,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) - cr_parser_try_to_skip_spaces_and_comments (a_this); - - do { -- status = cr_parser_parse_any_core (a_this); -+ status = cr_parser_parse_any_core (a_this, 0); - } while (status == CR_OK); - - status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, -@@ -795,7 +799,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) - cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, - token); - token = NULL; -- status = cr_parser_parse_block_core (a_this); -+ status = cr_parser_parse_block_core (a_this, 0); - CHECK_PARSING_STATUS (status, - FALSE); - goto done; -@@ -930,11 +934,11 @@ cr_parser_parse_selector_core (CRParser * a_this) - - RECORD_INITIAL_POS (a_this, &init_pos); - -- status = cr_parser_parse_any_core (a_this); -+ status = cr_parser_parse_any_core (a_this, 0); - CHECK_PARSING_STATUS (status, FALSE); - - do { -- status = cr_parser_parse_any_core (a_this); -+ status = cr_parser_parse_any_core (a_this, 0); - - } while (status == CR_OK); - -@@ -956,10 +960,12 @@ cr_parser_parse_selector_core (CRParser * a_this) - *in chapter 4.1 of the css2 spec. - *block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*; - *@param a_this the current instance of #CRParser. -+ *@param n_calls used to limit recursion depth - *FIXME: code this function. - */ - static enum CRStatus --cr_parser_parse_block_core (CRParser * a_this) -+cr_parser_parse_block_core (CRParser * a_this, -+ guint n_calls) - { - CRToken *token = NULL; - CRInputPos init_pos; -@@ -967,6 +973,9 @@ cr_parser_parse_block_core (CRParser * a_this) - - g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR); - -+ if (n_calls > RECURSIVE_CALLERS_LIMIT) -+ return CR_ERROR; -+ - RECORD_INITIAL_POS (a_this, &init_pos); - - status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token); -@@ -996,13 +1005,13 @@ cr_parser_parse_block_core (CRParser * a_this) - } else if (token->type == CBO_TK) { - cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token); - token = NULL; -- status = cr_parser_parse_block_core (a_this); -+ status = cr_parser_parse_block_core (a_this, n_calls + 1); - CHECK_PARSING_STATUS (status, FALSE); - goto parse_block_content; - } else { - cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token); - token = NULL; -- status = cr_parser_parse_any_core (a_this); -+ status = cr_parser_parse_any_core (a_this, n_calls + 1); - CHECK_PARSING_STATUS (status, FALSE); - goto parse_block_content; - } -@@ -1109,7 +1118,7 @@ cr_parser_parse_value_core (CRParser * a_this) - status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, - token); - token = NULL; -- status = cr_parser_parse_block_core (a_this); -+ status = cr_parser_parse_block_core (a_this, 0); - CHECK_PARSING_STATUS (status, FALSE); - ref++; - goto continue_parsing; -@@ -1123,7 +1132,7 @@ cr_parser_parse_value_core (CRParser * a_this) - status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, - token); - token = NULL; -- status = cr_parser_parse_any_core (a_this); -+ status = cr_parser_parse_any_core (a_this, 0); - if (status == CR_OK) { - ref++; - goto continue_parsing; -@@ -1162,10 +1171,12 @@ cr_parser_parse_value_core (CRParser * a_this) - * | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*; - * - *@param a_this the current instance of #CRParser. -+ *@param n_calls used to limit recursion depth - *@return CR_OK upon successfull completion, an error code otherwise. - */ - static enum CRStatus --cr_parser_parse_any_core (CRParser * a_this) -+cr_parser_parse_any_core (CRParser * a_this, -+ guint n_calls) - { - CRToken *token1 = NULL, - *token2 = NULL; -@@ -1174,6 +1185,9 @@ cr_parser_parse_any_core (CRParser * a_this) - - g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR); - -+ if (n_calls > RECURSIVE_CALLERS_LIMIT) -+ return CR_ERROR; -+ - RECORD_INITIAL_POS (a_this, &init_pos); - - status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1); -@@ -1212,7 +1226,7 @@ cr_parser_parse_any_core (CRParser * a_this) - *We consider parameter as being an "any*" production. - */ - do { -- status = cr_parser_parse_any_core (a_this); -+ status = cr_parser_parse_any_core (a_this, n_calls + 1); - } while (status == CR_OK); - - ENSURE_PARSING_COND (status == CR_PARSING_ERROR); -@@ -1237,7 +1251,7 @@ cr_parser_parse_any_core (CRParser * a_this) - } - - do { -- status = cr_parser_parse_any_core (a_this); -+ status = cr_parser_parse_any_core (a_this, n_calls + 1); - } while (status == CR_OK); - - ENSURE_PARSING_COND (status == CR_PARSING_ERROR); -@@ -1265,7 +1279,7 @@ cr_parser_parse_any_core (CRParser * a_this) - } - - do { -- status = cr_parser_parse_any_core (a_this); -+ status = cr_parser_parse_any_core (a_this, n_calls + 1); - } while (status == CR_OK); - - ENSURE_PARSING_COND (status == CR_PARSING_ERROR); diff --git a/meta/recipes-support/libcroco/libcroco_0.6.13.bb b/meta/recipes-support/libcroco/libcroco_0.6.13.bb deleted file mode 100644 index 419c962657..0000000000 --- a/meta/recipes-support/libcroco/libcroco_0.6.13.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Cascading Style Sheet (CSS) parsing and manipulation toolkit" -DESCRIPTION = "The Libcroco project is an effort to build a generic \ -Cascading Style Sheet (CSS) parsing and manipulation toolkit that can be \ -used by GNOME applications in need of CSS support." -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ - file://src/cr-rgb.c;endline=22;md5=31d5f0944d556c8589d04ea6055fcc66 \ - file://tests/cr-test-utils.c;endline=21;md5=2382c27934cae1d3792fcb17a6142c4e" - -SECTION = "x11/utils" -DEPENDS = "glib-2.0 libxml2 zlib" -BBCLASSEXTEND = "native nativesdk" -EXTRA_OECONF += "--enable-Bsymbolic=auto" - -BINCONFIG = "${bindir}/croco-0.6-config" - -inherit gnomebase gtk-doc binconfig-disabled - -SRC_URI[archive.md5sum] = "c80c5a8385011a0260dce6bd0da93dce" -SRC_URI[archive.sha256sum] = "767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4" - -SRC_URI +="file://CVE-2020-12825.patch \ -" diff --git a/meta/recipes-support/libdaemon/libdaemon_0.14.bb b/meta/recipes-support/libdaemon/libdaemon_0.14.bb index de6ac388a3..089f19d1cd 100644 --- a/meta/recipes-support/libdaemon/libdaemon_0.14.bb +++ b/meta/recipes-support/libdaemon/libdaemon_0.14.bb @@ -4,7 +4,6 @@ facilities for logging and a signal handler to enable graceful shutdown, \ as well as file locking to ensure that only a single copy of a given daemon \ is running at a time." SECTION = "libs" -AUTHOR = "Lennart Poettering <lennart@poettering.net>" HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ diff --git a/meta/recipes-support/libevdev/libevdev_1.12.1.bb b/meta/recipes-support/libevdev/libevdev_1.13.1.bb index bdca64f357..85cfd78507 100644 --- a/meta/recipes-support/libevdev/libevdev_1.12.1.bb +++ b/meta/recipes-support/libevdev/libevdev_1.13.1.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=80c550b3197bcb8da7d7557ebcc3fc46 \ " SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" -SRC_URI[sha256sum] = "1dbba41bc516d3ca7abc0da5b862efe3ea8a7018fa6e9b97ce9d39401b22426c" +SRC_URI[sha256sum] = "06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36" inherit autotools pkgconfig diff --git a/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch index ea17e876ea..26b707ad31 100644 --- a/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch +++ b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch @@ -6,7 +6,7 @@ Subject: [PATCH] test: retriable tests are marked failed only when all Fixes: #1193 -Upstream-Status: Accepted +Upstream-Status: Backport [https://github.com/libevent/libevent/commit/3daebf308a01b4b2d3fb867be3d6631f7b5a2dbb] Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com> --- diff --git a/meta/recipes-support/libevent/libevent_2.1.12.bb b/meta/recipes-support/libevent/libevent_2.1.12.bb index e26e8a9b57..25388fb4d7 100644 --- a/meta/recipes-support/libevent/libevent_2.1.12.bb +++ b/meta/recipes-support/libevent/libevent_2.1.12.bb @@ -11,7 +11,7 @@ SECTION = "libs" LICENSE = "BSD-3-Clause & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=17f20574c0b154d12236d5fbe964f549" -SRC_URI = "https://github.com/libevent/libevent/releases/download/release-${PV}-stable/${BP}-stable.tar.gz \ +SRC_URI = "${GITHUB_BASE_URI}/download/release-${PV}-stable/${BP}-stable.tar.gz \ file://Makefile-missing-test-dir.patch \ file://run-ptest \ file://0001-test-regress_dns.c-patch-out-tests-that-require-a-wo.patch \ @@ -21,15 +21,14 @@ SRC_URI = "https://github.com/libevent/libevent/releases/download/release-${PV}- " SRC_URI[sha256sum] = "92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb" - -UPSTREAM_CHECK_URI = "http://libevent.org/" +UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>.+)-stable" S = "${WORKDIR}/${BPN}-${PV}-stable" PACKAGECONFIG ??= "" PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" -inherit autotools +inherit autotools github-releases # Needed for Debian packaging LEAD_SONAME = "libevent-2.1.so" @@ -42,7 +41,7 @@ PACKAGES_DYNAMIC = "^${PN}-.*$" python split_libevent_libs () { do_split_packages(d, '${libdir}', r'^libevent_([a-z]*)-.*\.so\..*', '${PN}-%s', '${SUMMARY} (%s)', prepend=True, allow_links=True) } -PACKAGESPLITFUNCS:prepend = "split_libevent_libs " +PACKAGESPLITFUNCS =+ "split_libevent_libs" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libexif/libexif/0001-Add-serial-tests-config-needed-by-ptest.patch b/meta/recipes-support/libexif/libexif/0001-Add-serial-tests-config-needed-by-ptest.patch new file mode 100644 index 0000000000..505aa07330 --- /dev/null +++ b/meta/recipes-support/libexif/libexif/0001-Add-serial-tests-config-needed-by-ptest.patch @@ -0,0 +1,26 @@ +From 1ee7217c8ae724d793f9a9876c3608057a2ccbf8 Mon Sep 17 00:00:00 2001 +From: Julien Stephan <jstephan@baylibre.com> +Date: Tue, 11 Jul 2023 16:07:54 +0200 +Subject: [PATCH] Add serial-tests config needed by ptest + +Add serial-tests support, ptest needs it. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Julien Stephan <jstephan@baylibre.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index cd48047..5413907 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,7 @@ AM_INIT_AUTOMAKE([ + dist-zip + check-news + subdir-objects ++ serial-tests + ]) + AM_MAINTAINER_MODE + diff --git a/meta/recipes-support/libexif/libexif/run-ptest b/meta/recipes-support/libexif/libexif/run-ptest new file mode 100644 index 0000000000..2d23159eb0 --- /dev/null +++ b/meta/recipes-support/libexif/libexif/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +make -o Makefile runtest-TESTS diff --git a/meta/recipes-support/libexif/libexif_0.6.24.bb b/meta/recipes-support/libexif/libexif_0.6.24.bb index 20ba0ef282..b407ee52de 100644 --- a/meta/recipes-support/libexif/libexif_0.6.24.bb +++ b/meta/recipes-support/libexif/libexif_0.6.24.bb @@ -7,18 +7,41 @@ SECTION = "libs" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" -def version_underscore(v): - return "_".join(v.split(".")) - -SRC_URI = "https://github.com/libexif/libexif/releases/download/v${PV}/libexif-${PV}.tar.bz2 \ +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libexif-${PV}.tar.bz2 \ + file://0001-Add-serial-tests-config-needed-by-ptest.patch \ + file://run-ptest \ " SRC_URI[sha256sum] = "d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae" -UPSTREAM_CHECK_URI = "https://github.com/libexif/libexif/releases/" - -inherit autotools gettext +inherit autotools gettext github-releases ptest EXTRA_OECONF += "--disable-docs" +do_compile_ptest() { + oe_runmake -C test buildtest-TESTS +} + +do_install_ptest() { + install ${B}/test/test*[!\.o] ${D}${PTEST_PATH} + for f in ${D}${PTEST_PATH}/test*; do + sed -i "s/\(LD_LIBRARY_PATH=\).*\(:\$LD_LIBRARY_PATH\)\"/\1.\2/" $f + done + + install ${B}/test/Makefile ${D}${PTEST_PATH} + sed -i -e "/^srcdir/c srcdir = \$\{PWD\}" ${D}${PTEST_PATH}/Makefile + + install -d ${D}${PTEST_PATH}/nls + install ${B}/test/nls/*[!\.o] ${D}${PTEST_PATH}/nls + install -d ${D}${PTEST_PATH}/.libs + install ${B}/test/.libs/* ${D}${PTEST_PATH}/.libs + + install ${S}/test/*.sh ${D}${PTEST_PATH} + + install -d ${D}${PTEST_PATH}/testdata + install ${S}/test/testdata/* ${D}${PTEST_PATH}/testdata +} + +RDEPENDS:${PN}-ptest += "make bash" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch b/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch deleted file mode 100644 index 5e529d1ce7..0000000000 --- a/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 501a6b55853af549fae72723e74271f2a4ec7cf6 Mon Sep 17 00:00:00 2001 -From: Brett Warren <brett.warren@arm.com> -Date: Fri, 27 Nov 2020 15:28:42 +0000 -Subject: [PATCH] arm/sysv: reverted clang VFP mitigation - -Since commit e3d2812ce43940aacae5bab2d0e965278cb1e7ea, -seperate instructions were used when compiling under clang, -as clang didn't allow the directives at the time. This mitigation -now causes compilation to fail under clang 10, as described by -https://github.com/libffi/libffi/issues/607. Now that -clang supports the LDC and SDC instructions, this mitigation -has been reverted. - -Upstream-Status: Pending -Signed-off-by: Brett Warren <brett.warren@arm.com> ---- - src/arm/sysv.S | 33 --------------------------------- - 1 file changed, 33 deletions(-) - -diff --git a/src/arm/sysv.S b/src/arm/sysv.S -index fb36213..e4272a1 100644 ---- a/src/arm/sysv.S -+++ b/src/arm/sysv.S -@@ -142,13 +142,8 @@ ARM_FUNC_START(ffi_call_VFP) - - cmp r3, #3 @ load only d0 if possible - ite le --#ifdef __clang__ -- vldrle d0, [r0] -- vldmgt r0, {d0-d7} --#else - ldcle p11, cr0, [r0] @ vldrle d0, [r0] - ldcgt p11, cr0, [r0], {16} @ vldmgt r0, {d0-d7} --#endif - add r0, r0, #64 @ discard the vfp register args - /* FALLTHRU */ - ARM_FUNC_END(ffi_call_VFP) -@@ -193,25 +188,13 @@ ARM_FUNC_START(ffi_call_SYSV) - #endif - 0: - E(ARM_TYPE_VFP_S) --#ifdef __clang__ -- vstr s0, [r2] --#else - stc p10, cr0, [r2] @ vstr s0, [r2] --#endif - pop {fp,pc} - E(ARM_TYPE_VFP_D) --#ifdef __clang__ -- vstr d0, [r2] --#else - stc p11, cr0, [r2] @ vstr d0, [r2] --#endif - pop {fp,pc} - E(ARM_TYPE_VFP_N) --#ifdef __clang__ -- vstm r2, {d0-d3} --#else - stc p11, cr0, [r2], {8} @ vstm r2, {d0-d3} --#endif - pop {fp,pc} - E(ARM_TYPE_INT64) - str r1, [r2, #4] -@@ -320,11 +303,7 @@ ARM_FUNC_START(ffi_closure_VFP) - add ip, sp, #16 - sub sp, sp, #64+32 @ allocate frame - cfi_adjust_cfa_offset(64+32) --#ifdef __clang__ -- vstm sp, {d0-d7} --#else - stc p11, cr0, [sp], {16} @ vstm sp, {d0-d7} --#endif - stmdb sp!, {ip,lr} - - /* See above. */ -@@ -358,25 +337,13 @@ ARM_FUNC_START_LOCAL(ffi_closure_ret) - cfi_rel_offset(lr, 4) - 0: - E(ARM_TYPE_VFP_S) --#ifdef __clang__ -- vldr s0, [r2] --#else - ldc p10, cr0, [r2] @ vldr s0, [r2] --#endif - b call_epilogue - E(ARM_TYPE_VFP_D) --#ifdef __clang__ -- vldr d0, [r2] --#else - ldc p11, cr0, [r2] @ vldr d0, [r2] --#endif - b call_epilogue - E(ARM_TYPE_VFP_N) --#ifdef __clang__ -- vldm r2, {d0-d3} --#else - ldc p11, cr0, [r2], {8} @ vldm r2, {d0-d3} --#endif - b call_epilogue - E(ARM_TYPE_INT64) - ldr r1, [r2, #4] --- -2.25.1 - diff --git a/meta/recipes-support/libffi/libffi/not-win32.patch b/meta/recipes-support/libffi/libffi/not-win32.patch index 62daaf4b38..f4ed839ed8 100644 --- a/meta/recipes-support/libffi/libffi/not-win32.patch +++ b/meta/recipes-support/libffi/libffi/not-win32.patch @@ -1,4 +1,4 @@ -From 306719369a0d3608b4ff2737de74ae284788a14b Mon Sep 17 00:00:00 2001 +From be9d4cc110c159812699780348686da371296b94 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Thu, 4 Feb 2016 16:22:50 +0000 Subject: [PATCH] libffi: ensure sysroot paths are not in libffi.pc @@ -15,17 +15,16 @@ As this block is generally pointless, disable it. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@intel.com> - --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index b764368..d51ce91 100644 +index 816bfd6..e37c5a8 100644 --- a/configure.ac +++ b/configure.ac -@@ -354,7 +354,7 @@ AC_ARG_ENABLE(multi-os-directory, - +@@ -401,7 +401,7 @@ AC_ARG_ENABLE(multi-os-directory, + # These variables are only ever used when we cross-build to X86_WIN32. # And we only support this with GCC, so... -if test "x$GCC" = "xyes"; then diff --git a/meta/recipes-support/libffi/libffi_3.4.2.bb b/meta/recipes-support/libffi/libffi_3.4.6.bb index 733fcc5e6c..a6857a3981 100644 --- a/meta/recipes-support/libffi/libffi_3.4.2.bb +++ b/meta/recipes-support/libffi/libffi_3.4.6.bb @@ -8,29 +8,25 @@ library really only provides the lowest, machine dependent layer of a fully feat A layer must exist above `libffi' that handles type conversions for values passed between the two languages." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=679b5c9bdc79a2b93ee574e193e7a7bc" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1db54c9fd307a12218766c3c7f650ca7" -SRC_URI = "https://github.com/libffi/libffi/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BPN}-${PV}.tar.gz \ file://not-win32.patch \ - file://0001-arm-sysv-reverted-clang-VFP-mitigation.patch \ " -SRC_URI[sha256sum] = "540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620" -UPSTREAM_CHECK_URI = "https://github.com/libffi/libffi/releases/" -UPSTREAM_CHECK_REGEX = "libffi-(?P<pver>\d+(\.\d+)+)\.tar" +SRC_URI[sha256sum] = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e" EXTRA_OECONF += "--disable-builddir --disable-exec-static-tramp" +EXTRA_OECONF:class-native += "--with-gcc-arch=generic" EXTRA_OEMAKE:class-target = "LIBTOOLFLAGS='--tag=CC'" -inherit autotools texinfo multilib_header + +inherit autotools texinfo multilib_header github-releases do_install:append() { oe_multilib_header ffi.h ffitarget.h } -FILES:${PN}-dev += "${libdir}/libffi-${PV}" - # Doesn't compile in MIPS16e mode due to use of hand-written # assembly MIPS_INSTRUCTION_SET = "mips" BBCLASSEXTEND = "native nativesdk" - diff --git a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch index c873e24ed5..cbfa30f0ad 100644 --- a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch +++ b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch @@ -1,4 +1,4 @@ -From 839f38e5ecc22b7f1b837284bbbffac8cb32ab1e Mon Sep 17 00:00:00 2001 +From bcfd89abdb5110b93314297120412d4c7f2da313 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin <trevor.gamblin@windriver.com> Date: Tue, 29 Oct 2019 14:08:32 -0400 Subject: [PATCH] libgcrypt: fix m4 file for oe-core @@ -17,7 +17,7 @@ Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> 1 file changed, 4 insertions(+), 86 deletions(-) diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4 -index 19d514f..21125c7 100644 +index cd4249e..e53a36f 100644 --- a/src/libgcrypt.m4 +++ b/src/libgcrypt.m4 @@ -29,41 +29,6 @@ dnl is added to the gpg_config_script_warn variable. @@ -35,7 +35,7 @@ index 19d514f..21125c7 100644 - fi - - use_gpgrt_config="" -- if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then - if $GPGRT_CONFIG libgcrypt --exists; then - LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt" - AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config]) diff --git a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch index f9c362431c..cf9ebfb3e6 100644 --- a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch +++ b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch @@ -1,4 +1,4 @@ -From 3c6c10eae0993c8ca60879494c6650f7b8f54ebe Mon Sep 17 00:00:00 2001 +From 0f66e796a8522e1043dda03b88d5f6feae839d16 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Wed, 16 Aug 2017 10:44:41 +0800 Subject: [PATCH] libgcrypt: fix building error with '-O2' in sysroot path @@ -25,15 +25,15 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cipher/Makefile.am b/cipher/Makefile.am -index d644005..1cf5072 100644 +index c3d642b..88c883a 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am -@@ -147,7 +147,7 @@ gost-s-box: gost-s-box.c +@@ -153,7 +153,7 @@ gost-s-box: gost-s-box.c if ENABLE_O_FLAG_MUNGING --o_flag_munging = sed -e 's/-O\([2-9sg][2-9sg]*\)/-O1/' -e 's/-Ofast/-O1/g' -+o_flag_munging = sed -e 's/ -O\([2-9sg][2-9sg]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' +-o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g' ++o_flag_munging = sed -e 's/ -O\([2-9sgz][2-9sgz]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' else o_flag_munging = cat endif diff --git a/meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch b/meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch deleted file mode 100644 index 105df2957e..0000000000 --- a/meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 7cc702c7b5a1ccc2b0091f3effa1391b6c3030fd Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 16 Aug 2017 10:46:28 +0800 -Subject: [PATCH 3/4] tests/bench-slope.c: workaround ICE failure on mips with - '-O -g' - -Hit a ICE and could reduce it to the following minimal example: - -1. Only the size of array assigned with 2 caused the issue: -$ cat > mipgcc-test.c << END - -int main (int argc, char **argv) -{ - char *pStrArry[ARRAY_SIZE_MAX] = {"hello"}; - int i = 0; - - while(pStrArry[i] && i<ARRAY_SIZE_MAX) - { - printf("%s\n", pStrArry[i]); - i++; - } - - return 0; -} - -END - -2. Only -O1 and -g on mips caused the issue: -$ mips-poky-linux-gcc -O1 -g -o mipgcc-test mipgcc-test.c -mipgcc-test.c: In function 'main': -mipgcc-test.c:18:1: internal compiler error: in dwarf2out_var_location, -at dwarf2out.c:20810 - } - ^ -Please submit a full bug report, -with preprocessed source if appropriate. -See <http://gcc.gnu.org/bugs.html> for instructions - -3. The quick workround is trying to enlarge the size of array with -larger -than 2. - -4. File a bug to GNU, but it could not be reproduced on there -environment. -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60643 - -Upstream-Status: Inappropriate [oe specific] - -Rebase to 1.8.0 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - tests/bench-slope.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/bench-slope.c b/tests/bench-slope.c -index 75e6e43..4e70842 100644 ---- a/tests/bench-slope.c -+++ b/tests/bench-slope.c -@@ -1463,7 +1463,7 @@ static struct bench_ops hash_ops = { - }; - - --static struct bench_hash_mode hash_modes[] = { -+static struct bench_hash_mode hash_modes[3] = { - {"", &hash_ops}, - {0}, - }; -@@ -1629,7 +1629,7 @@ static struct bench_ops mac_ops = { - }; - - --static struct bench_mac_mode mac_modes[] = { -+static struct bench_mac_mode mac_modes[3] = { - {"", &mac_ops}, - {0}, - }; --- -1.8.3.1 - diff --git a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch new file mode 100644 index 0000000000..8de3c6713b --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch @@ -0,0 +1,20 @@ +The bench-slope test appears to be aborting fairly frequently, which causes +failures on the autobuilder. + +Until this has been root-caused, disable the test. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/tests/testdrv.c b/tests/testdrv.c +index 0ccde326..d3455186 100644 +--- a/tests/testdrv.c ++++ b/tests/testdrv.c +@@ -77,7 +77,6 @@ static struct { + { "t-x448" }, + { "t-ed448" }, + { "benchmark" }, +- { "bench-slope" }, + { "hashtest-256g", "hashtest", "--gigs 256 SHA1 SHA256 SHA512 SM3", + LONG_RUNNING }, + { NULL } diff --git a/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch new file mode 100644 index 0000000000..b9a607863d --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch @@ -0,0 +1,18 @@ +Don't depend on a native libgpg-error to build the test driver, as it's +an optional dependency for some C annotations. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/tests/testdrv.c b/tests/testdrv.c +index 0ccde326..6d6abd57 100644 +--- a/tests/testdrv.c ++++ b/tests/testdrv.c +@@ -32,7 +32,6 @@ + # include <fcntl.h> + # include <sys/wait.h> + #endif +-#include <gpg-error.h> /* For some macros. */ + + #include "stopwatch.h" + diff --git a/meta/recipes-support/libgcrypt/files/run-ptest b/meta/recipes-support/libgcrypt/files/run-ptest index 4818a061b4..c349ae1944 100644 --- a/meta/recipes-support/libgcrypt/files/run-ptest +++ b/meta/recipes-support/libgcrypt/files/run-ptest @@ -1,3 +1,9 @@ #!/bin/sh -make -C build/tests runtest-TESTS +# Run the tests in regression mode so they are quicker +export GCRYPT_IN_REGRESSION_TEST=1 +# The 'random' test invokes itself, so we need to be sure that the test +# directory is on PATH. +export PATH=$PATH:. + +./testdrv --verbose diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.10.1.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb index f7108013d3..5a76201ab5 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.10.1.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb @@ -17,20 +17,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ " DEPENDS = "libgpg-error" -RDEPENDS:${PN}-ptest = "bash make" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0001-libgcrypt-fix-m4-file-for-oe-core.patch \ - file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \ file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \ + file://no-native-gpg-error.patch \ + file://no-bench-slope.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de" - -# Below whitelisted CVEs are disputed and not affecting crypto libraries for any distro. -CVE_CHECK_IGNORE += "CVE-2018-12433 CVE-2018-12438" +SRC_URI[sha256sum] = "8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa" BINCONFIG = "${bindir}/libgcrypt-config" @@ -39,8 +36,6 @@ inherit autotools texinfo binconfig-disabled pkgconfig ptest EXTRA_OECONF = "--disable-asm" EXTRA_OEMAKE:class-target = "LIBTOOLFLAGS='--tag=CC'" -PRIVATE_LIBS:${PN}-ptest:append = " libgcrypt.so.20" - PACKAGECONFIG ??= "capabilities" PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap" @@ -49,25 +44,10 @@ do_configure:prepend () { rm -f ${S}/m4/gpg-error.m4 } -# libgcrypt.pc is added locally and thus installed here -do_install:append() { - install -d ${D}/${libdir}/pkgconfig - install -m 0644 ${B}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/ -} - do_install_ptest() { - cp -r --preserve=mode,links -v ${S} ${D}${PTEST_PATH} - cp -r --preserve=mode,links -v ${B} ${D}${PTEST_PATH} - rm ${D}${PTEST_PATH}/build/cipher/gost-s-box - rm ${D}${PTEST_PATH}/build/doc/yat2m - rm ${D}${PTEST_PATH}/build/libtool - rm ${D}${PTEST_PATH}/build/config.status - rm ${D}${PTEST_PATH}/build/config.log - rm ${D}${PTEST_PATH}/build/src/mpicalc - rm ${D}${PTEST_PATH}/${BP}/autom4te* -rf - sed -i -e 's/Makefile:.*/Makefile-disabled:/' ${D}${PTEST_PATH}/build/Makefile - find ${D}/${PTEST_PATH}/build -name "*.cmake" -or -name "Makefile" \ - | xargs sed -e "s|${WORKDIR}|${PTEST_PATH}|g" -e "s|${WORKDIR}/recipe-sysroot-native||g" -i + cd tests + oe_runmake testdrv-build testdrv + install testdrv $(srcdir=${S}/tests ./testdrv-build --files | sort | uniq) ${D}${PTEST_PATH} } FILES:${PN}-dev += "${bindir}/hmac256 ${bindir}/dumpsexp" diff --git a/meta/recipes-support/libgit2/libgit2_1.4.3.bb b/meta/recipes-support/libgit2/libgit2_1.7.2.bb index 7e27b5b018..d1629c0c0b 100644 --- a/meta/recipes-support/libgit2/libgit2_1.4.3.bb +++ b/meta/recipes-support/libgit2/libgit2_1.7.2.bb @@ -1,21 +1,20 @@ SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL" -LIC_FILES_CHKSUM = "file://COPYING;md5=e5a9227de4cb6afb5d35ed7b0fdf480d" +LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & Zlib & ISC & LGPL-2.1-or-later & CC0-1.0 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=5bdf47bbc9a39dc6ce076d59e322dc17" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.4;protocol=https" -SRCREV = "465bbf88ea939a965fbcbade72870c61f815e457" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.7;protocol=https" +SRCREV = "a418d9d4ab87bae16b87d8f37143a4687ae0e4b2" S = "${WORKDIR}/git" inherit cmake EXTRA_OECMAKE = "\ - -DBUILD_CLAR=OFF \ + -DBUILD_TESTS=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLIB_INSTALL_DIR=${libdir} \ -DREGEX_BACKEND='pcre2' \ " diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch index a0ab4f23ff..d72838bb05 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch +++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch @@ -1,4 +1,4 @@ -From 137805890951b6b585c1d23097e0a51e8c7a8a50 Mon Sep 17 00:00:00 2001 +From 75622f8b21459eb556b36edc3537fdaded7f04bf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 28 Feb 2020 09:19:56 +0000 Subject: [PATCH] Do not fail when testing config scripts @@ -14,14 +14,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 9303954..7630540 100644 +index 9389e99..6ded263 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -344,7 +344,6 @@ gpg-error-config: gpgrt-config gpg-error-config-old +@@ -324,6 +324,5 @@ gpg-error-config: gpgrt-config gpg-error-config-old gpg-error-config-test.sh else \ echo "no"; \ echo "*** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \ - exit 1; \ fi cp gpg-error-config-old $@ - diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 82bb4cdb47..3d886bcaa4 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch @@ -1,4 +1,4 @@ -From 0214d886d0153f7288f81213c47dc50f3b9fde20 Mon Sep 17 00:00:00 2001 +From b0df1cb468264a9bb9113524f0e1318c456b2348 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 29 Mar 2018 15:12:17 +0800 Subject: [PATCH] support pkgconfig @@ -14,17 +14,19 @@ Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - src/gpg-error.m4 | 161 +---------------------------------------------- - 1 file changed, 3 insertions(+), 158 deletions(-) + src/gpg-error.m4 | 192 ++--------------------------------------------- + 1 file changed, 5 insertions(+), 187 deletions(-) diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 -index 4b5cd40..c9978d6 100644 +index 7fa52b1..15a0859 100644 --- a/src/gpg-error.m4 +++ b/src/gpg-error.m4 -@@ -27,158 +27,12 @@ dnl is added to the gpg_config_script_warn variable. +@@ -15,187 +15,14 @@ dnl - AC_DEFUN([AM_PATH_GPG_ERROR], - [ AC_REQUIRE([AC_CANONICAL_HOST]) + dnl Find gpg-error-config, for backward compatibility + dnl +-dnl _AM_PATH_POSSIBLE_GPG_ERROR_CONFIG +-AC_DEFUN([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG],[dnl - gpg_error_config_prefix="" - dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, - dnl since that is consistent with how our three siblings use the directory/ @@ -60,9 +62,14 @@ index 4b5cd40..c9978d6 100644 - fi - - AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) -- min_gpg_error_version=ifelse([$1], ,1.33,$1) -- ok=no +-]) - +-dnl +-dnl Find gpgrt-config, which uses .pc file +-dnl (minimum pkg-config functionality, supporting cross build) +-dnl +-dnl _AM_PATH_GPGRT_CONFIG +-AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH]) - if test "$GPGRT_CONFIG" != "no"; then - # Determine gpgrt_libdir @@ -118,8 +125,9 @@ index 4b5cd40..c9978d6 100644 - fi - if test -n "$gpgrt_libdir"; then break; fi - done -- else -- # When we cannot determine system libdir-format, use this: +- fi +- if test -z "$gpgrt_libdir"; then +- # No valid pkgconfig dir in any of the system directories, fallback - gpgrt_libdir=${possible_libdir1} - fi - else @@ -133,12 +141,33 @@ index 4b5cd40..c9978d6 100644 - AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) - gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` - else +- gpg_error_config_version=`$GPG_ERROR_CONFIG --version` - unset GPGRT_CONFIG - fi - elif test "$GPG_ERROR_CONFIG" != "no"; then - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` - unset GPGRT_CONFIG - fi +-]) +- +-dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, +-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl +-dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, +-dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are +-dnl used for programs requireing real multi thread support. +-dnl +-dnl If a prefix option is not used, the config script is first +-dnl searched in $SYSROOT/bin and then along $PATH. If the used +-dnl config script does not match the host specification the script +-dnl is added to the gpg_config_script_warn variable. +-dnl +-AC_DEFUN([AM_PATH_GPG_ERROR],[dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl +-AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl +- min_gpg_error_version=ifelse([$1], ,1.33,$1) +- ok=no - if test "$GPG_ERROR_CONFIG" != "no"; then - req_major=`echo $min_gpg_error_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` @@ -159,6 +188,8 @@ index 4b5cd40..c9978d6 100644 - fi - fi - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) ++AC_DEFUN([AM_PATH_GPG_ERROR], ++[ AC_REQUIRE([AC_CANONICAL_HOST]) + min_gpg_error_version=ifelse([$1], ,0.0,$1) + PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) if test $ok = yes; then @@ -183,7 +214,7 @@ index 4b5cd40..c9978d6 100644 fi if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != x"$host" ; then -@@ -194,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], +@@ -211,15 +38,6 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl fi fi else diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.45.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb index ff3a673df2..9f2b49209d 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.45.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb @@ -6,7 +6,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index" LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/gpg-error.h.in;beginline=2;endline=18;md5=d82591bc81561f617da71e00ff4a9d79 \ + file://src/gpg-error.h.in;beginline=2;endline=18;md5=20f4cf5d81ea2fad18f6297500018654 \ file://src/init.c;beginline=2;endline=17;md5=f01cdfcf747af5380590cfd9bbfeaaf7 \ " @@ -20,13 +20,13 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://run-ptest \ " -SRC_URI[sha256sum] = "570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26" +SRC_URI[sha256sum] = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f" BINCONFIG = "${bindir}/gpg-error-config" inherit autotools binconfig-disabled pkgconfig gettext multilib_header multilib_script ptest -RDEPENDS:${PN}-ptest:append = " make" +RDEPENDS:${PN}-ptest:append = " make bash" MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/gpgrt-config" diff --git a/meta/recipes-support/libical/libical_3.0.14.bb b/meta/recipes-support/libical/libical_3.0.18.bb index 58baf3f32f..040d23b69d 100644 --- a/meta/recipes-support/libical/libical_3.0.14.bb +++ b/meta/recipes-support/libical/libical_3.0.18.bb @@ -7,18 +7,17 @@ HOMEPAGE = "https://github.com/libical/libical" BUGTRACKER = "https://github.com/libical/libical/issues" LICENSE = "LGPL-2.1-only | MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ - file://LICENSE.LGPL21.txt;md5=933adb561f159e7c3da079536f0ed871 \ + file://LICENSE.LGPL21.txt;md5=8f690bb538f4b301d931374a6eb864d0 \ file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640 \ " SECTION = "libs" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ " -SRC_URI[sha256sum] = "4284b780356f1dc6a01f16083e7b836e63d3815e27ed0eaaad684712357ccc8f" -UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" +SRC_URI[sha256sum] = "72b7dc1a5937533aee5a2baefc990983b66b141dd80d43b51f80aced4aae219c" -inherit cmake pkgconfig gobject-introspection vala +inherit cmake pkgconfig gobject-introspection vala github-releases DEPENDS += "libical-native" diff --git a/meta/recipes-support/libjitterentropy/libjitterentropy_3.4.0.bb b/meta/recipes-support/libjitterentropy/libjitterentropy_3.4.1.bb index 1d291cc357..6cef8c068c 100644 --- a/meta/recipes-support/libjitterentropy/libjitterentropy_3.4.0.bb +++ b/meta/recipes-support/libjitterentropy/libjitterentropy_3.4.1.bb @@ -10,12 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=64a87180908540620ce364b5e69b3b03 \ file://LICENSE.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ " SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master;protocol=https" -SRCREV = "2e5019cfe63038faaa405ce53715effe4ea580e4" +SRCREV = "4544e11320138ac02797af81766f4476a71bb09f" S = "${WORKDIR}/git" -# remove at next version upgrade or when output changes -HASHEQUIV_HASH_VERSION .= ".2" - do_configure[noexec] = "1" LDFLAGS += "-Wl,-O0" diff --git a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch index af96bd57cd..bdb80ff34d 100644 --- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch +++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch @@ -1,4 +1,4 @@ -From 6081640895b6d566fa21123e2de7d111eeab5c4c Mon Sep 17 00:00:00 2001 +From ca8174aa81d7bf364b33f7254a9e887735c4996d Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 3 Dec 2012 18:17:31 +0800 Subject: [PATCH] libksba: add pkgconfig support @@ -16,7 +16,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 1 file changed, 4 insertions(+), 86 deletions(-) diff --git a/src/ksba.m4 b/src/ksba.m4 -index 6b55bb8..6e7336f 100644 +index 452c245..aa96255 100644 --- a/src/ksba.m4 +++ b/src/ksba.m4 @@ -23,37 +23,6 @@ dnl with a changed API. @@ -44,7 +44,7 @@ index 6b55bb8..6e7336f 100644 - fi - - use_gpgrt_config="" -- if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then - if $GPGRT_CONFIG ksba --exists; then - KSBA_CONFIG="$GPGRT_CONFIG ksba" - AC_MSG_NOTICE([Use gpgrt-config as ksba-config]) diff --git a/meta/recipes-support/libksba/libksba_1.6.0.bb b/meta/recipes-support/libksba/libksba_1.6.6.bb index f9e83681dd..2230a032f6 100644 --- a/meta/recipes-support/libksba/libksba_1.6.0.bb +++ b/meta/recipes-support/libksba/libksba_1.6.6.bb @@ -24,7 +24,7 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://ksba-add-pkgconfig-support.patch" -SRC_URI[sha256sum] = "dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b" +SRC_URI[sha256sum] = "5dec033d211559338838c0c4957c73dfdc3ee86f73977d6279640c9cd08ce6a4" do_configure:prepend () { # Else these could be used in preference to those in aclocal-copy diff --git a/meta/recipes-support/libmd/libmd_1.0.4.bb b/meta/recipes-support/libmd/libmd_1.1.0.bb index b93dc2d78d..dc588a0f95 100644 --- a/meta/recipes-support/libmd/libmd_1.0.4.bb +++ b/meta/recipes-support/libmd/libmd_1.1.0.bb @@ -9,7 +9,7 @@ LICENSE = "BSD-3-Clause & BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=0436d4fb62a71f661d6e8b7812f9e1df" SRC_URI = "https://archive.hadrons.org/software/libmd/libmd-${PV}.tar.xz" -SRC_URI[sha256sum] = "f51c921042e34beddeded4b75557656559cf5b1f2448033b4c1eec11c07e530f" +SRC_URI[sha256sum] = "1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332" inherit autotools diff --git a/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.75.bb b/meta/recipes-support/libmicrohttpd/libmicrohttpd_1.0.1.bb index 9c99af7c91..0628ee71b5 100644 --- a/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.75.bb +++ b/meta/recipes-support/libmicrohttpd/libmicrohttpd_1.0.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" +SUMMARY = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=57d09285feac8a64efa878e692b14f36" @@ -7,19 +7,16 @@ SECTION = "net" DEPENDS = "file" SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz" -SRC_URI[sha256sum] = "9278907a6f571b391aab9644fd646a5108ed97311ec66f6359cebbedb0a4e3bb" +SRC_URI[sha256sum] = "a89e09fc9b4de34dde19f4fcb4faaa1ce10299b9908db1132bbfa1de47882b94" inherit autotools lib_package pkgconfig gettext CFLAGS += "-pthread -D_REENTRANT" -EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" +EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../ --enable-largefile" PACKAGECONFIG ?= "curl https" -PACKAGECONFIG:append:class-target = "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ -" -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," + PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls," diff --git a/meta/recipes-support/libmpc/libmpc_1.2.1.bb b/meta/recipes-support/libmpc/libmpc_1.3.1.bb index 15d382c4ad..ed57396c0a 100644 --- a/meta/recipes-support/libmpc/libmpc_1.2.1.bb +++ b/meta/recipes-support/libmpc/libmpc_1.3.1.bb @@ -5,7 +5,7 @@ DEPENDS = "gmp mpfr" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02" SRC_URI = "${GNU_MIRROR}/mpc/mpc-${PV}.tar.gz" -SRC_URI[sha256sum] = "17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459" +SRC_URI[sha256sum] = "ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8" S = "${WORKDIR}/mpc-${PV}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libnl/files/enable-serial-tests.patch b/meta/recipes-support/libnl/files/enable-serial-tests.patch deleted file mode 100644 index db774ad821..0000000000 --- a/meta/recipes-support/libnl/files/enable-serial-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b1476d89bf7a0bc6062438731ee4e9026696328b Mon Sep 17 00:00:00 2001 -From: Eric Xu <chi.xu@windriver.com> -Date: Fri, 9 Mar 2018 03:38:49 +0000 -Subject: [PATCH] Add ptest for libnl - -serial-tests is required to generate those targets. - -Upstream-Status: Inappropriate [oe-specific] -Signed-off-by: Eric Xu <chi.xu@windriver.com> ---- - configure.ac | 2 +- - 1 files changed, 1 insertion(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index dfead98..2cc8257 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -46,7 +46,7 @@ AC_INIT(libnl, [libnl_version], [], [], [http://www.infradead.org/~tgr/libnl/]) - AC_CONFIG_HEADERS([lib/defs.h]) - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) --AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) -+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects serial-tests]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)], []) - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - --- -2.13.3 - diff --git a/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch b/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch deleted file mode 100644 index 02662c939e..0000000000 --- a/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch +++ /dev/null @@ -1,48 +0,0 @@ -From fa7f97f8982544c4fcb403893bae6701230d5165 Mon Sep 17 00:00:00 2001 -From: Thomas Haller <thaller@redhat.com> -Date: Fri, 15 Apr 2022 13:29:49 +0200 -Subject: [PATCH] build: avoid building check-direct with --disable-static - -"check-direct" needs to statically link with the libraries, because -it wants to test internal ABI, which is hidden in the share libraries. -When configuring with "--disable-static", static libs are not build -and the test tool cannot be build. - -Just skip the test in that case. - -https://github.com/thom311/libnl/issues/306 -Upstream-Status: Backport [https://github.com/thom311/libnl/commit/fa7f97f8982544c4fcb403893bae6701230d5165] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - Makefile.am | 2 ++ - configure.ac | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index a6bcf553..2f5e0dfc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -984,8 +984,10 @@ tests_check_all_LDADD = \ - $(NULL) - - if WITH_CHECK -+if ENABLE_STATIC - check_programs += tests/check-direct - endif -+endif - - tests_check_direct_SOURCES = \ - tests/check-direct.c \ -diff --git a/configure.ac b/configure.ac -index 1f9ad0eb..0fd1cc0f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -107,6 +107,8 @@ else - AC_CHECK_LIB([pthread], [pthread_mutex_lock], [], AC_MSG_ERROR([libpthread is required])) - fi - -+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" != "no"]) -+ - AC_ARG_ENABLE([debug], - AS_HELP_STRING([--disable-debug], [Do not include debugging statements]), - [enable_debug="$enableval"], [enable_debug="yes"]) diff --git a/meta/recipes-support/libnl/files/run-ptest b/meta/recipes-support/libnl/files/run-ptest index e5c9eb0a32..0d0c665cd2 100755 --- a/meta/recipes-support/libnl/files/run-ptest +++ b/meta/recipes-support/libnl/files/run-ptest @@ -1,16 +1,3 @@ -#!/bin/sh +#! /bin/sh -num_fail=0 - -for test in check* -do - ./"$test" \ - && echo "PASS: $test" \ - || { - echo "FAIL: $test" - num_fail=$(( ${num_fail} + 1)) - } - -done - -exit $num_fail +CK_AUTOMAKE=1 ./check-all diff --git a/meta/recipes-support/libnl/libnl_3.6.0.bb b/meta/recipes-support/libnl/libnl_3.9.0.bb index af3aa41040..db9d93e8cb 100644 --- a/meta/recipes-support/libnl/libnl_3.6.0.bb +++ b/meta/recipes-support/libnl/libnl_3.9.0.bb @@ -14,19 +14,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "flex-native bison-native" -SRC_URI = " \ - https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ - file://enable-serial-tests.patch \ +SRC_URI = "${GITHUB_BASE_URI}/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ file://run-ptest \ - file://fa7f97f8982544c4fcb403893bae6701230d5165.patch \ - " + " -SRC_URI[sha256sum] = "532155fd011e5a805bd67121b87a01c757e2bb24112ac17e69cb86013b970009" +SRC_URI[sha256sum] = "aed507004d728a5cf11eab48ca4bf9e6e1874444e33939b9d3dfed25018ee9bb" +GITHUB_BASE_URI = "https://github.com/thom311/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/libnl(?P<pver>.+)" -UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" - -inherit autotools pkgconfig ptest +inherit autotools pkgconfig ptest github-releases FILES:${PN} = "${libdir}/libnl-3.so.* \ ${libdir}/libnl.so.* \ @@ -53,26 +50,15 @@ FILES:${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*" RREPLACES:${PN}-genl = "libnl-genl2" RCONFLICTS:${PN}-genl = "libnl-genl2" -RDEPENDS:${PN}-ptest += "libcheck" -RRECOMMENDS:${PN}-ptest += "kernel-module-dummy kernel-module-bonding" DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'libcheck', '', d)}" - -# make sure the tests don't link against wrong so file -EXTRA_OECONF += "${@bb.utils.contains('PTEST_ENABLED', '1', '--disable-rpath', '', d)}" +RRECOMMENDS:${PN}-ptest += "kernel-module-dummy kernel-module-bonding" do_compile_ptest() { - # hack to remove the call to `make runtest-TESTS` - sed -i 's/$(MAKE) $(AM_MAKEFLAGS) runtest-TESTS//g' Makefile - oe_runmake check + oe_runmake ./tests/check-all } -do_install_ptest(){ - # legacy? tests are also installed, but ptest-runner will not run them - # upstream are not running these tests in their CI pipeline - # issue opened https://github.com/thom311/libnl/issues/270 - install -m 0755 tests/.libs/* ${D}${PTEST_PATH}/ - # contains build paths - rm ${D}${PTEST_PATH}/*.la +do_install_ptest() { + ./libtool install install ./tests/check-all ${D}${PTEST_PATH}/ } BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libpcre/libpcre2_10.40.bb b/meta/recipes-support/libpcre/libpcre2_10.43.bb index 8c2cadfe2b..fd0bd79212 100644 --- a/meta/recipes-support/libpcre/libpcre2_10.40.bb +++ b/meta/recipes-support/libpcre/libpcre2_10.43.bb @@ -8,13 +8,14 @@ SUMMARY = "Perl Compatible Regular Expressions version 2" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=41bfb977e4933c506588724ce69bf5d2" +LIC_FILES_CHKSUM = "file://LICENCE;md5=321a5eb46acae6b6c1ff2c7a866d836a" -SRC_URI = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${PV}/pcre2-${PV}.tar.bz2" +SRC_URI = "${GITHUB_BASE_URI}/download/pcre2-${PV}/pcre2-${PV}.tar.bz2" -UPSTREAM_CHECK_URI = "https://github.com/PhilipHazel/pcre2/releases" +GITHUB_BASE_URI = "https://github.com/PhilipHazel/pcre2/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/pcre2-(?P<pver>\d+(\.\d+)+)$" -SRC_URI[sha256sum] = "14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68" +SRC_URI[sha256sum] = "e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb" CVE_PRODUCT = "pcre2" @@ -25,7 +26,7 @@ DEPENDS += "bzip2 zlib" BINCONFIG = "${bindir}/pcre2-config" -inherit autotools binconfig-disabled +inherit autotools binconfig-disabled github-releases EXTRA_OECONF = "\ --enable-newline-is-lf \ diff --git a/meta/recipes-support/libproxy/libproxy/determinism.patch b/meta/recipes-support/libproxy/libproxy/determinism.patch deleted file mode 100644 index 09770f68f0..0000000000 --- a/meta/recipes-support/libproxy/libproxy/determinism.patch +++ /dev/null @@ -1,26 +0,0 @@ -[PATCH] cmake/modules/config_sysconfig: Allow configuration of sysconfig module - -Checking whether the host system has /etc/sysconfig is not deterministic -when cross compiling. Allow this to be disabled by adding a configure -option for it. OpenEmbedded can set this and have deterministic build -output independent of the host OS. - -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Upstream-Status: Submitted [https://github.com/libproxy/libproxy/pull/160] - -Index: libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk -=================================================================== ---- libproxy-0.4.17.orig/libproxy/cmake/modules/config_sysconfig.cmk -+++ libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk -@@ -1,5 +1,8 @@ - if (NOT WIN32 AND NOT APPLE) -- if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig") -- set(SYSCONFIG_FOUND 1) -+ option(WITH_SYSCONFIG "Build sysconfig module for /etc/sysconfig" ON) -+ if(WITH_SYSCONFIG) -+ if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig") -+ set(SYSCONFIG_FOUND 1) -+ endif() - endif() - endif() -\ No newline at end of file diff --git a/meta/recipes-support/libproxy/libproxy_0.4.17.bb b/meta/recipes-support/libproxy/libproxy_0.4.17.bb deleted file mode 100644 index e121681ae8..0000000000 --- a/meta/recipes-support/libproxy/libproxy_0.4.17.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Library providing automatic proxy configuration management" -DESCRIPTION = "libproxy provides interfaces to get the proxy that will be \ -used to access network resources. It uses various plugins to get proxy \ -configuration via different mechanisms (e.g. environment variables or \ -desktop settings)." -HOMEPAGE = "https://github.com/libproxy/libproxy" -BUGTRACKER = "https://github.com/libproxy/libproxy/issues" -SECTION = "libs" -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" - -DEPENDS = "glib-2.0" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://determinism.patch" -SRC_URI[sha256sum] = "bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05" - -UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases" -UPSTREAM_CHECK_REGEX = "libproxy-(?P<pver>.*)\.tar" - -inherit cmake pkgconfig - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)} gnome3" -PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" -PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no" - -EXTRA_OECMAKE += " \ - -DWITH_KDE=no \ - -DWITH_MOZJS=no \ - -DWITH_NM=no \ - -DWITH_PERL=no \ - -DWITH_PYTHON2=no \ - -DWITH_PYTHON3=no \ - -DWITH_WEBKIT=no \ - -DWITH_SYSCONFIG=no \ - -DLIB_INSTALL_DIR=${libdir} \ - -DLIBEXEC_INSTALL_DIR=${libexecdir} \ -" -SECURITY_PIE_CFLAGS:remove = "-fPIE -pie" - -FILES:${PN} += "${libdir}/${BPN}/${PV}/modules" diff --git a/meta/recipes-support/libproxy/libproxy_0.5.4.bb b/meta/recipes-support/libproxy/libproxy_0.5.4.bb new file mode 100644 index 0000000000..b4f4c6d254 --- /dev/null +++ b/meta/recipes-support/libproxy/libproxy_0.5.4.bb @@ -0,0 +1,28 @@ +SUMMARY = "Library providing automatic proxy configuration management" +DESCRIPTION = "libproxy provides interfaces to get the proxy that will be \ +used to access network resources. It uses various plugins to get proxy \ +configuration via different mechanisms (e.g. environment variables or \ +desktop settings)." +HOMEPAGE = "https://github.com/libproxy/libproxy" +BUGTRACKER = "https://github.com/libproxy/libproxy/issues" +SECTION = "libs" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://src/libproxy/proxy.c;beginline=1;endline=20;md5=bb9a177ef1c995311070f34c5638a402 \ + " + +DEPENDS = "glib-2.0" + +SRC_URI = "git://github.com/libproxy/libproxy;protocol=https;branch=main" +SRCREV = "dff9a603d823dcc740ec966cd27960daa6b891b1" +S = "${WORKDIR}/git" + +inherit meson pkgconfig gobject-introspection vala gi-docgen +GIDOCGEN_MESON_OPTION = 'docs' + +PACKAGECONFIG ?= "" +PACKAGECONFIG[curl] = "-Dcurl=true,-Dcurl=false,curl" +PACKAGECONFIG[config-gnome] = "-Dconfig-gnome=true,-Dconfig-gnome=false,gsettings-desktop-schemas" +PACKAGECONFIG[pacrunner-duktape] = "-Dpacrunner-duktape=true,-Dpacrunner-duktape=false,duktape" + +FILES:${PN} += "${libdir}/${BPN}/${PV}/modules" diff --git a/meta/recipes-support/libpsl/libpsl_0.21.1.bb b/meta/recipes-support/libpsl/libpsl_0.21.5.bb index 4fc0ad8acb..b9341a986e 100644 --- a/meta/recipes-support/libpsl/libpsl_0.21.1.bb +++ b/meta/recipes-support/libpsl/libpsl_0.21.5.bb @@ -7,16 +7,17 @@ HOMEPAGE = "https://rockdaboot.github.io/libpsl/" BUGTRACKER = "https://github.com/rockdaboot/libpsl/issues" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5437030d9e4fbe7267ced058ddb8a7f5 \ - file://COPYING;md5=f41d10997a12da5ee3c24ceeb0148d18" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9f9e317096db2a598fc44237c5b8a4f7 \ + file://COPYING;md5=9f9e317096db2a598fc44237c5b8a4f7 \ + " -SRC_URI = "https://github.com/rockdaboot/${BPN}/releases/download/${PV}/${BP}.tar.gz \ +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c" +SRC_URI[sha256sum] = "1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208" -UPSTREAM_CHECK_URI = "https://github.com/rockdaboot/libpsl/releases" +GITHUB_BASE_URI = "https://github.com/rockdaboot/libpsl/releases" -inherit autotools gettext gtk-doc manpages pkgconfig lib_package +inherit autotools gettext gtk-doc manpages pkgconfig lib_package github-releases PACKAGECONFIG ?= "icu" PACKAGECONFIG[manpages] = "--enable-man,--disable-man,libxslt-native" diff --git a/meta/recipes-support/libseccomp/files/run-ptest b/meta/recipes-support/libseccomp/files/run-ptest index 54b4a63cd2..63c79f09c4 100644 --- a/meta/recipes-support/libseccomp/files/run-ptest +++ b/meta/recipes-support/libseccomp/files/run-ptest @@ -1,4 +1,7 @@ #!/bin/sh cd tests +sed -i 's/SUCCESS/PASS/g; s/FAILURE/FAIL/g; s/SKIPPED/SKIP/g' regression +sed -i 's/"Test %s result: %s\\n" "$1" "$2"/"%s: %s\\n" "$2" "$1"/g' regression +sed -i 's/"Test %s result: %s %s\\n" "$1" "$2" "$3"/"%s: %s %s\\n" "$2" "$1" "$3"/g' regression ./regression -a diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.4.bb b/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb index c76f3c3573..478e5f4289 100644 --- a/meta/recipes-support/libseccomp/libseccomp_2.5.4.bb +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb @@ -1,13 +1,13 @@ SUMMARY = "interface to seccomp filtering mechanism" -DESCRIPTION = "The libseccomp library provides and easy to use, platform independent,interface to the Linux Kernel's syscall filtering mechanism: seccomp." +DESCRIPTION = "The libseccomp library provides an easy to use, platform independent, interface to the Linux Kernel's syscall filtering mechanism: seccomp." HOMEPAGE = "https://github.com/seccomp/libseccomp" SECTION = "security" LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" DEPENDS += "gperf-native" -SRCREV = "f33f95014b36f97b42f0c2290e96d5c31647ed10" +SRCREV = "f0b04ab0b4fc0bc2cde6da1f407b4a487fe6d78f" SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5;protocol=https \ file://run-ptest \ @@ -17,10 +17,12 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig ptest features_check +inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} + REQUIRED_DISTRO_FEATURES = "seccomp" PACKAGECONFIG ??= "" -PACKAGECONFIG[python] = "--enable-python, --disable-python, python3" +PACKAGECONFIG[python] = "--enable-python, --disable-python, python3-cython-native" DISABLE_STATIC = "" @@ -37,6 +39,10 @@ do_install_ptest() { for file in $(find tests/*.tests -type f); do install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests done + for file in $(find tests/*.pfc -type f); do + install -m 644 ${S}/${file} ${D}/${PTEST_PATH}/tests + done + install -m 644 ${S}/tests/valgrind_test.supp ${D}/${PTEST_PATH}/tests for file in $(find tools/* -executable -type f); do install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools done @@ -44,11 +50,13 @@ do_install_ptest() { for file in $(find tools/.libs/* -executable -type f); do install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools done + # fix python shebang + sed -i -e 's@cmd /usr/bin/env python @cmd /usr/bin/env python3 @' ${D}/${PTEST_PATH}/tests/regression + sed -i -e 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@' ${D}/${PTEST_PATH}/tests/*.py } -FILES:${PN} = "${bindir} ${libdir}/${BPN}.so*" +FILES:${PN} = "${bindir} ${libdir}/${BPN}.so* ${PYTHON_SITEPACKAGES_DIR}/" FILES:${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" +RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3', '', d)}" RDEPENDS:${PN}-ptest = "coreutils bash" - -PV = "2.5.4" diff --git a/meta/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch b/meta/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch new file mode 100644 index 0000000000..d867e5bc17 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch @@ -0,0 +1,44 @@ +From ced3c5d8cad0177b297666343f1561799dfefb0d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 22 Nov 2023 18:49:10 -0800 +Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17 + +Fixes build errors about missing function prototypes with clang-17 + +Fixes +| ../libsoup-2.74.3/libsoup/soup-xmlrpc-old.c:512:8: error: call to undeclared function 'xmlParseMemory'; ISO C99 and later do not support implicit function declarations + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/385] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libsoup/soup-xmlrpc-old.c | 1 + + libsoup/soup-xmlrpc.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libsoup/soup-xmlrpc-old.c b/libsoup/soup-xmlrpc-old.c +index c57086b6..527e3b23 100644 +--- a/libsoup/soup-xmlrpc-old.c ++++ b/libsoup/soup-xmlrpc-old.c +@@ -11,6 +11,7 @@ + + #include <string.h> + ++#include <libxml/parser.h> + #include <libxml/tree.h> + + #include "soup-xmlrpc-old.h" +diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc.c +index 42dcda9c..e991cbf0 100644 +--- a/libsoup/soup-xmlrpc.c ++++ b/libsoup/soup-xmlrpc.c +@@ -17,6 +17,7 @@ + + #include <string.h> + #include <errno.h> ++#include <libxml/parser.h> + #include <libxml/tree.h> + #include "soup-xmlrpc.h" + #include "soup.h" +-- +2.43.0 + diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb index 6ff393c9a3..ee20530b64 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb @@ -11,8 +11,9 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[sha256sum] = "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159" +SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ + file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch" +SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13" CVE_PRODUCT = "libsoup" @@ -25,12 +26,24 @@ UPSTREAM_CHECK_REGEX = "libsoup-(?P<pver>2(\.(?!99)\d+)+)\.tar" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' -# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. PACKAGECONFIG ??= "" +PACKAGECONFIG[brotli] = "-Dbrotli=enabled,-Dbrotli=disabled,brotli" +# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false" PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" - -EXTRA_OEMESON:append = " -Dvapi=disabled -Dtls_check=false" +PACKAGECONFIG[ntlm] = "-Dntlm=enabled,-Dntlm=disabled" +PACKAGECONFIG[sysprof] = "-Dsysprof=enabled,-Dsysprof=disabled,sysprof" + +# Tell libsoup where the target ntlm_auth is installed +do_write_config:append:class-target() { + cat >${WORKDIR}/soup.cross <<EOF +[binaries] +ntlm_auth = '${bindir}/ntlm_auth' +EOF +} +EXTRA_OEMESON:append:class-target = " --cross-file ${WORKDIR}/soup.cross" + +EXTRA_OEMESON += "-Dvapi=disabled -Dtls_check=false" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta/recipes-support/libsoup/libsoup_3.0.6.bb b/meta/recipes-support/libsoup/libsoup_3.4.4.bb index 17825ae6a4..6f7cac4cf8 100644 --- a/meta/recipes-support/libsoup/libsoup_3.0.6.bb +++ b/meta/recipes-support/libsoup/libsoup_3.4.4.bb @@ -12,25 +12,40 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl nghttp2" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[sha256sum] = "b45d59f840b9acf9bb45fd45854e3ef672f57e3ab957401c3ad8d7502ac23da6" +SRC_URI[sha256sum] = "291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa" PROVIDES = "libsoup-3.0" CVE_PRODUCT = "libsoup" S = "${WORKDIR}/libsoup-${PV}" -inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc +inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gi-docgen vala GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' -# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. PACKAGECONFIG ??= "" +PACKAGECONFIG[brotli] = "-Dbrotli=enabled,-Dbrotli=disabled,brotli" PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" - -EXTRA_OEMESON:append = " -Dvapi=disabled -Dtls_check=false" - -GTKDOC_MESON_OPTION = "gtk_doc" +PACKAGECONFIG[ntlm] = "-Dntlm=enabled,-Dntlm=disabled" +PACKAGECONFIG[sysprof] = "-Dsysprof=enabled,-Dsysprof=disabled,sysprof" + +# Tell libsoup where the target ntlm_auth is installed +do_write_config:append:class-target() { + cat >${WORKDIR}/soup.cross <<EOF +[binaries] +ntlm_auth = '${bindir}/ntlm_auth' +EOF +} +EXTRA_OEMESON:append:class-target = " --cross-file ${WORKDIR}/soup.cross" + +EXTRA_OEMESON += "-Dtls_check=false" +# Disable the test suites +EXTRA_OEMESON += "-Dtests=false -Dautobahn=disabled -Dpkcs11_tests=disabled" + +GIDOCGEN_MESON_OPTION = 'docs' +GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' +GIDOCGEN_MESON_DISABLE_FLAG = 'disabled' # When built without gnome support, libsoup will contain only one shared lib # and will therefore become subject to renaming by debian.bbclass. Prevent diff --git a/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch b/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch deleted file mode 100644 index b1204e49eb..0000000000 --- a/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f6abce5ba41a412a247250dcd80e387e53474466 Mon Sep 17 00:00:00 2001 -From: Your Name <you@example.com> -Date: Mon, 28 Dec 2020 02:08:03 +0000 -Subject: [PATCH] Don't let host enviroment to decide if a test is build - -test ssh2.sh need sshd, for cross compile, we need it on target, so -don't use SSHD on host to decide weither to build a test - -Upstream-Status: Inappropriate[oe specific] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - ---- - tests/Makefile.am | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index dc0922f..6cbc35d 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,16 +1,12 @@ - AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src - LDADD = ../src/libssh2.la - --if SSHD - noinst_PROGRAMS = ssh2 - ssh2_SOURCES = ssh2.c --endif - - ctests = simple$(EXEEXT) - TESTS = $(ctests) mansyntax.sh --if SSHD - TESTS += ssh2.sh --endif - check_PROGRAMS = $(ctests) - - TESTS_ENVIRONMENT = SSHD=$(SSHD) EXEEXT=$(EXEEXT) -@@ -38,4 +34,4 @@ if OPENSSL - # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c - # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c - EXTRA_DIST += test_public_key_auth_succeeds_with_correct_rsa_openssh_key.c --endif -\ No newline at end of file -+endif diff --git a/meta/recipes-support/libssh2/libssh2/CVE-2023-48795.patch b/meta/recipes-support/libssh2/libssh2/CVE-2023-48795.patch new file mode 100644 index 0000000000..ab0f419ac5 --- /dev/null +++ b/meta/recipes-support/libssh2/libssh2/CVE-2023-48795.patch @@ -0,0 +1,466 @@ +From d4634630432594b139b3af6b9f254b890c0f275d Mon Sep 17 00:00:00 2001 +From: Michael Buckley <michael@buckleyisms.com> +Date: Thu, 30 Nov 2023 15:08:02 -0800 +Subject: [PATCH] src: add 'strict KEX' to fix CVE-2023-48795 "Terrapin Attack" + +Refs: +https://terrapin-attack.com/ +https://seclists.org/oss-sec/2023/q4/292 +https://osv.dev/list?ecosystem=&q=CVE-2023-48795 +https://github.com/advisories/GHSA-45x7-px36-x8w8 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-48795 + +Fixes #1290 +Closes #1291 + +CVE: CVE-2023-48795 +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + src/kex.c | 63 +++++++++++++++++++++++------------ + src/libssh2_priv.h | 18 +++++++--- + src/packet.c | 83 +++++++++++++++++++++++++++++++++++++++++++--- + src/packet.h | 2 +- + src/session.c | 3 ++ + src/transport.c | 12 ++++++- + 6 files changed, 149 insertions(+), 32 deletions(-) + +diff --git a/src/kex.c b/src/kex.c +index d4034a0a..b4b748ca 100644 +--- a/src/kex.c ++++ b/src/kex.c +@@ -3037,6 +3037,13 @@ kex_method_extension_negotiation = { + 0, + }; + ++static const LIBSSH2_KEX_METHOD ++kex_method_strict_client_extension = { ++ "kex-strict-c-v00@openssh.com", ++ NULL, ++ 0, ++}; ++ + static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { + #if LIBSSH2_ED25519 + &kex_method_ssh_curve25519_sha256, +@@ -3055,6 +3062,7 @@ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { + &kex_method_diffie_helman_group1_sha1, + &kex_method_diffie_helman_group_exchange_sha1, + &kex_method_extension_negotiation, ++ &kex_method_strict_client_extension, + NULL + }; + +@@ -3307,13 +3315,13 @@ static int kexinit(LIBSSH2_SESSION * session) + return 0; + } + +-/* kex_agree_instr ++/* _libssh2_kex_agree_instr + * Kex specific variant of strstr() + * Needle must be preceded by BOL or ',', and followed by ',' or EOL + */ +-static unsigned char * +-kex_agree_instr(unsigned char *haystack, size_t haystack_len, +- const unsigned char *needle, size_t needle_len) ++unsigned char * ++_libssh2_kex_agree_instr(unsigned char *haystack, size_t haystack_len, ++ const unsigned char *needle, size_t needle_len) + { + unsigned char *s; + unsigned char *end_haystack; +@@ -3398,7 +3406,7 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, + while(s && *s) { + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); +- if(kex_agree_instr(hostkey, hostkey_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(hostkey, hostkey_len, s, method_len)) { + const LIBSSH2_HOSTKEY_METHOD *method = + (const LIBSSH2_HOSTKEY_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3432,9 +3440,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, + } + + while(hostkeyp && (*hostkeyp) && (*hostkeyp)->name) { +- s = kex_agree_instr(hostkey, hostkey_len, +- (unsigned char *) (*hostkeyp)->name, +- strlen((*hostkeyp)->name)); ++ s = _libssh2_kex_agree_instr(hostkey, hostkey_len, ++ (unsigned char *) (*hostkeyp)->name, ++ strlen((*hostkeyp)->name)); + if(s) { + /* So far so good, but does it suit our purposes? (Encrypting vs + Signing) */ +@@ -3468,6 +3476,12 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + { + const LIBSSH2_KEX_METHOD **kexp = libssh2_kex_methods; + unsigned char *s; ++ const unsigned char *strict = ++ (unsigned char *)"kex-strict-s-v00@openssh.com"; ++ ++ if(_libssh2_kex_agree_instr(kex, kex_len, strict, 28)) { ++ session->kex_strict = 1; ++ } + + if(session->kex_prefs) { + s = (unsigned char *) session->kex_prefs; +@@ -3475,7 +3489,7 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + while(s && *s) { + unsigned char *q, *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); +- q = kex_agree_instr(kex, kex_len, s, method_len); ++ q = _libssh2_kex_agree_instr(kex, kex_len, s, method_len); + if(q) { + const LIBSSH2_KEX_METHOD *method = (const LIBSSH2_KEX_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3509,9 +3523,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + } + + while(*kexp && (*kexp)->name) { +- s = kex_agree_instr(kex, kex_len, +- (unsigned char *) (*kexp)->name, +- strlen((*kexp)->name)); ++ s = _libssh2_kex_agree_instr(kex, kex_len, ++ (unsigned char *) (*kexp)->name, ++ strlen((*kexp)->name)); + if(s) { + /* We've agreed on a key exchange method, + * Can we agree on a hostkey that works with this kex? +@@ -3555,7 +3569,7 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(crypt, crypt_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(crypt, crypt_len, s, method_len)) { + const LIBSSH2_CRYPT_METHOD *method = + (const LIBSSH2_CRYPT_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3577,9 +3591,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, + } + + while(*cryptp && (*cryptp)->name) { +- s = kex_agree_instr(crypt, crypt_len, +- (unsigned char *) (*cryptp)->name, +- strlen((*cryptp)->name)); ++ s = _libssh2_kex_agree_instr(crypt, crypt_len, ++ (unsigned char *) (*cryptp)->name, ++ strlen((*cryptp)->name)); + if(s) { + endpoint->crypt = *cryptp; + return 0; +@@ -3619,7 +3633,7 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(mac, mac_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(mac, mac_len, s, method_len)) { + const LIBSSH2_MAC_METHOD *method = (const LIBSSH2_MAC_METHOD *) + kex_get_method_by_name((char *) s, method_len, + (const LIBSSH2_COMMON_METHOD **) +@@ -3640,8 +3654,9 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, + } + + while(*macp && (*macp)->name) { +- s = kex_agree_instr(mac, mac_len, (unsigned char *) (*macp)->name, +- strlen((*macp)->name)); ++ s = _libssh2_kex_agree_instr(mac, mac_len, ++ (unsigned char *) (*macp)->name, ++ strlen((*macp)->name)); + if(s) { + endpoint->mac = *macp; + return 0; +@@ -3672,7 +3687,7 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(comp, comp_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(comp, comp_len, s, method_len)) { + const LIBSSH2_COMP_METHOD *method = + (const LIBSSH2_COMP_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3694,8 +3709,9 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, + } + + while(*compp && (*compp)->name) { +- s = kex_agree_instr(comp, comp_len, (unsigned char *) (*compp)->name, +- strlen((*compp)->name)); ++ s = _libssh2_kex_agree_instr(comp, comp_len, ++ (unsigned char *) (*compp)->name, ++ strlen((*compp)->name)); + if(s) { + endpoint->comp = *compp; + return 0; +@@ -3876,6 +3892,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->local.kexinit = key_state->oldlocal; + session->local.kexinit_len = key_state->oldlocal_len; + key_state->state = libssh2_NB_state_idle; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + return -1; +@@ -3901,6 +3918,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->local.kexinit = key_state->oldlocal; + session->local.kexinit_len = key_state->oldlocal_len; + key_state->state = libssh2_NB_state_idle; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + return -1; +@@ -3949,6 +3967,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->remote.kexinit = NULL; + } + ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + +diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h +index 82c3afe2..ee1d8b5c 100644 +--- a/src/libssh2_priv.h ++++ b/src/libssh2_priv.h +@@ -699,6 +699,9 @@ struct _LIBSSH2_SESSION + /* key signing algorithm preferences -- NULL yields server order */ + char *sign_algo_prefs; + ++ /* Whether to use the OpenSSH Strict KEX extension */ ++ int kex_strict; ++ + /* (remote as source of data -- packet_read ) */ + libssh2_endpoint_data remote; + +@@ -870,6 +873,7 @@ struct _LIBSSH2_SESSION + int fullpacket_macstate; + size_t fullpacket_payload_len; + int fullpacket_packet_type; ++ uint32_t fullpacket_required_type; + + /* State variables used in libssh2_sftp_init() */ + libssh2_nonblocking_states sftpInit_state; +@@ -910,10 +914,11 @@ struct _LIBSSH2_SESSION + }; + + /* session.state bits */ +-#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000001 +-#define LIBSSH2_STATE_NEWKEYS 0x00000002 +-#define LIBSSH2_STATE_AUTHENTICATED 0x00000004 +-#define LIBSSH2_STATE_KEX_ACTIVE 0x00000008 ++#define LIBSSH2_STATE_INITIAL_KEX 0x00000001 ++#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000002 ++#define LIBSSH2_STATE_NEWKEYS 0x00000004 ++#define LIBSSH2_STATE_AUTHENTICATED 0x00000008 ++#define LIBSSH2_STATE_KEX_ACTIVE 0x00000010 + + /* session.flag helpers */ + #ifdef MSG_NOSIGNAL +@@ -1144,6 +1149,11 @@ ssize_t _libssh2_send(libssh2_socket_t socket, const void *buffer, + int _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + key_exchange_state_t * state); + ++unsigned char *_libssh2_kex_agree_instr(unsigned char *haystack, ++ size_t haystack_len, ++ const unsigned char *needle, ++ size_t needle_len); ++ + /* Let crypt.c/hostkey.c expose their method structs */ + const LIBSSH2_CRYPT_METHOD **libssh2_crypt_methods(void); + const LIBSSH2_HOSTKEY_METHOD **libssh2_hostkey_methods(void); +diff --git a/src/packet.c b/src/packet.c +index b5b41981..35d4d39e 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -605,14 +605,13 @@ authagent_exit: + * layer when it has received a packet. + * + * The input pointer 'data' is pointing to allocated data that this function +- * is asked to deal with so on failure OR success, it must be freed fine. +- * The only exception is when the return code is LIBSSH2_ERROR_EAGAIN. ++ * will be freed unless return the code is LIBSSH2_ERROR_EAGAIN. + * + * This function will always be called with 'datalen' greater than zero. + */ + int + _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, +- size_t datalen, int macstate) ++ size_t datalen, int macstate, uint32_t seq) + { + int rc = 0; + unsigned char *message = NULL; +@@ -657,6 +656,70 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + break; + } + ++ if(session->state & LIBSSH2_STATE_INITIAL_KEX) { ++ if(msg == SSH_MSG_KEXINIT) { ++ if(!session->kex_strict) { ++ if(datalen < 17) { ++ LIBSSH2_FREE(session, data); ++ session->packAdd_state = libssh2_NB_state_idle; ++ return _libssh2_error(session, ++ LIBSSH2_ERROR_BUFFER_TOO_SMALL, ++ "Data too short extracting kex"); ++ } ++ else { ++ const unsigned char *strict = ++ (unsigned char *)"kex-strict-s-v00@openssh.com"; ++ struct string_buf buf; ++ unsigned char *algs = NULL; ++ size_t algs_len = 0; ++ ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr += 17; /* advance past type and cookie */ ++ ++ if(_libssh2_get_string(&buf, &algs, &algs_len)) { ++ LIBSSH2_FREE(session, data); ++ session->packAdd_state = libssh2_NB_state_idle; ++ return _libssh2_error(session, ++ LIBSSH2_ERROR_BUFFER_TOO_SMALL, ++ "Algs too short"); ++ } ++ ++ if(algs_len == 0 || ++ _libssh2_kex_agree_instr(algs, algs_len, strict, 28)) { ++ session->kex_strict = 1; ++ } ++ } ++ } ++ ++ if(session->kex_strict && seq) { ++ LIBSSH2_FREE(session, data); ++ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; ++ session->packAdd_state = libssh2_NB_state_idle; ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "KEXINIT was not the first packet"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "KEXINIT was not the first packet"); ++ } ++ } ++ ++ if(session->kex_strict && session->fullpacket_required_type && ++ session->fullpacket_required_type != msg) { ++ LIBSSH2_FREE(session, data); ++ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; ++ session->packAdd_state = libssh2_NB_state_idle; ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "unexpected packet type"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "unexpected packet type"); ++ } ++ } ++ + if(session->packAdd_state == libssh2_NB_state_allocated) { + /* A couple exceptions to the packet adding rule: */ + switch(msg) { +@@ -1341,6 +1404,15 @@ _libssh2_packet_ask(LIBSSH2_SESSION * session, unsigned char packet_type, + + return 0; + } ++ else if(session->kex_strict && ++ (session->state & LIBSSH2_STATE_INITIAL_KEX)) { ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "unexpected packet type"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "unexpected packet type"); ++ } + packet = _libssh2_list_next(&packet->node); + } + return -1; +@@ -1402,7 +1474,10 @@ _libssh2_packet_require(LIBSSH2_SESSION * session, unsigned char packet_type, + } + + while(session->socket_state == LIBSSH2_SOCKET_CONNECTED) { +- int ret = _libssh2_transport_read(session); ++ int ret; ++ session->fullpacket_required_type = packet_type; ++ ret = _libssh2_transport_read(session); ++ session->fullpacket_required_type = 0; + if(ret == LIBSSH2_ERROR_EAGAIN) + return ret; + else if(ret < 0) { +diff --git a/src/packet.h b/src/packet.h +index 79018bcf..6ea100a5 100644 +--- a/src/packet.h ++++ b/src/packet.h +@@ -71,6 +71,6 @@ int _libssh2_packet_burn(LIBSSH2_SESSION * session, + int _libssh2_packet_write(LIBSSH2_SESSION * session, unsigned char *data, + unsigned long data_len); + int _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, +- size_t datalen, int macstate); ++ size_t datalen, int macstate, uint32_t seq); + + #endif /* __LIBSSH2_PACKET_H */ +diff --git a/src/session.c b/src/session.c +index a4d602ba..f4bafb57 100644 +--- a/src/session.c ++++ b/src/session.c +@@ -464,6 +464,8 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)), + session->abstract = abstract; + session->api_timeout = 0; /* timeout-free API by default */ + session->api_block_mode = 1; /* blocking API by default */ ++ session->state = LIBSSH2_STATE_INITIAL_KEX; ++ session->fullpacket_required_type = 0; + session->packet_read_timeout = LIBSSH2_DEFAULT_READ_TIMEOUT; + session->flag.quote_paths = 1; /* default behavior is to quote paths + for the scp subsystem */ +@@ -1186,6 +1188,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, + const char *desc, const char *lang) + { + int rc; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + BLOCK_ADJUST(rc, session, + session_disconnect(session, reason, desc, lang)); +diff --git a/src/transport.c b/src/transport.c +index 6d902d33..3b30ff84 100644 +--- a/src/transport.c ++++ b/src/transport.c +@@ -187,6 +187,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + struct transportpacket *p = &session->packet; + int rc; + int compressed; ++ uint32_t seq = session->remote.seqno; + + if(session->fullpacket_state == libssh2_NB_state_idle) { + session->fullpacket_macstate = LIBSSH2_MAC_CONFIRMED; +@@ -318,7 +319,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + if(session->fullpacket_state == libssh2_NB_state_created) { + rc = _libssh2_packet_add(session, p->payload, + session->fullpacket_payload_len, +- session->fullpacket_macstate); ++ session->fullpacket_macstate, seq); + if(rc == LIBSSH2_ERROR_EAGAIN) + return rc; + if(rc) { +@@ -329,6 +330,11 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + + session->fullpacket_state = libssh2_NB_state_idle; + ++ if(session->kex_strict && ++ session->fullpacket_packet_type == SSH_MSG_NEWKEYS) { ++ session->remote.seqno = 0; ++ } ++ + return session->fullpacket_packet_type; + } + +@@ -1091,6 +1097,10 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session, + + session->local.seqno++; + ++ if(session->kex_strict && data[0] == SSH_MSG_NEWKEYS) { ++ session->local.seqno = 0; ++ } ++ + ret = LIBSSH2_SEND(session, p->outbuf, total_length, + LIBSSH2_SOCKET_SEND_FLAGS(session)); + if(ret < 0) +-- +2.34.1 + diff --git a/meta/recipes-support/libssh2/files/run-ptest b/meta/recipes-support/libssh2/libssh2/run-ptest index 9e2fce2d24..0f5526e316 100644 --- a/meta/recipes-support/libssh2/files/run-ptest +++ b/meta/recipes-support/libssh2/libssh2/run-ptest @@ -2,8 +2,7 @@ ptestdir=$(dirname "$(readlink -f "$0")") cd tests -# omit ssh2.sh until https://github.com/libssh2/libssh2/issues/630 is fixed -for test in simple mansyntax.sh +for test in mansyntax.sh test_simple test_sshd.test do ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test done diff --git a/meta/recipes-support/libssh2/libssh2_1.10.0.bb b/meta/recipes-support/libssh2/libssh2_1.11.0.bb index 072d6819c0..5100e6f7f9 100644 --- a/meta/recipes-support/libssh2/libssh2_1.10.0.bb +++ b/meta/recipes-support/libssh2/libssh2_1.11.0.bb @@ -5,22 +5,23 @@ SECTION = "libs" DEPENDS = "zlib" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=3e089ad0cf27edf1e7f261dfcd06acc7" +LIC_FILES_CHKSUM = "file://COPYING;md5=24a33237426720395ebb1dd1349ca225" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ file://run-ptest \ + file://CVE-2023-48795.patch \ " -SRC_URI:append:ptest = " file://0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch" - -SRC_URI[sha256sum] = "2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51" +SRC_URI[sha256sum] = "3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461" inherit autotools pkgconfig ptest EXTRA_OECONF += "\ --with-libz \ --with-libz-prefix=${STAGING_LIBDIR} \ + --disable-rpath \ " +DISABLE_STATIC = "" # only one of openssl and gcrypt could be set PACKAGECONFIG ??= "openssl" @@ -30,7 +31,7 @@ PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGI BBCLASSEXTEND = "native nativesdk" # required for ptest on documentation -RDEPENDS:${PN}-ptest = "man-db openssh util-linux-col" +RDEPENDS:${PN}-ptest = "bash man-db openssh util-linux-col" RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us" do_compile_ptest() { @@ -42,9 +43,11 @@ do_install_ptest() { install -d ${D}${PTEST_PATH}/tests install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ cp -rf ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests/ + cp -rf ${B}/tests/test_simple ${D}${PTEST_PATH}/tests/ cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/tests/ssh2.sh ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/tests/etc ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/key* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/openssh_server/ ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/*.test ${D}${PTEST_PATH}/tests/ mkdir -p ${D}${PTEST_PATH}/docs cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/ } diff --git a/meta/recipes-support/libunistring/libunistring_1.0.bb b/meta/recipes-support/libunistring/libunistring_1.2.bb index b6f5100ae8..3018dbfdfb 100644 --- a/meta/recipes-support/libunistring/libunistring_1.0.bb +++ b/meta/recipes-support/libunistring/libunistring_1.2.bb @@ -16,12 +16,12 @@ SECTION = "devel" LICENSE = "LGPL-3.0-or-later | GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://README;beginline=45;endline=65;md5=3a896a943b4da2c551e6be1af27eff8d \ - file://doc/libunistring.texi;md5=266e4297d7c18f197be3d9622ba99685 \ - " + file://doc/libunistring.texi;md5=36b7d20daef7fbcc032333ae2429aa94 \ + " DEPENDS = "gperf-native" SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz" -SRC_URI[sha256sum] = "3c0184c0e492d7c208ce31d25dd1d2c58f0c3ed6cbbe032c5b248cddad318544" +SRC_URI[sha256sum] = "fd6d5662fa706487c48349a758b57bc149ce94ec6c30624ec9fdc473ceabbc8e" inherit autotools texinfo BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc deleted file mode 100644 index bf74f9fa3c..0000000000 --- a/meta/recipes-support/libunwind/libunwind.inc +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Library for obtaining the call-chain of a program" -DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" -HOMEPAGE = "http://www.nongnu.org/libunwind" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f" -DEPENDS += "libatomic-ops" -DEPENDS:append:libc-musl = " libucontext" - -inherit autotools multilib_header - -PACKAGECONFIG ??= "" -PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" -PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, latex2man-native" - -EXTRA_OECONF:arm = "--enable-debug-frame" -EXTRA_OECONF:armeb = "--enable-debug-frame" -EXTRA_OECONF:aarch64 = "--enable-debug-frame" - -do_install:append () { - oe_multilib_header libunwind.h -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/libunwind/libunwind/0001-src-Gtrace-remove-unguarded-print-calls.patch b/meta/recipes-support/libunwind/libunwind/0001-src-Gtrace-remove-unguarded-print-calls.patch new file mode 100644 index 0000000000..5840c2b4f6 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind/0001-src-Gtrace-remove-unguarded-print-calls.patch @@ -0,0 +1,52 @@ +From 9b27fa9bcd5cadd4c841c42710f41a090377e531 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Fri, 24 Mar 2023 16:18:44 +0000 +Subject: [PATCH] src/Gtrace: remove unguarded print() calls + +There is a use of printf() without #include stdio.h in src/arm/Gtrace.c, +which results in a compiler error if clang 16 is used: + +src/arm/Gtrace.c:529:7: error: call to undeclared library function +'printf' with type 'int (const char *, ...)'; ISO C99 and later do not +support implicit function declarations [-Wimplicit-function-declaration] + +Replace the printf("XXX") with a Dprintf, so it doesn't pull stdio in +unless in a debug build, and reword the message to be clearer. + +Also there is another printf("XXX") inside a FreeBSD-specific block in +the UNW_ARM_FRAME_SIGRETURN case, replace this with a #error as the code +needs to be implemented. + +Fixes #482. + +Upstream-Status: Backport [9b27fa9bcd5cadd4c841c42710f41a090377e531] +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + src/arm/Gtrace.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/arm/Gtrace.c b/src/arm/Gtrace.c +index 51fc281d..9e0f25af 100644 +--- a/src/arm/Gtrace.c ++++ b/src/arm/Gtrace.c +@@ -514,7 +514,7 @@ tdep_trace (unw_cursor_t *cursor, void **buffer, int *size) + if (likely(ret >= 0)) + ACCESS_MEM_FAST(ret, c->validate, d, cfa + LINUX_SC_LR_OFF, lr); + #elif defined(__FreeBSD__) +- printf("XXX\n"); ++ #error implement UNW_ARM_FRAME_SIGRETURN on FreeBSD + #endif + + /* Resume stack at signal restoration point. The stack is not +@@ -526,7 +526,7 @@ tdep_trace (unw_cursor_t *cursor, void **buffer, int *size) + break; + + case UNW_ARM_FRAME_SYSCALL: +- printf("XXX1\n"); ++ Dprintf ("%s: implement me\n", __FUNCTION__); + break; + + default: +-- +2.34.1 + diff --git a/meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch b/meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch deleted file mode 100644 index f02f13f79c..0000000000 --- a/meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0b2243f19d4ea12a2a68478a5aed503947a800af Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 22 Mar 2016 16:19:29 +0000 -Subject: [PATCH] x86: Stub out x86_local_resume() - -its purpose seems -to be unwinding across signal handler boundaries, which cannot happen -in correct programs anyway. Replacing the whole function with -something like *(volatile char *)0=0; (i.e. crash), gets a working -libunwind - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - src/x86/Gos-linux.c | 26 +------------------------- - 1 file changed, 1 insertion(+), 25 deletions(-) - -diff --git a/src/x86/Gos-linux.c b/src/x86/Gos-linux.c -index d448dce..c25ae0c 100644 ---- a/src/x86/Gos-linux.c -+++ b/src/x86/Gos-linux.c -@@ -284,31 +284,7 @@ x86_r_uc_addr (ucontext_t *uc, int reg) - HIDDEN int - x86_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg) - { -- struct cursor *c = (struct cursor *) cursor; -- ucontext_t *uc = c->uc; -- -- /* Ensure c->pi is up-to-date. On x86, it's relatively common to be -- missing DWARF unwind info. We don't want to fail in that case, -- because the frame-chain still would let us do a backtrace at -- least. */ -- dwarf_make_proc_info (&c->dwarf); -- -- if (unlikely (c->sigcontext_format != X86_SCF_NONE)) -- { -- struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr; -- -- Debug (8, "resuming at ip=%x via sigreturn(%p)\n", c->dwarf.ip, sc); --#if !defined(__ANDROID__) -- x86_sigreturn (sc); --#endif -- } -- else -- { -- Debug (8, "resuming at ip=%x via setcontext()\n", c->dwarf.ip); --#if !defined(__ANDROID__) -- setcontext (uc); --#endif -- } -+ *(volatile char *)0=0; - return -UNW_EINVAL; - } - diff --git a/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch b/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch deleted file mode 100644 index 124d0e00b1..0000000000 --- a/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 6bdab5cc8f1e2ec5f84fc9f59f1699a726980709 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 23 Mar 2016 06:08:59 +0000 -Subject: [PATCH 4/6] Fix build on mips/musl - -Do not include endian.h on musl it includes -further headers which can not be compiled in __ASSEMBLER__ - mode - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - src/coredump/_UCD_internal.h | 35 +++++++++++++++++++++++++++++++++++ - src/mips/getcontext.S | 3 +-- - 2 files changed, 36 insertions(+), 2 deletions(-) - -diff --git a/src/coredump/_UCD_internal.h b/src/coredump/_UCD_internal.h -index 3c95a2a..21ed1c3 100644 ---- a/src/coredump/_UCD_internal.h -+++ b/src/coredump/_UCD_internal.h -@@ -44,6 +44,41 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - #include "libunwind_i.h" - -+#ifndef __GLIBC__ -+#include <sys/reg.h> -+ -+#define EF_REG0 6 -+#define EF_REG1 7 -+#define EF_REG2 8 -+#define EF_REG3 9 -+#define EF_REG4 10 -+#define EF_REG5 11 -+#define EF_REG6 12 -+#define EF_REG7 13 -+#define EF_REG8 14 -+#define EF_REG9 15 -+#define EF_REG10 16 -+#define EF_REG11 17 -+#define EF_REG12 18 -+#define EF_REG13 19 -+#define EF_REG14 20 -+#define EF_REG15 21 -+#define EF_REG16 22 -+#define EF_REG17 23 -+#define EF_REG18 24 -+#define EF_REG19 25 -+#define EF_REG20 26 -+#define EF_REG21 27 -+#define EF_REG22 28 -+#define EF_REG23 29 -+#define EF_REG24 30 -+#define EF_REG25 31 -+#define EF_REG28 34 -+#define EF_REG29 35 -+#define EF_REG30 36 -+#define EF_REG31 37 -+#endif -+ - - #if SIZEOF_OFF_T == 4 - typedef uint32_t uoff_t; -diff --git a/src/mips/getcontext.S b/src/mips/getcontext.S -index d1dbd57..de9b681 100644 ---- a/src/mips/getcontext.S -+++ b/src/mips/getcontext.S -@@ -24,12 +24,11 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - - #include "offsets.h" --#include <endian.h> - - .text - - #if _MIPS_SIM == _ABIO32 --# if __BYTE_ORDER == __BIG_ENDIAN -+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - # define OFFSET 4 - # else - # define OFFSET 0 --- -2.20.1 - diff --git a/meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch b/meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch deleted file mode 100644 index 9941612387..0000000000 --- a/meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f2eae0af620925b3686410470fc6fbc66ec1dc52 Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Tue, 13 Dec 2016 09:50:34 -0700 -Subject: [PATCH] Fix for X32 - -Apply patch to fix the X32 build from https://github.com/sjnewbury/x32. - -Upstream-Status: Pending -Signed-off-by: Christopher Larson <chris_larson@mentor.com> - ---- - src/x86_64/Gos-linux.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/x86_64/Gos-linux.c b/src/x86_64/Gos-linux.c -index b489329..0550005 100644 ---- a/src/x86_64/Gos-linux.c -+++ b/src/x86_64/Gos-linux.c -@@ -146,8 +146,8 @@ x86_64_sigreturn (unw_cursor_t *cursor) - - Debug (8, "resuming at ip=%llx via sigreturn(%p)\n", - (unsigned long long) c->dwarf.ip, sc); -- __asm__ __volatile__ ("mov %0, %%rsp;" -- "mov %1, %%rax;" -+ __asm__ __volatile__ ("mov %q0, %%rsp;" -+ "mov %q1, %%rax;" - "syscall" - :: "r"((uint64_t)sc), "i"(SYS_rt_sigreturn) - : "memory"); diff --git a/meta/recipes-support/libunwind/libunwind/mips-byte-order.patch b/meta/recipes-support/libunwind/libunwind/mips-byte-order.patch new file mode 100644 index 0000000000..8848780fd1 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind/mips-byte-order.patch @@ -0,0 +1,35 @@ +From dbbf8110ed3fd2cbac20a8ec2ac769e13c67bab1 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 16 Jan 2024 18:22:38 +0000 +Subject: [PATCH 2/2] byte order + +endian.h on musl/mips can't be included in __ASSEMBLER__ mode, +so use the __BYTE_ORDER__ symbol instead. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + src/mips/getcontext.S | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/mips/getcontext.S b/src/mips/getcontext.S +index d1dbd579..de9b6818 100644 +--- a/src/mips/getcontext.S ++++ b/src/mips/getcontext.S +@@ -24,12 +24,11 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + #include "offsets.h" +-#include <endian.h> + + .text + + #if _MIPS_SIM == _ABIO32 +-# if __BYTE_ORDER == __BIG_ENDIAN ++# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + # define OFFSET 4 + # else + # define OFFSET 0 +-- +2.34.1 + diff --git a/meta/recipes-support/libunwind/libunwind/mips-coredump-register.patch b/meta/recipes-support/libunwind/libunwind/mips-coredump-register.patch new file mode 100644 index 0000000000..68adcd1d71 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind/mips-coredump-register.patch @@ -0,0 +1,100 @@ +From 7750e2a29b084ee033acc82abab410035e220d3f Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 16 Jan 2024 18:21:26 +0000 +Subject: [PATCH 1/2] coredump-mips-register + +glibc and musl have different names for the registers, add a +macro that generates the names appropriately. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +--- + src/coredump/_UCD_access_reg_linux.c | 69 ++++++++++++++++------------ + 1 file changed, 39 insertions(+), 30 deletions(-) + +diff --git a/src/coredump/_UCD_access_reg_linux.c b/src/coredump/_UCD_access_reg_linux.c +index 27eef123..beefdb47 100644 +--- a/src/coredump/_UCD_access_reg_linux.c ++++ b/src/coredump/_UCD_access_reg_linux.c +@@ -67,38 +67,47 @@ _UCD_access_reg (unw_addr_space_t as, + goto badreg; + #else + #if defined(UNW_TARGET_MIPS) ++ ++/* glibc and musl use different names */ ++#ifdef __GLIBC__ ++#define EF_REG(x) EF_REG ## x ++#else ++#include <sys/reg.h> ++#define EF_REG(x) EF_R ## x ++#endif ++ + static const uint8_t remap_regs[] = + { +- [UNW_MIPS_R0] = EF_REG0, +- [UNW_MIPS_R1] = EF_REG1, +- [UNW_MIPS_R2] = EF_REG2, +- [UNW_MIPS_R3] = EF_REG3, +- [UNW_MIPS_R4] = EF_REG4, +- [UNW_MIPS_R5] = EF_REG5, +- [UNW_MIPS_R6] = EF_REG6, +- [UNW_MIPS_R7] = EF_REG7, +- [UNW_MIPS_R8] = EF_REG8, +- [UNW_MIPS_R9] = EF_REG9, +- [UNW_MIPS_R10] = EF_REG10, +- [UNW_MIPS_R11] = EF_REG11, +- [UNW_MIPS_R12] = EF_REG12, +- [UNW_MIPS_R13] = EF_REG13, +- [UNW_MIPS_R14] = EF_REG14, +- [UNW_MIPS_R15] = EF_REG15, +- [UNW_MIPS_R16] = EF_REG16, +- [UNW_MIPS_R17] = EF_REG17, +- [UNW_MIPS_R18] = EF_REG18, +- [UNW_MIPS_R19] = EF_REG19, +- [UNW_MIPS_R20] = EF_REG20, +- [UNW_MIPS_R21] = EF_REG21, +- [UNW_MIPS_R22] = EF_REG22, +- [UNW_MIPS_R23] = EF_REG23, +- [UNW_MIPS_R24] = EF_REG24, +- [UNW_MIPS_R25] = EF_REG25, +- [UNW_MIPS_R28] = EF_REG28, +- [UNW_MIPS_R29] = EF_REG29, +- [UNW_MIPS_R30] = EF_REG30, +- [UNW_MIPS_R31] = EF_REG31, ++ [UNW_MIPS_R0] = EF_REG(0), ++ [UNW_MIPS_R1] = EF_REG(1), ++ [UNW_MIPS_R2] = EF_REG(2), ++ [UNW_MIPS_R3] = EF_REG(3), ++ [UNW_MIPS_R4] = EF_REG(4), ++ [UNW_MIPS_R5] = EF_REG(5), ++ [UNW_MIPS_R6] = EF_REG(6), ++ [UNW_MIPS_R7] = EF_REG(7), ++ [UNW_MIPS_R8] = EF_REG(8), ++ [UNW_MIPS_R9] = EF_REG(9), ++ [UNW_MIPS_R10] = EF_REG(10), ++ [UNW_MIPS_R11] = EF_REG(11), ++ [UNW_MIPS_R12] = EF_REG(12), ++ [UNW_MIPS_R13] = EF_REG(13), ++ [UNW_MIPS_R14] = EF_REG(14), ++ [UNW_MIPS_R15] = EF_REG(15), ++ [UNW_MIPS_R16] = EF_REG(16), ++ [UNW_MIPS_R17] = EF_REG(17), ++ [UNW_MIPS_R18] = EF_REG(18), ++ [UNW_MIPS_R19] = EF_REG(19), ++ [UNW_MIPS_R20] = EF_REG(20), ++ [UNW_MIPS_R21] = EF_REG(21), ++ [UNW_MIPS_R22] = EF_REG(22), ++ [UNW_MIPS_R23] = EF_REG(23), ++ [UNW_MIPS_R24] = EF_REG(24), ++ [UNW_MIPS_R25] = EF_REG(25), ++ [UNW_MIPS_R28] = EF_REG(28), ++ [UNW_MIPS_R29] = EF_REG(29), ++ [UNW_MIPS_R30] = EF_REG(30), ++ [UNW_MIPS_R31] = EF_REG(31), + [UNW_MIPS_PC] = EF_CP0_EPC, + }; + #elif defined(UNW_TARGET_X86) +-- +2.34.1 + diff --git a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch b/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch deleted file mode 100644 index 49985b5b3c..0000000000 --- a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e1de5a5b42062dc02769f320c7785928b2ee0c57 Mon Sep 17 00:00:00 2001 -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Thu, 18 Aug 2016 14:46:32 +0100 -Subject: [PATCH] If you: - -TCLIBC=musl bitbake unwind -TCLIBC=musl bitbake gcc-runtime -c cleansstate -TCLIBC=musl bitbake gcc-runtime - -you will see libstdc++ fail to build due to finding libunwind's header file. - -Khem: "When we build any of gcc components they expect to use internal version -and that works with glibc based gcc since the search headers first look into gcc -headers, however with musl the gcc headers are searched after the standard -headers ( which is by design the right thing )." - -This patch hacks around the issue by looking for a define used during gcc-runtime's -build and skipping to the internal header in that case. - -[YOCTO #10129] - -RP 2016/8/18 - -Upstream-Status: Inappropriate [really need to fix gcc] - ---- - include/unwind.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/unwind.h b/include/unwind.h -index 93780fa..c812414 100644 ---- a/include/unwind.h -+++ b/include/unwind.h -@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - -+#ifdef _GLIBCXX_SHARED -+#include_next <unwind.h> -+#endif -+ - #ifndef _UNWIND_H - #define _UNWIND_H - diff --git a/meta/recipes-support/libunwind/libunwind_1.6.2.bb b/meta/recipes-support/libunwind/libunwind_1.6.2.bb index 716be9a452..3208785124 100644 --- a/meta/recipes-support/libunwind/libunwind_1.6.2.bb +++ b/meta/recipes-support/libunwind/libunwind_1.6.2.bb @@ -1,24 +1,42 @@ -require libunwind.inc +SUMMARY = "Library for obtaining the call-chain of a program" +DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" +HOMEPAGE = "http://www.nongnu.org/libunwind" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f" +DEPENDS += "libatomic-ops" +DEPENDS:append:libc-musl = " libucontext" SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ - file://0003-x86-Stub-out-x86_local_resume.patch \ - file://0004-Fix-build-on-mips-musl.patch \ + file://mips-byte-order.patch \ + file://mips-coredump-register.patch \ file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ - file://0006-Fix-for-X32.patch \ + file://0001-src-Gtrace-remove-unguarded-print-calls.patch \ " -SRC_URI:append:libc-musl = " file://musl-header-conflict.patch" SRC_URI[sha256sum] = "4a6aec666991fb45d0889c44aede8ad6eb108071c3554fcdff671f9c94794976" -EXTRA_OECONF:append:libc-musl = " --disable-documentation --disable-tests --enable-static" +inherit autotools multilib_header + +COMPATIBLE_HOST:riscv32 = "null" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" +PACKAGECONFIG[zlib] = "--enable-zlibdebuginfo,--disable-zlibdebuginfo,zlib" +PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, latex2man-native" + +EXTRA_OECONF = "--enable-static" # http://errors.yoctoproject.org/Errors/Details/20487/ ARM_INSTRUCTION_SET:armv4 = "arm" ARM_INSTRUCTION_SET:armv5 = "arm" -COMPATIBLE_HOST:riscv32 = "null" - LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" SECURITY_LDFLAGS:append:libc-musl = " -lssp_nonshared" CACHED_CONFIGUREVARS:append:libc-musl = " LDFLAGS='${LDFLAGS} -lucontext'" + +do_install:append () { + oe_multilib_header libunwind.h +} + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/liburcu/liburcu_0.13.1.bb b/meta/recipes-support/liburcu/liburcu_0.14.0.bb index 66763349d2..f03c990632 100644 --- a/meta/recipes-support/liburcu/liburcu_0.13.1.bb +++ b/meta/recipes-support/liburcu/liburcu_0.14.0.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \ SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2" -SRC_URI[sha256sum] = "3213f33d2b8f710eb920eb1abb279ec04bf8ae6361f44f2513c28c20d3363083" +SRC_URI[sha256sum] = "ca43bf261d4d392cff20dfae440836603bf009fce24fdc9b2697d837a2239d4f" S = "${WORKDIR}/userspace-rcu-${PV}" inherit autotools multilib_header diff --git a/meta/recipes-support/libusb/libusb1_1.0.26.bb b/meta/recipes-support/libusb/libusb1_1.0.27.bb index fd63e7adc2..f2431d75c8 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.26.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.27.bb @@ -10,17 +10,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" BBCLASSEXTEND = "native nativesdk" -SRC_URI = "https://github.com/libusb/libusb/releases/download/v${PV}/libusb-${PV}.tar.bz2 \ +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libusb-${PV}.tar.bz2 \ file://run-ptest \ - " + " -UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb/releases" +GITHUB_BASE_URI = "https://github.com/libusb/libusb/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" -SRC_URI[sha256sum] = "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5" +SRC_URI[sha256sum] = "ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575" S = "${WORKDIR}/libusb-${PV}" -inherit autotools pkgconfig ptest +inherit autotools pkgconfig ptest github-releases PACKAGECONFIG:class-target ??= "udev" PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" @@ -34,12 +35,12 @@ do_install:append() { fi } -do_compile_ptest() { - oe_runmake -C tests stress -} - -do_install_ptest() { - install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} +do_compile_ptest() { + oe_runmake -C tests stress +} + +do_install_ptest() { + install -m 755 ${B}/tests/stress ${D}${PTEST_PATH} } FILES:${PN} += "${base_libdir}/*.so.*" diff --git a/meta/recipes-support/libxslt/libxslt_1.1.35.bb b/meta/recipes-support/libxslt/libxslt_1.1.39.bb index 51cfb2e281..2cc0c84bec 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.35.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.39.bb @@ -15,10 +15,12 @@ DEPENDS = "libxml2" SRC_URI = "https://download.gnome.org/sources/libxslt/1.1/libxslt-${PV}.tar.xz" -SRC_URI[sha256sum] = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79" +SRC_URI[sha256sum] = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0" UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar" +CVE_STATUS[CVE-2022-29824] = "not-applicable-config: Static linking to libxml2 is not enabled." + S = "${WORKDIR}/libxslt-${PV}" BINCONFIG = "${bindir}/xslt-config" @@ -35,7 +37,7 @@ do_configure:prepend () { touch ${S}/doc/xsltproc.1 } -EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto --with-html-subdir=${BPN}" +EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" # older versions of this recipe had ${PN}-utils RPROVIDES:${PN}-bin += "${PN}-utils" RCONFLICTS:${PN}-bin += "${PN}-utils" diff --git a/meta/recipes-support/lz4/files/CVE-2021-3520.patch b/meta/recipes-support/lz4/files/CVE-2021-3520.patch deleted file mode 100644 index 5ac8f6691f..0000000000 --- a/meta/recipes-support/lz4/files/CVE-2021-3520.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001 -From: Jasper Lievisse Adriaanse <j@jasper.la> -Date: Fri, 26 Feb 2021 15:21:20 +0100 -Subject: [PATCH] Fix potential memory corruption with negative memmove() size - -Upstream-Status: Backport -https://github.com/lz4/lz4/commit/8301a21773ef61656225e264f4f06ae14462bca7#diff-7055e9cf14c488aea9837aaf9f528b58ee3c22988d7d0d81d172ec62d94a88a7 -CVE: CVE-2021-3520 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - lib/lz4.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: git/lib/lz4.c -=================================================================== ---- git.orig/lib/lz4.c -+++ git/lib/lz4.c -@@ -1665,7 +1665,7 @@ LZ4_decompress_generic( - const size_t dictSize /* note : = 0 if noDict */ - ) - { -- if (src == NULL) { return -1; } -+ if ((src == NULL) || (outputSize < 0)) { return -1; } - - { const BYTE* ip = (const BYTE*) src; - const BYTE* const iend = ip + srcSize; diff --git a/meta/recipes-support/lz4/files/run-ptest b/meta/recipes-support/lz4/files/run-ptest new file mode 100644 index 0000000000..f4a46a4f2c --- /dev/null +++ b/meta/recipes-support/lz4/files/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +# Define test work dir +WORKDIR=@PTEST_PATH@/tests/ + +# Run test +cd ${WORKDIR} + +case_name="test_frame" +./frametest +ret=$? +if [[ ${ret} == "0" ]]; then + echo "PASS: lz4/$case_name" +else + echo "FAIL: lz4/$case_name" +fi + diff --git a/meta/recipes-support/lz4/lz4_1.9.3.bb b/meta/recipes-support/lz4/lz4_1.9.4.bb index 129a86b681..51a854d44a 100644 --- a/meta/recipes-support/lz4/lz4_1.9.3.bb +++ b/meta/recipes-support/lz4/lz4_1.9.4.bb @@ -3,24 +3,25 @@ DESCRIPTION = "LZ4 is a very fast lossless compression algorithm, providing comp HOMEPAGE = "https://github.com/lz4/lz4" LICENSE = "BSD-2-Clause | GPL-2.0-only" -LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \ +LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=5cd5f851b52ec832b10eedb3f01f885a \ file://programs/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE;md5=d57c0d21cb917fb4e0af2454aa48b956 \ + file://LICENSE;md5=c5cc3cd6f9274b4d32988096df9c3ec3 \ " PE = "1" -SRCREV = "d44371841a2f1728a3f36839fd4b7e872d0927d3" +SRCREV = "5ff839680134437dbf4678f3d0c7b371d84f4964" SRC_URI = "git://github.com/lz4/lz4.git;branch=release;protocol=https \ - file://CVE-2021-3520.patch \ - " + file://run-ptest \ + " UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" S = "${WORKDIR}/git" -# Fixed in r118, which is larger than the current version. -CVE_CHECK_IGNORE += "CVE-2014-4715" +inherit ptest + +CVE_STATUS[CVE-2014-4715] = "fixed-version: Fixed in r118, which is larger than the current version." EXTRA_OEMAKE = "PREFIX=${prefix} CC='${CC}' CFLAGS='${CFLAGS}' DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir} BUILD_STATIC=no" @@ -29,3 +30,17 @@ do_install() { } BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN}-ptest += "bash" + +do_compile_ptest() { + oe_runmake -C ${B}/tests/ +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests/ + install --mode=755 ${B}/tests/frametest ${D}${PTEST_PATH}/tests/ + sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/run-ptest + +} + diff --git a/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch b/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch index db3a70e803..a0d2502d24 100644 --- a/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch +++ b/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch @@ -10,7 +10,15 @@ Change suggested by Julian Taylor. Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757037 -Upstream-Status: Pending +RP: Patch is still in debian as of 20220524 in a revised form: +https://sources.debian.org/patches/lzo2/2.10-2/ +https://sources.debian.org/patches/lzo2/2.10-2/0001-Conditionally-replace-reinvention-of-memcpy-with-cal.patch/ +It was submitted in 2015, no reply to an email from RP in 2022 either. + +We likely need this in OE to prevent against unaligned accesses +on systems such as armv5. + +Upstream-Status: Inactive-Upstream Signed-off-by: Saul Wold <sgw@linux.intel.com> --- minilzo/minilzo.c | 14 ++++++++++++++ diff --git a/meta/recipes-support/mpfr/mpfr_4.1.0.bb b/meta/recipes-support/mpfr/mpfr_4.2.1.bb index 2121dad57c..a2067e1036 100644 --- a/meta/recipes-support/mpfr/mpfr_4.1.0.bb +++ b/meta/recipes-support/mpfr/mpfr_4.2.1.bb @@ -9,10 +9,10 @@ inherit autotools texinfo LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ " -DEPENDS = "gmp autoconf-archive" +DEPENDS = "gmp autoconf-archive-native" SRC_URI = "https://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz" -SRC_URI[sha256sum] = "0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f" +SRC_URI[sha256sum] = "277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2" UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/" diff --git a/meta/recipes-support/nettle/nettle/dlopen-test.patch b/meta/recipes-support/nettle/nettle/dlopen-test.patch deleted file mode 100644 index ab9b91f88b..0000000000 --- a/meta/recipes-support/nettle/nettle/dlopen-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -Remove the relative path for libnettle.so so the test -program can find it. -Relative paths are not suitable, as the folder strucure for ptest -is different from the one expected by the nettle testsuite. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - testsuite/dlopen-test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testsuite/dlopen-test.c b/testsuite/dlopen-test.c -index 4265bf7..1a25d17 100644 ---- a/testsuite/dlopen-test.c -+++ b/testsuite/dlopen-test.c -@@ -15,7 +15,7 @@ int - main (int argc UNUSED, char **argv UNUSED) - { - #if HAVE_LIBDL -- void *handle = dlopen ("../libnettle." SO_EXT, RTLD_NOW); -+ void *handle = dlopen ("libnettle.so", RTLD_NOW); - int (*get_version)(void); - if (!handle) - { --- -2.17.1 - diff --git a/meta/recipes-support/nettle/nettle/run-ptest b/meta/recipes-support/nettle/nettle/run-ptest index b90bed66d2..61a43c78f1 100644 --- a/meta/recipes-support/nettle/nettle/run-ptest +++ b/meta/recipes-support/nettle/nettle/run-ptest @@ -6,31 +6,35 @@ failed=0 all=0 for f in *-test; do - if [ "$f" = "sha1-huge-test" ] ; then - echo "SKIP: $f (skipped for ludicrous run time)" - continue - fi - - "./$f" - case "$?" in - 0) - echo "PASS: $f" - all=$((all + 1)) + case "$f" in + "sha1-huge-test") + echo "SKIP: $f (long run time)" ;; - 77) - echo "SKIP: $f" + "symbols-test") + echo "SKIP: $f (needs static libraries)" ;; *) - echo "FAIL: $f" - failed=$((failed + 1)) - all=$((all + 1)) + "./$f" + case "$?" in + 0) + echo "PASS: $f" + all=$((all + 1)) + ;; + 77) + echo "SKIP: $f" + ;; + *) + echo "FAIL: $f" + failed=$((failed + 1)) + all=$((all + 1)) + ;; + esac ;; esac done if [ "$failed" -eq 0 ] ; then - echo "All $all tests passed" + echo "All $all tests passed" else - echo "$failed of $all tests failed" + echo "$failed of $all tests failed" fi - diff --git a/meta/recipes-support/nettle/nettle_3.7.3.bb b/meta/recipes-support/nettle/nettle_3.9.1.bb index 889dc74667..396708cf87 100644 --- a/meta/recipes-support/nettle/nettle_3.7.3.bb +++ b/meta/recipes-support/nettle/nettle_3.9.1.bb @@ -20,20 +20,19 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://check-header-files-of-openssl-only-if-enable_.patch \ " -SRC_URI:append:class-target = "\ - file://dlopen-test.patch \ - " - -SRC_URI[sha256sum] = "661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0" +SRC_URI[sha256sum] = "ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3" UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" -inherit autotools ptest multilib_header +inherit autotools ptest multilib_header lib_package EXTRA_AUTORECONF += "--exclude=aclocal" EXTRA_OECONF = "--disable-openssl" +EXTRA_OECONF:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon",""," --disable-arm-neon --disable-fat",d)}" +EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon",""," --disable-arm-neon --disable-fat",d)}" + do_compile_ptest() { oe_runmake buildtest } @@ -44,14 +43,19 @@ do_install:append() { do_install_ptest() { install -d ${D}${PTEST_PATH}/testsuite/ - install ${S}/testsuite/gold-bug.txt ${D}${PTEST_PATH}/testsuite/ - install ${S}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ - # tools can be found in PATH, not in ../tools/ - sed -i -e 's|../tools/||' ${D}${PTEST_PATH}/testsuite/*-test install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ + install ${S}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ + install ${S}/testsuite/gold-bug.txt ${D}${PTEST_PATH}/testsuite/ + + # Install a symlink for dlopen-test + ln -sr ${D}${libdir}/libnettle.so.*.* ${D}${PTEST_PATH}/libnettle.so + # These examples are needed for pkcs1-conv-test + install ${B}/examples/rsa-sign ${B}/examples/rsa-verify ${D}${PTEST_PATH}/testsuite/ + # Fix build-time relative paths + sed -i -e 's|../tools/|${bindir}/|g' ${D}${PTEST_PATH}/testsuite/*-test + sed -i -e 's|../examples/|./|g' ${D}${PTEST_PATH}/testsuite/*-test } -RDEPENDS:${PN}-ptest += "${PN}-dev" -INSANE_SKIP:${PN}-ptest += "dev-deps" +RDEPENDS:${PN}-ptest += "${PN}-bin" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch b/meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch deleted file mode 100644 index e4db09638f..0000000000 --- a/meta/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 73ec79432fc557a8be4f1500982b1c0f5fdf12a9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> -Date: Thu, 7 Nov 2019 09:58:52 +0000 -Subject: [PATCH] fetch-ocsp-response: use python3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [oe specific] -Signed-off-by: André Draszik <git@andred.net> ---- - script/fetch-ocsp-response | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/script/fetch-ocsp-response b/script/fetch-ocsp-response -index 0ff7461..185116b 100755 ---- a/script/fetch-ocsp-response -+++ b/script/fetch-ocsp-response -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - # nghttp2 - HTTP/2 C Library --- -2.23.0.rc1 - diff --git a/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb b/meta/recipes-support/nghttp2/nghttp2_1.61.0.bb index 58ce08084d..ad85576dcb 100644 --- a/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb +++ b/meta/recipes-support/nghttp2/nghttp2_1.61.0.bb @@ -4,32 +4,25 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" -UPSTREAM_CHECK_URI = "https://github.com/nghttp2/nghttp2/releases" +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz" +SRC_URI[sha256sum] = "c0e660175b9dc429f11d25b9507a834fb752eea9135ab420bb7cb7e9dbcc9654" -SRC_URI = "\ - https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz \ - file://0001-fetch-ocsp-response-use-python3.patch \ -" -SRC_URI[sha256sum] = "68271951324554c34501b85190f22f2221056db69f493afc3bbac8e7be21e7cc" - -inherit cmake manpages python3native +inherit cmake manpages python3native github-releases PACKAGECONFIG[manpages] = "" # examples are never installed, and don't need to be built in the # first place -EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF" +EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF -DENABLE_PYTHON_BINDINGS=OFF" -PACKAGES =+ "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server" +PACKAGES =+ "lib${BPN} ${PN}-proxy " -RDEPENDS:${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})" +RDEPENDS:${PN} = "${PN}-proxy (>= ${PV})" RDEPENDS:${PN}:class-native = "" RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell" ALLOW_EMPTY:${PN} = "1" FILES:${PN} = "" FILES:lib${BPN} = "${libdir}/*${SOLIBS}" -FILES:${PN}-client = "${bindir}/h2load ${bindir}/nghttp" FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response" -FILES:${PN}-server = "${bindir}/nghttpd" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch b/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch deleted file mode 100644 index 47c426b4a5..0000000000 --- a/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e43524868bb4901703d63876f9d49f73ca75b3ab Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 May 2021 20:27:52 -0700 -Subject: [PATCH] Revert "Fix problem with regression tests on recent glibc." - -This reverts commit 3a9d32eb59194b989656548755066ccd9feb36ac. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8a9373c..8cda28d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -284,11 +284,9 @@ AC_TYPE_SSIZE_T - # - # Checks for libraries and functions. - # --# We test for pthread_detach because glibc 2.22 includes --# pthread_create but not pthread_detach. - if test "$have_w32_system" = no; then -- AC_SEARCH_LIBS([pthread_detach],[pthread]) -- case "x$ac_cv_search_pthread_detach" in -+ AC_SEARCH_LIBS([pthread_create],[pthread]) -+ case "x$ac_cv_search_pthread_create" in - xno) - have_pthread=no - ;; -@@ -297,7 +295,7 @@ if test "$have_w32_system" = no; then - ;; - *) - have_pthread=yes -- config_libs="$config_libs $ac_cv_search_pthread_detach" -+ config_libs="$config_libs $ac_cv_search_pthread_create" - ;; - esac - if test "$have_pthread" != no; then --- -2.31.1 - diff --git a/meta/recipes-support/npth/npth/musl-fix.patch b/meta/recipes-support/npth/npth/musl-fix.patch new file mode 100644 index 0000000000..fabe78b14c --- /dev/null +++ b/meta/recipes-support/npth/npth/musl-fix.patch @@ -0,0 +1,37 @@ +From 417abd56fd7bf45cd4948414050615cb1ad59134 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Fri, 1 Mar 2024 13:53:52 +0900 +Subject: [PATCH] Fix INSERT_EXPOSE_RWLOCK_API for musl C library. + +* configure.ac: Add a case for musl system. + +Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=417abd56fd7bf45cd4948414050615cb1ad59134] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +-- + +GnuPG-bug-id: 5664 +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c1091b1..576a26e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -381,7 +381,10 @@ fi + AC_SUBST(INSERT_NO_RWLOCK) + + case "${host}" in +- *-*-linux*|*-*-gnu*) ++ *-*-linux-musl*) ++ INSERT_EXPOSE_RWLOCK_API="1" ++ ;; ++ *-*-linux-gnu*|*-*-gnu*) + INSERT_EXPOSE_RWLOCK_API="defined(__USE_UNIX98) || defined(__USE_XOPEN2K)" + ;; + *) +-- +2.30.2 + + diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/meta/recipes-support/npth/npth/pkgconfig.patch deleted file mode 100644 index b6a12e7309..0000000000 --- a/meta/recipes-support/npth/npth/pkgconfig.patch +++ /dev/null @@ -1,49 +0,0 @@ -Added npth pkgconfig file - -Upstream-Status: Pending - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: npth-1.1/src/npth.pc.in -=================================================================== ---- /dev/null -+++ npth-1.1/src/npth.pc.in -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: npth -+Description: a new portable posix threading library -+Version: @VERSION@ -+Libs: -L${libdir} -lnpth -lpthread -+Cflags: -I${includedir} -Index: npth-1.1/src/Makefile.am -=================================================================== ---- npth-1.1.orig/src/Makefile.am -+++ npth-1.1/src/Makefile.am -@@ -27,8 +27,10 @@ - # License along with this program; if not, see <http://www.gnu.org/licenses/>. - - ## Process this file with automake to produce Makefile.in -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = npth.pc - --EXTRA_DIST = libnpth.vers -+EXTRA_DIST = libnpth.vers npth.pc - # versioninfo.rc.in - nodist_include_HEADERS = npth.h - -Index: npth-1.1/configure.ac -=================================================================== ---- npth-1.1.orig/configure.ac -+++ npth-1.1/configure.ac -@@ -337,6 +337,7 @@ src/Makefile - w32/Makefile - tests/Makefile]) - AC_CONFIG_FILES(npth-config, chmod +x npth-config) -+AC_CONFIG_FILES([src/npth.pc]) - AC_OUTPUT - - echo " diff --git a/meta/recipes-support/npth/npth_1.6.bb b/meta/recipes-support/npth/npth_1.6.bb deleted file mode 100644 index ef863d39b0..0000000000 --- a/meta/recipes-support/npth/npth_1.6.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "New GNU Portable Threads library" -DESCRIPTION = "nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. " -HOMEPAGE = "https://www.gnu.org/software/pth/" -SECTION = "libs" -LICENSE = "LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "\ - file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de\ - " -UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" -SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ - file://pkgconfig.patch \ - file://0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch \ - " - -SRC_URI[md5sum] = "375d1a15ad969f32d25f1a7630929854" -SRC_URI[sha256sum] = "1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1" - -BINCONFIG = "${bindir}/npth-config" - -inherit autotools binconfig-disabled multilib_header - -FILES:${PN} = "${libdir}/libnpth.so.*" -FILES:${PN}-dev += "${bindir}/npth-config" - -do_install:append() { - oe_multilib_header npth.h -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb new file mode 100644 index 0000000000..0cf35565a3 --- /dev/null +++ b/meta/recipes-support/npth/npth_1.7.bb @@ -0,0 +1,21 @@ +SUMMARY = "New GNU Portable Threads library" +DESCRIPTION = "nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. " +HOMEPAGE = "https://gnupg.org/software/npth/" +SECTION = "libs" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de" +UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" + +SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ + file://musl-fix.patch \ + " + +SRC_URI[sha256sum] = "8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05" + +inherit autotools multilib_header + +do_install:append() { + oe_multilib_header npth.h +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch b/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch index 9e65a45133..68b3e2491f 100644 --- a/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch +++ b/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch @@ -1,4 +1,7 @@ -rename test target as run-test +From a5e1fa272f294e739d6caaf629968478796ca53a Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Mon, 19 Oct 2020 14:42:11 -0700 +Subject: [PATCH] rename test target as run-test Upstream-Status: Pending @@ -8,15 +11,16 @@ not suitable for cross-compile environment, so rename it as run-test. and define test target to compile the test files. Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index b6db339..de176c4 100644 +index da01d27..c738b93 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -124,7 +124,9 @@ regress2: $(check_PROGRAMS) +@@ -126,7 +126,9 @@ regress2: $(check_PROGRAMS) test_numademo: numademo ./numademo -t -e 10M @@ -27,6 +31,3 @@ index b6db339..de176c4 100644 TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir; --- -1.9.1 - diff --git a/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch index 9812ecc8b3..8345f71d72 100644 --- a/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch +++ b/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch @@ -1,4 +1,4 @@ -From 59fd750a84bbe5874dec936d2bee9ef11a1b6505 Mon Sep 17 00:00:00 2001 +From 29f811d9d381f2ab54b3c8cef77334e32970ef09 Mon Sep 17 00:00:00 2001 From: Li xin <lixin.fnst@cn.fujitsu.com> Date: Tue, 21 Jul 2015 02:01:22 +0900 Subject: [PATCH] Fix the test output format @@ -7,24 +7,26 @@ Upstream-Status: Pending Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> +Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> + --- test/regress | 6 +++--- test/regress2 | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/test/regress b/test/regress -index 2ce1705..d086a47 100755 +index f06b22f..2fdfacb 100755 --- a/test/regress +++ b/test/regress -@@ -74,6 +74,7 @@ probe_hardware() +@@ -78,6 +78,7 @@ probe_hardware() if [ $numnodes -lt 2 ] ; then echo "need at least two nodes with at least $NEEDPAGES each of" echo "free memory for mempolicy regression tests" -+ echo "FAIL: numa regress" - exit 77 # Skip test ++ echo "SKIP: numa regress" + exit 77 # Skip test fi } -@@ -207,10 +208,9 @@ main() +@@ -209,10 +210,9 @@ main() rm A B if [ "$EXIT" = 0 ] ; then @@ -59,6 +61,3 @@ index aa6ea41..450c510 100755 } # still broken --- -1.8.4.2 - diff --git a/meta/recipes-support/numactl/numactl/run-ptest b/meta/recipes-support/numactl/numactl/run-ptest index bf269da755..e019b0d364 100755 --- a/meta/recipes-support/numactl/numactl/run-ptest +++ b/meta/recipes-support/numactl/numactl/run-ptest @@ -8,7 +8,11 @@ if ! numactl -s | grep -q "No NUMA support available on this system."; then if numademo -t -e 10M; then echo "PASS: numademo" else - echo "FAIL: numademo" + if [ "$?" = 77 ] ; then + echo "SKIP: numademo" + else + echo "FAIL: numademo" + fi fi else echo "SKIP: ./../test/bind_range" diff --git a/meta/recipes-support/numactl/numactl_git.bb b/meta/recipes-support/numactl/numactl_git.bb index 93547ea239..bd16df91ec 100644 --- a/meta/recipes-support/numactl/numactl_git.bb +++ b/meta/recipes-support/numactl/numactl_git.bb @@ -8,10 +8,10 @@ SECTION = "apps" inherit autotools-brokensep ptest -LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" +LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=9f34c3af4ed6f3f5df0da5f3c0835a43" -SRCREV = "dd6de072c92c892a86e18c0fd0dfa1ba57a9a05d" -PV = "2.0.14" +SRCREV = "3871b1c42fc71bceadafd745d2eff5dddfc2d67e" +PV = "2.0.18" SRC_URI = "git://github.com/numactl/numactl;branch=master;protocol=https \ file://Fix-the-test-output-format.patch \ diff --git a/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch b/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch new file mode 100644 index 0000000000..47df027106 --- /dev/null +++ b/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch @@ -0,0 +1,33 @@ +It fails occasionally with missing generated header files: + +| ../git/common/asn1.c:42:10: fatal error: openssl.asn.h: No such file or directory +| 42 | #include "openssl.asn.h" +| | ^~~~~~~~~~~~~~~ +| compilation terminated. + +According to meson manual page: + +https://mesonbuild.com/Wrap-best-practices-and-tips.html#declare-generated-headers-explicitly + +'asn_h_dep' should be a dependency of static_library target 'libp11_asn1' to +make sure that required header files generated before compile common/asn1.c. + +Upstream-Status: Submitted [https://github.com/p11-glue/p11-kit/pull/619] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + common/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/common/meson.build b/common/meson.build +index dc86d7b..cc3ec48 100644 +--- a/common/meson.build ++++ b/common/meson.build +@@ -113,6 +113,7 @@ if with_asn1 + 'p11-asn1', libp11_asn1_sources, + gnu_symbol_visibility: 'hidden', + include_directories: configinc, ++ dependencies: asn_h_dep, + ) + + libp11_asn1_dep = declare_dependency( diff --git a/meta/recipes-support/p11-kit/p11-kit_0.24.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb index 59cbb67961..b7ebd44abc 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.24.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb @@ -10,8 +10,10 @@ DEPENDS = "libtasn1 libtasn1-native libffi" DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" -SRC_URI = "git://github.com/p11-glue/p11-kit;branch=master;protocol=https" -SRCREV = "dd0590d4e583f107e3e9fafe9ed754149da335d0" +SRC_URI = "gitsm://github.com/p11-glue/p11-kit;branch=master;protocol=https \ + file://fix-parallel-build-failures.patch \ + " +SRCREV = "917e02a3211dabbdea4b079cb598581dce84fda1" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" @@ -29,4 +31,4 @@ FILES:${PN} += " \ # PN contains p11-kit-proxy.so, a symlink to a loadable module INSANE_SKIP:${PN} = "dev-so" -BBCLASSEXTEND = "nativesdk" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch b/meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch index 507c0c3917..bb7e43b1e7 100644 --- a/meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch +++ b/meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch @@ -1,4 +1,4 @@ -From 54a4c9d3e5f1897ed4b978d5cdee646ca7a4f637 Mon Sep 17 00:00:00 2001 +From 785777dc0bc6b69ff68c91547ec6b6634049662f Mon Sep 17 00:00:00 2001 From: Armin Kuster <akuster@mvista.com> Date: Fri, 2 Sep 2005 11:50:01 +0000 Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and @@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Armin Kuster <akuster@mvista.com> --- - m4/gpg-error.m4 | 159 ++---------------------------------------------- - 1 file changed, 4 insertions(+), 155 deletions(-) + m4/gpg-error.m4 | 160 ++---------------------------------------------- + 1 file changed, 4 insertions(+), 156 deletions(-) diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 -index 56a5d07..c0bec1f 100644 +index 4b5cd40..7dfbb83 100644 --- a/m4/gpg-error.m4 +++ b/m4/gpg-error.m4 -@@ -26,159 +26,12 @@ dnl config script does not match the host specification the script +@@ -26,160 +26,12 @@ dnl config script does not match the host specification the script dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPG_ERROR], @@ -135,6 +135,7 @@ index 56a5d07..c0bec1f 100644 - fi - elif test "$GPG_ERROR_CONFIG" != "no"; then - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` +- unset GPGRT_CONFIG - fi - if test "$GPG_ERROR_CONFIG" != "no"; then - req_major=`echo $min_gpg_error_version | \ @@ -182,7 +183,7 @@ index 56a5d07..c0bec1f 100644 if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -193,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], +@@ -194,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], fi fi else diff --git a/meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch b/meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch index f4aec2d1c3..f4aec2d1c3 100644 --- a/meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch +++ b/meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch diff --git a/meta/recipes-support/pinentry/pinentry_1.2.0.bb b/meta/recipes-support/pinentry/pinentry_1.2.1.bb index 169cac8965..7daf80f36e 100644 --- a/meta/recipes-support/pinentry/pinentry_1.2.0.bb +++ b/meta/recipes-support/pinentry/pinentry_1.2.1.bb @@ -16,14 +16,13 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://gpg-error_pkconf.patch \ " -SRC_URI[sha256sum] = "10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470" +SRC_URI[sha256sum] = "457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067" inherit autotools pkgconfig -PACKAGECONFIG ??= "ncurses libcap" +PACKAGECONFIG ??= "ncurses" PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses" -PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" @@ -32,5 +31,8 @@ PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" EXTRA_OECONF = " \ --disable-rpath \ " +EXTRA_OECONF:append:libc-musl = " \ + ac_cv_should_define__xopen_source=yes \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/popt/popt/0001-popt-test-output-format-for-ptest.patch b/meta/recipes-support/popt/popt/0001-popt-test-output-format-for-ptest.patch deleted file mode 100644 index 020949cc34..0000000000 --- a/meta/recipes-support/popt/popt/0001-popt-test-output-format-for-ptest.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 330b77081c3a4c7ae76cb08602db385b40fa7ff7 Mon Sep 17 00:00:00 2001 -From: Simone Weiss <simone.weiss@elektrobit.com> -Date: Mon, 13 Dec 2021 09:29:53 +0000 -Subject: [PATCH] popt test output format for ptest - -patch test output format to match simple-test as it is used in ptests. - -Upstream-Status: Pending - -Signed-off-by: Simone Weiss <simone.weiss@elektrobit.com> -Signed-off-by: David Niederpruem <david.niederpruem@elektrobit.com> ---- - tests/testit.sh | 20 ++++++++------------ - 1 file changed, 8 insertions(+), 12 deletions(-) - -diff --git a/tests/testit.sh b/tests/testit.sh -index 2a7b4aa..50b42e2 100755 ---- a/tests/testit.sh -+++ b/tests/testit.sh -@@ -5,12 +5,11 @@ run() { - name=$1; shift - answer=$1; shift - -- echo Running test $name. -- - result=`HOME=$builddir $builddir/$prog $*` - if [ "$answer" != "$result" ]; then -- echo "Test \"$prog $*\" failed with: \"$result\" != \"$answer\" " -- exit 2 -+ echo "FAIL: $name" -+ else -+ echo "PASS: $name" - fi - } - -@@ -23,17 +22,17 @@ run_diff() { - out=$builddir/tmp.out - diff_file=$builddir/tmp.diff - -- echo Running test $name. -- - $builddir/$prog $in_file > $out - ret=$? - diff $out $answer_file > $diff_file - diff_ret=$? - - if [ "$diff_ret" != "0" ]; then -- echo "Test \"$name\" failed output is in $out, diff is:" -- cat $diff_file -- exit 2 -+ echo "FAIL: $name" -+ echo "diff is:" -+ cat $diff_file -+ else -+ echo "PASS: $name" - fi - rm $out $diff_file - } -@@ -174,6 +173,3 @@ Help options: - #run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer - #run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer - #run_diff test3 "test3 - 53" test3-data/03.input test3-data/03.answer -- --echo "" --echo "Passed." --- -2.17.1 - diff --git a/meta/recipes-support/popt/popt_1.18.bb b/meta/recipes-support/popt/popt_1.19.bb index af8add4ad6..b1d8bea790 100644 --- a/meta/recipes-support/popt/popt_1.18.bb +++ b/meta/recipes-support/popt/popt_1.19.bb @@ -4,20 +4,18 @@ HOMEPAGE = "https://www.rpm.org/" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" +LIC_FILES_CHKSUM = "file://COPYING;md5=e0206ac9471d06667e076212db20c5f4" DEPENDS = "virtual/libiconv" -SRC_URI = "\ - http://ftp.rpm.org/popt/releases/popt-1.x/${BP}.tar.gz \ - file://0001-popt-test-output-format-for-ptest.patch \ - file://run-ptest \ -" -SRC_URI[sha256sum] = "5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1" +SRC_URI = "http://ftp.rpm.org/popt/releases/popt-1.x/${BP}.tar.gz \ + file://run-ptest \ + " +SRC_URI[sha256sum] = "c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9" inherit autotools gettext ptest -RDEPENDS_${PN}-ptest += "bash" +RDEPENDS:${PN}-ptest += "bash" do_compile_ptest() { sed 's#lt-test1#test1#g' ${S}/tests/testit.sh > ${B}/tests/testit.sh diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb index 5a1d329993..e6668da01f 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb @@ -7,10 +7,10 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "bcb82804daa8f725b6add259dcef2067e61a75aa" -PV .= "+git${SRCPV}" +SRCREV = "92c1b97bfdb4a94acc1cabcaf97eef52dc29144c" +PV .= "+git" -SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master \ +SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master;protocol=https \ " S = "${WORKDIR}/git" @@ -32,3 +32,8 @@ RDEPENDS:${PN}:append:libc-glibc = " libgcc" # pstree is called by ptest-runner-collect-system-data RDEPENDS:${PN}:append = " pstree" + +# Create a non-root user that test suites can use easily +inherit useradd +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --home / --user-group ptest" diff --git a/meta/recipes-support/re2c/re2c_3.0.bb b/meta/recipes-support/re2c/re2c_3.1.bb index ab047601ae..a4b20422f6 100644 --- a/meta/recipes-support/re2c/re2c_3.0.bb +++ b/meta/recipes-support/re2c/re2c_3.1.bb @@ -2,15 +2,14 @@ SUMMARY = "Tool for writing very fast and very flexible scanners" DESCRIPTION = "A free and open-source lexer generator for C, C++ and Go. It compiles regular expressions to determinisitic finite automata and encodes the automata in the form of a program in the target language. Unlike any other such tool, re2c focuses on generating high efficient code for regular expression matching. As a result this allows a much broader range of use than any traditional lexer." HOMEPAGE = "http://re2c.org/" BUGTRACKER = "https://github.com/skvadrik/re2c/issues" -AUTHOR = "Marcus Börger <helly@users.sourceforge.net>" SECTION = "devel" LICENSE = "PD" LIC_FILES_CHKSUM = "file://LICENSE;md5=64eca4d8a3b67f9dc7656094731a2c8d" -SRC_URI = "https://github.com/skvadrik/re2c/releases/download/${PV}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "b3babbbb1461e13fe22c630a40c43885efcfbbbb585830c6f4c0d791cf82ba0b" -UPSTREAM_CHECK_URI = "https://github.com/skvadrik/re2c/releases" +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "0ac299ad359e3f512b06a99397d025cfff81d3be34464ded0656f8a96676c029" +GITHUB_BASE_URI = "https://github.com/skvadrik/re2c/releases" BBCLASSEXTEND = "native nativesdk" -inherit autotools +inherit autotools github-releases diff --git a/meta/recipes-support/rng-tools/rng-tools/rngd.service b/meta/recipes-support/rng-tools/rng-tools/rng-tools.service index 568686e80e..5ae2fba215 100644 --- a/meta/recipes-support/rng-tools/rng-tools/rngd.service +++ b/meta/recipes-support/rng-tools/rng-tools/rng-tools.service @@ -1,10 +1,9 @@ [Unit] Description=Hardware RNG Entropy Gatherer Daemon DefaultDependencies=no -After=systemd-udev-settle.service -Before=sysinit.target shutdown.target -Wants=systemd-udev-settle.service Conflicts=shutdown.target +Before=sysinit.target shutdown.target +ConditionVirtualization=!container [Service] EnvironmentFile=-@SYSCONFDIR@/default/rng-tools diff --git a/meta/recipes-support/rng-tools/rng-tools_6.15.bb b/meta/recipes-support/rng-tools/rng-tools_6.16.bb index 0696351903..f0aa3ff93f 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.15.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.16.bb @@ -1,19 +1,17 @@ SUMMARY = "Random number generator daemon" DESCRIPTION = "Check and feed random data from hardware device to kernel" -AUTHOR = "Philipp Rumpf, Jeff Garzik <jgarzik@pobox.com>, \ - Henrique de Moraes Holschuh <hmh@debian.org>" HOMEPAGE = "https://github.com/nhorman/rng-tools" BUGTRACKER = "https://github.com/nhorman/rng-tools/issues" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "sysfsutils openssl" +DEPENDS = "openssl libcap" SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master;protocol=https \ file://init \ file://default \ - file://rngd.service \ + file://rng-tools.service \ " -SRCREV = "381f69828b782afda574f259c1b7549f48f9bb77" +SRCREV = "e061c313b95890eb5fa0ada0cd6eec619dafdfe2" S = "${WORKDIR}/git" @@ -27,15 +25,25 @@ PACKAGECONFIG:libc-musl = "libargp libjitterentropy" PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterentropy,libjitterentropy" PACKAGECONFIG[libp11] = "--with-pkcs11,--without-pkcs11,libp11 openssl" -PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2 openssl" +PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2" +PACKAGECONFIG[qrypt] = "--with-qrypt,--without-qrypt,curl" -INITSCRIPT_NAME = "rng-tools" -INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ." +INITSCRIPT_PACKAGES = "${PN}-service" +INITSCRIPT_NAME:${PN}-service = "rng-tools" +INITSCRIPT_PARAMS:${PN}-service = "start 03 2 3 4 5 . stop 30 0 6 1 ." -SYSTEMD_SERVICE:${PN} = "rngd.service" +SYSTEMD_PACKAGES = "${PN}-service" +SYSTEMD_SERVICE:${PN}-service = "rng-tools.service" CFLAGS += " -DJENT_CONF_ENABLE_INTERNAL_TIMER " +PACKAGES =+ "${PN}-service" + +FILES:${PN}-service += " \ + ${sysconfdir}/init.d/rng-tools \ + ${sysconfdir}/default/rng-tools \ +" + # Refer autogen.sh in rng-tools do_configure:prepend() { cp ${S}/README.md ${S}/README @@ -44,18 +52,18 @@ do_configure:prepend() { do_install:append() { install -Dm 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools - install -Dm 0644 ${WORKDIR}/rngd.service \ - ${D}${systemd_system_unitdir}/rngd.service + install -Dm 0644 ${WORKDIR}/rng-tools.service \ + ${D}${systemd_system_unitdir}/rng-tools.service sed -i \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ ${D}${sysconfdir}/init.d/rng-tools \ - ${D}${systemd_system_unitdir}/rngd.service + ${D}${systemd_system_unitdir}/rng-tools.service if [ "${@bb.utils.contains('PACKAGECONFIG', 'nistbeacon', 'yes', 'no', d)}" = "yes" ]; then sed -i \ -e '/^IPAddressDeny=any/d' \ -e '/^RestrictAddressFamilies=/ s/$/ AF_INET AF_INET6/' \ - ${D}${systemd_system_unitdir}/rngd.service + ${D}${systemd_system_unitdir}/rng-tools.service fi } diff --git a/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch b/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch deleted file mode 100644 index 4a5832ac1a..0000000000 --- a/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 99f6e1b0d68281b63218d6adfe68cd9e331ac5be Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 3 Sep 2018 10:50:08 -0700 -Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building - with most recent scons version. - -* SConstruct Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python - 3.0 and 2.7. - -Upstream-Status: Backport -[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1809132&r2=1811083&diff_format=h] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - SConstruct | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index 1670459..18a45fa 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -184,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help')) - - unknown = opts.UnknownVariables() - if unknown: -- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) -+ print('Warning: Used unknown variables:', ', '.join(unknown.keys())) - - apr = str(env['APR']) - apu = str(env['APU']) diff --git a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch b/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch deleted file mode 100644 index 91ccc8a474..0000000000 --- a/meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2f45711a66ff99886b6e4a5708e2db01a63e5af4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Fri, 10 Sep 2021 11:05:10 +0200 -Subject: [PATCH] buckets/ssl_buckets.c: do not use ERR_GET_FUNC - -Upstream removed it in -https://github.com/openssl/openssl/pull/16004 - -Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - buckets/ssl_buckets.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c -index b01e535..9801f87 100644 ---- a/buckets/ssl_buckets.c -+++ b/buckets/ssl_buckets.c -@@ -1325,8 +1325,7 @@ static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey) - return 0; - } - else { -- printf("OpenSSL cert error: %d %d %d\n", ERR_GET_LIB(err), -- ERR_GET_FUNC(err), -+ printf("OpenSSL cert error: %d %d\n", ERR_GET_LIB(err), - ERR_GET_REASON(err)); - PKCS12_free(p12); - bio_meth_free(biom); diff --git a/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch b/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch deleted file mode 100644 index 02fa9e3a06..0000000000 --- a/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 565211fd082ef653ca9c44a345350fc1451f5a0f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 3 Sep 2018 11:12:38 -0700 -Subject: [PATCH] Follow-up to r1811083 fix building with scons 3.0.0 and - Python3 - -* SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid - TypeError: cannot use a string pattern on a bytes-like object - -Upstream-Status: Backport -[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1811088&r2=1814604] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - SConstruct | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index 877731e..7678bb1 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -169,7 +169,7 @@ env.Append(BUILDERS = { - match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' - 'SERF_MINOR_VERSION ([0-9]+).*' - 'SERF_PATCH_VERSION ([0-9]+)', -- env.File('serf.h').get_contents(), -+ env.File('serf.h').get_contents().decode('utf-8'), - re.DOTALL) - MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] - env.Append(MAJOR=str(MAJOR)) diff --git a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch index 4105868a7e..c8e6eddfec 100644 --- a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch +++ b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch @@ -31,7 +31,7 @@ ERROR: scons install execution failed. and the installed paths (including the paths inside libserf*.pc) look correct -Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019] +Upstream-Status: Inappropriate [removes block of code rather than fixing the problem in that block] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> diff --git a/meta/recipes-support/serf/serf_1.3.9.bb b/meta/recipes-support/serf/serf_1.3.10.bb index 669f42b8e7..c6b51452aa 100644 --- a/meta/recipes-support/serf/serf_1.3.9.bb +++ b/meta/recipes-support/serf/serf_1.3.10.bb @@ -7,16 +7,12 @@ HOMEPAGE = "http://serf.apache.org/" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://norpath.patch \ file://env.patch \ - file://0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch \ file://0002-SConstruct-Fix-path-quoting-for-.def-generator.patch \ file://0003-gen_def.patch \ - file://0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch \ file://SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch \ - file://0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch \ " -SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57" -SRC_URI[sha256sum] = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc" +SRC_URI[sha256sum] = "be81ef08baa2516ecda76a77adf7def7bc3227eeb578b9a33b45f7b41dc064e6" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch new file mode 100644 index 0000000000..936f72ccf8 --- /dev/null +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch @@ -0,0 +1,26 @@ +From 665383306c725f299a1b373f947cda01949d49e4 Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Sun, 19 Nov 2023 11:18:11 +0100 +Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17 + +Fixes #219 + +Upstream-Status: Backport [https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/c918fe77e255150938e83a6aec259f153d303573] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/test-subclassing.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/test-subclassing.c b/src/test-subclassing.c +index dd099e4..0758164 100644 +--- a/src/test-subclassing.c ++++ b/src/test-subclassing.c +@@ -1,4 +1,5 @@ + #include <libxml/tree.h> ++#include <libxml/parser.h> + #include <stdio.h> + #include <string.h> + +-- +2.43.0 + diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/0002-Handle-build-with-older-versions-of-GCC.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/0002-Handle-build-with-older-versions-of-GCC.patch new file mode 100644 index 0000000000..2af6b461b6 --- /dev/null +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/0002-Handle-build-with-older-versions-of-GCC.patch @@ -0,0 +1,54 @@ +From 461d00fcd5c5842b9a56f7462d55d46bf21163cc Mon Sep 17 00:00:00 2001 +From: Patrick Williams <patrick@stwcx.xyz> +Date: Fri, 1 Dec 2023 11:19:02 -0600 +Subject: [PATCH] Handle build with older versions of GCC + +Older versions of GCC (prior to 9.1) did not put the `std::filesystem` +support directly into libstdcpp, but in a separate `libstdc++fs`. Add +meson logic to detect if an extra linker flag is necessary. + +Fixes #223. + +Tested on AlmaLinux 8 which uses GCC-8. + +Signed-off-by: Patrick Williams <patrick@stwcx.xyz> +Upstream-Status: Submitted [https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/278] +--- + meson.build | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/meson.build b/meson.build +index ecc012f..93acd40 100644 +--- a/meson.build ++++ b/meson.build +@@ -11,6 +11,7 @@ config = configuration_data() + i18n = import('i18n') + + cc = meson.get_compiler('c') ++cxx = meson.get_compiler('cpp') + + ############################################################################### + # Project configuration +@@ -46,6 +47,19 @@ if not xdgmime_found + ''') + endif + ++############################################################################### ++# Check if GCC needs -lstdc++fs (before 9.1) ++ ++if not cxx.links(''' ++ #include <filesystem> ++ int main() { ++ return std::filesystem::is_directory( ++ std::filesystem::status("/tmp")) ? 0 : 1; ++ } ++ ''', name: 'std++fs-check') ++ add_project_link_arguments('-lstdc++fs', language : 'cpp') ++endif ++ + ############################################################################### + # Dependencies + +-- +2.41.0 + diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb index 387dd7bbad..ef5df44ad6 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb @@ -8,9 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native xmlto-native" -SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master" -SRCREV = "13695c7225c2f525a435e72739c33ac32bbfbbb9" -PV = "2.2" +SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master \ + file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch \ + file://0002-Handle-build-with-older-versions-of-GCC.patch" +SRCREV = "9a6d6b8e963935f145f3a1ef446552de6996dada" + S = "${WORKDIR}/git" inherit meson pkgconfig gettext python3native mime diff --git a/meta/recipes-support/sqlite/sqlite3_3.38.3.bb b/meta/recipes-support/sqlite/sqlite3_3.38.3.bb deleted file mode 100644 index 286987b708..0000000000 --- a/meta/recipes-support/sqlite/sqlite3_3.38.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -require sqlite3.inc - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" - -SRC_URI = "http://www.sqlite.org/2022/sqlite-autoconf-${SQLITE_PV}.tar.gz" -SRC_URI[sha256sum] = "61f2dd93a2e38c33468b7125967c3218bf9f4dd8365def6025e314f905dc942e" - -# -19242 is only an issue in specific development branch commits -CVE_CHECK_IGNORE += "CVE-2019-19242" -# This is believed to be iOS specific (https://groups.google.com/g/sqlite-dev/c/U7OjAbZO6LA) -CVE_CHECK_IGNORE += "CVE-2015-3717" -# Issue in an experimental extension we don't have/use. Fixed by https://sqlite.org/src/info/b1e0c22ec981cf5f -CVE_CHECK_IGNORE += "CVE-2021-36690" diff --git a/meta/recipes-support/sqlite/sqlite3_3.45.1.bb b/meta/recipes-support/sqlite/sqlite3_3.45.1.bb new file mode 100644 index 0000000000..50612feb25 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3_3.45.1.bb @@ -0,0 +1,8 @@ +require sqlite3.inc + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" + +SRC_URI = "http://www.sqlite.org/2024/sqlite-autoconf-${SQLITE_PV}.tar.gz" +SRC_URI[sha256sum] = "cd9c27841b7a5932c9897651e20b86c701dd740556989b01ca596fcfa3d49a0a" + diff --git a/meta/recipes-support/taglib/taglib_1.12.bb b/meta/recipes-support/taglib/taglib_2.0.1.bb index 47ad8aacb6..14f99aabbc 100644 --- a/meta/recipes-support/taglib/taglib_1.12.bb +++ b/meta/recipes-support/taglib/taglib_2.0.1.bb @@ -7,14 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \ file://taglib/audioproperties.h;beginline=1;endline=24;md5=9df2c7399519b7310568a7c55042ecee" -DEPENDS = "zlib" +DEPENDS = "zlib utfcpp" SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "4313ed2671234e029b7af8f97c84e9af" -SRC_URI[sha256sum] = "7fccd07669a523b07a15bd24c8da1bbb92206cb19e9366c3692af3d79253b703" +SRC_URI[sha256sum] = "08c0a27b96aa5c4e23060fe0b6f93102ee9091a9385257b9d0ddcf467de0d925" -UPSTREAM_CHECK_URI = "http://github.com/taglib/taglib/releases/" +UPSTREAM_CHECK_URI = "https://taglib.org/" +UPSTREAM_CHECK_REGEX = "taglib-(?P<pver>\d+(\.\d+)+)\.tar" BINCONFIG = "${bindir}/taglib-config" diff --git a/meta/recipes-support/utfcpp/utfcpp_4.0.5.bb b/meta/recipes-support/utfcpp/utfcpp_4.0.5.bb new file mode 100644 index 0000000000..5ac6fd369a --- /dev/null +++ b/meta/recipes-support/utfcpp/utfcpp_4.0.5.bb @@ -0,0 +1,16 @@ +SUMMARY = " UTF-8 with C++ in a Portable Way" +HOMEPAGE = "https://github.com/nemtrif/utfcpp" + +LICENSE = "BSL-1.0 & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c \ + file://extern/ftest/LICENSE;md5=d33c6488d3b003723a5f17ac984db030" + +SRC_URI = "gitsm://github.com/nemtrif/utfcpp;protocol=https;branch=master" + +SRCREV = "6be08bbea14ffa0a5c594257fb6285a054395cd7" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN}-dev += "${datadir}/utf8cpp/cmake" diff --git a/meta/recipes-support/vim/files/no-path-adjust.patch b/meta/recipes-support/vim/files/no-path-adjust.patch index 9d6da80913..908459a95e 100644 --- a/meta/recipes-support/vim/files/no-path-adjust.patch +++ b/meta/recipes-support/vim/files/no-path-adjust.patch @@ -1,4 +1,7 @@ -vim: do not adjust script pathnames +From 4125a1ccb82fd53d003acdc34e462f238f0c4f0d Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Fri, 8 Jul 2022 11:03:22 +0800 +Subject: [PATCH] vim: do not adjust script pathnames When cross-compiling, we do not want to reference the host versions of things like perl and awk. @@ -6,24 +9,28 @@ things like perl and awk. Upstream-Status: Pending Signed-off-by: Joe Slater <joe.slater@windriver.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/Makefile | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) -Index: git/src/Makefile -=================================================================== ---- git.orig/src/Makefile -+++ git/src/Makefile -@@ -2565,11 +2565,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ +diff --git a/src/Makefile b/src/Makefile +index c9513a632..7a7cbdc43 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -2534,11 +2534,7 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \ rm -rf $$cvs; \ fi -chmod $(FILEMOD) $(DEST_TOOLS)/* -# replace the path in some tools -+ -+# replace the path in some tools, but not when cross-compiling -+ifneq ($(CROSS_COMPILING),1) - perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl - awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ - awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ - awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi -+endif +- perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl +- awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ +- awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ +- awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi ++# not replace the path in some tools -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*` # install the language specific files for tools, if they were unpacked +-- +2.25.1 + diff --git a/meta/recipes-support/vim/files/racefix.patch b/meta/recipes-support/vim/files/racefix.patch deleted file mode 100644 index 1cb8fb442f..0000000000 --- a/meta/recipes-support/vim/files/racefix.patch +++ /dev/null @@ -1,33 +0,0 @@ -The creation of the LINGUAS file is duplicated for each desktop file -which can lead the commands to race against each other. Rework -the makefile to avoid this as the expense of leaving the file on disk. - -Upstream-Status: Pending -RP 2021/2/15 - -Index: git/src/po/Makefile -=================================================================== ---- git.orig/src/po/Makefile -+++ git/src/po/Makefile -@@ -207,17 +207,16 @@ $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM - # Delete the temporary files - rm *.js - --vim.desktop: vim.desktop.in $(POFILES) -+LINGUAS: - echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS -+ -+vim.desktop: vim.desktop.in $(POFILES) LINGUAS - $(MSGFMT) --desktop -d . --template vim.desktop.in -o tmp_vim.desktop -- rm -f LINGUAS - if command -v desktop-file-validate; then desktop-file-validate tmp_vim.desktop; fi - mv tmp_vim.desktop vim.desktop - --gvim.desktop: gvim.desktop.in $(POFILES) -- echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS -+gvim.desktop: gvim.desktop.in $(POFILES) LINGUAS - $(MSGFMT) --desktop -d . --template gvim.desktop.in -o tmp_gvim.desktop -- rm -f LINGUAS - if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi - mv tmp_gvim.desktop gvim.desktop - diff --git a/meta/recipes-support/vim/vim-tiny_8.2.bb b/meta/recipes-support/vim/vim-tiny_9.1.bb index e4c26d23f6..e4c26d23f6 100644 --- a/meta/recipes-support/vim/vim-tiny_8.2.bb +++ b/meta/recipes-support/vim/vim-tiny_9.1.bb diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index c5922b7fcd..071deed338 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -10,31 +10,28 @@ DEPENDS = "ncurses gettext-native" RSUGGESTS:${PN} = "diffutils" LICENSE = "Vim" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99 \ - file://runtime/doc/uganda.txt;md5=daf48235bb824c77fe8ae88d5f575f74" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d1a651ab770b45d41c0f8cb5a8ca930e" SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://disable_acl_header_check.patch \ file://vim-add-knob-whether-elf.h-are-checked.patch \ file://0001-src-Makefile-improve-reproducibility.patch \ file://no-path-adjust.patch \ - file://racefix.patch \ " -PV .= ".4912" -SRCREV = "a7583c42cd6b64fd276a5d7bb0db5ce7bfafa730" - -# Remove when 8.3 is out -UPSTREAM_VERSION_UNKNOWN = "1" +PV .= ".0114" +SRCREV = "fcaed6a70faf73bff3e5405ada556d726024f866" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" +# Ignore that the upstream version .z in x.y.z is always newer +UPSTREAM_VERSION_UNKNOWN = "1" S = "${WORKDIR}/git" VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" -inherit autotools-brokensep update-alternatives mime-xdg +inherit autotools-brokensep update-alternatives mime-xdg pkgconfig CLEANBROKEN = "1" @@ -43,22 +40,18 @@ do_configure () { cd src rm -f auto/* touch auto/config.mk + # git timestamps aren't reliable, so touch the shipped .po files so they aren't regenerated + touch -c po/cs.cp1250.po po/ja.euc-jp.po po/ja.sjis.po po/ko.po po/pl.UTF-8.po po/pl.cp1250.po po/ru.cp1251.po po/sk.cp1250.po po/uk.cp1251.po po/zh_CN.po po/zh_CN.cp936.po po/zh_TW.po + # ru.cp1251.po uses CP1251 rather than cp1251, fix that + sed -i -e s/CP1251/cp1251/ po/ru.cp1251.po aclocal autoconf cd .. oe_runconf touch src/auto/configure touch src/auto/config.mk src/auto/config.h -} - -do_compile() { - # We do not support fully / correctly the following locales. Attempting - # to use these with msgfmt in order to update the ".desktop" files exposes - # this problem and leads to the compile failing. - for LOCALE in cs fr ko pl sk zh_CN zh_TW;do - echo -n > src/po/${LOCALE}.po - done - autotools_do_compile + # need a native tool, not a target one + ${BUILD_CC} src/po/sjiscorr.c -o src/po/sjiscorr } PACKAGECONFIG ??= "\ @@ -83,6 +76,7 @@ EXTRA_OECONF = " \ --disable-netbeans \ --disable-desktop-database-update \ --with-tlib=ncurses \ + --with-modified-by='${MAINTAINER}' \ ac_cv_small_wchar_t=no \ ac_cv_path_GLIB_COMPILE_RESOURCES=no \ vim_cv_getcwd_broken=no \ @@ -95,6 +89,10 @@ EXTRA_OECONF = " \ STRIP=/bin/true \ " +# Some host distros don't have it, disable consistently +EXTRA_OECONF:append:class-native = " vim_cv_timer_create=no" +EXTRA_OECONF:append:class-target = " vim_cv_timer_create=yes" + do_install() { autotools_do_install diff --git a/meta/recipes-support/vim/vim_8.2.bb b/meta/recipes-support/vim/vim_9.1.bb index f358e61132..fee9f055e9 100644 --- a/meta/recipes-support/vim/vim_8.2.bb +++ b/meta/recipes-support/vim/vim_9.1.bb @@ -2,14 +2,18 @@ require vim.inc PROVIDES = "xxd" -RDEPENDS:${PN} = "ncurses-terminfo-base" +RDEPENDS:${PN} = "ncurses-terminfo-base ${PN}-xxd" # Recommend that runtime data is installed along with vim RRECOMMENDS:${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common" PACKAGECONFIG:class-native = "" BBCLASSEXTEND = "native nativesdk" -ALTERNATIVE:${PN}:append = " xxd" +PACKAGES =+ "${PN}-xxd" +FILES:${PN}-xxd = "${bindir}/xxd" +RPROVIDES:${PN}-xxd = "xxd" + +ALTERNATIVE:${PN}-xxd = "xxd" ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd" ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd" diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch index b4100fc381..8934d5f80a 100644 --- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +++ b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch @@ -11,32 +11,25 @@ Upstream-Status: Submitted [1] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> [1] https://gitlab.gnome.org/GNOME/vte/issues/72 - --- - src/missing.hh | 4 ++++ - src/widget.cc | 1 + - 2 files changed, 5 insertions(+) + src/widget.cc | 4 +++ + 1 files changed, 4 insertions(+) ---- a/src/missing.hh -+++ b/src/missing.hh -@@ -24,6 +24,10 @@ - #define NSIG (8 * sizeof(sigset_t)) - #endif +diff --git a/src/widget.cc b/src/widget.cc +index 07f7cabf..31a77f68 100644 +--- a/src/widget.cc ++++ b/src/widget.cc +@@ -16,6 +16,10 @@ + * along with this library. If not, see <https://www.gnu.org/licenses/>. + */ +#ifndef W_EXITCODE +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) +#endif + - #ifndef HAVE_FDWALK - int fdwalk(int (*cb)(void* data, int fd), - void* data); ---- a/src/widget.cc -+++ b/src/widget.cc -@@ -21,6 +21,7 @@ - #include "widget.hh" - - #include <sys/wait.h> // for W_EXITCODE -+#include "missing.hh" // for W_EXITCODE on non-glibc systems + #include "config.h" - #include <exception> - #include <new> + #include "widget.hh" +-- +2.42.0 + diff --git a/meta/recipes-support/vte/vte/0001-Makefile.docs-correctly-substitute-gtkdoc-qemu-wrapp.patch b/meta/recipes-support/vte/vte/0001-Makefile.docs-correctly-substitute-gtkdoc-qemu-wrapp.patch deleted file mode 100644 index c69a52e5d0..0000000000 --- a/meta/recipes-support/vte/vte/0001-Makefile.docs-correctly-substitute-gtkdoc-qemu-wrapp.patch +++ /dev/null @@ -1,24 +0,0 @@ -From daa30d0039397a735d49ea535305ed0bc5f9d73b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Tue, 26 Oct 2021 09:38:42 +0200 -Subject: [PATCH] Makefile.docs: correctly substitute gtkdoc qemu wrapper - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - doc/reference/Makefile.docs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/reference/Makefile.docs b/doc/reference/Makefile.docs -index b18f0a4..da18440 100644 ---- a/doc/reference/Makefile.docs -+++ b/doc/reference/Makefile.docs -@@ -233,7 +233,7 @@ INSTALL_DATA = $(INSTALL) -m 644 - - GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(CPPFLAGS) $(CFLAGS) - GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(CFLAGS) $(LDFLAGS) --GTKDOC_RUN = -+GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper - - GTKDOC_CHECK_PATH = gtkdoc-check - GTKDOC_REBASE = gtkdoc-rebase diff --git a/meta/recipes-support/vte/vte_0.68.0.bb b/meta/recipes-support/vte/vte_0.68.0.bb deleted file mode 100644 index fc4324872d..0000000000 --- a/meta/recipes-support/vte/vte_0.68.0.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Virtual terminal emulator GTK+ widget library" -DESCRIPTION = "VTE provides a virtual terminal widget for GTK applications." -HOMEPAGE = "https://wiki.gnome.org/Apps/Terminal/VTE" -BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" -LICENSE = "GPL-3.0-only & LGPL-3.0-or-later & MIT" -LICENSE:libvte = "LGPL-3.0-or-later" - -LIC_FILES_CHKSUM = " \ - file://COPYING.GPL3;md5=cc702cf3444d1f19680c794cc61948f9 \ - file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \ - file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \ -" - -DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu" - -GNOMEBASEBUILDCLASS = "meson" -GIR_MESON_OPTION = 'gir' - -inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection - -# vapigen.m4 is required when vala is not present (but the one from vala should be used normally) -SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ - file://0001-Makefile.docs-correctly-substitute-gtkdoc-qemu-wrapp.patch" -SRC_URI[archive.sha256sum] = "13e7d4789ca216a33780030d246c9b13ddbfd04094c6316eea7ff92284dd1749" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -# Instead of "inherit vala" we do the relevant settings here so we can -# set DEPENDS based on PACKAGECONFIG. - -# Our patched version of Vala looks in STAGING_DATADIR for .vapi files -export STAGING_DATADIR -# Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files -export XDG_DATA_DIRS = "${STAGING_DATADIR}" - -# Help g-ir-scanner find the .so for linking -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/.libs" -} - -# Package additional files -FILES:${PN}-dev += "${datadir}/vala/vapi/*" - -PACKAGECONFIG ??= "gnutls" -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala" -PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" -PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" -# vala requires gir -PACKAGECONFIG:remove:class-native = "vala" - -CFLAGS += "-D_GNU_SOURCE" - -PACKAGES =+ "libvte ${PN}-prompt" -FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" -FILES:${PN}-prompt = " \ - ${sysconfdir}/profile.d \ - ${libexecdir}/vte-urlencode-cwd \ -" - -FILES:${PN}-dev += "${datadir}/glade/" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/vte/vte_0.74.2.bb b/meta/recipes-support/vte/vte_0.74.2.bb new file mode 100644 index 0000000000..d8eafde2fb --- /dev/null +++ b/meta/recipes-support/vte/vte_0.74.2.bb @@ -0,0 +1,56 @@ +SUMMARY = "Virtual terminal emulator GTK+ widget library" +DESCRIPTION = "VTE provides a virtual terminal widget for GTK applications." +HOMEPAGE = "https://wiki.gnome.org/Apps/Terminal/VTE" +BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" +LICENSE = "GPL-3.0-only & LGPL-3.0-or-later & MIT" +LICENSE:libvte = "LGPL-3.0-or-later" + +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL3;md5=cc702cf3444d1f19680c794cc61948f9 \ + file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \ + file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \ +" + +DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libpcre2 libxml2-native gperf-native icu" + +GIR_MESON_OPTION = 'gir' +GIDOCGEN_MESON_OPTION = "docs" + +inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection systemd vala + +SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" +SRC_URI[archive.sha256sum] = "a535fb2a98fea8a2449cd1a02cccf5190131dddff52e715afdace3feb536eae7" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}" +EXTRA_OEMESON:append = " ${@bb.utils.contains('GI_DATA_ENABLED', 'False', '-Ddocs=false', '', d)}" + +PACKAGECONFIG ??= " \ + gnutls \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \ +" +PACKAGECONFIG[fribidi] = "-Dfribidi=true,-Dfribidi=false,fribidi" +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" +PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" +PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" + +PACKAGES =+ "libvte-gtk4 ${PN}-gtk4 ${PN}-gtk4-dev libvte ${PN}-prompt" +FILES:libvte-gtk4 = "${libdir}/lib*gtk4.so.* ${libdir}/girepository-1.0/Vte-3.91.typelib" +FILES:${PN}-gtk4 ="${bindir}/vte-2.91-gtk4" +FILES:${PN}-gtk4-dev = "${libdir}/lib*gtk4.so \ + ${libdir}/pkgconfig/vte-2.91-gtk4.pc \ + ${datadir}/gir-1.0/Vte-3.91.gir \ + ${datadir}/vala/vapi/vte-2.91-gtk4.deps \ + ${datadir}/vala/vapi/vte-2.91-gtk4.vapi \ + ${includedir}/vte-2.91-gtk4 \ + " +FILES:${PN} +="${systemd_user_unitdir}" +FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" +FILES:${PN}-prompt = " \ + ${sysconfdir}/profile.d \ + ${libexecdir}/vte-urlencode-cwd \ +" + +FILES:${PN}-dev += "${datadir}/glade/" diff --git a/meta/recipes-support/xxhash/xxhash_0.8.1.bb b/meta/recipes-support/xxhash/xxhash_0.8.2.bb index b3b9702598..f16b183c95 100644 --- a/meta/recipes-support/xxhash/xxhash_0.8.1.bb +++ b/meta/recipes-support/xxhash/xxhash_0.8.2.bb @@ -3,17 +3,19 @@ DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ working at speeds close to RAM limits." HOMEPAGE = "http://www.xxhash.com/" LICENSE = "BSD-2-Clause & GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cdfe7764d5685d8e08b3df302885d7f3 \ +LIC_FILES_CHKSUM = "file://LICENSE;md5=13be6b481ff5616f77dda971191bb29b \ file://cli/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - " + " SRC_URI = "git://github.com/Cyan4973/xxHash.git;branch=release;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" -SRCREV = "35b0373c697b5f160d3db26b1cbb45a0d5ba788c" +SRCREV = "bbb27a5efb85b92a0486cf361a8635715a53f6ba" S = "${WORKDIR}/git" +CFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}" + do_compile () { oe_runmake all } |