diff options
Diffstat (limited to 'external/poky/meta/recipes-support')
316 files changed, 4762 insertions, 10066 deletions
diff --git a/external/poky/meta/recipes-support/apr/apr-util_1.6.1.bb b/external/poky/meta/recipes-support/apr/apr-util_1.6.1.bb index 0c90f8d2..0dd8f025 100644 --- a/external/poky/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/external/poky/meta/recipes-support/apr/apr-util_1.6.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Apache Portable Runtime (APR) companion library" HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" -DEPENDS = "apr expat gdbm" +DEPENDS = "apr expat" BBCLASSEXTEND = "native nativesdk" @@ -23,12 +23,13 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ --without-pgsql \ --with-dbm=gdbm \ - --with-gdbm=${STAGING_DIR_HOST}${prefix} \ --without-sqlite2 \ --with-expat=${STAGING_DIR_HOST}${prefix}" -inherit autotools lib_package binconfig +inherit autotools lib_package binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apu-1-config" OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" @@ -64,10 +65,11 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config } -PACKAGECONFIG ??= "crypto" +PACKAGECONFIG ??= "crypto gdbm" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" +PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" #files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" @@ -79,6 +81,7 @@ INSANE_SKIP_${PN} += "dev-so" inherit ptest RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-iso8859-1 glibc-gconv-iso8859-2 glibc-gconv-utf-7" +RDEPENDS_${PN}-ptest += "libgcc" do_compile_ptest() { cd ${B}/test diff --git a/external/poky/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/external/poky/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch new file mode 100644 index 00000000..abff4e93 --- /dev/null +++ b/external/poky/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch @@ -0,0 +1,69 @@ +From 2bbe20b4f69e84e7a18bc79d382486953f479328 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 +system under heavy load, these tests randomly fail because they miss +a timer or other timing related issues. + +Upstream-Status: Pending +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> +--- + configure.in | 6 ++++++ + include/apr.h.in | 1 + + test/testlock.c | 4 ++-- + 3 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index d9f32d6..f0c5661 100644 +--- a/configure.in ++++ b/configure.in +@@ -2886,6 +2886,12 @@ AC_ARG_ENABLE(timedlocks, + ) + AC_SUBST(apr_has_timedlocks) + ++AC_ARG_ENABLE(timed-tests, ++ [ --disable-timed-tests Disable timed tests ], ++ [apr_has_timedtests="0"], [apr_has_timedtests="1"] ++) ++AC_SUBST(apr_has_timedtests) ++ + # hstrerror is only needed if IPv6 is not enabled, + # so getaddrinfo/gai_strerror are not used. + if test $have_ipv6 = 0; then +diff --git a/include/apr.h.in b/include/apr.h.in +index ee99def..c46a5f4 100644 +--- a/include/apr.h.in ++++ b/include/apr.h.in +@@ -298,6 +298,7 @@ extern "C" { + #define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@ + #define APR_HAS_OS_UUID @osuuid@ + #define APR_HAS_TIMEDLOCKS @apr_has_timedlocks@ ++#define APR_HAVE_TIME_DEPENDANT_TESTS @apr_has_timedtests@ + + #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 +--- a/test/testlock.c ++++ b/test/testlock.c +@@ -396,13 +396,13 @@ abts_suite *testlock(abts_suite *suite) + abts_run_test(suite, threads_not_impl, NULL); + #else + abts_run_test(suite, test_thread_mutex, NULL); +-#if APR_HAS_TIMEDLOCKS ++#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS + abts_run_test(suite, test_thread_timedmutex, NULL); + #endif + abts_run_test(suite, test_thread_rwlock, NULL); + abts_run_test(suite, test_cond, NULL); + abts_run_test(suite, test_timeoutcond, NULL); +-#if APR_HAS_TIMEDLOCKS ++#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS + abts_run_test(suite, test_timeoutmutex, NULL); + #endif + #endif +-- +2.23.0 + diff --git a/external/poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch b/external/poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch deleted file mode 100644 index 097c195a..00000000 --- a/external/poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4efdc06fb17b8a00a9eca923caa176be741d1e04 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 1 Feb 2018 14:56:13 +0800 -Subject: [PATCH 1/7] build/buildcheck.sh: improve libtool detection - -Support customize libtool by variable assigning, it is helpful -for cross compileing (such as libtool=aarch64-linux-libtool) - -Upstream-Status: Submitted [https://github.com/apache/apr/pull/8] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - build/buildcheck.sh | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/build/buildcheck.sh b/build/buildcheck.sh -index ab5df44..f191a41 100755 ---- a/build/buildcheck.sh -+++ b/build/buildcheck.sh -@@ -40,7 +40,9 @@ fi - # 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'` - if test -z "$lt_pversion"; then - echo "buildconf: libtool not found." --- -1.8.3.1 - diff --git a/external/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/external/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch index 5f5e7eac..d1a2ebe8 100644 --- a/external/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +++ b/external/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch @@ -1,7 +1,7 @@ -From f4d6e45ed5d2ccffd1af4c2ccdf7099ba0dce137 Mon Sep 17 00:00:00 2001 +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 6/7] apr: fix off_t size doesn't match in glibc when cross +Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross compiling In configure.in, it contains the following: @@ -29,15 +29,16 @@ 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 3b10422..a227e72 100644 +index 27b8539..fb408d1 100644 --- a/configure.in +++ b/configure.in -@@ -1769,7 +1769,7 @@ else +@@ -1801,7 +1801,7 @@ else socklen_t_value="int" fi @@ -46,25 +47,25 @@ index 3b10422..a227e72 100644 if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1838,7 +1838,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) - APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) - APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"]) +@@ -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]) - if test -n "$ssize_t_fmt"; then -@@ -1855,7 +1855,7 @@ fi +@@ -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]) - if test -n "$size_t_fmt"; then -@@ -1872,7 +1872,7 @@ fi +@@ -1909,7 +1909,7 @@ fi size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" @@ -73,6 +74,3 @@ index 3b10422..a227e72 100644 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then # Enable LFS --- -1.8.3.1 - diff --git a/external/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch b/external/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch deleted file mode 100644 index 6809fa60..00000000 --- a/external/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 036f90748247417dbfa714b1b912ca7dd4053f04 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 23 Jul 2018 14:12:35 +0800 -Subject: [PATCH] apr: fix ptest hang in teststr - -ptest hang in teststr since turns into a non-terminating loop, -fix by below backported patch. - -Upstream-Status: Backport[https://github.com/apache/apr/commit/ - 2e8fbff4ecf82d0decf6baf774c209948f2f4998?diff=unified] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - test/teststr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/teststr.c b/test/teststr.c -index d9a5054..951a830 100644 ---- a/test/teststr.c -+++ b/test/teststr.c -@@ -307,7 +307,7 @@ static void overflow_strfsize(abts_case *tc, void *data) - for (; off < 999999999; off += 999) { - apr_strfsize(off, buf); - } -- for (off = 1; off < LONG_MAX && off > 0; off *= 2) { -+ for (off = LONG_MAX; off > 1; off /= 2) { - apr_strfsize(off, buf); - apr_strfsize(off + 1, buf); - apr_strfsize(off - 1, buf); --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/apr/apr/libtoolize_check.patch b/external/poky/meta/recipes-support/apr/apr/libtoolize_check.patch new file mode 100644 index 00000000..740792e6 --- /dev/null +++ b/external/poky/meta/recipes-support/apr/apr/libtoolize_check.patch @@ -0,0 +1,28 @@ +From: Helmut Grohne <helmut@subdivi.de> +Subject: check for libtoolize rather than libtool +Last-Update: 2014-09-19 + +libtool is now in package libtool-bin, but apr only needs libtoolize. + +Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch ] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +--- apr.orig/build/buildcheck.sh ++++ apr/build/buildcheck.sh +@@ -39,11 +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` +-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` ++lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` + if test -z "$lt_pversion"; then +- echo "buildconf: libtool not found." ++ echo "buildconf: libtoolize not found." + echo " You need libtool version 1.4 or newer installed" + echo " to build APR from SVN." + res=1 diff --git a/external/poky/meta/recipes-support/apr/apr_1.6.3.bb b/external/poky/meta/recipes-support/apr/apr_1.7.0.bb index 7bfb6985..7073af8c 100644 --- a/external/poky/meta/recipes-support/apr/apr_1.6.3.bb +++ b/external/poky/meta/recipes-support/apr/apr_1.7.0.bb @@ -11,20 +11,20 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://run-ptest \ - file://0001-build-buildcheck.sh-improve-libtool-detection.patch \ 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://0008-apr-fix-ptest-hang-in-teststr.patch \ -" + file://libtoolize_check.patch \ + file://0001-Add-option-to-disable-timed-dependant-tests.patch \ + " -SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa" -SRC_URI[sha256sum] = "131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172" +SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7" +SRC_URI[sha256sum] = "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea" -inherit autotools-brokensep lib_package binconfig multilib_header ptest +inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" @@ -38,13 +38,9 @@ CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sct CACHED_CONFIGUREVARS += "ac_cv_sizeof_struct_iovec=yes" CACHED_CONFIGUREVARS += "ac_cv_file__dev_zero=yes" -# Otherwise libtool fails to compile apr-utils -# x86_64-linux-libtool: compile: unable to infer tagged configuration -# x86_64-linux-libtool: error: specify a tag with '--tag' -CCACHE = "" - PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[timed-tests] = "--enable-timed-tests,--disable-timed-tests," do_configure_prepend() { # Avoid absolute paths for grep since it causes failures @@ -53,12 +49,18 @@ do_configure_prepend() { export GREP="grep" cd ${S} - libtool='${HOST_SYS}-libtool' ./buildconf + # The "2" means libtool version 2. + ./buildconf 2 } +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apr-1-config \ + ${PN}-dev:${datadir}/build-1/apr_rules.mk" + FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" RDEPENDS_${PN}-dev += "bash" +RDEPENDS_${PN}-ptest += "libgcc" + #for some reason, build/libtool.m4 handled by buildconf still be overwritten #when autoconf, so handle it again. do_configure_append() { diff --git a/external/poky/meta/recipes-support/aspell/aspell/gcc7.patch b/external/poky/meta/recipes-support/aspell/aspell/gcc7.patch deleted file mode 100644 index 6ffd0772..00000000 --- a/external/poky/meta/recipes-support/aspell/aspell/gcc7.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8089fa02122fed0a6394eba14bbedcb1d18e2384 Mon Sep 17 00:00:00 2001 -From: Kevin Atkinson <kevina@gnu.org> -Date: Thu, 29 Dec 2016 00:50:31 -0500 -Subject: [PATCH] Compile Fixes for GCC 7. - -Closes #519. ---- -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport - - modules/filter/tex.cpp | 2 +- - prog/check_funs.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp -index a979539..19ab63c 100644 ---- a/modules/filter/tex.cpp -+++ b/modules/filter/tex.cpp -@@ -174,7 +174,7 @@ namespace { - - if (c == '{') { - -- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0') -+ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0') - push_command(Parm); - - top.in_what = Parm; -diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp -index db54f3d..89ee09d 100644 ---- a/prog/check_funs.cpp -+++ b/prog/check_funs.cpp -@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) { - } - } - if (i == width-1) { -- if (word == '\0') -+ if (*word == '\0') - put(out,' '); - else if (word[len] == '\0') - put(out, word, len); diff --git a/external/poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/external/poky/meta/recipes-support/aspell/aspell_0.60.8.bb index 161bb5ce..62998781 100644 --- a/external/poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb +++ b/external/poky/meta/recipes-support/aspell/aspell_0.60.8.bb @@ -4,13 +4,9 @@ SECTION = "console/utils" LICENSE = "LGPLv2 | LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -PR = "r1" - -SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \ - file://gcc7.patch \ - " -SRC_URI[md5sum] = "e66a9c9af6a60dc46134fdacf6ce97d7" -SRC_URI[sha256sum] = "f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1" +SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz" +SRC_URI[md5sum] = "012fa9209203ae4e5a61c2a668fd10e3" +SRC_URI[sha256sum] = "f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2" PACKAGECONFIG ??= "" PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses" diff --git a/external/poky/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch b/external/poky/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch new file mode 100644 index 00000000..f64e46ec --- /dev/null +++ b/external/poky/meta/recipes-support/atk/at-spi2-atk/0001-atk_test_util.h-add-missing-sys-time.h-include.patch @@ -0,0 +1,61 @@ +From a8f9b2d36dc887216e8923047dc309435dd8b254 Mon Sep 17 00:00:00 2001 +From: Tim Orling <timothy.t.orling@linux.intel.com> +Date: Fri, 28 Feb 2020 10:49:41 -0800 +Subject: [PATCH] atk_test_util.h: add missing sys/time.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On centos-7, we see errors likei [1]: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_sec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_nsec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size of ‘timeout’ isn’t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit declaration of function ‘nanosleep’ [-Wimplicit-function-declaration] + nanosleep(&timeout, NULL); + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ‘terminate_app’: +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable ‘timeout’ has initializer but incomplete type + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + ^ +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_sec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_nsec’ specified in initializer +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] +../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size of ‘timeout’ isn’t known + struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 1000000 }; + +This is because of missing sys/time.h in tests/atk_test_util.h [2] + +Thanks go to Khem Raj for pointing this out [3] + +[1] http://errors.yoctoproject.org/Errors/Details/392974/ +[2] https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/14 +[3] http://lists.openembedded.org/pipermail/openembedded-core/2020-February/293707.html + +Upstream-Status: Pending + +Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> +--- + tests/atk_test_util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/atk_test_util.h b/tests/atk_test_util.h +index d69e650..98a2c01 100644 +--- a/tests/atk_test_util.h ++++ b/tests/atk_test_util.h +@@ -26,6 +26,7 @@ + + #include <stdio.h> + #include <unistd.h> ++#include <sys/time.h> + #include <glib.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/external/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb b/external/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb deleted file mode 100644 index 16d8e45e..00000000 --- a/external/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "AT-SPI 2 Toolkit Bridge" -HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" - -SRC_URI[archive.md5sum] = "355c7916a69513490cb83ad34016b169" -SRC_URI[archive.sha256sum] = "61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e" - -DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase distro_features_check upstream-version-is-even - -# The at-spi2-core requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -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.*" diff --git a/external/poky/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb b/external/poky/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb new file mode 100644 index 00000000..c2979125 --- /dev/null +++ b/external/poky/meta/recipes-support/atk/at-spi2-atk_2.34.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "AT-SPI 2 Toolkit Bridge" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "e0f99641c5a403041c4214be04722e15" +SRC_URI[archive.sha256sum] = "776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16" + +DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase features_check upstream-version-is-even + +# gnomebase.bbclass sets SRC_URI = , so we need to append after, at least for -native +SRC_URI += " file://0001-atk_test_util.h-add-missing-sys-time.h-include.patch" + +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/external/poky/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch b/external/poky/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch new file mode 100644 index 00000000..7631969c --- /dev/null +++ b/external/poky/meta/recipes-support/atk/at-spi2-core/0001-Fix-source-reproducibility.patch @@ -0,0 +1,32 @@ +From b7fa0aa00b07e03e338dd02af564431bf2f2b185 Mon Sep 17 00:00:00 2001 +From: Joshua Watt <Joshua.Watt@garmin.com> +Date: Wed, 20 Nov 2019 15:24:02 -0600 +Subject: [PATCH] Fix source reproducibility + +The generated enum type files can be included in source packages meant +for debugging, and thus need to be reproducible. Replace the absolute +include of the header with the basename. This is sufficient because the +target include files are always in the include path anyway. + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/at-spi2-core/merge_requests/25] +Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com> +--- + atspi/atspi-enum-types.c.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atspi/atspi-enum-types.c.template b/atspi/atspi-enum-types.c.template +index 385d0ee..92e4937 100644 +--- a/atspi/atspi-enum-types.c.template ++++ b/atspi/atspi-enum-types.c.template +@@ -5,7 +5,7 @@ + + /*** BEGIN file-production ***/ + /* enumerations from "@basename@" */ +-#include "@filename@" ++#include "@basename@" + + /*** END file-production ***/ + +-- +2.23.0 + diff --git a/external/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb b/external/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb deleted file mode 100644 index 0bdb1e37..00000000 --- a/external/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" -HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ - " - -SRC_URI[md5sum] = "9c42f79636ed1c0e908b7483d789b32e" -SRC_URI[sha256sum] = "42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87" - -DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" - -inherit meson gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ - -Ddbus_daemon=${bindir}/dbus-daemon" - -GTKDOC_ENABLE_FLAG = "-Denable_docs=true" -GTKDOC_DISABLE_FLAG = "-Denable_docs=false" - -GI_ENABLE_FLAG = "-Denable-introspection=yes" -GI_DISABLE_FLAG = "-Denable-introspection=no" - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ - '${GI_DISABLE_FLAG}', d)} " - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ - '${GTKDOC_DISABLE_FLAG}', d)} " - -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 \ - " diff --git a/external/poky/meta/recipes-support/atk/at-spi2-core_2.34.0.bb b/external/poky/meta/recipes-support/atk/at-spi2-core_2.34.0.bb new file mode 100644 index 00000000..84e05e77 --- /dev/null +++ b/external/poky/meta/recipes-support/atk/at-spi2-core_2.34.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +LICENSE = "LGPL-2.1+" +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 \ + file://0001-Fix-source-reproducibility.patch" + +SRC_URI[md5sum] = "53c21565507105fb68031cd9c21a559b" +SRC_URI[sha256sum] = "d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6" + +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/external/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch b/external/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch deleted file mode 100644 index 047e81fb..00000000 --- a/external/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Submitted - -From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001 -From: Jeremy Puhlman <jpuhlman@mvista.com> -Date: Thu, 14 Jun 2018 17:21:49 +0000 -Subject: [PATCH] Switch from filename to basename - -When atk-enum-types.h is installed in to a system, the user likely has -no access to the location where the headers were built, especially if -the software was built in a sysroot environment. If the headers were -built for a mulitlib environment, the build pathing may be different. -Subsequently, if two mulitlib variants of atk are installed together the -headers conflict for no other reason then they were built in two -different locations. Switching from filename to basename, still should -provide sufficient information on the providence of the enums, while not -conflicting for really no good reason. - -Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> ---- - atk/atk-enum-types.h.template | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template -index 7b4cec4..8321c24 100644 ---- a/atk/atk-enum-types.h.template -+++ b/atk/atk-enum-types.h.template -@@ -14,7 +14,7 @@ G_BEGIN_DECLS - - /*** BEGIN file-production ***/ - --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - /*** END file-production ***/ - - /*** BEGIN value-header ***/ --- -2.14.1.459.g238e487 - diff --git a/external/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/external/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch deleted file mode 100644 index c604a984..00000000 --- a/external/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3838757d29590cc1ef99c97f7268377322fc17e9 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <anuj.mittal@intel.com> -Date: Fri, 6 Apr 2018 12:04:00 +0800 -Subject: [PATCH] meson.build: enable introspection for cross-compile - -It works fine in OE-core and doesn't need to be disabled. Let the user decide -if it should be disabled or not. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - atk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/meson.build b/atk/meson.build -index 7b5a683..855e28f 100644 ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -139,7 +139,7 @@ libatk_dep = declare_dependency(link_with: libatk, - - disable_introspection = get_option('disable_introspection') - --if not meson.is_cross_build() and not disable_introspection -+if not disable_introspection - gnome.generate_gir(libatk, - sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], - namespace: 'Atk', diff --git a/external/poky/meta/recipes-support/atk/atk_2.28.1.bb b/external/poky/meta/recipes-support/atk/atk_2.28.1.bb deleted file mode 100644 index 26b13b69..00000000 --- a/external/poky/meta/recipes-support/atk/atk_2.28.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Accessibility toolkit for GNOME" -HOMEPAGE = "http://live.gnome.org/GAP/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/libs" - -LICENSE = "GPLv2+ & LGPLv2+" -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 - -GTKDOC_ENABLE_FLAG = "-Denable_docs=true" -GTKDOC_DISABLE_FLAG = "-Denable_docs=false" - -GI_ENABLE_FLAG = "-Ddisable_introspection=false" -GI_DISABLE_FLAG = "-Ddisable_introspection=true" - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ - '${GI_DISABLE_FLAG}', d)} " - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ - '${GTKDOC_DISABLE_FLAG}', d)} " - -SRC_URI_append = " \ - file://0001-meson.build-enable-introspection-for-cross-compile.patch \ - file://0001-Switch-from-filename-to-basename.patch \ - " -SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11" -SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc" - -BBCLASSEXTEND = "native" - diff --git a/external/poky/meta/recipes-support/atk/atk_2.34.1.bb b/external/poky/meta/recipes-support/atk/atk_2.34.1.bb new file mode 100644 index 00000000..277397c6 --- /dev/null +++ b/external/poky/meta/recipes-support/atk/atk_2.34.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "Accessibility toolkit for GNOME" +HOMEPAGE = "http://live.gnome.org/GAP/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/libs" + +LICENSE = "GPLv2+ & LGPLv2+" +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.md5sum] = "f60bbaf8bdd08b93d98736b54b2fc8e9" +SRC_URI[archive.sha256sum] = "d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/external/poky/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch b/external/poky/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch new file mode 100644 index 00000000..ba2ffee5 --- /dev/null +++ b/external/poky/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch @@ -0,0 +1,63 @@ +From 9e08219e0e99ee2589cf35fa8d52cef3515accce 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 + +I have confirmed on the host distro (Ubuntu 18.04) that they +fail as well; upstream probably haven't noticed because the +test is only executed under sudo. + +Upstream-Status: Inappropriate [disabling tests instead of fixing them properly] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + test/root/permissions.test | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/test/root/permissions.test b/test/root/permissions.test +index 8f8f825..21e8a95 100644 +--- a/test/root/permissions.test ++++ b/test/root/permissions.test +@@ -50,10 +50,6 @@ User daemon is a member in the owning group, which has only read access. + Verify this. + + $ su daemon +- $ cat f +- > root +- > bin +- + $ echo daemon >> f + >~ .*f: Permission denied$ + +@@ -146,8 +142,6 @@ the owning group, he should still have no write access. + $ setfacl -x g:daemon f + + $ su daemon +- $ echo daemon4 >> f +- >~ .*f: Permission denied$ + + + Change the owning group. The other permissions should now grant user +@@ -158,12 +152,6 @@ daemon write access. + + $ su daemon + $ echo daemon5 >> f +- $ cat f +- > root +- > bin +- > daemon +- > daemon2 +- > daemon5 + + + Verify that permissions in separate matching ACL entries do not +@@ -173,7 +161,6 @@ accumulate. + $ setfacl -m g:bin:r,g:daemon:w f + + $ su daemon +- $ : < f + $ : > f + $ : <> f + >~ .*f: Permission denied$ +-- +2.17.1 + diff --git a/external/poky/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch b/external/poky/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch new file mode 100644 index 00000000..57ef0bb7 --- /dev/null +++ b/external/poky/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch @@ -0,0 +1,24 @@ +From 39d332a8801de5d9ef09dacb3dba85c208b7b2ad 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 + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + test/Makemodule.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/Makemodule.am b/test/Makemodule.am +index 17d4927..015de7f 100644 +--- a/test/Makemodule.am ++++ b/test/Makemodule.am +@@ -30,7 +30,7 @@ EXTRA_DIST += \ + check_LTLIBRARIES = libtestlookup.la + + libtestlookup_la_SOURCES = test/test_passwd.c test/test_group.c +-libtestlookup_la_CFLAGS = -DBASEDIR=\"$(abs_srcdir)\" ++libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\" + libtestlookup_la_LDFLAGS = -rpath $(abs_builddir) + + AM_TESTS_ENVIRONMENT = PATH="$(abs_top_builddir):$$PATH"; diff --git a/external/poky/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch b/external/poky/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch deleted file mode 100644 index 4c7cba3b..00000000 --- a/external/poky/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d82457ce5ca7455e336da5e244d95f90e52aaef8 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Tue, 18 Apr 2017 01:17:26 -0700 -Subject: [PATCH] Makefile: libacl should depend on include - -Fixed race issue: - In file included from acl_copy_entry.c:22:0: - libacl.h:19:21: fatal error: sys/acl.h: No such file or directory - #include <sys/acl.h> - -[snip] - - compilation terminated. - acl_get_file.c:27:24: fatal error: acl/libacl.h: No such file or directory - #include <acl/libacl.h> - ^ - -The acl.h is in "include" directory, and include/Makefile creates -symlink "sys" and "acl" poinst to current dirctory: -$ ls include/ -l -acl -> . -sys -> . - -So if "libacl" target runs before "include", the error would happen -since no "acl" or "sys" directory. - -Let libacl depend on include can fix the problem. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index dce32d3..8a79379 100644 ---- a/Makefile -+++ b/Makefile -@@ -48,7 +48,7 @@ else - endif - - # tool/lib dependencies --libacl: libmisc -+libacl: include libmisc - getfacl setfacl chacl: libacl - - ifeq ($(HAVE_BUILDDEFS), yes) --- -2.10.2 - diff --git a/external/poky/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch b/external/poky/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch deleted file mode 100644 index cf765fdb..00000000 --- a/external/poky/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch +++ /dev/null @@ -1,198 +0,0 @@ -acl: fix the order of expected output of getfacl - -The result of getfacl is sorted by user id. -In Centos or RHEL, bin user id is 1 and daemon user id is 2. -But in our image, bin user id is 2 and daemon user id is 1. -The patch fixes this issue to make ptest pass. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---- - test/misc.test | 38 +++++++++++++++++++------------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/test/misc.test b/test/misc.test -index 6e98053..53ae5b0 100644 ---- a/test/misc.test -+++ b/test/misc.test -@@ -79,8 +79,8 @@ Multiple users - - $ getfacl --omit-header f - > user::rw- -- > user:bin:rw- - > user:daemon:r-- -+ > user:bin:rw- - > group::r-- - > mask::rw- - > other::r-- -@@ -94,8 +94,8 @@ Multiple groups - - $ getfacl --omit-header f - > user::rw- -- > user:bin:rw- - > user:daemon:r-- -+ > user:bin:rw- - > group::r-- - > group:daemon:r-- - > group:users:rw- -@@ -111,8 +111,8 @@ Remove one group - - $ getfacl --omit-header f - > user::rw- -- > user:bin:rw- - > user:daemon:r-- -+ > user:bin:rw- - > group::r-- - > group:daemon:r-- - > mask::rw- -@@ -146,8 +146,8 @@ Default ACL - - $ getfacl --omit-header d - > user::rwx -- > user:bin:rwx - > user:daemon:rw- -+ > user:bin:rwx - > group::r-x - > mask::rwx - > other::--- -@@ -236,16 +236,16 @@ Add some users and groups - - $ getfacl --omit-header d/d - > user::rwx -- > user:bin:rwx #effective:r-x - > user:daemon:r-x -+ > user:bin:rwx #effective:r-x - > group::r-x - > group:daemon:rwx #effective:r-x - > group:users:r-x - > mask::r-x - > other::--- - > default:user::rwx -- > default:user:bin:rwx #effective:r-x - > default:user:daemon:r-x -+ > default:user:bin:rwx #effective:r-x - > default:group::r-x - > default:mask::r-x - > default:other::--- -@@ -262,16 +262,16 @@ Symlink in directory with default ACL? - - $ getfacl --omit-header d/l - > user::rwx -- > user:bin:rwx #effective:r-x - > user:daemon:r-x -+ > user:bin:rwx #effective:r-x - > group::r-x - > group:daemon:rwx #effective:r-x - > group:users:r-x - > mask::r-x - > other::--- - > default:user::rwx -- > default:user:bin:rwx #effective:r-x - > default:user:daemon:r-x -+ > default:user:bin:rwx #effective:r-x - > default:group::r-x - > default:mask::r-x - > default:other::--- -@@ -287,16 +287,16 @@ Does mask manipulation work? - - $ getfacl --omit-header d/d - > user::rwx -- > user:bin:r-x - > user:daemon:r-x -+ > user:bin:r-x - > group::r-x - > group:daemon:r-x - > group:users:r-x - > mask::r-x - > other::--- - > default:user::rwx -- > default:user:bin:rwx #effective:r-x - > default:user:daemon:r-x -+ > default:user:bin:rwx #effective:r-x - > default:group::r-x - > default:mask::r-x - > default:other::--- -@@ -308,16 +308,16 @@ Does mask manipulation work? - - $ getfacl --omit-header d/d - > user::rwx -- > user:bin:r-x - > user:daemon:r-x -+ > user:bin:r-x - > group::r-x - > group:daemon:r-x - > group:users:r-x - > mask::r-x - > other::--- - > default:user::rwx -- > default:user:bin:rwx - > default:user:daemon:r-x -+ > default:user:bin:rwx - > default:group::r-x - > default:mask::rwx - > default:other::--- -@@ -333,8 +333,8 @@ Remove the default ACL - - $ getfacl --omit-header d - > user::rwx -- > user:bin:rwx - > user:daemon:rw- -+ > user:bin:rwx - > group::r-x - > mask::rwx - > other::--- -@@ -373,14 +373,14 @@ Now, chmod should change the group_obj entry - - $ getfacl --omit-header d - > user::rwx -- > user:bin:r-x - > user:daemon:rwx -+ > user:bin:r-x - > group::rwx - > mask::rwx - > other::r-x - > default:user::rwx -- > default:user:bin:r-x - > default:user:daemon:rwx -+ > default:user:bin:r-x - > default:group::rwx - > default:mask::rwx - > default:other::r-x -@@ -392,14 +392,14 @@ Now, chmod should change the group_obj entry - - $ getfacl --omit-header d - > user::rwx -- > user:bin:r-x - > user:daemon:rwx #effective:r-x -+ > user:bin:r-x - > group::rwx #effective:r-x - > mask::r-x - > other::--- - > default:user::rwx -- > default:user:bin:r-x - > default:user:daemon:rwx -+ > default:user:bin:r-x - > default:group::rwx - > default:mask::rwx - > default:other::r-x -@@ -411,14 +411,14 @@ Now, chmod should change the group_obj entry - - $ getfacl --omit-header d - > user::rwx -- > user:bin:r-x - > user:daemon:rwx #effective:r-x -+ > user:bin:r-x - > group::rwx #effective:r-x - > mask::r-x - > other::--- - > default:user::rwx -- > default:user:bin:r-x - > default:user:daemon:rwx -+ > default:user:bin:r-x - > default:group::rwx - > default:mask::rwx - > default:other::r-x --- -1.7.9.5 - diff --git a/external/poky/meta/recipes-support/attr/acl/configure.ac b/external/poky/meta/recipes-support/attr/acl/configure.ac deleted file mode 100644 index 7af2e8d8..00000000 --- a/external/poky/meta/recipes-support/attr/acl/configure.ac +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de> -# -# This program is free software: you can redistribute it and/or modify it -# 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. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -AC_INIT(include/acl.h) -AC_CONFIG_AUX_DIR([.]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_HEADER(include/config.h) -AC_PREFIX_DEFAULT(/usr) - -AC_PROG_LIBTOOL - -AC_ARG_ENABLE(shared, -[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, - enable_shared=yes) -AC_SUBST(enable_shared) - -AC_ARG_ENABLE(gettext, -[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, - enable_gettext=yes) -AC_SUBST(enable_gettext) - -AC_ARG_ENABLE(lib64, -[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],, - enable_lib64=no) -AC_SUBST(enable_lib64) - -AC_PACKAGE_GLOBALS(acl) -AC_PACKAGE_UTILITIES(acl) -AC_PACKAGE_NEED_ATTR_XATTR_H -AC_PACKAGE_NEED_ATTR_ERROR_H -AC_MULTILIB($enable_lib64) -AC_PACKAGE_NEED_GETXATTR_LIBATTR -AC_MANUAL_FORMAT - -AC_FUNC_GCC_VISIBILITY - -AC_OUTPUT(include/builddefs) diff --git a/external/poky/meta/recipes-support/attr/acl/run-ptest b/external/poky/meta/recipes-support/attr/acl/run-ptest index a56946d8..43128233 100644 --- a/external/poky/meta/recipes-support/attr/acl/run-ptest +++ b/external/poky/meta/recipes-support/attr/acl/run-ptest @@ -4,61 +4,7 @@ #umask 077 -EXT3_IMAGE=ext3.img -EXT3_MOUNT_POINT=/mnt/ext3 +mkdir -p /tmp/acl-ptest/test +cp test/test.* /tmp/acl-ptest/test -trap 'rm -f ${EXT3_IMAGE}' EXIT - -dd if=/dev/zero of=${EXT3_IMAGE} bs=1M count=1 -if [ "$?" -eq 0 ]; then - echo "PASS: dump ext3.img" -else - echo "FAIL: dump ext3.img" - exit 1 -fi - -mkfs.ext3 -F ${EXT3_IMAGE} -if [ "$?" -eq 0 ]; then - echo "PASS: mkfs.ext3 -F ext3.img" -else - echo "FAIL: mkfs.ext3 -F ext3.img" - exit 1 -fi - -if [ -d $EXT3_MOUNT_POINT ]; then - echo "mount point exist" -else - mkdir -p $EXT3_MOUNT_POINT -fi - - -mount -o loop,rw,acl ${EXT3_IMAGE} $EXT3_MOUNT_POINT -if [ "$?" -eq 0 ]; then - echo "PASS: mount ext3.img" -else - echo "FAIL: mount ext3.img" - exit 1 -fi - -cp -rf ./test/ $EXT3_MOUNT_POINT - -cd $EXT3_MOUNT_POINT/test/ - -if sed -e 's!^bin:x:2:$!bin:x:2:daemon!' < /etc/group > gtmp -then if cp /etc/group group.orig; - then cp gtmp /etc/group - make -k tests root-tests | sed \ - -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \ - -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|' - cp group.orig /etc/group - else echo "FAIL: couldn't save original group file." - exit 1 - fi -else echo "FAIL: couldn't create modified group file." - exit 1 -fi - -cd - -umount $EXT3_MOUNT_POINT -rm -rf $EXT3_MOUNT_POINT -rm $EXT3_IMAGE +make test-suite.log diff --git a/external/poky/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch b/external/poky/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted file mode 100644 index e64990ad..00000000 --- a/external/poky/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 311589fedf196168382d8f0db303ab328bcf9d83 Mon Sep 17 00:00:00 2001 -From: Peter Seebach <peter.seebach@windriver.com> -Date: Wed, 11 May 2016 15:16:06 -0500 -Subject: [PATCH] acl.inc, run-ptest: improve ptest functionality on limited - -commit c45bae84817a70fef6c2b661a07a492a0d23ae85 - - Fix permissions on temporary directory - - The temporary directory's permissions have to allow other users to - view the directory. A default umask of 022 is common, but not mandatory, - and secure systems may have more restrictive defaults. - - Signed-off-by: Peter Seebach <peter.seebach@windriver.com> - -Upstream-Status: Backport [ http://git.savannah.gnu.org/cgit/acl.git/commit/?id=c6772a958800de064482634f77c20a0faafc5af6 ] - -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - test/root/permissions.test | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test/root/permissions.test b/test/root/permissions.test -index 42615f5..098b52a 100644 ---- a/test/root/permissions.test -+++ b/test/root/permissions.test -@@ -16,6 +16,7 @@ Cry immediately if we are not running as root. - First, set up a temporary directory and create a regular file with - defined permissions. - -+ $ umask 022 - $ mkdir d - $ cd d - $ umask 027 --- -2.8.1 - diff --git a/external/poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch b/external/poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch deleted file mode 100644 index f392465b..00000000 --- a/external/poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch +++ /dev/null @@ -1,100 +0,0 @@ -From e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d Mon Sep 17 00:00:00 2001 -From: Kamil Dudka <kdudka@redhat.com> -Date: Mon, 20 May 2013 16:38:06 +0200 -Subject: [PATCH] test: fix insufficient quoting of '\' - -This is a follow-up to 7f2c91b8369242a8dbc2b304a5b71b2a85f5b855, which -caused sbits-restore.test to fail in the following way in case SELinux -was disabled: - -*** sbits-restore.test *** -[3] $ umask 022 -- ok -[4] $ mkdir d -- ok -[5] $ touch d/g -- ok -[6] $ touch d/u -- ok -[7] $ chmod u+s d/u -- ok -[8] $ chmod g+s d/g -- ok -[9] $ chmod +t d -- ok -[10] $ getfacl -R d > d.acl -- ok -[11] $ rm -R d -- ok -[12] $ mkdir d -- ok -[13] $ touch d/g -- ok -[14] $ touch d/u -- ok -[15] $ setfacl --restore d.acl -- ok -[16] $ ls -dl d | awk '{print $1}' | sed 's/.$//g' -- failed -drwxr-xr- != drwxr-xr-t -[18] $ ls -dl d/u | awk '{print $1}' | sed 's/.$//g' -- failed --rwSr--r- != -rwSr--r-- -[20] $ ls -dl d/g | awk '{print $1}' | sed 's/.$//g' -- failed --rw-r-Sr- != -rw-r-Sr-- -[22] $ rm -Rf d -- ok -17 commands (14 passed, 3 failed) - -Upstream-Status: Backport -http://git.savannah.gnu.org/cgit/acl.git/commit/?id=e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d - -Signed-off-by: Kamil Dudka <kdudka@redhat.com> -Signed-off-by: He Zhe <zhe.he@windriver.com> - -Index: acl-2.2.52/test/cp.test -=================================================================== ---- acl-2.2.52.orig/test/cp.test -+++ acl-2.2.52/test/cp.test -@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if - > -rw-rw-r--+ - - $ cp f g -- $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g' -+ $ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//g' - > -rw-r--r-- - - $ rm g -Index: acl-2.2.52/test/misc.test -=================================================================== ---- acl-2.2.52.orig/test/misc.test -+++ acl-2.2.52/test/misc.test -@@ -254,7 +254,7 @@ Add some users and groups - Symlink in directory with default ACL? - - $ ln -s d d/l -- $ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g' -+ $ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//g' - > lrwxrwxrwx - - $ ls -dl -L d/l | awk '{print $1}' -@@ -343,7 +343,7 @@ Remove the default ACL - Reset to base entries - - $ setfacl -b d -- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' -+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' - > drwxr-x--- - - $ getfacl --omit-header d -@@ -355,7 +355,7 @@ Reset to base entries - Now, chmod should change the group_obj entry - - $ chmod 775 d -- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' -+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' - > drwxrwxr-x - - $ getfacl --omit-header d -Index: acl-2.2.52/test/sbits-restore.test -=================================================================== ---- acl-2.2.52.orig/test/sbits-restore.test -+++ acl-2.2.52/test/sbits-restore.test -@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via - - $ touch d/g - $ touch d/u - $ setfacl --restore d.acl -- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' -+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' - > drwxr-xr-t -- $ ls -dl d/u | awk '{print $1}' | sed 's/\.$//g' -+ $ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//g' - > -rwSr--r-- -- $ ls -dl d/g | awk '{print $1}' | sed 's/\.$//g' -+ $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g' - > -rw-r-Sr-- - $ rm -Rf d diff --git a/external/poky/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch b/external/poky/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch deleted file mode 100644 index 8cc11a63..00000000 --- a/external/poky/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch +++ /dev/null @@ -1,84 +0,0 @@ -From d2f49ee6fe4850b8dda5b08676b36201d3c43710 Mon Sep 17 00:00:00 2001 -From: He Zhe <zhe.he@windriver.com> -Date: Wed, 2 Mar 2016 15:46:57 +0800 -Subject: [PATCH] test: fixups on SELinux machines for root testcases - -ls adds a '.' at the end of the permission field list on SELinux -machines, filter this out so root tests work on SELinux machines. - -Upstream-Status: Accepted -http://git.savannah.gnu.org/cgit/acl.git/commit/?id=26a87d36f80d5e98bccb5878834d9e69dadfe3e9 - -Signed-off-by: He Zhe <zhe.he@windriver.com> ---- - test/root/permissions.test | 8 ++++---- - test/root/restore.test | 2 +- - test/root/setfacl.test | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/test/root/permissions.test b/test/root/permissions.test -index 9b9e3de..665339a 100644 ---- a/test/root/permissions.test -+++ b/test/root/permissions.test -@@ -19,7 +19,7 @@ defined permissions. - $ cd d - $ umask 027 - $ touch f -- $ ls -l f | awk -- '{ print $1, $3, $4 }' -+ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' - > -rw-r----- root root - - -@@ -39,7 +39,7 @@ Now, change the ownership of the file to bin:bin and verify that this - gives user bin write access. - - $ chown bin:bin f -- $ ls -l f | awk -- '{ print $1, $3, $4 }' -+ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' - > -rw-r----- bin bin - $ su bin - $ echo bin >> f -@@ -256,12 +256,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them. - $ mkdir -m 600 x - $ chown daemon:daemon x - $ echo j > x/j -- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' -+ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' - > -rw-r----- root root - - $ setfacl -m u:daemon:r x - -- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' -+ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' - > -rw-r----- root root - (With the bug this gives: `ls: x/j: Permission denied'.) - -diff --git a/test/root/restore.test b/test/root/restore.test -index 63a9d01..c85097c 100644 ---- a/test/root/restore.test -+++ b/test/root/restore.test -@@ -21,7 +21,7 @@ Cry immediately if we are not running as root. - $ chown bin passwd - $ chmod u+s passwd - $ setfacl --restore passwd.acl -- $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' -+ $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\\.//g' - > -rwsr-xr-x root root - - $ rm passwd passwd.acl -diff --git a/test/root/setfacl.test b/test/root/setfacl.test -index a46a9f4..7efbad7 100644 ---- a/test/root/setfacl.test -+++ b/test/root/setfacl.test -@@ -12,7 +12,7 @@ Cry immediately if we are not running as root. - $ sg bin - $ umask 027 - $ touch g -- $ ls -dl g | awk '{print $1}' -+ $ ls -dl g | awk '{print $1}' | sed 's/\\.//g' - > -rw-r----- - - $ setfacl -m m:- g --- -1.9.1 - diff --git a/external/poky/meta/recipes-support/attr/acl_2.2.52.bb b/external/poky/meta/recipes-support/attr/acl_2.2.52.bb deleted file mode 100644 index 8b89de9b..00000000 --- a/external/poky/meta/recipes-support/attr/acl_2.2.52.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Utilities for managing POSIX Access Control Lists" -HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" -SECTION = "libs" - -LICENSE = "LGPLv2.1+ & GPLv2+" -LICENSE_${PN} = "GPLv2+" -LICENSE_lib${BPN} = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ - file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764" - -DEPENDS = "attr" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \ - file://configure.ac;subdir=${BP} \ - file://run-ptest \ - file://acl-fix-the-order-of-expected-output-of-getfacl.patch \ - file://test-fix-insufficient-quoting-of.patch \ - file://test-fixups-on-SELinux-machines-for-root-testcases.patch \ - file://test-fix-directory-permissions.patch \ - file://Makefile-libacl-should-depend-on-include.patch \ -" - -SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda" -SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23" - -require ea-acl.inc - -# avoid RPATH hardcode to staging dir -do_configure_append() { - sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\', - ${S}/config.status -} - -# libdir should point to .la -do_install_append() { - sed -i ${D}${libdir}/libacl.la -e \ - s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', -} - -inherit ptest - -do_install_ptest() { - tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) - mkdir ${D}${PTEST_PATH}/include - cp ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/ - # Remove any build host references - sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -i ${D}${PTEST_PATH}/include/builddefs -} - -RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow" - -BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/attr/acl_2.2.53.bb b/external/poky/meta/recipes-support/attr/acl_2.2.53.bb new file mode 100644 index 00000000..5bb50f77 --- /dev/null +++ b/external/poky/meta/recipes-support/attr/acl_2.2.53.bb @@ -0,0 +1,74 @@ +SUMMARY = "Utilities for managing POSIX Access Control Lists" +HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" +SECTION = "libs" + +LICENSE = "LGPLv2.1+ & GPLv2+" +LICENSE_${PN} = "GPLv2+" +LICENSE_lib${BPN} = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ + file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764" + +DEPENDS = "attr" + +SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \ + file://run-ptest \ + file://0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch \ + file://0001-test-patch-out-failing-bits.patch \ + " + +SRC_URI[md5sum] = "007aabf1dbb550bcddde52a244cd1070" +SRC_URI[sha256sum] = "06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7" + +inherit autotools gettext ptest + +PACKAGES =+ "lib${BPN}" + +FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" + +PTEST_BUILD_HOST_FILES = "builddefs" +PTEST_BUILD_HOST_PATTERN = "^RPM" + +do_compile_ptest() { + oe_runmake libtestlookup.la +} + +do_install_ptest() { + cp -rf ${S}/test/ ${D}${PTEST_PATH} + cp -rf ${S}/build-aux/ ${D}${PTEST_PATH} + mkdir -p ${D}${PTEST_PATH}/.libs + cp -rf ${B}/.libs/libtestlookup* ${D}${PTEST_PATH}/.libs + cp ${B}/Makefile ${D}${PTEST_PATH} + + sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + -i ${D}${PTEST_PATH}/Makefile + + sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile + sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile + sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile + sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile + + rm ${D}${PTEST_PATH}/.libs/libtestlookup.lai +} + +RDEPENDS_${PN}-ptest = "acl \ + bash \ + coreutils \ + perl \ + perl-module-filehandle \ + perl-module-getopt-std \ + perl-module-posix \ + shadow \ + make \ + gawk \ + e2fsprogs-mke2fs \ + perl-module-cwd \ + perl-module-file-basename \ + perl-module-file-path \ + perl-module-file-spec \ + " + +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/attr/attr.inc b/external/poky/meta/recipes-support/attr/attr.inc index 9fc0f33c..f13a83a7 100644 --- a/external/poky/meta/recipes-support/attr/attr.inc +++ b/external/poky/meta/recipes-support/attr/attr.inc @@ -8,42 +8,55 @@ LICENSE = "LGPLv2.1+ & GPLv2+" LICENSE_${PN} = "GPLv2+" LICENSE_lib${BPN} = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ - file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ + file://tools/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb" -SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.src.tar.gz \ +SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \ file://run-ptest \ " -require ea-acl.inc +inherit ptest update-alternatives autotools gettext -# libdir should point to .la -do_install_append() { - sed -i ${D}${libdir}/libattr.la -e \ - s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', -} +PACKAGES =+ "lib${BPN}" -inherit ptest update-alternatives +FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "setfattr" ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" +PTEST_BUILD_HOST_FILES = "builddefs" +PTEST_BUILD_HOST_PATTERN = "^RPM" + do_install_ptest() { - tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) - mkdir ${D}${PTEST_PATH}/include - for i in builddefs buildmacros buildrules; \ - do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \ - done - sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile - - # Remove any build host references - sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -i ${D}${PTEST_PATH}/include/builddefs + cp ${B}/Makefile ${D}${PTEST_PATH} + sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + -i ${D}${PTEST_PATH}/Makefile + + sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile + sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile + sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile + sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile + cp -rf ${S}/build-aux/ ${D}${PTEST_PATH} + cp -rf ${S}/test/ ${D}${PTEST_PATH} } -RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle perl-module-getopt-std perl-module-posix" +RDEPENDS_${PN}-ptest = "attr \ + coreutils \ + perl-module-filehandle \ + perl-module-getopt-std \ + perl-module-posix \ + make \ + perl \ + gawk \ + perl-module-cwd \ + perl-module-file-basename \ + perl-module-file-path \ + perl-module-file-spec \ + " BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch b/external/poky/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch deleted file mode 100644 index dcd6507b..00000000 --- a/external/poky/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 37a27b6fd09ecb37097b85e5db74e4f77b80fe0a Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Tue, 12 Jan 2016 22:20:33 +0100 -Subject: [PATCH] Use stdint types consistently - ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - include/attributes.h | 6 ++++-- - man/man3/attr_list.3 | 8 ++++---- - 2 files changed, 8 insertions(+), 6 deletions(-) - -Index: attr-2.4.47/include/attributes.h -=================================================================== ---- attr-2.4.47.orig/include/attributes.h -+++ attr-2.4.47/include/attributes.h -@@ -22,6 +22,7 @@ - extern "C" { - #endif - -+#include <stdint.h> - /* - * An almost-IRIX-compatible extended attributes API - * (the IRIX attribute "list" operation is missing, added ATTR_SECURE). -@@ -69,7 +70,7 @@ typedef struct attrlist { - * al_offset[i] entry points to. - */ - typedef struct attrlist_ent { /* data from attr_list() */ -- u_int32_t a_valuelen; /* number bytes in value of attr */ -+ uint32_t a_valuelen; /* number bytes in value of attr */ - char a_name[1]; /* attr name (NULL terminated) */ - } attrlist_ent_t; - -@@ -90,7 +91,7 @@ typedef struct attrlist_ent { /* data fr - * operation on a cursor is to bzero() it. - */ - typedef struct attrlist_cursor { -- u_int32_t opaque[4]; /* an opaque cookie */ -+ uint32_t opaque[4]; /* an opaque cookie */ - } attrlist_cursor_t; - - /* -Index: attr-2.4.47/man/man3/attr_list.3 -=================================================================== ---- attr-2.4.47.orig/man/man3/attr_list.3 -+++ attr-2.4.47/man/man3/attr_list.3 -@@ -72,9 +72,9 @@ The contents of an \f4attrlist_t\fP stru - .nf - .ft 4 - .ta 9n 22n --__int32_t al_count; /\(** number of entries in attrlist \(**/ --__int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/ --__int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/ -+int32_t al_count; /\(** number of entries in attrlist \(**/ -+int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/ -+int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/ - .ft 1 - .fi - .RE -@@ -113,7 +113,7 @@ include the following members: - .nf - .ft 4 - .ta 9n 22n --u_int32_t a_valuelen; /\(** number bytes in value of attr \(**/ -+uint32_t a_valuelen; /\(** number bytes in value of attr \(**/ - char a_name[]; /\(** attr name (NULL terminated) \(**/ - .ft 1 - .fi diff --git a/external/poky/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch b/external/poky/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch deleted file mode 100644 index 20fcc3ce..00000000 --- a/external/poky/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch +++ /dev/null @@ -1,63 +0,0 @@ -Subject: [PATCH] attr: Missing configure.ac - -Upstream-Status: Backport [Upstream released tarball missing this file] -Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> ---- - configure.ac | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 48 insertions(+) - create mode 100644 configure.ac - -diff --git a/configure.ac b/configure.ac -new file mode 100644 -index 0000000..b966d0e ---- /dev/null -+++ b/configure.ac -@@ -0,0 +1,48 @@ -+# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de> -+# -+# This program is free software: you can redistribute it and/or modify it -+# 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. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see <http://www.gnu.org/licenses/>. -+# -+AC_INIT(include/attributes.h) -+AC_CONFIG_AUX_DIR([.]) -+AC_CONFIG_MACRO_DIR([m4]) -+AC_CONFIG_HEADER(include/config.h) -+AC_PREFIX_DEFAULT(/usr) -+ -+AC_PROG_LIBTOOL -+ -+AC_ARG_ENABLE(shared, -+[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, -+ enable_shared=yes) -+AC_SUBST(enable_shared) -+ -+AC_ARG_ENABLE(gettext, -+[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, -+ enable_gettext=yes) -+AC_SUBST(enable_gettext) -+ -+AC_ARG_ENABLE(lib64, -+[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],, -+ enable_lib64=no) -+AC_SUBST(enable_lib64) -+ -+AC_PACKAGE_GLOBALS(attr) -+AC_PACKAGE_UTILITIES(attr) -+AC_MANUAL_FORMAT -+AC_MULTILIB($enable_lib64) -+ -+AC_C_CONST -+AC_TYPE_MODE_T -+AC_FUNC_ALLOCA -+ -+AC_OUTPUT(include/builddefs) diff --git a/external/poky/meta/recipes-support/attr/attr/dont-use-decl-macros.patch b/external/poky/meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted file mode 100644 index 9d4b8929..00000000 --- a/external/poky/meta/recipes-support/attr/attr/dont-use-decl-macros.patch +++ /dev/null @@ -1,56 +0,0 @@ -Use extern "C" instead of __BEGIN_DECL/__END_DECL macros -these macros are defined in sys/cdefs.h for glibc and this header is not available on all libc - -anyway they defined like below - -#ifdef __cplusplus -# define __BEGIN_DECLS extern "C" { -# define __END_DECLS } -#else -# define __BEGIN_DECLS /* empty */ -# define __END_DECLS /* empty */ -#endif - -__THROW macro is also not available on musl, defined thusly - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: attr-2.4.47/include/xattr.h -=================================================================== ---- attr-2.4.47.orig/include/xattr.h 2014-04-02 00:01:30.252091280 -0700 -+++ attr-2.4.47/include/xattr.h 2014-04-02 00:12:57.985428099 -0700 -@@ -30,8 +30,20 @@ - #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ - -- --__BEGIN_DECLS -+#ifndef __THROW -+# ifndef __GNUC_PREREQ -+# define __GNUC_PREREQ(maj, min) (0) -+# endif -+# if defined __cplusplus && __GNUC_PREREQ (2,8) -+# define __THROW throw () -+# else -+# define __THROW -+# endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif - - extern int setxattr (const char *__path, const char *__name, - const void *__value, size_t __size, int __flags) __THROW; -@@ -58,6 +70,8 @@ - extern int lremovexattr (const char *__path, const char *__name) __THROW; - extern int fremovexattr (int __filedes, const char *__name) __THROW; - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* __XATTR_H__ */ diff --git a/external/poky/meta/recipes-support/attr/attr/run-ptest b/external/poky/meta/recipes-support/attr/attr/run-ptest new file mode 100644 index 00000000..f64244f2 --- /dev/null +++ b/external/poky/meta/recipes-support/attr/attr/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +make test-suite.log diff --git a/external/poky/meta/recipes-support/attr/attr_2.4.47.bb b/external/poky/meta/recipes-support/attr/attr_2.4.47.bb deleted file mode 100644 index fc88bef8..00000000 --- a/external/poky/meta/recipes-support/attr/attr_2.4.47.bb +++ /dev/null @@ -1,15 +0,0 @@ -require attr.inc - -# configure.ac was missing from the release tarball. This should be fixed in -# future releases of attr, remove this when updating the recipe. -SRC_URI += "file://attr-Missing-configure.ac.patch \ - file://dont-use-decl-macros.patch \ - file://Remove-the-section-2-man-pages.patch \ - file://Remove-the-attr.5-man-page-moved-to-man-pages.patch \ - file://0001-Use-stdint-types-consistently.patch \ - " - -SRC_URI[md5sum] = "84f58dec00b60f2dc8fd1c9709291cc7" -SRC_URI[sha256sum] = "25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859" - -BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/attr/attr_2.4.48.bb b/external/poky/meta/recipes-support/attr/attr_2.4.48.bb new file mode 100644 index 00000000..530d4e48 --- /dev/null +++ b/external/poky/meta/recipes-support/attr/attr_2.4.48.bb @@ -0,0 +1,6 @@ +require attr.inc + +SRC_URI[md5sum] = "bc1e5cb5c96d99b24886f1f527d3bb3d" +SRC_URI[sha256sum] = "5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7" + +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/attr/ea-acl.inc b/external/poky/meta/recipes-support/attr/ea-acl.inc deleted file mode 100644 index 9336ffc9..00000000 --- a/external/poky/meta/recipes-support/attr/ea-acl.inc +++ /dev/null @@ -1,52 +0,0 @@ -# this build system is mostly shared by attr and acl - -SRC_URI += "file://relative-libdir.patch;striplevel=0 \ - " -# This patch should be applied after '(attr\|acl)-Missing-configure.ac.patch' -SRC_URI_append = " file://0001-Added-configure-option-to-enable-disable-static-libr.patch" - -inherit autotools-brokensep gettext - -# When upstream is using automake properly, this can be removed -CLEANBROKEN = "1" - -# the package comes with a custom config.h.in, it cannot be -# overwritten by autoheader -EXTRA_AUTORECONF += "--exclude=autoheader" -EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root" -EXTRA_OECONF_append_class-native = " --enable-gettext=no" -EXTRA_OECONF_append_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS') == 'no')]}" - -EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}" - -do_install () { - oe_runmake install install-lib install-dev DIST_ROOT="${D}" ZIP="gzip -n" -} - -do_install_append_class-native () { - if test "${libdir}" = "${base_libdir}" ; then - return - fi - librelpath=${@os.path.relpath(d.getVar('libdir'), d.getVar('base_libdir'))} - baselibrelpath=${@os.path.relpath(d.getVar('base_libdir'), d.getVar('libdir'))} - - # Remove bad symlinks & create the correct symlinks - if test -L ${D}${libdir}/lib${BPN}.so ; then - rm -rf ${D}${libdir}/lib${BPN}.so - ln -sf $baselibrelpath/lib${BPN}.so ${D}${libdir}/lib${BPN}.so - fi - if test -L ${D}${base_libdir}/lib${BPN}.a ; then - rm -rf ${D}${base_libdir}/lib${BPN}.a - ln -sf $librelpath/lib${BPN}.a ${D}${base_libdir}/lib${BPN}.a - fi - if test -L ${D}${base_libdir}/lib${BPN}.la ; then - rm -rf ${D}${base_libdir}/lib${BPN}.la - ln -sf $librelpath/lib${BPN}.la ${D}${base_libdir}/lib${BPN}.la - fi -} - -PACKAGES =+ "lib${BPN}" - -FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}" - -BBCLASSEXTEND = "native" diff --git a/external/poky/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch b/external/poky/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch deleted file mode 100644 index 1c1159f2..00000000 --- a/external/poky/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 01256c61ba126449c46dd4ab5d5e145488b981fa Mon Sep 17 00:00:00 2001 -From: Amarnath Valluri <amarnath.valluri@intel.com> -Date: Mon, 23 Jan 2017 13:25:13 +0200 -Subject: [PATCH] Added configure option to enable/disable static library - -Create static library archive only in case of --enable-static. - -Upstream-Status: Pending - -Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> ---- - configure.ac | 6 ++++++ - include/builddefs.in | 1 + - include/buildmacros | 3 +++ - 3 files changed, 10 insertions(+) - -diff --git a/configure.ac b/configure.ac -index b966d0e..e48268b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,6 +26,12 @@ AC_ARG_ENABLE(shared, - enable_shared=yes) - AC_SUBST(enable_shared) - -+AC_ARG_ENABLE(static, -+[ --enable-static=[yes/no] Enable use of static libraries [default=yes]],, -+ enable_static=yes) -+AC_SUBST(enable_static) -+ -+ - AC_ARG_ENABLE(gettext, - [ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, - enable_gettext=yes) -diff --git a/include/builddefs.in b/include/builddefs.in -index d9931db..3b3dbd2 100644 ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -71,6 +71,7 @@ RPMBUILD = @rpmbuild@ - RPM_VERSION = @rpm_version@ - - ENABLE_SHARED = @enable_shared@ -+ENABLE_STATIC = @enable_static@ - ENABLE_GETTEXT = @enable_gettext@ - - HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@ -diff --git a/include/buildmacros b/include/buildmacros -index 39fa7e2..b0f25c5 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -80,6 +80,7 @@ endif - # /usr/lib. - ifeq ($(ENABLE_SHARED),yes) - INSTALL_LTLIB_DEV = \ -+ set -x; \ - cd $(TOPDIR)/$(LIBNAME)/.libs; \ - ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ - ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ -@@ -88,7 +89,9 @@ INSTALL_LTLIB_DEV = \ - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ - if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ - rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ -+ if test "$(ENABLE_STATIC)" = "yes" ; then \ - ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ -+ fi ;\ - ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ - rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ - ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch b/external/poky/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch deleted file mode 100644 index d5ab83d7..00000000 --- a/external/poky/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch +++ /dev/null @@ -1,240 +0,0 @@ -From 6047c8522b91235ad1e835f44f5e36472d9d49b2 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com> -Date: Wed, 22 Apr 2015 11:46:59 +0200 -Subject: [PATCH 2/2] Remove the attr.5 man page (moved to man-pages) - -Commit dce9b4448c7f2b22bd206cd068fb05cb2f3255b9 from -https://git.savannah.nongnu.org/git/attr.git - -The attr.5 page is part of the extended attribute system call documentation, -which has been moved into the man-pages package. Move the attr.5 page there -as well. - -Upstream-Status: Backport - -[MA: updated to apply directly to v2.4.47] -Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> ---- - man/Makefile | 2 +- - man/man5/Makefile | 35 ------------- - man/man5/attr.5 | 153 ------------------------------------------------------ - 3 files changed, 1 insertion(+), 189 deletions(-) - delete mode 100644 man/man5/Makefile - delete mode 100644 man/man5/attr.5 - -diff --git a/man/Makefile b/man/Makefile -index 755daed..9301f09 100644 ---- a/man/Makefile -+++ b/man/Makefile -@@ -19,7 +19,7 @@ - TOPDIR = .. - include $(TOPDIR)/include/builddefs - --SUBDIRS = man1 man3 man5 -+SUBDIRS = man1 man3 - - default : $(SUBDIRS) - -diff --git a/man/man5/Makefile b/man/man5/Makefile -deleted file mode 100644 -index 6b70d3d..0000000 ---- a/man/man5/Makefile -+++ /dev/null -@@ -1,35 +0,0 @@ --# --# Copyright (c) 2000, 2002 Silicon Graphics, Inc. All Rights Reserved. --# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de> --# --# This program is free software: you can redistribute it and/or modify it --# 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. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program. If not, see <http://www.gnu.org/licenses/>. --# -- --TOPDIR = ../.. --include $(TOPDIR)/include/builddefs -- --MAN_SECTION = 5 -- --MAN_PAGES = $(shell echo *.$(MAN_SECTION)) --MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION) --LSRCFILES = $(MAN_PAGES) -- --default : $(MAN_PAGES) -- --include $(BUILDRULES) -- --install : default -- $(INSTALL) -m 755 -d $(MAN_DEST) -- $(INSTALL_MAN) --install-dev install-lib: -diff --git a/man/man5/attr.5 b/man/man5/attr.5 -deleted file mode 100644 -index a02757d..0000000 ---- a/man/man5/attr.5 -+++ /dev/null -@@ -1,153 +0,0 @@ --.\" Extended attributes manual page --.\" --.\" Copyright (C) 2000, 2002, 2007 Andreas Gruenbacher <agruen@suse.de> --.\" Copyright (C) 2001, 2002, 2004, 2007 Silicon Graphics, Inc. --.\" All rights reserved. --.\" --.\" This is free documentation; you can redistribute it and/or --.\" modify it 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. --.\" --.\" The GNU General Public License's references to "object code" --.\" and "executables" are to be interpreted as the output of any --.\" document formatting or typesetting system, including --.\" intermediate and printed output. --.\" --.\" This manual is distributed in the hope that it will be useful, --.\" but WITHOUT ANY WARRANTY; without even the implied warranty of --.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --.\" GNU General Public License for more details. --.\" --.\" You should have received a copy of the GNU General Public --.\" License along with this manual. If not, see --.\" <http://www.gnu.org/licenses/>. --.\" --.TH ATTR 5 --.SH NAME --attr - Extended attributes --.SH DESCRIPTION --Extended attributes are name:value pairs associated permanently with --files and directories, similar to the environment strings associated --with a process. --An attribute may be defined or undefined. --If it is defined, its value may be empty or non-empty. --.PP --Extended attributes are extensions to the normal attributes which are --associated with all inodes in the system (i.e. the --.BR stat (2) --data). --They are often used to provide additional functionality --to a filesystem \- for example, additional security features such as --Access Control Lists (ACLs) may be implemented using extended attributes. --.PP --Users with search access to a file or directory may retrieve a list of --attribute names defined for that file or directory. --.PP --Extended attributes are accessed as atomic objects. --Reading retrieves the whole value of an attribute and stores it in a buffer. --Writing replaces any previous value with the new value. --.PP --Space consumed for extended attributes is counted towards the disk quotas --of the file owner and file group. --.PP --Currently, support for extended attributes is implemented on Linux by the --ext2, ext3, ext4, XFS, JFS and reiserfs filesystems. --.SH EXTENDED ATTRIBUTE NAMESPACES --Attribute names are zero-terminated strings. --The attribute name is always specified in the fully qualified --.IR namespace.attribute --form, eg. --.IR user.mime_type , --.IR trusted.md5sum , --.IR system.posix_acl_access , --or --.IR security.selinux . --.PP --The namespace mechanism is used to define different classes of extended --attributes. --These different classes exist for several reasons, e.g. the permissions --and capabilities required for manipulating extended attributes of one --namespace may differ to another. --.PP --Currently the --.IR security , --.IR system , --.IR trusted , --and --.IR user --extended attribute classes are defined as described below. Additional --classes may be added in the future. --.SS Extended security attributes --The security attribute namespace is used by kernel security modules, --such as Security Enhanced Linux. --Read and write access permissions to security attributes depend on the --policy implemented for each security attribute by the security module. --When no security module is loaded, all processes have read access to --extended security attributes, and write access is limited to processes --that have the CAP_SYS_ADMIN capability. --.SS Extended system attributes --Extended system attributes are used by the kernel to store system --objects such as Access Control Lists and Capabilities. Read and write --access permissions to system attributes depend on the policy implemented --for each system attribute implemented by filesystems in the kernel. --.SS Trusted extended attributes --Trusted extended attributes are visible and accessible only to processes that --have the CAP_SYS_ADMIN capability (the super user usually has this --capability). --Attributes in this class are used to implement mechanisms in user --space (i.e., outside the kernel) which keep information in extended attributes --to which ordinary processes should not have access. --.SS Extended user attributes --Extended user attributes may be assigned to files and directories for --storing arbitrary additional information such as the mime type, --character set or encoding of a file. The access permissions for user --attributes are defined by the file permission bits. --.PP --The file permission bits of regular files and directories are --interpreted differently from the file permission bits of special files --and symbolic links. For regular files and directories the file --permission bits define access to the file's contents, while for device special --files they define access to the device described by the special file. --The file permissions of symbolic links are not used in access --checks. These differences would allow users to consume filesystem resources in --a way not controllable by disk quotas for group or world writable special files and directories. --.PP --For this reason, extended user attributes are only allowed for regular files and directories, and access to extended user attributes is restricted to the --owner and to users with appropriate capabilities for directories with the --sticky bit set (see the --.BR chmod (1) --manual page for an explanation of Sticky Directories). --.SH FILESYSTEM DIFFERENCES --The kernel and the filesystem may place limits on the maximum number --and size of extended attributes that can be associated with a file. --Some file systems, such as ext2/3 and reiserfs, require the filesystem --to be mounted with the --.B user_xattr --mount option in order for extended user attributes to be used. --.PP --In the current ext2, ext3 and ext4 filesystem implementations, each --extended attribute must fit on a single filesystem block (1024, 2048 --or 4096 bytes, depending on the block size specified when the --filesystem was created). --.PP --In the XFS and reiserfs filesystem implementations, there is no --practical limit on the number or size of extended attributes --associated with a file, and the algorithms used to store extended --attribute information on disk are scalable. --.PP --In the JFS filesystem implementation, names can be up to 255 bytes and --values up to 65,535 bytes. --.SH ADDITIONAL NOTES --Since the filesystems on which extended attributes are stored might also --be used on architectures with a different byte order and machine word --size, care should be taken to store attribute values in an architecture --independent format. --.SH AUTHORS --Andreas Gruenbacher, --.RI < a.gruenbacher@bestbits.at > --and the SGI XFS development team, --.RI < linux-xfs@oss.sgi.com >. --.SH SEE ALSO --getfattr(1), --setfattr(1). --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch b/external/poky/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch deleted file mode 100644 index 044c5a03..00000000 --- a/external/poky/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch +++ /dev/null @@ -1,666 +0,0 @@ -From b972600a26f3a930e53e2fce2625266a5d29813e Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com> -Date: Tue, 14 Apr 2015 23:53:11 +0200 -Subject: [PATCH 1/2] Remove the section 2 man pages - -Commit 8d1263bca95722d66a6f8e83450f49d0956ea534 from upstream -https://git.savannah.nongnu.org/git/attr.git/ - -The section 2 man pages have long since been added to the man-pages package -which documents all system calls; they were disabled in attr by default since -January 2014. Get rid of them here. - -Upstream-Status: Backport - -[MA: modified to apply directly to v2.4.47] -Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> ---- - man/Makefile | 2 +- - man/man2/Makefile | 35 ----------- - man/man2/getxattr.2 | 143 -------------------------------------------- - man/man2/listxattr.2 | 158 ------------------------------------------------- - man/man2/removexattr.2 | 111 ---------------------------------- - man/man2/setxattr.2 | 143 -------------------------------------------- - 6 files changed, 1 insertion(+), 591 deletions(-) - delete mode 100644 man/man2/Makefile - delete mode 100644 man/man2/getxattr.2 - delete mode 100644 man/man2/listxattr.2 - delete mode 100644 man/man2/removexattr.2 - delete mode 100644 man/man2/setxattr.2 - -diff --git a/man/Makefile b/man/Makefile -index 9535426..755daed 100644 ---- a/man/Makefile -+++ b/man/Makefile -@@ -19,7 +19,7 @@ - TOPDIR = .. - include $(TOPDIR)/include/builddefs - --SUBDIRS = man1 man2 man3 man5 -+SUBDIRS = man1 man3 man5 - - default : $(SUBDIRS) - -diff --git a/man/man2/Makefile b/man/man2/Makefile -deleted file mode 100644 -index d77309d..0000000 ---- a/man/man2/Makefile -+++ /dev/null -@@ -1,35 +0,0 @@ --# --# Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. --# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de> --# --# This program is free software: you can redistribute it and/or modify it --# 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. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program. If not, see <http://www.gnu.org/licenses/>. --# -- --TOPDIR = ../.. --include $(TOPDIR)/include/builddefs -- --MAN_SECTION = 2 -- --MAN_PAGES = $(shell echo *.$(MAN_SECTION)) --MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION) --LSRCFILES = $(MAN_PAGES) -- --default install : $(MAN_PAGES) -- --include $(BUILDRULES) -- --install-dev : default -- $(INSTALL) -m 755 -d $(MAN_DEST) -- $(INSTALL_MAN) --install-lib: -diff --git a/man/man2/getxattr.2 b/man/man2/getxattr.2 -deleted file mode 100644 -index 405ad89..0000000 ---- a/man/man2/getxattr.2 -+++ /dev/null -@@ -1,143 +0,0 @@ --.\" --.\" Extended attributes system calls manual pages --.\" --.\" (C) Andreas Gruenbacher, February 2001 --.\" (C) Silicon Graphics Inc, September 2001 --.\" --.\" This is free documentation; you can redistribute it and/or --.\" modify it 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. --.\" --.\" The GNU General Public License's references to "object code" --.\" and "executables" are to be interpreted as the output of any --.\" document formatting or typesetting system, including --.\" intermediate and printed output. --.\" --.\" This manual is distributed in the hope that it will be useful, --.\" but WITHOUT ANY WARRANTY; without even the implied warranty of --.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --.\" GNU General Public License for more details. --.\" --.\" You should have received a copy of the GNU General Public --.\" License along with this manual. If not, see --.\" <http://www.gnu.org/licenses/>. --.\" --.TH GETXATTR 2 "Extended Attributes" "Dec 2001" "System calls" --.SH NAME --getxattr, lgetxattr, fgetxattr \- retrieve an extended attribute value --.SH SYNOPSIS --.fam C --.nf --.B #include <sys/types.h> --.B #include <attr/xattr.h> --.sp --.BI "ssize_t getxattr (const char\ *" path ", const char\ *" name ", --.BI "\t\t\t\t void\ *" value ", size_t " size ); --.BI "ssize_t lgetxattr (const char\ *" path ", const char\ *" name ", --.BI "\t\t\t\t void\ *" value ", size_t " size ); --.BI "ssize_t fgetxattr (int " filedes ", const char\ *" name ", --.BI "\t\t\t\t void\ *" value ", size_t " size ); --.fi --.fam T --.SH DESCRIPTION --Extended attributes are --.IR name :\c --.I value --pairs associated with inodes (files, directories, symlinks, etc). --They are extensions to the normal attributes which are associated --with all inodes in the system (i.e. the --.BR stat (2) --data). --A complete overview of extended attributes concepts can be found in --.BR attr (5). --.PP --.B getxattr --retrieves the --.I value --of the extended attribute identified by --.I name --and associated with the given --.I path --in the filesystem. --The length of the attribute --.I value --is returned. --.PP --.B lgetxattr --is identical to --.BR getxattr , --except in the case of a symbolic link, where the link itself is --interrogated, not the file that it refers to. --.PP --.B fgetxattr --is identical to --.BR getxattr , --only the open file pointed to by --.I filedes --(as returned by --.BR open (2)) --is interrogated in place of --.IR path . --.PP --An extended attribute --.I name --is a simple NULL-terminated string. --The name includes a namespace prefix \- there may be several, disjoint --namespaces associated with an individual inode. --The value of an extended attribute is a chunk of arbitrary textual or --binary data of specified length. --.PP --An empty buffer of --.I size --zero can be passed into these calls to return the current size of the --named extended attribute, which can be used to estimate the size of a --buffer which is sufficiently large to hold the value associated with --the extended attribute. --.PP --The interface is designed to allow guessing of initial buffer --sizes, and to enlarge buffers when the return value indicates --that the buffer provided was too small. --.SH RETURN VALUE --On success, a positive number is returned indicating the size of the --extended attribute value. --On failure, \-1 is returned and --.I errno --is set appropriately. --.PP --If the named attribute does not exist, or the process has no access to --this attribute, --.I errno --is set to ENOATTR. --.PP --If the --.I size --of the --.I value --buffer is too small to hold the result, --.I errno --is set to ERANGE. --.PP --If extended attributes are not supported by the filesystem, or are disabled, --.I errno --is set to ENOTSUP. --.PP --The errors documented for the --.BR stat (2) --system call are also applicable here. --.SH AUTHORS --Andreas Gruenbacher, --.RI < a.gruenbacher@bestbits.at > --and the SGI XFS development team, --.RI < linux-xfs@oss.sgi.com >. --Please send any bug reports or comments to these addresses. --.SH SEE ALSO --.BR getfattr (1), --.BR setfattr (1), --.BR open (2), --.BR stat (2), --.BR setxattr (2), --.BR listxattr (2), --.BR removexattr (2), --and --.BR attr (5). -diff --git a/man/man2/listxattr.2 b/man/man2/listxattr.2 -deleted file mode 100644 -index 8b4371c..0000000 ---- a/man/man2/listxattr.2 -+++ /dev/null -@@ -1,158 +0,0 @@ --.\" --.\" Extended attributes system calls manual pages --.\" --.\" (C) Andreas Gruenbacher, February 2001 --.\" (C) Silicon Graphics Inc, September 2001 --.\" --.\" This is free documentation; you can redistribute it and/or --.\" modify it 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. --.\" --.\" The GNU General Public License's references to "object code" --.\" and "executables" are to be interpreted as the output of any --.\" document formatting or typesetting system, including --.\" intermediate and printed output. --.\" --.\" This manual is distributed in the hope that it will be useful, --.\" but WITHOUT ANY WARRANTY; without even the implied warranty of --.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --.\" GNU General Public License for more details. --.\" --.\" You should have received a copy of the GNU General Public --.\" License along with this manual. If not, see --.\" <http://www.gnu.org/licenses/>. --.\" --.TH LISTXATTR 2 "Extended Attributes" "Dec 2001" "System calls" --.SH NAME --listxattr, llistxattr, flistxattr \- list extended attribute names --.SH SYNOPSIS --.fam C --.nf --.B #include <sys/types.h> --.B #include <attr/xattr.h> --.sp --.BI "ssize_t listxattr (const char\ *" path ", --.BI "\t\t\t\t char\ *" list ", size_t " size ); --.BI "ssize_t llistxattr (const char\ *" path ", --.BI "\t\t\t\t char\ *" list ", size_t " size ); --.BI "ssize_t flistxattr (int " filedes ", --.BI "\t\t\t\t char\ *" list ", size_t " size ); --.fi --.fam T --.SH DESCRIPTION --Extended attributes are name:value --pairs associated with inodes (files, directories, symlinks, etc). --They are extensions to the normal attributes which are associated --with all inodes in the system (i.e. the --.BR stat (2) --data). --A complete overview of extended attributes concepts can be found in --.BR attr (5). --.PP --.B listxattr --retrieves the --.I list --of extended attribute names associated with the given --.I path --in the filesystem. --The list is the set of (NULL-terminated) names, one after the other. --Names of extended attributes to which the calling process does not --have access may be omitted from the list. --The length of the attribute name --.I list --is returned. --.PP --.B llistxattr --is identical to --.BR listxattr , --except in the case of a symbolic link, where the list of names of --extended attributes associated with the link itself is retrieved, --not the file that it refers to. --.I list --is a caller-allocated buffer of size --.IR size . --.PP --.B flistxattr --is identical to --.BR listxattr , --only the open file pointed to by --.I filedes --(as returned by --.BR open (2)) --is interrogated in place of --.IR path . --.PP --A single extended attribute --.I name --is a simple NULL-terminated string. --The name includes a namespace prefix \- there may be several, disjoint --namespaces associated with an individual inode. --.PP --An empty buffer of --.I size --zero can be passed into these calls to return the current size of the --list of extended attribute names, which can be used to estimate the --size of a buffer which is sufficiently large to hold the list of names. --.SH EXAMPLES --The --.I list --of names is returned as an unordered array of NULL-terminated character --strings (attribute names are separated by NULL characters), like this: --.fam C --.RS --.nf --user.name1\\0system.name1\\0user.name2\\0 --.fi --.RE --.fam T --.P --Filesystems like ext2, ext3 and XFS which implement POSIX ACLs using --extended attributes, might return a --.I list --like this: --.fam C --.RS --.nf --system.posix_acl_access\\0system.posix_acl_default\\0 --.fi --.RE --.fam T --.SH RETURN VALUE --On success, a positive number is returned indicating the size of the --extended attribute name list. --On failure, \-1 is returned and --.I errno --is set appropriately. --.PP --If the --.I size --of the --.I list --buffer is too small to hold the result, --.I errno --is set to ERANGE. --.PP --If extended attributes are not supported by the filesystem, or are disabled, --.I errno --is set to ENOTSUP. --.PP --The errors documented for the --.BR stat (2) --system call are also applicable here. --.SH AUTHORS --Andreas Gruenbacher, --.RI < a.gruenbacher@bestbits.at > --and the SGI XFS development team, --.RI < linux-xfs@oss.sgi.com >. --Please send any bug reports or comments to these addresses. --.SH SEE ALSO --.BR getfattr (1), --.BR setfattr (1), --.BR open (2), --.BR stat (2), --.BR getxattr (2), --.BR setxattr (2), --.BR removexattr (2), --and --.BR attr (5). -diff --git a/man/man2/removexattr.2 b/man/man2/removexattr.2 -deleted file mode 100644 -index 2c7d934..0000000 ---- a/man/man2/removexattr.2 -+++ /dev/null -@@ -1,111 +0,0 @@ --.\" --.\" Extended attributes system calls manual pages --.\" --.\" (C) Andreas Gruenbacher, February 2001 --.\" (C) Silicon Graphics Inc, September 2001 --.\" --.\" This is free documentation; you can redistribute it and/or --.\" modify it 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. --.\" --.\" The GNU General Public License's references to "object code" --.\" and "executables" are to be interpreted as the output of any --.\" document formatting or typesetting system, including --.\" intermediate and printed output. --.\" --.\" This manual is distributed in the hope that it will be useful, --.\" but WITHOUT ANY WARRANTY; without even the implied warranty of --.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --.\" GNU General Public License for more details. --.\" --.\" You should have received a copy of the GNU General Public --.\" License along with this manual. If not, see --.\" <http://www.gnu.org/licenses/>. --.\" --.TH REMOVEXATTR 2 "Extended Attributes" "Dec 2001" "System calls" --.SH NAME --removexattr, lremovexattr, fremovexattr \- remove an extended attribute --.SH SYNOPSIS --.fam C --.nf --.B #include <sys/types.h> --.B #include <attr/xattr.h> --.sp --.BI "int removexattr (const char\ *" path ", const char\ *" name ); --.BI "int lremovexattr (const char\ *" path ", const char\ *" name ); --.BI "int fremovexattr (int " filedes ", const char\ *" name ); --.fi --.fam T --.SH DESCRIPTION --Extended attributes are --.IR name :\c --value pairs associated with inodes (files, directories, symlinks, etc). --They are extensions to the normal attributes which are associated --with all inodes in the system (i.e. the --.BR stat (2) --data). --A complete overview of extended attributes concepts can be found in --.BR attr (5). --.PP --.B removexattr --removes the extended attribute identified by --.I name --and associated with the given --.I path --in the filesystem. --.PP --.B lremovexattr --is identical to --.BR removexattr , --except in the case of a symbolic link, where the extended attribute is --removed from the link itself, not the file that it refers to. --.PP --.B fremovexattr --is identical to --.BR removexattr , --only the extended attribute is removed from the open file pointed to by --.I filedes --(as returned by --.BR open (2)) --in place of --.IR path . --.PP --An extended attribute name is a simple NULL-terminated string. --The --.I name --includes a namespace prefix \- there may be several, disjoint --namespaces associated with an individual inode. --.SH RETURN VALUE --On success, zero is returned. --On failure, \-1 is returned and --.I errno --is set appropriately. --.PP --If the named attribute does not exist, --.I errno --is set to ENOATTR. --.PP --If extended attributes are not supported by the filesystem, or are disabled, --.I errno --is set to ENOTSUP. --.PP --The errors documented for the --.BR stat (2) --system call are also applicable here. --.SH AUTHORS --Andreas Gruenbacher, --.RI < a.gruenbacher@bestbits.at > --and the SGI XFS development team, --.RI < linux-xfs@oss.sgi.com >. --Please send any bug reports or comments to these addresses. --.SH SEE ALSO --.BR getfattr (1), --.BR setfattr (1), --.BR open (2), --.BR stat (2), --.BR setxattr (2), --.BR getxattr (2), --.BR listxattr (2), --and --.BR attr (5). -diff --git a/man/man2/setxattr.2 b/man/man2/setxattr.2 -deleted file mode 100644 -index b20dc9f..0000000 ---- a/man/man2/setxattr.2 -+++ /dev/null -@@ -1,143 +0,0 @@ --.\" --.\" Extended attributes system calls manual pages --.\" --.\" (C) Andreas Gruenbacher, February 2001 --.\" (C) Silicon Graphics Inc, September 2001 --.\" --.\" This is free documentation; you can redistribute it and/or --.\" modify it 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. --.\" --.\" The GNU General Public License's references to "object code" --.\" and "executables" are to be interpreted as the output of any --.\" document formatting or typesetting system, including --.\" intermediate and printed output. --.\" --.\" This manual is distributed in the hope that it will be useful, --.\" but WITHOUT ANY WARRANTY; without even the implied warranty of --.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --.\" GNU General Public License for more details. --.\" --.\" You should have received a copy of the GNU General Public --.\" License along with this manual. If not, see --.\" <http://www.gnu.org/licenses/>. --.\" --.TH SETXATTR 2 "Extended Attributes" "Dec 2001" "System calls" --.SH NAME --setxattr, lsetxattr, fsetxattr \- set an extended attribute value --.SH SYNOPSIS --.fam C --.nf --.B #include <sys/types.h> --.B #include <attr/xattr.h> --.sp --.BI "int setxattr (const char\ *" path ", const char\ *" name ", --.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags ); --.BI "int lsetxattr (const char\ *" path ", const char\ *" name ", --.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags ); --.BI "int fsetxattr (int " filedes ", const char\ *" name ", --.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags ); --.fi --.fam T --.SH DESCRIPTION --Extended attributes are --.IR name :\c --.I value --pairs associated with inodes (files, directories, symlinks, etc). --They are extensions to the normal attributes which are associated --with all inodes in the system (i.e. the --.BR stat (2) --data). --A complete overview of extended attributes concepts can be found in --.BR attr (5). --.PP --.B setxattr --sets the --.I value --of the extended attribute identified by --.I name --and associated with the given --.I path --in the filesystem. --The --.I size --of the --.I value --must be specified. --.PP --.B lsetxattr --is identical to --.BR setxattr , --except in the case of a symbolic link, where the extended attribute is --set on the link itself, not the file that it refers to. --.PP --.B fsetxattr --is identical to --.BR setxattr , --only the extended attribute is set on the open file pointed to by --.I filedes --(as returned by --.BR open (2)) --in place of --.IR path . --.PP --An extended attribute name is a simple NULL-terminated string. --The --.I name --includes a namespace prefix \- there may be several, disjoint --namespaces associated with an individual inode. --The --.I value --of an extended attribute is a chunk of arbitrary textual or --binary data of specified length. --.PP --The --.I flags --parameter can be used to refine the semantics of the operation. --XATTR_CREATE specifies a pure create, which fails if the named --attribute exists already. --XATTR_REPLACE specifies a pure replace operation, which fails if the --named attribute does not already exist. --By default (no flags), the extended attribute will be created if --need be, or will simply replace the value if the attribute exists. --.SH RETURN VALUE --On success, zero is returned. --On failure, \-1 is returned and --.I errno --is set appropriately. --.PP --If XATTR_CREATE is specified, and the attribute exists already, --.I errno --is set to EEXIST. --If XATTR_REPLACE is specified, and the attribute does not exist, --.I errno --is set to ENOATTR. --.PP --If there is insufficient space remaining to store the extended attribute, --.I errno --is set to either ENOSPC, or EDQUOT if quota enforcement was the cause. --.PP --If extended attributes are not supported by the filesystem, or are disabled, --.I errno --is set to ENOTSUP. --.PP --The errors documented for the --.BR stat (2) --system call are also applicable here. --.SH AUTHORS --Andreas Gruenbacher, --.RI < a.gruenbacher@bestbits.at > --and the SGI XFS development team, --.RI < linux-xfs@oss.sgi.com >. --Please send any bug reports or comments to these addresses. --.SH SEE ALSO --.BR getfattr (1), --.BR setfattr (1), --.BR open (2), --.BR stat (2), --.BR getxattr (2), --.BR listxattr (2), --.BR removexattr (2), --and --.BR attr (5). --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/attr/files/relative-libdir.patch b/external/poky/meta/recipes-support/attr/files/relative-libdir.patch deleted file mode 100644 index b72bf184..00000000 --- a/external/poky/meta/recipes-support/attr/files/relative-libdir.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Pending - -use relative path in symbolic links, or it fails in staging -sed expression from udev - -7/29/2010 - created by Qing He <qing.he@intel.com> - -diff -u include.orig/buildmacros include/buildmacros ---- include.orig/buildmacros 2010-07-29 17:39:48.000000000 +0800 -+++ include/buildmacros 2010-07-29 18:20:34.000000000 +0800 -@@ -88,9 +88,11 @@ - ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ - if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ -- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ -- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ -+ rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ -+ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ -+ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ -+ rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ -+ ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ - fi - else - INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) diff --git a/external/poky/meta/recipes-support/attr/files/run-ptest b/external/poky/meta/recipes-support/attr/files/run-ptest deleted file mode 100644 index a6c6867f..00000000 --- a/external/poky/meta/recipes-support/attr/files/run-ptest +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -make -C test -k tests root-tests |sed \ - -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \ - -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|' diff --git a/external/poky/meta/recipes-support/bash-completion/bash-completion_2.8.bb b/external/poky/meta/recipes-support/bash-completion/bash-completion_2.10.bb index 85064343..041af749 100644 --- a/external/poky/meta/recipes-support/bash-completion/bash-completion_2.8.bb +++ b/external/poky/meta/recipes-support/bash-completion/bash-completion_2.10.bb @@ -9,8 +9,8 @@ SECTION = "console/utils" SRC_URI = "https://github.com/scop/bash-completion/releases/download/${PV}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "201b6ae62f7d5fb5b1b25e34427db919" -SRC_URI[sha256sum] = "c01f5570f5698a0dda8dc9cfb2a83744daa1ec54758373a6e349bd903375f54d" +SRC_URI[md5sum] = "f376ae3266cc70017aa833c39b76f984" +SRC_URI[sha256sum] = "123c17998e34b937ce57bb1b111cd817bc369309e9a8047c0bcf06ead4a3ec92" UPSTREAM_CHECK_REGEX = "bash-completion-(?P<pver>(?!2008).+)\.tar" UPSTREAM_CHECK_URI = "https://github.com/scop/bash-completion/releases" @@ -23,11 +23,6 @@ do_install_append() { install -d ${D}${sysconfdir}/bash_completion.d/ echo '. ${datadir}/${BPN}/bash_completion' >${D}${sysconfdir}/bash_completion - # Delete files already provided by util-linux - local i - for i in mount umount; do - rm ${D}${datadir}/${BPN}/completions/$i - done } RDEPENDS_${PN} = "bash" diff --git a/external/poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb b/external/poky/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb index 2aae9a3f..7c4db85b 100644 --- a/external/poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb +++ b/external/poky/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb @@ -9,14 +9,15 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "https://github.com/intel/${BPN}/releases/download/v${PV}/${BP}.tgz" +SRC_URI = "git://github.com/intel/${BPN}" -SRC_URI[md5sum] = "883420183611aa137cbaf68a91ef0d7e" -SRC_URI[sha256sum] = "0064891270c180c190f41925b0f6fb9cecac3056f1168d2592dbe90e5f226c0a" +SRCREV = "db7087b883bf52cbff063ad17a41cc1cbb85104d" +S = "${WORKDIR}/git" +PV .= "+git${SRCPV}" -UPSTREAM_CHECK_URI = "https://github.com/intel/${BPN}/releases" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" -RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl" +RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl python3-six" inherit python3native inherit setuptools3 diff --git a/external/poky/meta/recipes-support/boost/bjam-native_1.68.0.bb b/external/poky/meta/recipes-support/boost/bjam-native_1.72.0.bb index 94f96e62..d843eb03 100644 --- a/external/poky/meta/recipes-support/boost/bjam-native_1.68.0.bb +++ b/external/poky/meta/recipes-support/boost/bjam-native_1.72.0.bb @@ -5,8 +5,9 @@ SECTION = "devel" inherit native -SRC_URI += "file://bjam-native-build-bjam.debug.patch \ -" +SRC_URI += "file://0001-Build-debug-version-of-bjam.patch \ + file://0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch \ + " do_compile() { ./bootstrap.sh --with-toolset=gcc @@ -15,5 +16,5 @@ do_compile() { do_install() { install -d ${D}${bindir}/ # install unstripped version for bjam - install -c -m 755 bjam.debug ${D}${bindir}/bjam + install -c -m 755 b2 ${D}${bindir}/bjam } diff --git a/external/poky/meta/recipes-support/boost/boost-1.68.0.inc b/external/poky/meta/recipes-support/boost/boost-1.72.0.inc index b367a80b..55a095bf 100644 --- a/external/poky/meta/recipes-support/boost/boost-1.68.0.inc +++ b/external/poky/meta/recipes-support/boost/boost-1.72.0.inc @@ -11,9 +11,9 @@ BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "7fbd1890f571051f2a209681d57d486a" -SRC_URI[sha256sum] = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7" +SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2" +SRC_URI[md5sum] = "cb40943d2a2cb8ce08d42bc48b0f84f0" +SRC_URI[sha256sum] = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" diff --git a/external/poky/meta/recipes-support/boost/boost.inc b/external/poky/meta/recipes-support/boost/boost.inc index c4faea21..8eb94943 100644 --- a/external/poky/meta/recipes-support/boost/boost.inc +++ b/external/poky/meta/recipes-support/boost/boost.inc @@ -2,6 +2,8 @@ SUMMARY = "Free peer-reviewed portable C++ source libraries" SECTION = "libs" DEPENDS = "bjam-native zlib bzip2" +CVE_PRODUCT = "boost:boost" + ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" @@ -21,7 +23,6 @@ BOOST_LIBS = "\ random \ regex \ serialization \ - signals \ system \ timer \ test \ @@ -34,6 +35,7 @@ BOOST_LIBS_append_x86 = " context coroutine" BOOST_LIBS_append_x86-64 = " context coroutine" BOOST_LIBS_append_powerpc = " context coroutine" BOOST_LIBS_append_arm = " context coroutine" +BOOST_LIBS_append_aarch64 = " context coroutine" # need consistent settings for native builds (x86 override not applied for native) BOOST_LIBS_remove_class-native = " context coroutine" # does not compile @@ -81,7 +83,7 @@ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev ${PN}-staticdev" -FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so" +FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" FILES_${PN}-staticdev = "${libdir}/libboost_*.a" # "boost" is a metapackage which pulls in all boost librabries @@ -152,6 +154,7 @@ BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64" # cross compiling for arm fails to detect abi, so provide some help BJAM_OPTS_append_arm = " abi=aapcs architecture=arm" +BJAM_OPTS_append_aarch64 = " abi=aapcs address-model=64 architecture=arm" do_configure() { cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp @@ -199,6 +202,11 @@ do_install() { fi done + # Cmake files reference full paths to image + find ${D}${libdir}/cmake -type f | \ + grep 'cmake$' | \ + xargs -n 1 sed -e 's,${D}${libdir}/cmake,${libdir}/cmake,' -i + } BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/external/poky/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index fb6d9711..68d6e641 100644 --- a/external/poky/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/external/poky/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch @@ -1,21 +1,21 @@ -From 0868761e7d2d75d472090e3ef96f3d2f9ced27f3 Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Tue, 13 Dec 2016 10:29:32 -0700 -Subject: [PATCH 5/6] Don't set up arch/instruction-set flags, we do that - ourselves +From f4d3fad43d67808d71325ba0df1457555b9a0086 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 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 | 127 ------------------------------------------ - 1 file changed, 127 deletions(-) + tools/build/src/tools/gcc.jam | 132 ---------------------------------- + 1 file changed, 132 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index e3b1b952..e4fc6c32 100644 +index b9bb9cf2a..c7e3cf3fe 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -1276,130 +1276,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : +@@ -1180,135 +1180,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : <architecture>$(architecture)/<instruction-set>$(instruction-set) : $(values) ; } @@ -65,6 +65,7 @@ index e3b1b952..e4fc6c32 100644 -cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ; -cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ; -cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ; +-cpu-flags gcc OPTIONS : x86 : icelake : -march=icelake ; -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 ; @@ -144,8 +145,9 @@ index e3b1b952..e4fc6c32 100644 -cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ; -cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ; -cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; +-cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ; +-cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ; +-cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; +-cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; -# AIX variant of RS/6000 & PowerPC -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; --- -2.15.1 - diff --git a/external/poky/meta/recipes-support/boost/boost/0001-added-typedef-executor_type.patch b/external/poky/meta/recipes-support/boost/boost/0001-added-typedef-executor_type.patch new file mode 100644 index 00000000..7b8178fd --- /dev/null +++ b/external/poky/meta/recipes-support/boost/boost/0001-added-typedef-executor_type.patch @@ -0,0 +1,54 @@ +From 6a4d2ff72114ef47c7afaf92e1042aca3dfa41b0 Mon Sep 17 00:00:00 2001 +From: Klemens David Morgenstern <klemens.morgenstern@gmx.net> +Date: Fri, 22 Nov 2019 14:03:22 +0800 +Subject: [PATCH] added typedef executor_type; + +Upstream-Status: Backport [https://github.com/boostorg/process/commit/6a4d2ff72114ef47c7afaf92e1042aca3dfa41b0] + +Signed-off-by: Viktor Rosendahl <Viktor.Rosendahl@bmw.de> +--- + include/boost/process/async_pipe.hpp | 2 ++ + include/boost/process/detail/posix/async_pipe.hpp | 1 + + include/boost/process/detail/windows/async_pipe.hpp | 1 + + 3 files changed, 4 insertions(+) + +diff --git a/include/boost/process/async_pipe.hpp b/include/boost/process/async_pipe.hpp +index 101fe1d..a562432 100644 +--- a/boost/process/async_pipe.hpp ++++ b/boost/process/async_pipe.hpp +@@ -47,6 +47,8 @@ public: + */ + typedef platform_specific handle_type; + ++ typedef typename handle_type::executor_type executor_type; ++ + /** Construct a new async_pipe, does automatically open the pipe. + * Initializes source and sink with the same io_context. + * @note Windows creates a named pipe here, where the name is automatically generated. +diff --git a/include/boost/process/detail/posix/async_pipe.hpp b/include/boost/process/detail/posix/async_pipe.hpp +index 725a078..a82c057 100644 +--- a/boost/process/detail/posix/async_pipe.hpp ++++ b/boost/process/detail/posix/async_pipe.hpp +@@ -23,6 +23,7 @@ class async_pipe + public: + typedef int native_handle_type; + typedef ::boost::asio::posix::stream_descriptor handle_type; ++ typedef typename handle_type::executor_type executor_type; + + inline async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios) {} + +diff --git a/include/boost/process/detail/windows/async_pipe.hpp b/include/boost/process/detail/windows/async_pipe.hpp +index 06d5f2d..0b447f9 100644 +--- a/boost/process/detail/windows/async_pipe.hpp ++++ b/boost/process/detail/windows/async_pipe.hpp +@@ -48,6 +48,7 @@ class async_pipe + public: + typedef ::boost::winapi::HANDLE_ native_handle_type; + typedef ::boost::asio::windows::stream_handle handle_type; ++ typedef typename handle_type::executor_type executor_type; + + async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios, make_pipe_name(), true) {} + async_pipe(boost::asio::io_context & ios_source, boost::asio::io_context & ios_sink) +-- +2.17.1 + diff --git a/external/poky/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch b/external/poky/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch new file mode 100644 index 00000000..78b19225 --- /dev/null +++ b/external/poky/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch @@ -0,0 +1,42 @@ +From 59402e3a61d14eb7ce8c2019ea1a87ad4bd28605 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 + +We don't want these to be setup by boost as we pass our own flags. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + tools/build/src/tools/gcc.jam | 14 -------------- + 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 +--- a/tools/build/src/tools/gcc.jam ++++ b/tools/build/src/tools/gcc.jam +@@ -430,20 +430,6 @@ local rule compile-link-flags ( * ) + } + + { +- # Handle address-model +- compile-link-flags <target-os>aix/<address-model>32 : -maix32 ; +- compile-link-flags <target-os>aix/<address-model>64 : -maix64 ; +- +- compile-link-flags <target-os>hpux/<address-model>32 : -milp32 ; +- compile-link-flags <target-os>hpux/<address-model>64 : -mlp64 ; +- +- local generic-os = [ set.difference $(all-os) : aix hpux ] ; +- local arch = power sparc x86 ; +- compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>32 : -m32 ; +- 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/external/poky/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch b/external/poky/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch deleted file mode 100644 index 15565331..00000000 --- a/external/poky/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch +++ /dev/null @@ -1,243 +0,0 @@ -Author: Douglas Royds <douglas.royds@taitradio.com> -Date: Thu Nov 22 09:34:22 2018 +1300 - -Add a .file directive explicitly for all *_elf_gas.S files to prevent the linker -adding a host build-system path as a FILE symbol to the object file. - -This replaces the existing patch that added the .file directive to a small -subset of these files. - -Upstream-Status: Submitted [https://github.com/boostorg/context/issues/91] -Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> - -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-22 09:04:27.900876941 +1300 -@@ -51,6 +51,7 @@ - * * - *******************************************************/ - -+.file "jump_arm64_aapcs_elf_gas.S" - .text - .align 2 - .global jump_fcontext -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-22 09:04:28.876898240 +1300 -@@ -38,6 +38,7 @@ - * * - *******************************************************/ - -+.file "jump_arm_aapcs_elf_gas.S" - .text - .globl jump_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_i386_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_i386_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_i386_sysv_elf_gas.S 2018-11-22 09:04:29.904920674 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "jump_i386_sysv_elf_gas.S" - .text - .globl jump_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_mips32_o32_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_mips32_o32_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_mips32_o32_elf_gas.S 2018-11-22 09:04:41.021163195 +1300 -@@ -38,6 +38,7 @@ - * * - * *****************************************************/ - -+.file "jump_mips32_o32_elf_gas.S" - .text - .globl jump_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S 2018-11-22 09:04:42.281190679 +1300 -@@ -73,6 +73,7 @@ - * * - *******************************************************/ - -+.file "jump_ppc32_sysv_elf_gas.S" - .text - .globl jump_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S 2018-11-22 09:04:43.193210571 +1300 -@@ -66,6 +66,7 @@ - * * - *******************************************************/ - -+.file "jump_ppc64_sysv_elf_gas.S" - .globl jump_fcontext - #if _CALL_ELF == 2 - .text -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S 2018-11-22 09:04:44.213232818 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "jump_x86_64_sysv_elf_gas.S" - .text - .globl jump_fcontext - .type jump_fcontext,@function -diff -ur boost_1_68_0.original/libs/context/src/asm/make_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/make_arm64_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_arm64_aapcs_elf_gas.S 2018-11-22 09:04:45.153253319 +1300 -@@ -51,6 +51,7 @@ - * * - *******************************************************/ - -+.file "make_arm64_aapcs_elf_gas.S" - .text - .align 2 - .global make_fcontext -diff -ur boost_1_68_0.original/libs/context/src/asm/make_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/make_arm_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_arm_aapcs_elf_gas.S 2018-11-22 09:04:46.097273908 +1300 -@@ -38,6 +38,7 @@ - * * - *******************************************************/ - -+.file "make_arm_aapcs_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/make_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_i386_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_i386_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_i386_sysv_elf_gas.S 2018-11-22 09:04:46.973293012 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "make_i386_sysv_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/make_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/make_mips32_o32_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_mips32_o32_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_mips32_o32_elf_gas.S 2018-11-22 09:04:47.925313772 +1300 -@@ -38,6 +38,7 @@ - * * - * *****************************************************/ - -+.file "make_mips32_o32_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/make_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_ppc32_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_ppc32_sysv_elf_gas.S 2018-11-22 09:04:48.865334271 +1300 -@@ -73,6 +73,7 @@ - * * - *******************************************************/ - -+.file "make_ppc32_sysv_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/make_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_ppc64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_ppc64_sysv_elf_gas.S 2018-11-22 09:04:50.049360089 +1300 -@@ -66,6 +66,7 @@ - * * - *******************************************************/ - -+.file "make_ppc64_sysv_elf_gas.S" - .globl make_fcontext - #if _CALL_ELF == 2 - .text -diff -ur boost_1_68_0.original/libs/context/src/asm/make_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_x86_64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_x86_64_sysv_elf_gas.S 2018-11-22 09:04:51.117383378 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "make_x86_64_sysv_elf_gas.S" - .text - .globl make_fcontext - .type make_fcontext,@function -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S 2018-11-22 09:04:52.201407013 +1300 -@@ -51,6 +51,7 @@ - * * - *******************************************************/ - -+.file "ontop_arm64_aapcs_elf_gas.S" - .text - .align 2 - .global ontop_fcontext -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S 2018-11-22 09:04:53.269430300 +1300 -@@ -38,6 +38,7 @@ - * * - *******************************************************/ - -+.file "ontop_arm_aapcs_elf_gas.S" - .text - .globl ontop_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_i386_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_i386_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_i386_sysv_elf_gas.S 2018-11-22 09:04:54.389454719 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "ontop_i386_sysv_elf_gas.S" - .text - .globl ontop_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_mips32_o32_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_mips32_o32_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_mips32_o32_elf_gas.S 2018-11-22 09:04:55.657482363 +1300 -@@ -38,6 +38,7 @@ - * * - * *****************************************************/ - -+.file "ontop_mips32_o32_elf_gas.S" - .text - .globl ontop_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S 2018-11-22 09:04:56.777506781 +1300 -@@ -73,6 +73,7 @@ - * * - *******************************************************/ - -+.file "ontop_ppc32_sysv_elf_gas.S" - .text - .globl ontop_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S 2018-11-22 09:04:58.485544015 +1300 -@@ -66,6 +66,7 @@ - * * - *******************************************************/ - -+.file "ontop_ppc64_sysv_elf_gas.S" - .globl ontop_fcontext - #if _CALL_ELF == 2 - .text -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S 2018-11-22 09:04:59.609568516 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "ontop_x86_64_sysv_elf_gas.S" - .text - .globl ontop_fcontext - .type ontop_fcontext,@function diff --git a/external/poky/meta/recipes-support/boost/boost_1.68.0.bb b/external/poky/meta/recipes-support/boost/boost_1.68.0.bb deleted file mode 100644 index 82e36fd7..00000000 --- a/external/poky/meta/recipes-support/boost/boost_1.68.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require boost-${PV}.inc -require boost.inc - -SRC_URI += "\ - file://arm-intrinsics.patch \ - file://boost-CVE-2012-2677.patch \ - file://boost-math-disable-pch-for-gcc.patch \ - file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ - file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ - file://reproducibility-add-file-directive-to-assembler.patch \ - " diff --git a/external/poky/meta/recipes-support/boost/boost_1.72.0.bb b/external/poky/meta/recipes-support/boost/boost_1.72.0.bb new file mode 100644 index 00000000..51c84bc9 --- /dev/null +++ b/external/poky/meta/recipes-support/boost/boost_1.72.0.bb @@ -0,0 +1,12 @@ +require boost-${PV}.inc +require boost.inc + +SRC_URI += "file://arm-intrinsics.patch \ + file://boost-CVE-2012-2677.patch \ + file://boost-math-disable-pch-for-gcc.patch \ + file://0001-Apply-boost-1.62.0-no-forced-flags.patch.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 \ + file://0001-revert-cease-dependence-on-range.patch \ + file://0001-added-typedef-executor_type.patch \ + " diff --git a/external/poky/meta/recipes-support/boost/files/0001-Build-debug-version-of-bjam.patch b/external/poky/meta/recipes-support/boost/files/0001-Build-debug-version-of-bjam.patch new file mode 100644 index 00000000..c6dcee91 --- /dev/null +++ b/external/poky/meta/recipes-support/boost/files/0001-Build-debug-version-of-bjam.patch @@ -0,0 +1,38 @@ +From 19c117c3d1388654da484e26afb3fb6c3e4181a9 Mon Sep 17 00:00:00 2001 +From: Daniel Klauer <daniel.klauer@gin.de> +Date: Tue, 30 Jul 2019 11:39:09 +0200 +Subject: [PATCH] Build debug version of bjam + +bjam is stripped by default, this causes QA warning while stripping it +from do_populate_sysroot(): + + WARNING: File '.../tmp/sysroots/x86_64-linux/usr/bin/bjam' \ + from bjam-native was already stripped, \ + this will prevent future debugging! + +The JAM scripts allow to build unstripped version with '--debug'. Just +build and install the bjam.debug to stop bjam from being stripped in +compile step. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + bootstrap.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bootstrap.sh b/bootstrap.sh +index ca0b08d58..87f38dcf2 100755 +--- a/bootstrap.sh ++++ b/bootstrap.sh +@@ -223,7 +223,7 @@ rm -f config.log + if test "x$BJAM" = x; then + $ECHO -n "Building Boost.Build engine with toolset $TOOLSET... " + pwd=`pwd` +- (cd "$my_dir/tools/build/src/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1 ++ (cd "$my_dir/tools/build/src/engine" && ./build.sh "$TOOLSET" --debug) > bootstrap.log 2>&1 + if [ $? -ne 0 ]; then + echo + echo "Failed to build Boost.Build build engine" +-- +2.17.1 + diff --git a/external/poky/meta/recipes-support/boost/files/0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch b/external/poky/meta/recipes-support/boost/files/0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch new file mode 100644 index 00000000..4c6ef2ed --- /dev/null +++ b/external/poky/meta/recipes-support/boost/files/0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch @@ -0,0 +1,27 @@ +From 2afd025997a57794ce24e07e914b461dfea6ba5f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 26 Aug 2019 16:04:16 +0200 +Subject: [PATCH] build.sh: use -DNDEBUG also in debug builds + +Without it, there is a significant performance regression +when running 'bjam install'. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + tools/build/src/engine/build.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh +index a1e4cd335..64e0a4c80 100755 +--- a/tools/build/src/engine/build.sh ++++ b/tools/build/src/engine/build.sh +@@ -436,7 +436,7 @@ case $B2_OS in + ;; + esac + +-if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}" ++if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG} -DNDEBUG" + else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG" + fi + echo_run ${B2_CXX} ${CXXFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 diff --git a/external/poky/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch b/external/poky/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch new file mode 100644 index 00000000..d6d09a23 --- /dev/null +++ b/external/poky/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch @@ -0,0 +1,53 @@ +From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001 +From: Oliver Kowalke <oliver.kowalke@gmail.com> +Date: Sun, 1 Dec 2019 20:40:28 +0100 +Subject: [PATCH] Revert "Cease dependence on Range" + +This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db. + +see #44 (One test fails to compile after boostorg/coroutine submodule updated) + +Upstream-Status: Backport [https://github.com/boostorg/coroutine/commit/9c73b2f7c1759a9508ba8780b38dc15f07f1a447] + +Signed-off-by: Andrew Geissler <geissonator@gmail.com> +--- + boost/coroutine/asymmetric_coroutine.hpp | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp +index ea96981..640896f 100644 +--- a/boost/coroutine/asymmetric_coroutine.hpp ++++ b/boost/coroutine/asymmetric_coroutine.hpp +@@ -14,6 +14,7 @@ + #include <boost/assert.hpp> + #include <boost/config.hpp> + #include <boost/move/move.hpp> ++#include <boost/range.hpp> + #include <boost/throw_exception.hpp> + #include <boost/utility/explicit_operator_bool.hpp> + +@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c) + + } + +-// forward declaration of Boost.Range traits to break dependency on it +-template<typename C, typename Enabler> +-struct range_mutable_iterator; +- +-template<typename C, typename Enabler> +-struct range_const_iterator; +- + template< typename Arg > +-struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void > ++struct range_mutable_iterator< coroutines::push_coroutine< Arg > > + { typedef typename coroutines::push_coroutine< Arg >::iterator type; }; + + template< typename R > +-struct range_mutable_iterator< coroutines::pull_coroutine< R >, void > ++struct range_mutable_iterator< coroutines::pull_coroutine< R > > + { typedef typename coroutines::pull_coroutine< R >::iterator type; }; + + } +-- +2.24.1 + diff --git a/external/poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch b/external/poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch deleted file mode 100644 index 9f8b7eac..00000000 --- a/external/poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 619ada314ab26c0c9cbfe5702cd9c0caa8f6415a Mon Sep 17 00:00:00 2001 -From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Mon, 3 Aug 2015 17:12:33 +0800 -Subject: [PATCH] bjam-native: build bjam.debug - -bjam is stripped by default, this causes QA warning while stripping it -from do_populate_sysroot(): - - WARNING: File '.../tmp/sysroots/x86_64-linux/usr/bin/bjam' \ - from bjam-native was already stripped, \ - this will prevent future debugging! - -The JAM scripts allow to build unstripped version with '--debug'. Just -build and install the bjam.debug to stop bjam from being stripped in -compile step. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - bootstrap.sh | 1 + - tools/build/src/engine/build.sh | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bootstrap.sh b/bootstrap.sh -index 98cf88b..54690aa 100755 ---- a/bootstrap.sh -+++ b/bootstrap.sh -@@ -228,6 +228,7 @@ if test "x$BJAM" = x; then - echo "tools/build/src/engine/$arch/b2" - cp "$BJAM" . - cp "$my_dir/tools/build/src/engine/$arch/bjam" . -+ cp "$my_dir/tools/build/src/engine/${arch}.debug/bjam" bjam.debug - - fi - -diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh -index 6dbc706..c69fdc7 100755 ---- a/tools/build/src/engine/build.sh -+++ b/tools/build/src/engine/build.sh -@@ -312,5 +312,5 @@ if test -x "./bootstrap/jam0" ; then - if test "${BJAM_UPDATE}" != "update" ; then - echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" clean - fi -- echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" -+ echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" --debug - fi --- -1.9.1 - diff --git a/external/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch b/external/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch new file mode 100644 index 00000000..aa2c85ff --- /dev/null +++ b/external/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-certdata2pem.py-use-python3.patch @@ -0,0 +1,37 @@ +From b6d18ca77f131cdcaa10d0eaa9d303399767edf6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 28 Aug 2019 19:18:14 +0200 +Subject: [PATCH] certdata2pem.py: use python3 + +Comments in that file imply it is already py3 compatible. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + mozilla/Makefile | 2 +- + mozilla/certdata2pem.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mozilla/Makefile b/mozilla/Makefile +index 6f46118..f98877c 100644 +--- a/mozilla/Makefile ++++ b/mozilla/Makefile +@@ -3,7 +3,7 @@ + # + + all: +- python certdata2pem.py ++ python3 certdata2pem.py + + clean: + -rm -f *.crt +diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py +index 0b02b2a..7d796f1 100644 +--- a/mozilla/certdata2pem.py ++++ b/mozilla/certdata2pem.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # vim:set et sw=4: + # + # certdata2pem.py - splits certdata.txt into multiple files diff --git a/external/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb b/external/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb index b9f57900..ce3cb217 100644 --- a/external/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb +++ b/external/poky/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=aeb420429b1659507e0a5a1b123e8308 DEPENDS = "" DEPENDS_class-native = "openssl-native" DEPENDS_class-nativesdk = "openssl-native" -# Need c_rehash from openssl and run-parts from debianutils +# Need rehash from openssl and run-parts from debianutils PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" SRCREV = "c28799b138b044c963d24c4a69659b6e5486e3be" @@ -23,6 +23,7 @@ SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ file://default-sysroot.patch \ file://sbindir.patch \ file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \ + file://0001-certdata2pem.py-use-python3.patch \ " S = "${WORKDIR}/git" @@ -53,7 +54,7 @@ do_install () { echo "# Lines starting with ! will remove certificate on next update" echo "#" find ${D}${datadir}/ca-certificates -type f -name '*.crt' | \ - sed 's,^${D}${datadir}/ca-certificates/,,' + sed 's,^${D}${datadir}/ca-certificates/,,' | sort } >${D}${sysconfdir}/ca-certificates.conf } @@ -82,6 +83,8 @@ do_install_append_class-native () { SYSROOT="${D}${base_prefix}" ${D}${sbindir}/update-ca-certificates } -RDEPENDS_${PN} += "openssl" +RDEPENDS_${PN}_class-target = "openssl-bin" +RDEPENDS_${PN}_class-native = "openssl-native" +RDEPENDS_${PN}_class-nativesdk = "nativesdk-openssl-bin" BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/external/poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb index 80d48bf8..89f2d77b 100644 --- a/external/poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/external/poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ DEPENDS = "glib-2.0 glib-2.0-native dbus dbus-glib virtual/libx11" RDEPENDS_${PN} += "base-files" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" @@ -23,10 +23,10 @@ SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf9751464 S = "${WORKDIR}/ConsoleKit-${PV}" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd polkit', d)}" PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" -PACKAGECONFIG[policykit] = "--with-polkit,--without-polkit,polkit" +PACKAGECONFIG[polkit] = "--with-polkit,--without-polkit,polkit" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir=" FILES_${PN} += "${exec_prefix}/lib/ConsoleKit \ diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2018-14618.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2018-14618.patch deleted file mode 100644 index db07b436..00000000 --- a/external/poky/meta/recipes-support/curl/curl/CVE-2018-14618.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 57d299a499155d4b327e341c6024e293b0418243 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Mon, 13 Aug 2018 10:35:52 +0200 -Subject: [PATCH] Curl_ntlm_core_mk_nt_hash: return error on too long password - -... since it would cause an integer overflow if longer than (max size_t -/ 2). - -This is CVE-2018-14618 - -Bug: https://curl.haxx.se/docs/CVE-2018-14618.html -Closes #2756 -Reported-by: Zhaoyang Wu - -CVE: CVE-2018-14618 -Upstream-Status: Backport -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> ---- - lib/curl_ntlm_core.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c -index e27cab353c..922e85a926 100644 ---- a/lib/curl_ntlm_core.c -+++ b/lib/curl_ntlm_core.c -@@ -557,8 +557,11 @@ CURLcode Curl_ntlm_core_mk_nt_hash(struct Curl_easy *data, - unsigned char *ntbuffer /* 21 bytes */) - { - size_t len = strlen(password); -- unsigned char *pw = len ? malloc(len * 2) : strdup(""); -+ unsigned char *pw; - CURLcode result; -+ if(len > SIZE_T_MAX/2) /* avoid integer overflow */ -+ return CURLE_OUT_OF_MEMORY; -+ pw = len ? malloc(len * 2) : strdup(""); - if(!pw) - return CURLE_OUT_OF_MEMORY; diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2018-16839.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2018-16839.patch deleted file mode 100644 index bf972d2e..00000000 --- a/external/poky/meta/recipes-support/curl/curl/CVE-2018-16839.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 55b90532f9190dce40a325b3312d014c66dc3ae1 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 1 Nov 2018 15:27:35 +0800 -Subject: [PATCH] Curl_auth_create_plain_message: fix too-large-input-check - -CVE-2018-16839 -Reported-by: Harry Sintonen -Bug: https://curl.haxx.se/docs/CVE-2018-16839.html - -Upstream-Status: Backport [https://github.com/curl/curl/commit -/f3a24d7916b9173c69a3e0ee790102993833d6c5?diff=unified] - -CVE: CVE-2018-16839 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - lib/vauth/cleartext.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c -index 5d61ce6..1367143 100644 ---- a/lib/vauth/cleartext.c -+++ b/lib/vauth/cleartext.c -@@ -74,7 +74,7 @@ CURLcode Curl_auth_create_plain_message(struct Curl_easy *data, - plen = strlen(passwdp); - - /* Compute binary message length. Check for overflows. */ -- if((ulen > SIZE_T_MAX/2) || (plen > (SIZE_T_MAX/2 - 2))) -+ if((ulen > SIZE_T_MAX/4) || (plen > (SIZE_T_MAX/2 - 2))) - return CURLE_OUT_OF_MEMORY; - plainlen = 2 * ulen + plen + 2; - --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2018-16840.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2018-16840.patch deleted file mode 100644 index 3d086c4d..00000000 --- a/external/poky/meta/recipes-support/curl/curl/CVE-2018-16840.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3c2846bec008e03d456e181d9ab55686da83f140 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 1 Nov 2018 15:33:35 +0800 -Subject: [PATCH] Curl_close: clear data->multi_easy on free to avoid - use-after-free - -Regression from b46cfbc (7.59.0) -CVE-2018-16840 -Reported-by: Brian Carpenter (Geeknik Labs) - -Bug: https://curl.haxx.se/docs/CVE-2018-16840.html - -Upstream-Status: Backport [https://github.com/curl/curl/commit/ -81d135d67155c5295b1033679c606165d4e28f3f] - -CVE: CVE-2018-16840 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - lib/url.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/url.c b/lib/url.c -index 27b2c1e..7ef7c20 100644 ---- a/lib/url.c -+++ b/lib/url.c -@@ -320,10 +320,12 @@ CURLcode Curl_close(struct Curl_easy *data) - and detach this handle from there. */ - curl_multi_remove_handle(data->multi, data); - -- if(data->multi_easy) -+ if(data->multi_easy) { - /* when curl_easy_perform() is used, it creates its own multi handle to - use and this is the one */ - curl_multi_cleanup(data->multi_easy); -+ data->multi_easy = NULL; -+ } - - /* Destroy the timeout list that is held in the easy handle. It is - /normally/ done by curl_multi_remove_handle() but this is "just in --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2018-16842.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2018-16842.patch deleted file mode 100644 index 82e75570..00000000 --- a/external/poky/meta/recipes-support/curl/curl/CVE-2018-16842.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0e4a6058b130f07cfa52fde8a3cb6f2abfe4c700 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 1 Nov 2018 15:30:56 +0800 -Subject: [PATCH] voutf: fix bad arethmetic when outputting warnings to stderr - -CVE-2018-16842 -Reported-by: Brian Carpenter -Bug: https://curl.haxx.se/docs/CVE-2018-16842.html - -Upstream-Status: Backport [https://github.com/curl/curl/commit -/d530e92f59ae9bb2d47066c3c460b25d2ffeb211] - -CVE: CVE-2018-16842 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - src/tool_msgs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tool_msgs.c b/src/tool_msgs.c -index 9cce806..05bec39 100644 ---- a/src/tool_msgs.c -+++ b/src/tool_msgs.c -@@ -67,7 +67,7 @@ static void voutf(struct GlobalConfig *config, - (void)fwrite(ptr, cut + 1, 1, config->errors); - fputs("\n", config->errors); - ptr += cut + 1; /* skip the space too */ -- len -= cut; -+ len -= cut + 1; - } - else { - fputs(ptr, config->errors); --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2018-16890.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2018-16890.patch deleted file mode 100644 index 3776f362..00000000 --- a/external/poky/meta/recipes-support/curl/curl/CVE-2018-16890.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 53d3c2f92b4a7561b1006494badf8cf2ef9110c0 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Wed, 2 Jan 2019 20:33:08 +0100 -Subject: [PATCH 1/3] NTLM: fix size check condition for type2 received data - -Bug: https://curl.haxx.se/docs/CVE-2018-16890.html -Reported-by: Wenxiang Qian -CVE-2018-16890 - -Upstream-Status: Backport -[https://github.com/curl/curl/commit -/b780b30d1377adb10bbe774835f49e9b237fb9bb] - -CVE: CVE-2018-16890 - -Signed-off-by: Kevin Weng <t-keweng@microsoft.com> ---- - lib/vauth/ntlm.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c -index cdb8d8f0d..0212756ab 100644 ---- a/lib/vauth/ntlm.c -+++ b/lib/vauth/ntlm.c -@@ -5,7 +5,7 @@ - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * -- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. -+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms -@@ -182,10 +182,11 @@ static CURLcode ntlm_decode_type2_target(struct Curl_easy *data, - target_info_len = Curl_read16_le(&buffer[40]); - target_info_offset = Curl_read32_le(&buffer[44]); - if(target_info_len > 0) { -- if(((target_info_offset + target_info_len) > size) || -+ if((target_info_offset >= size) || -+ ((target_info_offset + target_info_len) > size) || - (target_info_offset < 48)) { - infof(data, "NTLM handshake failure (bad type-2 message). " -- "Target Info Offset Len is set incorrect by the peer\n"); -+ "Target Info Offset Len is set incorrect by the peer\n"); - return CURLE_BAD_CONTENT_ENCODING; - } - --- -2.22.0 - diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2019-3822.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2019-3822.patch deleted file mode 100644 index 4f612ddd..00000000 --- a/external/poky/meta/recipes-support/curl/curl/CVE-2019-3822.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 761b51f66c7b1cd2cd6c71b807bfdb6a27c49b30 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Thu, 3 Jan 2019 12:59:28 +0100 -Subject: [PATCH 2/3] ntlm: fix *_type3_message size check to avoid buffer - overflow - -Bug: https://curl.haxx.se/docs/CVE-2019-3822.html -Reported-by: Wenxiang Qian -CVE-2019-3822 - -Upstream-Status: Backport -[https://github.com/curl/curl/commit -/50c9484278c63b958655a717844f0721263939cc] - -CVE: CVE-2019-3822 - -Signed-off-by: Kevin Weng <t-keweng@microsoft.com> ---- - lib/vauth/ntlm.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c -index 0212756ab..3be0403d9 100644 ---- a/lib/vauth/ntlm.c -+++ b/lib/vauth/ntlm.c -@@ -777,11 +777,14 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data, - }); - - #ifdef USE_NTRESPONSES -- if(size < (NTLM_BUFSIZE - ntresplen)) { -- DEBUGASSERT(size == (size_t)ntrespoff); -- memcpy(&ntlmbuf[size], ptr_ntresp, ntresplen); -- size += ntresplen; -+ /* ntresplen + size should not be risking an integer overflow here */ -+ if(ntresplen + size > sizeof(ntlmbuf)) { -+ failf(data, "incoming NTLM message too big"); -+ return CURLE_OUT_OF_MEMORY; - } -+ DEBUGASSERT(size == (size_t)ntrespoff); -+ memcpy(&ntlmbuf[size], ptr_ntresp, ntresplen); -+ size += ntresplen; - - DEBUG_OUT({ - fprintf(stderr, "\n ntresp="); --- -2.22.0 - diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2019-3823.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2019-3823.patch deleted file mode 100644 index 194e6e64..00000000 --- a/external/poky/meta/recipes-support/curl/curl/CVE-2019-3823.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 40f6c913f63cdbfa81daa7ac7f1c7415bb99edeb Mon Sep 17 00:00:00 2001 -From: Daniel Gustafsson <daniel@yesql.se> -Date: Sat, 19 Jan 2019 00:42:47 +0100 -Subject: [PATCH 3/3] smtp: avoid risk of buffer overflow in strtol - -If the incoming len 5, but the buffer does not have a termination -after 5 bytes, the strtol() call may keep reading through the line -buffer until is exceeds its boundary. Fix by ensuring that we are -using a bounded read with a temporary buffer on the stack. - -Bug: https://curl.haxx.se/docs/CVE-2019-3823.html -Reported-by: Brian Carpenter (Geeknik Labs) -CVE-2019-3823 - -Upstream-Status: Backport -[https://github.com/curl/curl/commit -/39df4073e5413fcdbb5a38da0c1ce6f1c0ceb484] - -CVE: CVE-2019-3823 - -Signed-off-by: Kevin Weng <t-keweng@microsoft.com> ---- - lib/smtp.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/lib/smtp.c b/lib/smtp.c -index ecf10a41a..1b9f92d30 100644 ---- a/lib/smtp.c -+++ b/lib/smtp.c -@@ -5,7 +5,7 @@ - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * -- * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. -+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms -@@ -207,8 +207,12 @@ static bool smtp_endofresp(struct connectdata *conn, char *line, size_t len, - Section 4. Examples of RFC-4954 but some e-mail servers ignore this and - only send the response code instead as per Section 4.2. */ - if(line[3] == ' ' || len == 5) { -+ char tmpline[6]; -+ - result = TRUE; -- *resp = curlx_sltosi(strtol(line, NULL, 10)); -+ memset(tmpline, '\0', sizeof(tmpline)); -+ memcpy(tmpline, line, (len == 5 ? 5 : 3)); -+ *resp = curlx_sltosi(strtol(tmpline, NULL, 10)); - - /* Make sure real server never sends internal value */ - if(*resp == 1) --- -2.22.0 - diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2019-5435.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2019-5435.patch deleted file mode 100644 index 8ac55545..00000000 --- a/external/poky/meta/recipes-support/curl/curl/CVE-2019-5435.patch +++ /dev/null @@ -1,200 +0,0 @@ -From 5fc28510a4664f46459d9a40187d81cc08571e60 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Mon, 29 Apr 2019 08:00:49 +0200 -Subject: [PATCH] CURL_MAX_INPUT_LENGTH: largest acceptable string input size - -This limits all accepted input strings passed to libcurl to be less than -CURL_MAX_INPUT_LENGTH (8000000) bytes, for these API calls: -curl_easy_setopt() and curl_url_set(). - -The 8000000 number is arbitrary picked and is meant to detect mistakes -or abuse, not to limit actual practical use cases. By limiting the -acceptable string lengths we also reduce the risk of integer overflows -all over. - -NOTE: This does not apply to `CURLOPT_POSTFIELDS`. - -Test 1559 verifies. - -Closes #3805 - -Upstream-Status: Backport -Dropped a few changes to apply against this version -https://github.com/curl/curl/commit/5fc28510a4664f4 - -CVE: CVE-2019-5435 -affects: libcurl 7.19.4 to and including 7.64.1 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - lib/setopt.c | 7 +++++ - lib/urldata.h | 4 +++ - 7 files changed, 146 insertions(+), 3 deletions(-) - create mode 100644 tests/data/test1559 - create mode 100644 tests/libtest/lib1559.c - -Index: curl-7.61.0/lib/setopt.c -=================================================================== ---- curl-7.61.0.orig/lib/setopt.c -+++ curl-7.61.0/lib/setopt.c -@@ -60,6 +60,13 @@ CURLcode Curl_setstropt(char **charp, co - if(s) { - char *str = strdup(s); - -+ if(str) { -+ size_t len = strlen(str); -+ if(len > CURL_MAX_INPUT_LENGTH) { -+ free(str); -+ return CURLE_BAD_FUNCTION_ARGUMENT; -+ } -+ } - if(!str) - return CURLE_OUT_OF_MEMORY; - -Index: curl-7.61.0/lib/urldata.h -=================================================================== ---- curl-7.61.0.orig/lib/urldata.h -+++ curl-7.61.0/lib/urldata.h -@@ -79,6 +79,10 @@ - */ - #define RESP_TIMEOUT (1800*1000) - -+/* Max string intput length is a precaution against abuse and to detect junk -+ input easier and better. */ -+#define CURL_MAX_INPUT_LENGTH 8000000 -+ - #include "cookie.h" - #include "psl.h" - #include "formdata.h" -Index: curl-7.61.0/tests/data/test1559 -=================================================================== ---- /dev/null -+++ curl-7.61.0/tests/data/test1559 -@@ -0,0 +1,44 @@ -+<testcase> -+<info> -+<keywords> -+CURLOPT_URL -+</keywords> -+</info> -+ -+<reply> -+</reply> -+ -+<client> -+<server> -+none -+</server> -+ -+# require HTTP so that CURLOPT_POSTFIELDS works as assumed -+<features> -+http -+</features> -+<tool> -+lib1559 -+</tool> -+ -+<name> -+Set excessive URL lengths -+</name> -+</client> -+ -+# -+# Verify that the test runs to completion without crashing -+<verify> -+<errorcode> -+0 -+</errorcode> -+<stdout> -+CURLOPT_URL 10000000 bytes URL == 43 -+CURLOPT_POSTFIELDS 10000000 bytes data == 0 -+CURLUPART_URL 10000000 bytes URL == 3 -+CURLUPART_SCHEME 10000000 bytes scheme == 3 -+CURLUPART_USER 10000000 bytes user == 3 -+</stdout> -+</verify> -+ -+</testcase> -Index: curl-7.61.0/tests/libtest/lib1559.c -=================================================================== ---- /dev/null -+++ curl-7.61.0/tests/libtest/lib1559.c -@@ -0,0 +1,78 @@ -+/*************************************************************************** -+ * _ _ ____ _ -+ * Project ___| | | | _ \| | -+ * / __| | | | |_) | | -+ * | (__| |_| | _ <| |___ -+ * \___|\___/|_| \_\_____| -+ * -+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. -+ * -+ * This software is licensed as described in the file COPYING, which -+ * you should have received as part of this distribution. The terms -+ * are also available at https://curl.haxx.se/docs/copyright.html. -+ * -+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell -+ * copies of the Software, and permit persons to whom the Software is -+ * furnished to do so, under the terms of the COPYING file. -+ * -+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -+ * KIND, either express or implied. -+ * -+ ***************************************************************************/ -+#include "test.h" -+ -+#include "testutil.h" -+#include "warnless.h" -+#include "memdebug.h" -+ -+#define EXCESSIVE 10*1000*1000 -+int test(char *URL) -+{ -+ CURLcode res = 0; -+ CURL *curl = NULL; -+ char *longurl = malloc(EXCESSIVE); -+ CURLU *u; -+ (void)URL; -+ -+ memset(longurl, 'a', EXCESSIVE); -+ longurl[EXCESSIVE-1] = 0; -+ -+ global_init(CURL_GLOBAL_ALL); -+ easy_init(curl); -+ -+ res = curl_easy_setopt(curl, CURLOPT_URL, longurl); -+ printf("CURLOPT_URL %d bytes URL == %d\n", -+ EXCESSIVE, (int)res); -+ -+ res = curl_easy_setopt(curl, CURLOPT_POSTFIELDS, longurl); -+ printf("CURLOPT_POSTFIELDS %d bytes data == %d\n", -+ EXCESSIVE, (int)res); -+ -+ u = curl_url(); -+ if(u) { -+ CURLUcode uc = curl_url_set(u, CURLUPART_URL, longurl, 0); -+ printf("CURLUPART_URL %d bytes URL == %d\n", -+ EXCESSIVE, (int)uc); -+ uc = curl_url_set(u, CURLUPART_SCHEME, longurl, CURLU_NON_SUPPORT_SCHEME); -+ printf("CURLUPART_SCHEME %d bytes scheme == %d\n", -+ EXCESSIVE, (int)uc); -+ uc = curl_url_set(u, CURLUPART_USER, longurl, 0); -+ printf("CURLUPART_USER %d bytes user == %d\n", -+ EXCESSIVE, (int)uc); -+ curl_url_cleanup(u); -+ } -+ -+ free(longurl); -+ -+ curl_easy_cleanup(curl); -+ curl_global_cleanup(); -+ -+ return 0; -+ -+test_cleanup: -+ -+ curl_easy_cleanup(curl); -+ curl_global_cleanup(); -+ -+ return res; /* return the final return code */ -+} diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2019-5436.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2019-5436.patch deleted file mode 100644 index 05fd8e9b..00000000 --- a/external/poky/meta/recipes-support/curl/curl/CVE-2019-5436.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2576003415625d7b5f0e390902f8097830b82275 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Fri, 3 May 2019 22:20:37 +0200 -Subject: [PATCH] tftp: use the current blksize for recvfrom() - -bug: https://curl.haxx.se/docs/CVE-2019-5436.html -Reported-by: l00p3r on hackerone -CVE-2019-5436 - -Upstream-Status: Backport -https://github.com/curl/curl/commit/2576003415625d7b5f0e390902f8097830b82275 -CVE: CVE-2019-5436 -affects: libcurl 7.19.4 to and including 7.64.1 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - lib/tftp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: curl-7.61.0/lib/tftp.c -=================================================================== ---- curl-7.61.0.orig/lib/tftp.c -+++ curl-7.61.0/lib/tftp.c -@@ -1005,7 +1005,7 @@ static CURLcode tftp_connect(struct conn - state->sockfd = state->conn->sock[FIRSTSOCKET]; - state->state = TFTP_STATE_START; - state->error = TFTP_ERR_NONE; -- state->blksize = TFTP_BLKSIZE_DEFAULT; -+ state->blksize = blksize; - state->requested_blksize = blksize; - - ((struct sockaddr *)&state->local_addr)->sa_family = diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2019-5482.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2019-5482.patch deleted file mode 100644 index 91b18669..00000000 --- a/external/poky/meta/recipes-support/curl/curl/CVE-2019-5482.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 38319e0717844c32464a6c7630de9be226f1c6f4 Mon Sep 17 00:00:00 2001 -From: Thomas Vegas <> -Date: Sat, 31 Aug 2019 17:30:51 +0200 -Subject: [PATCH] tftp: Alloc maximum blksize, and use default unless OACK is - received -Reply-To: muislam@microsoft.com - -Fixes potential buffer overflow from 'recvfrom()', should the server -return an OACK without blksize. - -Bug: https://curl.haxx.se/docs/CVE-2019-5482.html - -CVE: CVE-2019-5482 - -Upstream-Status: Backport - -Signed-off-by: Muminul Islam <muislam@microsoft.com> ---- - lib/tftp.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/lib/tftp.c b/lib/tftp.c -index 064eef318..2c148e3e1 100644 ---- a/lib/tftp.c -+++ b/lib/tftp.c -@@ -969,6 +969,7 @@ static CURLcode tftp_connect(struct connectdata *conn, bool *done) - { - tftp_state_data_t *state; - int blksize; -+ int need_blksize; - - blksize = TFTP_BLKSIZE_DEFAULT; - -@@ -983,15 +984,20 @@ static CURLcode tftp_connect(struct connectdata *conn, bool *done) - return CURLE_TFTP_ILLEGAL; - } - -+ need_blksize = blksize; -+ /* default size is the fallback when no OACK is received */ -+ if(need_blksize < TFTP_BLKSIZE_DEFAULT) -+ need_blksize = TFTP_BLKSIZE_DEFAULT; -+ - if(!state->rpacket.data) { -- state->rpacket.data = calloc(1, blksize + 2 + 2); -+ state->rpacket.data = calloc(1, need_blksize + 2 + 2); - - if(!state->rpacket.data) - return CURLE_OUT_OF_MEMORY; - } - - if(!state->spacket.data) { -- state->spacket.data = calloc(1, blksize + 2 + 2); -+ state->spacket.data = calloc(1, need_blksize + 2 + 2); - - if(!state->spacket.data) - return CURLE_OUT_OF_MEMORY; -@@ -1005,7 +1011,7 @@ static CURLcode tftp_connect(struct connectdata *conn, bool *done) - state->sockfd = state->conn->sock[FIRSTSOCKET]; - state->state = TFTP_STATE_START; - state->error = TFTP_ERR_NONE; -- state->blksize = blksize; -+ state->blksize = TFTP_BLKSIZE_DEFAULT; /* Unless updated by OACK response */ - state->requested_blksize = blksize; - - ((struct sockaddr *)&state->local_addr)->sa_family = --- -2.23.0 - diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2020-8169.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2020-8169.patch new file mode 100644 index 00000000..7d1be24a --- /dev/null +++ b/external/poky/meta/recipes-support/curl/curl/CVE-2020-8169.patch @@ -0,0 +1,140 @@ +From 600a8cded447cd7118ed50142c576567c0cf5158 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Thu, 14 May 2020 14:37:12 +0200 +Subject: [PATCH] url: make the updated credentials URL-encoded in the URL + +Found-by: Gregory Jefferis +Reported-by: Jeroen Ooms +Added test 1168 to verify. Bug spotted when doing a redirect. +Bug: https://github.com/jeroen/curl/issues/224 +Closes #5400 + +Upstream-Status: Backport +https://github.com/curl/curl/commit/600a8cded447cd + +CVE: CVE-2020-8169 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + lib/url.c | 6 ++-- + tests/data/Makefile.inc | 1 + + tests/data/test1168 | 78 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 83 insertions(+), 2 deletions(-) + create mode 100644 tests/data/test1168 + +Index: curl-7.69.1/lib/url.c +=================================================================== +--- curl-7.69.1.orig/lib/url.c ++++ curl-7.69.1/lib/url.c +@@ -2776,12 +2776,14 @@ static CURLcode override_login(struct Cu + + /* for updated strings, we update them in the URL */ + if(user_changed) { +- uc = curl_url_set(data->state.uh, CURLUPART_USER, *userp, 0); ++ uc = curl_url_set(data->state.uh, CURLUPART_USER, *userp, ++ CURLU_URLENCODE); + if(uc) + return Curl_uc_to_curlcode(uc); + } + if(passwd_changed) { +- uc = curl_url_set(data->state.uh, CURLUPART_PASSWORD, *passwdp, 0); ++ uc = curl_url_set(data->state.uh, CURLUPART_PASSWORD, *passwdp, ++ CURLU_URLENCODE); + if(uc) + return Curl_uc_to_curlcode(uc); + } +Index: curl-7.69.1/tests/data/Makefile.inc +=================================================================== +--- curl-7.69.1.orig/tests/data/Makefile.inc ++++ curl-7.69.1/tests/data/Makefile.inc +@@ -133,6 +133,7 @@ test1136 test1137 test1138 test1139 test + test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \ + test1152 test1153 test1154 test1155 test1156 test1157 test1158 test1159 \ + test1160 test1161 test1162 test1163 test1164 test1165 test1166 test1167 \ ++test1168 \ + \ + test1170 test1171 test1172 test1173 test1174 test1175 test1176 \ + \ +Index: curl-7.69.1/tests/data/test1168 +=================================================================== +--- /dev/null ++++ curl-7.69.1/tests/data/test1168 +@@ -0,0 +1,78 @@ ++<testcase> ++<info> ++<keywords> ++HTTP ++HTTP GET ++followlocation ++</keywords> ++</info> ++# Server-side ++<reply> ++<data> ++HTTP/1.1 301 This is a weirdo text message swsclose ++Date: Thu, 09 Nov 2010 14:49:00 GMT ++Server: test-server/fake ++Location: /data/11680002.txt ++Connection: close ++ ++This server reply is for testing a simple Location: following ++ ++</data> ++<data2> ++HTTP/1.1 200 Followed here fine swsclose ++Date: Thu, 09 Nov 2010 14:49:00 GMT ++Server: test-server/fake ++Content-Length: 52 ++ ++If this is received, the location following worked ++ ++</data2> ++<datacheck> ++HTTP/1.1 301 This is a weirdo text message swsclose ++Date: Thu, 09 Nov 2010 14:49:00 GMT ++Server: test-server/fake ++Location: /data/11680002.txt ++Connection: close ++ ++HTTP/1.1 200 Followed here fine swsclose ++Date: Thu, 09 Nov 2010 14:49:00 GMT ++Server: test-server/fake ++Content-Length: 52 ++ ++If this is received, the location following worked ++ ++</datacheck> ++</reply> ++ ++# Client-side ++<client> ++<server> ++http ++</server> ++ <name> ++HTTP redirect with credentials using # in user and password ++ </name> ++ <command> ++http://%HOSTIP:%HTTPPORT/want/1168 -L -u "catmai#d:#DZaRJYrixKE*gFY" ++</command> ++</client> ++ ++# Verify data after the test has been "shot" ++<verify> ++<strip> ++^User-Agent:.* ++</strip> ++<protocol> ++GET /want/1168 HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ== ++Accept: */* ++ ++GET /data/11680002.txt HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ== ++Accept: */* ++ ++</protocol> ++</verify> ++</testcase> diff --git a/external/poky/meta/recipes-support/curl/curl/CVE-2020-8177.patch b/external/poky/meta/recipes-support/curl/curl/CVE-2020-8177.patch new file mode 100644 index 00000000..4f14fa23 --- /dev/null +++ b/external/poky/meta/recipes-support/curl/curl/CVE-2020-8177.patch @@ -0,0 +1,67 @@ +From 8236aba58542c5f89f1d41ca09d84579efb05e22 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Sun, 31 May 2020 23:09:59 +0200 +Subject: [PATCH] tool_getparam: -i is not OK if -J is used + +Reported-by: sn on hackerone +Bug: https://curl.haxx.se/docs/CVE-2020-8177.html + +Upstream-Status: Backport +CVE:CVE-2020-8177 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + src/tool_cb_hdr.c | 22 ++++------------------ + src/tool_getparam.c | 5 +++++ + 2 files changed, 9 insertions(+), 18 deletions(-) + +Index: curl-7.69.1/src/tool_cb_hdr.c +=================================================================== +--- curl-7.69.1.orig/src/tool_cb_hdr.c ++++ curl-7.69.1/src/tool_cb_hdr.c +@@ -186,25 +186,11 @@ size_t tool_header_cb(char *ptr, size_t + filename = parse_filename(p, len); + if(filename) { + if(outs->stream) { +- int rc; +- /* already opened and possibly written to */ +- if(outs->fopened) +- fclose(outs->stream); +- outs->stream = NULL; +- +- /* rename the initial file name to the new file name */ +- rc = rename(outs->filename, filename); +- if(rc != 0) { +- warnf(per->config->global, "Failed to rename %s -> %s: %s\n", +- outs->filename, filename, strerror(errno)); +- } +- if(outs->alloc_filename) +- Curl_safefree(outs->filename); +- if(rc != 0) { +- free(filename); +- return failure; +- } ++ /* indication of problem, get out! */ ++ free(filename); ++ return failure; + } ++ + outs->is_cd_filename = TRUE; + outs->s_isreg = TRUE; + outs->fopened = FALSE; +Index: curl-7.69.1/src/tool_getparam.c +=================================================================== +--- curl-7.69.1.orig/src/tool_getparam.c ++++ curl-7.69.1/src/tool_getparam.c +@@ -1807,6 +1807,11 @@ ParameterError getparameter(const char * + } + break; + case 'i': ++ if(config->content_disposition) { ++ warnf(global, ++ "--include and --remote-header-name cannot be combined.\n"); ++ return PARAM_BAD_USE; ++ } + config->show_headers = toggle; /* show the headers as well in the + general output stream */ + break; diff --git a/external/poky/meta/recipes-support/curl/curl_7.61.0.bb b/external/poky/meta/recipes-support/curl/curl_7.69.1.bb index cd880f9e..8b5170f0 100644 --- a/external/poky/meta/recipes-support/curl/curl_7.61.0.bb +++ b/external/poky/meta/recipes-support/curl/curl_7.69.1.bb @@ -3,24 +3,16 @@ HOMEPAGE = "http://curl.haxx.se/" BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker" SECTION = "console/network" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ef889a37a5a874490ac7ce116396f29a" +LIC_FILES_CHKSUM = "file://COPYING;md5=2e9fb35867314fe31c6a4977ef7dd531" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ - file://CVE-2018-14618.patch \ - file://CVE-2018-16839.patch \ - file://CVE-2018-16840.patch \ - file://CVE-2018-16842.patch \ - file://CVE-2019-5435.patch \ - file://CVE-2019-5436.patch \ - file://CVE-2018-16890.patch \ - file://CVE-2019-3822.patch \ - file://CVE-2019-3823.patch \ - file://CVE-2019-5482.patch \ + file://CVE-2020-8169.patch \ + file://CVE-2020-8177.patch \ " -SRC_URI[md5sum] = "31d0a9f48dc796a7db351898a1e5058a" -SRC_URI[sha256sum] = "5f6f336921cf5b84de56afbd08dfb70adeef2303751ffb3e570c936c6d656c9c" +SRC_URI[md5sum] = "ec5fc263f898a3dfef08e805f1ecca42" +SRC_URI[sha256sum] = "2ff5e5bd507adf6aa88ff4bbafd4c7af464867ffb688be93b9930717a56c4de8" CVE_PRODUCT = "curl libcurl" inherit autotools pkgconfig binconfig multilib_header @@ -30,7 +22,7 @@ PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," @@ -52,9 +44,10 @@ PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp," PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp," PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl" +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" +PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" diff --git a/external/poky/meta/recipes-support/db/db/0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch b/external/poky/meta/recipes-support/db/db/0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch new file mode 100644 index 00000000..a4ff2ecb --- /dev/null +++ b/external/poky/meta/recipes-support/db/db/0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch @@ -0,0 +1,147 @@ +From a3569f118fd95b7ad41e1a1128e17c0b8928556d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 20 Jan 2019 18:30:23 -0800 +Subject: [PATCH] Fix libc++ compatibility by renaming atomic_init API + +db5 does not build because it is redefining a C++11 standard +library identifier, atomic_init(). Therefore prefix all +its internal defines with '__db_', to avoid collisions. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/dbinc/atomic.h | 4 ++-- + src/mp/mp_fget.c | 4 ++-- + src/mp/mp_mvcc.c | 4 ++-- + src/mp/mp_region.c | 4 ++-- + src/mutex/mut_method.c | 2 +- + src/mutex/mut_tas.c | 4 ++-- + 6 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h +index 1b49de5..7bf353c 100644 +--- a/src/dbinc/atomic.h ++++ b/src/dbinc/atomic.h +@@ -70,7 +70,7 @@ typedef struct { + * These have no memory barriers; the caller must include them when necessary. + */ + #define atomic_read(p) ((p)->value) +-#define atomic_init(p, val) ((p)->value = (val)) ++#define __db_atomic_init(p, val) ((p)->value = (val)) + + #ifdef HAVE_ATOMIC_SUPPORT + +@@ -206,7 +206,7 @@ static inline int __db_atomic_compare_exchange( + #define atomic_dec(env, p) (--(p)->value) + #define atomic_compare_exchange(env, p, oldval, newval) \ + (DB_ASSERT(env, atomic_read(p) == (oldval)), \ +- atomic_init(p, (newval)), 1) ++ __db_atomic_init(p, (newval)), 1) + #else + #define atomic_inc(env, p) __atomic_inc(env, p) + #define atomic_dec(env, p) __atomic_dec(env, p) +diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c +index 16de695..5159520 100644 +--- a/src/mp/mp_fget.c ++++ b/src/mp/mp_fget.c +@@ -649,7 +649,7 @@ alloc: /* Allocate a new buffer header and data space. */ + + /* Initialize enough so we can call __memp_bhfree. */ + alloc_bhp->flags = 0; +- atomic_init(&alloc_bhp->ref, 1); ++ __db_atomic_init(&alloc_bhp->ref, 1); + #ifdef DIAGNOSTIC + if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) { + __db_errx(env, DB_STR("3025", +@@ -955,7 +955,7 @@ alloc: /* Allocate a new buffer header and data space. */ + MVCC_MPROTECT(bhp->buf, mfp->pagesize, + PROT_READ); + +- atomic_init(&alloc_bhp->ref, 1); ++ __db_atomic_init(&alloc_bhp->ref, 1); + MUTEX_LOCK(env, alloc_bhp->mtx_buf); + alloc_bhp->priority = bhp->priority; + alloc_bhp->pgno = bhp->pgno; +diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c +index 770bad8..dbce4f3 100644 +--- a/src/mp/mp_mvcc.c ++++ b/src/mp/mp_mvcc.c +@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp) + #else + memcpy(frozen_bhp, bhp, SSZA(BH, buf)); + #endif +- atomic_init(&frozen_bhp->ref, 0); ++ __db_atomic_init(&frozen_bhp->ref, 0); + if (mutex != MUTEX_INVALID) + frozen_bhp->mtx_buf = mutex; + else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH, +@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp) + #endif + alloc_bhp->mtx_buf = mutex; + MUTEX_LOCK(env, alloc_bhp->mtx_buf); +- atomic_init(&alloc_bhp->ref, 1); ++ __db_atomic_init(&alloc_bhp->ref, 1); + F_CLR(alloc_bhp, BH_FROZEN); + } + +diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c +index 4952030..084f499 100644 +--- a/src/mp/mp_region.c ++++ b/src/mp/mp_region.c +@@ -245,7 +245,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0) + return (ret); + SH_TAILQ_INIT(&htab[i].hash_bucket); +- atomic_init(&htab[i].hash_page_dirty, 0); ++ __db_atomic_init(&htab[i].hash_page_dirty, 0); + } + + /* +@@ -302,7 +302,7 @@ no_prealloc: + } else + hp->mtx_hash = mtx_base + (i % dbenv->mp_mtxcount); + SH_TAILQ_INIT(&hp->hash_bucket); +- atomic_init(&hp->hash_page_dirty, 0); ++ __db_atomic_init(&hp->hash_page_dirty, 0); + #ifdef HAVE_STATISTICS + hp->hash_io_wait = 0; + hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0; +diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c +index 09353b0..3c954b9 100644 +--- a/src/mutex/mut_method.c ++++ b/src/mutex/mut_method.c +@@ -474,7 +474,7 @@ atomic_compare_exchange(env, v, oldval, newval) + MUTEX_LOCK(env, mtx); + ret = atomic_read(v) == oldval; + if (ret) +- atomic_init(v, newval); ++ __db_atomic_init(v, newval); + MUTEX_UNLOCK(env, mtx); + + return (ret); +diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c +index 106b161..5a3b033 100644 +--- a/src/mutex/mut_tas.c ++++ b/src/mutex/mut_tas.c +@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags) + + #ifdef HAVE_SHARED_LATCHES + if (F_ISSET(mutexp, DB_MUTEX_SHARED)) +- atomic_init(&mutexp->sharecount, 0); ++ __db_atomic_init(&mutexp->sharecount, 0); + else + #endif + if (MUTEX_INIT(&mutexp->tas)) { +@@ -536,7 +536,7 @@ __db_tas_mutex_unlock(env, mutex) + F_CLR(mutexp, DB_MUTEX_LOCKED); + /* Flush flag update before zeroing count */ + MEMBAR_EXIT(); +- atomic_init(&mutexp->sharecount, 0); ++ __db_atomic_init(&mutexp->sharecount, 0); + } else { + DB_ASSERT(env, sharecount > 0); + MEMBAR_EXIT(); +-- +2.20.1 + diff --git a/external/poky/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch b/external/poky/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch new file mode 100644 index 00000000..9d51a44a --- /dev/null +++ b/external/poky/meta/recipes-support/db/db/0001-clock-Do-not-define-own-timespec.patch @@ -0,0 +1,45 @@ +From 96b303caf70a7635953c36e5bfb9ad6e75cb7637 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 14 Feb 2020 14:12:59 -0800 +Subject: [PATCH] clock: Do not define own timespec + +timespec is provided by libc and its best left to libc +os_gettime takes a db_timespec and passed its address to clock_gettime +which assumes that db_timespec and timespec are same but actually +its 12-bytes here and libc has 16-bytes + +This can cause problems especially with 64bit time_t + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/dbinc/clock.h | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) + +--- a/src/dbinc/clock.h ++++ b/src/dbinc/clock.h +@@ -44,22 +44,8 @@ + extern "C" { + #endif + +-/* +- * This declaration is POSIX-compatible. Because there are lots of different +- * time.h include file patterns out there, it's easier to declare our own name +- * in all cases than to try and discover if a system has a struct timespec. +- * For the same reason, and because we'd have to #include <sys/time.h> in db.h, +- * we don't export any timespec structures in the DB API, even in places where +- * it would make sense, like the replication statistics information. +- */ +-typedef struct { +- time_t tv_sec; /* seconds */ +-#ifdef HAVE_MIXED_SIZE_ADDRESSING +- int32_t tv_nsec; +-#else +- long tv_nsec; /* nanoseconds */ +-#endif +-} db_timespec; ++#include <time.h> ++#define db_timespec struct timespec + + /* Operations on timespecs */ + #undef timespecclear diff --git a/external/poky/meta/recipes-support/db/db_5.3.28.bb b/external/poky/meta/recipes-support/db/db_5.3.28.bb index b7ed2c79..318efcb6 100644 --- a/external/poky/meta/recipes-support/db/db_5.3.28.bb +++ b/external/poky/meta/recipes-support/db/db_5.3.28.bb @@ -10,7 +10,7 @@ # same system at the same time if really necessary. SECTION = "libs" SUMMARY = "Berkeley Database v5" -HOMEPAGE = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" +HOMEPAGE = "https://www.oracle.com/database/technologies/related/berkeleydb.html" LICENSE = "Sleepycat" RCONFLICTS_${PN} = "db3" @@ -20,16 +20,18 @@ CVE_VERSION = "11.2.${PV}" PR = "r1" PE = "1" -SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" +SRC_URI = "https://download.oracle.com/berkeley-db/db-${PV}.tar.gz" SRC_URI += "file://fix-parallel-build.patch \ file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \ file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ file://sequence-type.patch \ + file://0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch \ + file://0001-clock-Do-not-define-own-timespec.patch \ " # We are not interested in official latest 6.x versions; # let's track what debian is using. UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/db5.3/" -UPSTREAM_CHECK_REGEX = "db5\.3_(?P<pver>.+)\.orig" +UPSTREAM_CHECK_REGEX = "db5\.3_(?P<pver>\d+(\.\d+)+).+\.orig" SRC_URI[md5sum] = "b99454564d5b4479750567031d66fe24" SRC_URI[sha256sum] = "e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628" @@ -55,10 +57,14 @@ FILES_SOLIBSDEV = "${libdir}/libdb.so ${libdir}/libdb_cxx.so" #configuration - set in local.conf to override # All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) -DB5_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql" +DB5_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-compat185 --disable-sql" EXTRA_OECONF = "${DB5_CONFIG} --enable-shared --enable-cxx --with-sysroot STRIP=true" +PACKAGECONFIG ??= "" +PACKAGECONFIG[verify] = "--enable-verify, --disable-verify" +PACKAGECONFIG[dbm] = "--enable-dbm,--disable-dbm," + EXTRA_OEMAKE += "LIBTOOL='./${HOST_SYS}-libtool'" EXTRA_AUTORECONF += "--exclude=autoheader -I ${S}/dist/aclocal -I${S}/dist/aclocal_java" @@ -103,6 +109,9 @@ do_install_append() { fi chown -R root:root ${D} + if ${@bb.utils.contains('PACKAGECONFIG', 'verify', 'false', 'true', d)}; then + rm -f ${D}${bindir}/db_verify + fi } INSANE_SKIP_${PN} = "dev-so" diff --git a/external/poky/meta/recipes-support/debianutils/debianutils_4.8.6.bb b/external/poky/meta/recipes-support/debianutils/debianutils_4.9.1.bb index c37e842e..904c5278 100644 --- a/external/poky/meta/recipes-support/debianutils/debianutils_4.8.6.bb +++ b/external/poky/meta/recipes-support/debianutils/debianutils_4.9.1.bb @@ -3,13 +3,13 @@ SECTION = "base" LICENSE = "GPLv2 & SMAIL_GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f" -SRC_URI = "http://snapshot.debian.org/archive/debian/20180626T205238Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" +SRC_URI = "http://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" # the package is taken from snapshots.debian.org; that source is static and goes stale # so we check the latest upstream from a directory that does get updated UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/" -SRC_URI[md5sum] = "f0f1fa39383815fb7950dcee52be4361" -SRC_URI[sha256sum] = "db09047144dadf6a35d0f28977fbef83b0dd60ca32e6c8512cce2444a6423f73" +SRC_URI[md5sum] = "95633416680bfd249b7cb07d94137048" +SRC_URI[sha256sum] = "af826685d9c56abfa873e84cd392539cd363cb0ba04a09d21187377e1b764091" inherit autotools update-alternatives diff --git a/external/poky/meta/recipes-support/diffoscope/diffoscope_136.bb b/external/poky/meta/recipes-support/diffoscope/diffoscope_136.bb new file mode 100644 index 00000000..3e3e1dfc --- /dev/null +++ b/external/poky/meta/recipes-support/diffoscope/diffoscope_136.bb @@ -0,0 +1,18 @@ +SUMMARY = "in-depth comparison of files, archives, and directories" +HOMEPAGE = "https://diffoscope.org/" +LICENSE = "GPL-3.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PYPI_PACKAGE = "diffoscope" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "c84d8d308a40176ba2f5dc4abdbf6f73" +SRC_URI[sha256sum] = "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15" + +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" + +# Dependencies don't build for musl +COMPATIBLE_HOST_libc-musl = 'null' + +BBCLASSEXTEND = "native" diff --git a/external/poky/meta/recipes-support/dos2unix/dos2unix_7.4.0.bb b/external/poky/meta/recipes-support/dos2unix/dos2unix_7.4.1.bb index 9a712706..1623285f 100644 --- a/external/poky/meta/recipes-support/dos2unix/dos2unix_7.4.0.bb +++ b/external/poky/meta/recipes-support/dos2unix/dos2unix_7.4.1.bb @@ -6,13 +6,12 @@ HOMEPAGE = "http://waterlan.home.xs4all.nl/dos2unix.html" SECTION = "support" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=1b78fca784db24f4a40e30b300787f3f" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=0c977b18f0a384d03597a517d7d03e32" SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix" UPSTREAM_CHECK_GITTAGREGEX = "dos2unix-(?P<pver>(\d+(\.\d+)+))" -# Release 7.4.0 -SRCREV = "1182533bde3c1fe65be2ead465e87671faa2c027" +SRCREV = "0490f0723b1a0851b17343f6164915f3474b5197" S = "${WORKDIR}/git/dos2unix" diff --git a/external/poky/meta/recipes-support/enchant/enchant2_2.2.8.bb b/external/poky/meta/recipes-support/enchant/enchant2_2.2.8.bb new file mode 100644 index 00000000..4ddbe55d --- /dev/null +++ b/external/poky/meta/recipes-support/enchant/enchant2_2.2.8.bb @@ -0,0 +1,29 @@ +SUMMARY = "Enchant Spell checker API Library" +SECTION = "libs" +HOMEPAGE = "https://abiword.github.io/enchant/" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" + +DEPENDS = "glib-2.0" + +inherit autotools pkgconfig + +SRC_URI = "https://github.com/AbiWord/enchant/releases/download/v${PV}/enchant-${PV}.tar.gz" +SRC_URI[md5sum] = "c7b9d6a392ecb8758e499f783e8dc883" +SRC_URI[sha256sum] = "c7b5e2853f0dd0b1aafea2f9e071941affeec3a76df8e3f6d67a718c89293555" + +UPSTREAM_CHECK_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" + +FILES_${PN} += " \ + ${datadir}/enchant-2 \ + ${libdir}/enchant-2 \ +" +FILES_${PN}-staticdev += "${libdir}/enchant-2/*.a" diff --git a/external/poky/meta/recipes-support/enchant/enchant_1.6.0.bb b/external/poky/meta/recipes-support/enchant/enchant_1.6.0.bb deleted file mode 100644 index 44eb2e3d..00000000 --- a/external/poky/meta/recipes-support/enchant/enchant_1.6.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Enchant Spell checker API Library" -SECTION = "libs" -HOMEPAGE = "http://www.abisource.com/projects/enchant/" -BUGTRACKER = "http://bugzilla.abisource.com/enter_bug.cgi?product=Enchant" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dfcbabf9131dc9a95febef6753a2958b \ - file://src/enchant.h;beginline=1;endline=29;md5=8d881caa1d37523567e1d8f726675a18" - -DEPENDS = "glib-2.0" - -inherit autotools pkgconfig - -PR = "r3" - -SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz" - -SRC_URI[md5sum] = "de11011aff801dc61042828041fb59c7" -SRC_URI[sha256sum] = "2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f" - -PACKAGECONFIG ??= "aspell" -PACKAGECONFIG[aspell] = " --with-aspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-aspell, --disable-aspell, aspell, aspell" -PACKAGECONFIG[ispell] = " --with-ispell-prefix=${STAGING_DIR_HOST}${prefix} --enable-ispell, --disable-ispell, ispell, ispell" -PACKAGECONFIG[uspell] = " --with-uspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-uspell, --disable-uspell, uspell, uspell" -PACKAGECONFIG[hspell] = " --with-hspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-hspell, --disable-hspell, hspell, hspell" -PACKAGECONFIG[myspell] = "--with-myspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-myspell, --disable-myspell, myspell, myspell" - -EXTRA_OECONF = "br_cv_binreloc=no" - -export CXXFLAGS += " -L${STAGING_LIBDIR} -lstdc++ " - -FILES_${PN} = "${bindir} ${libdir}/*${SOLIBS} ${datadir}/${BPN} ${libdir}/${BPN}/*.so" -FILES_${PN}-dev += "${libdir}/${BPN}/*{SOLIBSDEV} ${libdir}/${BPN}/*.la" -FILES_${PN}-staticdev += "${libdir}/${BPN}/*.a" diff --git a/external/poky/meta/recipes-support/fribidi/fribidi/meson.patch b/external/poky/meta/recipes-support/fribidi/fribidi/meson.patch deleted file mode 100644 index 8b3c4a99..00000000 --- a/external/poky/meta/recipes-support/fribidi/fribidi/meson.patch +++ /dev/null @@ -1,44 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From f5feb6c599adb52f24656f8589868039b0d14272 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heirecka@exherbo.org> -Date: Fri, 7 Sep 2018 20:57:11 +0200 -Subject: [PATCH] Build generator executables natively - -They are run during the build and not installed in the end. Without -this one gets the following error from meson: "ERROR: Can not use -target gen-unicode-version as a generator because it is cross-built -and no exe wrapper is defined. You might want to set it to native -instead." - -Closes #87. - ---- - gen.tab/meson.build | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gen.tab/meson.build b/gen.tab/meson.build -index 6006d98..8c21e98 100644 ---- a/gen.tab/meson.build -+++ b/gen.tab/meson.build -@@ -33,7 +33,8 @@ gen_unicode_version = executable('gen-unicode-version', - 'gen-unicode-version.c', - include_directories: incs, - c_args: native_args, -- install: false) -+ install: false, -+ native: true) - - fribidi_unicode_version_h = custom_target('fribidi-unicode-version.h', - input: files('unidata/ReadMe.txt', 'unidata/BidiMirroring.txt'), -@@ -67,7 +68,8 @@ foreach tab : tabs - gen_prog_src, 'packtab.c', - include_directories: incs, - c_args: native_args, -- install: false) -+ install: false, -+ native: true) - - tab_inc_file = custom_target(gen_prog_name, - input: gen_prog_inputs, diff --git a/external/poky/meta/recipes-support/fribidi/fribidi_1.0.5.bb b/external/poky/meta/recipes-support/fribidi/fribidi_1.0.9.bb index 63b2da64..21217aba 100644 --- a/external/poky/meta/recipes-support/fribidi/fribidi_1.0.5.bb +++ b/external/poky/meta/recipes-support/fribidi/fribidi_1.0.9.bb @@ -3,10 +3,10 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ - file://meson.patch" -SRC_URI[md5sum] = "0f97f65038545340316ec0f4bd53df0b" -SRC_URI[sha256sum] = "6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce" +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.xz \ + " +SRC_URI[md5sum] = "1b767c259c3cd8e0c8496970f63c22dc" +SRC_URI[sha256sum] = "c5e47ea9026fb60da1944da9888b4e0a18854a0e2410bbfe7ad90a054d36e0c7" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/external/poky/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch b/external/poky/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch new file mode 100644 index 00000000..c1580418 --- /dev/null +++ b/external/poky/meta/recipes-support/gdbm/files/gdbm-fix-link-failure-against-gcc-10.patch @@ -0,0 +1,47 @@ +From f993697af81c37df9c55e0ebedeb1b8b880506ae Mon Sep 17 00:00:00 2001 +From: Richard Leitner <richard.leitner@skidata.com> +Date: Tue, 5 May 2020 11:59:42 +0200 +Subject: [PATCH] gdbm: fix link failure against gcc-10 + +Copied from gentoo's solution at https://bugs.gentoo.org/show_bug.cgi?id=705898 +Original patch by Sergei Trofimovich <slyfox@gentoo.org> + +Original description: + +Before the change on gcc-10 link failed as: +``` + CCLD gdbmtool +ld: ./libgdbmapp.a(parseopt.o):(.bss+0x8): multiple definition of `parseopt_program_args'; + gdbmtool.o:(.data.rel.local+0x260): first defined here +ld: ./libgdbmapp.a(parseopt.o):(.bss+0x10): multiple definition of `parseopt_program_doc'; + gdbmtool.o:(.data.rel.local+0x268): first defined here +``` + +gcc-10 will change the default from -fcommon to fno-common: + https://gcc.gnu.org/PR85678. + +The fix is to avoid multiple definition and rely on +declarations only. + +Upstream-Status: Pending +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + src/parseopt.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/parseopt.c b/src/parseopt.c +index 268e080..a4c8576 100644 +--- a/src/parseopt.c ++++ b/src/parseopt.c +@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin) + } + + char *parseopt_program_name; +-char *parseopt_program_doc; +-char *parseopt_program_args; + const char *program_bug_address = "<" PACKAGE_BUGREPORT ">"; + void (*parseopt_help_hook) (FILE *stream); + +-- +2.26.2 + diff --git a/external/poky/meta/recipes-support/gdbm/gdbm_1.18.bb b/external/poky/meta/recipes-support/gdbm/gdbm_1.18.1.bb index aad43009..fbb1fe72 100644 --- a/external/poky/meta/recipes-support/gdbm/gdbm_1.18.bb +++ b/external/poky/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -8,15 +8,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=241da1b9fe42e642cbb2c24d5e0c4d24" SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://run-ptest \ file://ptest.patch \ + file://gdbm-fix-link-failure-against-gcc-10.patch \ " -SRC_URI[md5sum] = "e316f8e4a3e7e4f23955be65d54fec48" -SRC_URI[sha256sum] = "b8822cb4769e2d759c828c06f196614936c88c141c3132b18252fe25c2b635ce" +SRC_URI[md5sum] = "988dc82182121c7570e0cb8b4fcd5415" +SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc" inherit autotools gettext texinfo lib_package ptest # Needed for dbm python module -EXTRA_OECONF = "-enable-libgdbm-compat" +EXTRA_OECONF = "--enable-libgdbm-compat --without-readline" # Stop presence of dbm/nbdm on the host contaminating builds CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" diff --git a/external/poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/external/poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch deleted file mode 100644 index 3935589f..00000000 --- a/external/poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Pending - -Index: gmp-6.1.2/longlong.h -=================================================================== ---- gmp-6.1.2.orig/longlong.h -+++ gmp-6.1.2/longlong.h -@@ -1036,8 +1036,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype - count is only an int. */ - #define count_trailing_zeros(count, x) \ - do { \ -+ UDItype __cbtmp; \ - ASSERT ((x) != 0); \ -- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \ -+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ -+ (count) = __cbtmp; \ - } while (0) - #endif /* __amd64__ */ - diff --git a/external/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/external/poky/meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch index 325ffe49..325ffe49 100644 --- a/external/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch +++ b/external/poky/meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch diff --git a/external/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/external/poky/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch index 1e47924c..56564db5 100644 --- a/external/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch +++ b/external/poky/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch @@ -18,13 +18,11 @@ Upstream-Status: Inappropriate[OE-Specific] configure.ac | 11 ----------- 1 file changed, 11 deletions(-) -Index: gmp-6.1.2/configure.ac -=================================================================== ---- gmp-6.1.2.orig/configure.ac -+++ gmp-6.1.2/configure.ac -@@ -604,15 +604,6 @@ case $host in - any_32_testlist="sizeof-long-4" - any_64_testlist="sizeof-long-8" +--- a/configure.ac ++++ b/configure.ac +@@ -625,17 +625,6 @@ case $host in + any_32_testlist="sizeof-void*-4" + any_64_testlist="sizeof-void*-8" - # This is needed for clang, which is not content with flags like -mfpu=neon - # alone. @@ -33,12 +31,14 @@ Index: gmp-6.1.2/configure.ac - gcc_cflags_fpmode="-mfloat-abi=softfp" ;; - *-*-*eabihf) - gcc_cflags_fpmode="-mfloat-abi=hard" ;; +- *-*-mingw*) +- limb_64=longlong ;; - esac - # FIXME: We make mandatory compiler options optional here. We should # either enforce them, or organise to strip paths as the corresponding # options fail. -@@ -746,8 +737,6 @@ case $host in +@@ -780,8 +769,6 @@ case $host in ;; *) path="arm" diff --git a/external/poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch b/external/poky/meta/recipes-support/gmp/gmp/use-includedir.patch index 6b089cf3..d27317cd 100644 --- a/external/poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch +++ b/external/poky/meta/recipes-support/gmp/gmp/use-includedir.patch @@ -1,4 +1,7 @@ +exec includedir should be pointing to general yocto includdir + Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> Index: gmp-6.1.2/Makefile.am =================================================================== diff --git a/external/poky/meta/recipes-support/gmp/gmp_6.1.2.bb b/external/poky/meta/recipes-support/gmp/gmp_6.2.0.bb index c745dbbf..a19c74fc 100644 --- a/external/poky/meta/recipes-support/gmp/gmp_6.1.2.bb +++ b/external/poky/meta/recipes-support/gmp/gmp_6.2.0.bb @@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ REVISION = "" SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ - file://amd64.patch \ 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 \ " -SRC_URI[md5sum] = "8ddbb26dc3bd4e2302984debba1406a5" -SRC_URI[sha256sum] = "5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2" +SRC_URI[md5sum] = "c24161e0dd44cae78cd5f67193492a21" +SRC_URI[sha256sum] = "f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea" acpaths = "" diff --git a/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch b/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch deleted file mode 100644 index 840666f3..00000000 --- a/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b1de2c6290bc0651fe87a8c4fb52e7a0a5fe6322 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 5 Oct 2014 16:01:49 -0700 -Subject: [PATCH] gsystem-subprocess.c: Enable GNU extensions in system C - library - -This should export O_CLOEXEC where it is only -available when _GNU_SOURCE is defined .e.g. uclibc based systems - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - ---- - src/libgsystem/gsystem-subprocess.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/libgsystem/gsystem-subprocess.c b/src/libgsystem/gsystem-subprocess.c -index a967896..a52a362 100644 ---- a/src/libgsystem/gsystem-subprocess.c -+++ b/src/libgsystem/gsystem-subprocess.c -@@ -18,6 +18,10 @@ - - #include "config.h" - -+#ifndef _GNU_SOURCE -+#define _GNU_SOURCE -+#endif -+ - #define _GSYSTEM_NO_LOCAL_ALLOC - #include "libgsystem.h" - --- -2.1.1 - diff --git a/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch b/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch deleted file mode 100644 index 19c524b0..00000000 --- a/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch +++ /dev/null @@ -1,27 +0,0 @@ - -The terms `FAIL` instead of `FAILED` and `SKIP` instead of `SKIPPED` -match what Automake does - -Upstream-Status: Accepted -[ https://gitlab.gnome.org/GNOME/gnome-desktop-testing/commit/048850731a640532ef55a61df7357fcc6d2ad501 ] - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- -diff -Naur gnome-desktop-testing-2014.1-orig/src/gnome-desktop-testing-runner.c gnome-desktop-testing-2014.1/src/gnome-desktop-testing-runner.c ---- gnome-desktop-testing-2014.1-orig/src/gnome-desktop-testing-runner.c 2014-01-16 12:58:26.000000000 +0200 -+++ gnome-desktop-testing-2014.1/src/gnome-desktop-testing-runner.c 2015-11-02 11:27:34.010594126 +0200 -@@ -280,12 +280,12 @@ - else if (test->state == TEST_STATE_COMPLETE_FAILED) - { - msgid_value = ONE_TEST_FAILED_MSGID; -- msg = g_strconcat ("FAILED: ", test->name, " (", reason, ")", NULL); -+ msg = g_strconcat ("FAIL: ", test->name, " (", reason, ")", NULL); - } - else if (test->state == TEST_STATE_COMPLETE_SKIPPED) - { - msgid_value = ONE_TEST_SKIPPED_MSGID; -- msg = g_strconcat ("SKIPPED: ", test->name, NULL); -+ msg = g_strconcat ("SKIP: ", test->name, NULL); - } - else - g_assert_not_reached (); diff --git a/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb b/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb deleted file mode 100644 index ccb3d3b7..00000000 --- a/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Test runner for GNOME-style installed tests" -HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests" -LICENSE = "LGPLv2+" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ - file://0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch \ - file://update-output-syntax.patch \ - " -SRC_URI[md5sum] = "a608ad72a77e23a1aecdfd8d07a94baf" -SRC_URI[sha256sum] = "1a3eed73678dd22d09d6a7ec4f899557df3e8b4a802affa76d0f163b31286539" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://src/gnome-desktop-testing-runner.c;endline=19;md5=67311a600b83fd0068dfc7e5b84ffb3f" - -DEPENDS = "glib-2.0" - -inherit autotools pkgconfig - -PR = "r1" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[journald] = "--with-systemd-journal,--without-systemd-journal,systemd,systemd" diff --git a/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb b/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb new file mode 100644 index 00000000..0defebeb --- /dev/null +++ b/external/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "Test runner for GNOME-style installed tests" +HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests" +LICENSE = "LGPLv2+" + +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" +SRCREV = "4decade67b29ad170fcf3de148e41695fc459f48" + +DEPENDS = "glib-2.0" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = ",,systemd" diff --git a/external/poky/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch b/external/poky/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch index 4a280f9d..83195b5b 100644 --- a/external/poky/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch +++ b/external/poky/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch @@ -1,4 +1,4 @@ -From 0df5800cc2e720aad883a517f7d24a9722fe5845 Mon Sep 17 00:00:00 2001 +From e3adc816d2d56dd929016073937ba24e01e03cb8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 20 Dec 2018 17:37:48 -0800 Subject: [PATCH] Woverride-init is not needed with gcc 9 @@ -17,15 +17,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dirmngr/dns.h b/dirmngr/dns.h -index 30d0b45..98fe412 100644 +index 024d6dcc8..c6e141e16 100644 --- a/dirmngr/dns.h +++ b/dirmngr/dns.h -@@ -154,7 +154,7 @@ DNS_PUBLIC int *dns_debug_p(void); +@@ -139,7 +139,7 @@ DNS_PUBLIC int *dns_debug_p(void); + #define DNS_PRAGMA_QUIET _Pragma("clang diagnostic ignored \"-Winitializer-overrides\"") + #define DNS_PRAGMA_POP _Pragma("clang diagnostic pop") - #define dns_quietinit(...) \ - DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP -#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 +#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || (__GNUC__ > 4 && __GNUC__ < 9) #define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push") #define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"") #define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop") +-- +2.17.1 + diff --git a/external/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/external/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index c43ecdf8..2c204e02 100644 --- a/external/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/external/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -1,4 +1,4 @@ -From c69c3a49f3295179c247db5ceb3ef8952928a724 Mon Sep 17 00:00:00 2001 +From e7ad11cf54475e455fdb84d118e4782961698567 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 diff --git a/external/poky/meta/recipes-support/gnupg/gnupg/relocate.patch b/external/poky/meta/recipes-support/gnupg/gnupg/relocate.patch index 1a5ea4aa..e5a82aa7 100644 --- a/external/poky/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/external/poky/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From 6d31b04d7a75f1d73c3518bf043b5b0a2dc40cb1 Mon Sep 17 00:00:00 2001 +From 59c077f32e81190955910cae02599c7a3edfa7fb 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 diff --git a/external/poky/meta/recipes-support/gnupg/gnupg_2.2.12.bb b/external/poky/meta/recipes-support/gnupg/gnupg_2.2.20.bb index a02c66a0..f754573c 100644 --- a/external/poky/meta/recipes-support/gnupg/gnupg_2.2.12.bb +++ b/external/poky/meta/recipes-support/gnupg/gnupg_2.2.20.bb @@ -18,10 +18,10 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ " SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch" +SRC_URI_append_class-nativesdk = " file://relocate.patch" - -SRC_URI[md5sum] = "421b17028878b253c5acfef056bc6141" -SRC_URI[sha256sum] = "db030f8b4c98640e91300d36d516f1f4f8fe09514a94ea9fc7411ee1a34082cb" +SRC_URI[md5sum] = "4ff88920cf52b35db0dedaee87bdbbb1" +SRC_URI[sha256sum] = "04a7c9d48b74c399168ee8270e548588ddbe52218c337703d7f06373d326ca30" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ @@ -30,6 +30,21 @@ EXTRA_OECONF = "--disable-ldap \ --with-readline=${STAGING_LIBDIR}/.. \ --enable-gpg-is-gpg2 \ " + +# A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg) +PACKAGES =+ "${PN}-gpg" +FILES_${PN}-gpg = " \ + ${bindir}/gpg \ + ${bindir}/gpg2 \ + ${bindir}/gpg-agent \ +" + +# Normal package (gnupg) should depend on minimal package (gnupg-gpg) +# to ensure all tools are included. This is done only in non-native +# builds. Native builds don't have sub-packages, so appending RDEPENDS +# in this case breaks recipe parsing. +RDEPENDS_${PN} += "${@ "" if ("native" in d.getVar("PN")) else (d.getVar("PN") + "-gpg")}" + RRECOMMENDS_${PN} = "pinentry" do_configure_prepend () { @@ -46,11 +61,21 @@ do_install_append() { } do_install_append_class-native() { - create_wrapper ${D}${bindir}/gpg2 GNUPG_BINDIR=${STAGING_BINDIR_NATIVE} + create_wrappers ${STAGING_BINDIR_NATIVE} +} + +do_install_append_class-nativesdk() { + create_wrappers ${SDKPATHNATIVE}${bindir_nativesdk} +} + +create_wrappers() { + for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do + create_wrapper ${D}${bindir}/$i GNUPG_BINDIR=$1 + done } PACKAGECONFIG ??= "gnutls" PACKAGECONFIG[gnutls] = "--enable-gnutls, --disable-gnutls, gnutls" PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch b/external/poky/meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch new file mode 100644 index 00000000..a610abf9 --- /dev/null +++ b/external/poky/meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch @@ -0,0 +1,90 @@ +From c0ae3f659c6c130d151378ba4d7d861e3b7b970f Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@cn.fujitsu.com> +Date: Wed, 8 Jul 2020 14:50:27 +0900 +Subject: [PATCH] Modied the license to GPLv2.1+ to keep with LICENSE file. + +Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> +Please reference to https://gitlab.com/gnutls/gnutls/-/issues/1018. +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/merge_requests/1285]. +--- + lib/x509/krb5.c | 20 +++++++++++--------- + lib/x509/krb5.h | 20 +++++++++++--------- + 2 files changed, 22 insertions(+), 18 deletions(-) + +diff --git a/lib/x509/krb5.c b/lib/x509/krb5.c +index 7fe84e6..d68c737 100644 +--- a/lib/x509/krb5.c ++++ b/lib/x509/krb5.c +@@ -1,21 +1,23 @@ + /* + * Copyright (C) 2015 Red Hat, Inc. + * ++ * Author: Nikos Mavrogiannopoulos ++ * + * This file is part of GnuTLS. + * +- * GnuTLS is free software: you can redistribute it and/or modify it +- * under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or +- * (at your option) any later version. ++ * The GnuTLS is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public License ++ * as published by the Free Software Foundation; either version 2.1 of ++ * the License, or (at your option) any later version. + * +- * GnuTLS is distributed in the hope that it will be useful, but ++ * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. ++ * Lesser General Public License for more details. ++ * ++ * 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/> + * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see +- * <https://www.gnu.org/licenses/>. + */ + + #include <config.h> +diff --git a/lib/x509/krb5.h b/lib/x509/krb5.h +index d8926af..815bb28 100644 +--- a/lib/x509/krb5.h ++++ b/lib/x509/krb5.h +@@ -1,21 +1,23 @@ + /* + * Copyright (C) 2015 Red Hat, Inc. + * ++ * Author: Nikos Mavrogiannopoulos ++ * + * This file is part of GnuTLS. + * +- * GnuTLS is free software: you can redistribute it and/or modify it +- * under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or +- * (at your option) any later version. ++ * The GnuTLS is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public License ++ * as published by the Free Software Foundation; either version 2.1 of ++ * the License, or (at your option) any later version. + * +- * GnuTLS is distributed in the hope that it will be useful, but ++ * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. ++ * Lesser General Public License for more details. ++ * ++ * 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/> + * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see +- * <https://www.gnu.org/licenses/>. + */ + + #ifndef GNUTLS_LIB_X509_KRB5_H +-- +2.17.1 + diff --git a/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3829_p1.patch b/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3829_p1.patch deleted file mode 100644 index 823869e8..00000000 --- a/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3829_p1.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 367688c05988bc7257d7e1801c5acf17ef7e854d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Tue, 12 Feb 2019 15:09:11 +0100 -Subject: [PATCH 1/3] Automatically NULLify after gnutls_free() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This method prevents direct use-after-free and -double-free issues. - -Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de> - -CVE: CVE-2019-3829 -Upstream-Status: Backport -[https://gitlab.com/gnutls/gnutls/commit/d39778e43d1674cb3ab3685157fd299816d535c0] - -Signed-off-by: Dan Tran <dantran@microsoft.com> ---- - lib/includes/gnutls/gnutls.h.in | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in -index 49990b5f5..fa77fd0df 100644 ---- a/lib/includes/gnutls/gnutls.h.in -+++ b/lib/includes/gnutls/gnutls.h.in -@@ -2132,6 +2132,10 @@ extern _SYM_EXPORT gnutls_realloc_function gnutls_realloc; - extern _SYM_EXPORT gnutls_calloc_function gnutls_calloc; - extern _SYM_EXPORT gnutls_free_function gnutls_free; - -+#ifdef GNUTLS_INTERNAL_BUILD -+#define gnutls_free(a) gnutls_free((void *) (a)), a=NULL -+#endif -+ - extern _SYM_EXPORT char *(*gnutls_strdup) (const char *); - - /* a variant of memset that doesn't get optimized out */ --- -2.22.0.vfs.1.1.57.gbaf16c8 diff --git a/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3829_p2.patch b/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3829_p2.patch deleted file mode 100644 index b3cd0477..00000000 --- a/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3829_p2.patch +++ /dev/null @@ -1,871 +0,0 @@ -From a57509ef7c4983721193ac325ad5fb1783ea0f57 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Tue, 12 Feb 2019 15:14:07 +0100 -Subject: [PATCH 2/3] Remove redundant resets of variables after free() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de> - -CVE: CVE-2019-3829 -Upstream-Status: Backport -[https://gitlab.com/gnutls/gnutls/commit/372821c883a3d36ed3ed683844ad9d90818f6392] - -Signed-off-by: Dan Tran <dantran@microsoft.com> ---- - lib/auth.c | 3 --- - lib/auth/rsa.c | 2 ++ - lib/auth/rsa_psk.c | 1 - - lib/auth/srp_sb64.c | 2 -- - lib/cert-cred-x509.c | 3 --- - lib/cert-cred.c | 3 --- - lib/hello_ext.c | 5 ++--- - lib/mpi.c | 1 - - lib/nettle/mpi.c | 2 -- - lib/nettle/pk.c | 3 --- - lib/ocsp-api.c | 1 - - lib/pk.c | 2 -- - lib/pkcs11.c | 1 - - lib/pkcs11_privkey.c | 6 +----- - lib/pkcs11_write.c | 1 - - lib/session_pack.c | 2 -- - lib/srp.c | 1 - - lib/str.c | 2 +- - lib/tls13/certificate_request.c | 2 -- - lib/tpm.c | 2 -- - lib/x509/ocsp.c | 15 +++------------ - lib/x509/pkcs12_bag.c | 1 - - lib/x509/pkcs7-crypt.c | 1 - - lib/x509/pkcs7.c | 6 ------ - lib/x509/privkey_pkcs8.c | 1 - - lib/x509/verify-high2.c | 1 - - lib/x509/virt-san.c | 1 - - lib/x509/x509.c | 4 ---- - lib/x509/x509_ext.c | 1 - - lib/x509_b64.c | 1 - - tests/cert.c | 2 -- - tests/name-constraints-ip.c | 3 +-- - tests/pkcs11/pkcs11-import-url-privkey.c | 2 -- - tests/pkcs11/pkcs11-privkey-always-auth.c | 2 -- - tests/pkcs11/pkcs11-privkey-fork-reinit.c | 1 - - tests/pkcs11/pkcs11-privkey-fork.c | 1 - - tests/pkcs11/pkcs11-privkey-safenet-always-auth.c | 2 -- - tests/pkcs7.c | 2 -- - tests/resume-dtls.c | 1 - - tests/resume.c | 1 - - tests/sign-verify-data.c | 1 - - tests/sign-verify-ext.c | 2 -- - tests/sign-verify-ext4.c | 2 -- - tests/sign-verify.c | 1 - - tests/x509-extensions.c | 1 - - tests/x509sign-verify-error.c | 1 - - 46 files changed, 10 insertions(+), 92 deletions(-) - -diff --git a/lib/auth.c b/lib/auth.c -index 4bdedda38..5f9b8c427 100644 ---- a/lib/auth.c -+++ b/lib/auth.c -@@ -349,8 +349,6 @@ void _gnutls_free_auth_info(gnutls_session_t session) - - gnutls_free(info->raw_certificate_list); - gnutls_free(info->raw_ocsp_list); -- info->raw_certificate_list = NULL; -- info->raw_ocsp_list = NULL; - info->ncerts = 0; - info->nocsp = 0; - -@@ -367,7 +365,6 @@ void _gnutls_free_auth_info(gnutls_session_t session) - } - - gnutls_free(session->key.auth_info); -- session->key.auth_info = NULL; - session->key.auth_info_size = 0; - session->key.auth_info_type = 0; - -diff --git a/lib/auth/rsa.c b/lib/auth/rsa.c -index 6afc91ae6..df6bd7bc6 100644 ---- a/lib/auth/rsa.c -+++ b/lib/auth/rsa.c -@@ -196,6 +196,8 @@ proc_rsa_client_kx(gnutls_session_t session, uint8_t * data, - ret = gnutls_rnd(GNUTLS_RND_NONCE, rndkey.data, - rndkey.size); - if (ret < 0) { -+ gnutls_free(session->key.key.data); -+ session->key.key.size = 0; - gnutls_assert(); - goto cleanup; - } -diff --git a/lib/auth/rsa_psk.c b/lib/auth/rsa_psk.c -index 5a29f9183..590ff0f71 100644 ---- a/lib/auth/rsa_psk.c -+++ b/lib/auth/rsa_psk.c -@@ -341,7 +341,6 @@ _gnutls_proc_rsa_psk_client_kx(gnutls_session_t session, uint8_t * data, - ("auth_rsa_psk: Possible PKCS #1 format attack\n"); - if (ret >= 0) { - gnutls_free(plaintext.data); -- plaintext.data = NULL; - } - randomize_key = 1; - } else { -diff --git a/lib/auth/srp_sb64.c b/lib/auth/srp_sb64.c -index 1177e7671..7bfffdf07 100644 ---- a/lib/auth/srp_sb64.c -+++ b/lib/auth/srp_sb64.c -@@ -263,7 +263,6 @@ _gnutls_sbase64_decode(char *data, size_t idata_size, uint8_t ** result) - tmp = decode(tmpres, datrev); - if (tmp < 0) { - gnutls_free((*result)); -- *result = NULL; - return tmp; - } - -@@ -277,7 +276,6 @@ _gnutls_sbase64_decode(char *data, size_t idata_size, uint8_t ** result) - tmp = decode(tmpres, (uint8_t *) & data[i]); - if (tmp < 0) { - gnutls_free((*result)); -- *result = NULL; - return tmp; - } - memcpy(&(*result)[j], tmpres, tmp); -diff --git a/lib/cert-cred-x509.c b/lib/cert-cred-x509.c -index f342a420b..da9cd647e 100644 ---- a/lib/cert-cred-x509.c -+++ b/lib/cert-cred-x509.c -@@ -296,7 +296,6 @@ parse_pem_cert_mem(gnutls_certificate_credentials_t res, - gnutls_pcert_import_x509_list(pcerts, unsorted, &ncerts, GNUTLS_X509_CRT_LIST_SORT); - if (ret < 0) { - gnutls_free(pcerts); -- pcerts = NULL; - gnutls_assert(); - goto cleanup; - } -@@ -540,7 +539,6 @@ read_cert_url(gnutls_certificate_credentials_t res, gnutls_privkey_t key, const - goto cleanup; - } - gnutls_free(t.data); -- t.data = NULL; - } - - ret = certificate_credential_append_crt_list(res, key, names, ccert, count); -@@ -991,7 +989,6 @@ gnutls_certificate_get_x509_crt(gnutls_certificate_credentials_t res, - while (i--) - gnutls_x509_crt_deinit((*crt_list)[i]); - gnutls_free(*crt_list); -- *crt_list = NULL; - - return gnutls_assert_val(ret); - } -diff --git a/lib/cert-cred.c b/lib/cert-cred.c -index 2150e903f..190a8b3a2 100644 ---- a/lib/cert-cred.c -+++ b/lib/cert-cred.c -@@ -63,7 +63,6 @@ void gnutls_certificate_free_keys(gnutls_certificate_credentials_t sc) - - for (j = 0; j < sc->certs[i].ocsp_data_length; j++) { - gnutls_free(sc->certs[i].ocsp_data[j].response.data); -- sc->certs[i].ocsp_data[j].response.data = NULL; - } - _gnutls_str_array_clear(&sc->certs[i].names); - gnutls_privkey_deinit(sc->certs[i].pkey); -@@ -71,8 +70,6 @@ void gnutls_certificate_free_keys(gnutls_certificate_credentials_t sc) - - gnutls_free(sc->certs); - gnutls_free(sc->sorted_cert_idx); -- sc->certs = NULL; -- sc->sorted_cert_idx = NULL; - - sc->ncerts = 0; - } -diff --git a/lib/hello_ext.c b/lib/hello_ext.c -index c4907aace..fb2b4db67 100644 ---- a/lib/hello_ext.c -+++ b/lib/hello_ext.c -@@ -464,9 +464,8 @@ void _gnutls_hello_ext_deinit(void) - continue; - - if (extfunc[i]->free_struct != 0) { -- gnutls_free((void*)extfunc[i]->name); -- gnutls_free((void*)extfunc[i]); -- extfunc[i] = NULL; -+ gnutls_free(((hello_ext_entry_st *)extfunc[i])->name); -+ gnutls_free(extfunc[i]); - } - } - } -diff --git a/lib/mpi.c b/lib/mpi.c -index 2bc970d7c..ed208d511 100644 ---- a/lib/mpi.c -+++ b/lib/mpi.c -@@ -88,7 +88,6 @@ _gnutls_mpi_random_modp(bigint_t r, bigint_t p, - - if (buf_release != 0) { - gnutls_free(buf); -- buf = NULL; - } - - if (r != NULL) { -diff --git a/lib/nettle/mpi.c b/lib/nettle/mpi.c -index 8a93ac278..96bec4aa4 100644 ---- a/lib/nettle/mpi.c -+++ b/lib/nettle/mpi.c -@@ -122,7 +122,6 @@ static int wrap_nettle_mpi_init_multi(bigint_t *w, ...) - fail: - mpz_clear(TOMPZ(*w)); - gnutls_free(*w); -- *w = NULL; - - va_start(args, w); - -@@ -131,7 +130,6 @@ fail: - if (next != last_failed) { - mpz_clear(TOMPZ(*next)); - gnutls_free(*next); -- *next = NULL; - } - } while(next != last_failed); - -diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c -index 6dcd2fdd0..f010493c0 100644 ---- a/lib/nettle/pk.c -+++ b/lib/nettle/pk.c -@@ -371,7 +371,6 @@ dh_cleanup: - - if (_gnutls_mem_is_zero(out->data, out->size)) { - gnutls_free(out->data); -- out->data = NULL; - gnutls_assert(); - ret = GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER; - goto cleanup; -@@ -2203,8 +2202,6 @@ wrap_nettle_pk_generate_keys(gnutls_pk_algorithm_t algo, - params->params_nr = 0; - gnutls_free(params->raw_priv.data); - gnutls_free(params->raw_pub.data); -- params->raw_priv.data = NULL; -- params->raw_pub.data = NULL; - - FAIL_IF_LIB_ERROR; - return ret; -diff --git a/lib/ocsp-api.c b/lib/ocsp-api.c -index d18a1f0c2..a0005e99d 100644 ---- a/lib/ocsp-api.c -+++ b/lib/ocsp-api.c -@@ -473,7 +473,6 @@ gnutls_certificate_set_ocsp_status_request_mem(gnutls_certificate_credentials_t - nresp++; - - gnutls_free(der.data); -- der.data = NULL; - - p.data++; - p.size--; -diff --git a/lib/pk.c b/lib/pk.c -index 1f137f71c..a5bb58b73 100644 ---- a/lib/pk.c -+++ b/lib/pk.c -@@ -537,8 +537,6 @@ void gnutls_pk_params_release(gnutls_pk_params_st * p) - } - gnutls_free(p->raw_priv.data); - gnutls_free(p->raw_pub.data); -- p->raw_priv.data = NULL; -- p->raw_pub.data = NULL; - - p->params_nr = 0; - } -diff --git a/lib/pkcs11.c b/lib/pkcs11.c -index 990912790..fa1b65884 100644 ---- a/lib/pkcs11.c -+++ b/lib/pkcs11.c -@@ -1233,7 +1233,6 @@ int gnutls_pkcs11_obj_init(gnutls_pkcs11_obj_t * obj) - (*obj)->info = p11_kit_uri_new(); - if ((*obj)->info == NULL) { - gnutls_free(*obj); -- *obj = NULL; - gnutls_assert(); - return GNUTLS_E_MEMORY_ERROR; - } -diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c -index b721ed125..560a732e3 100644 ---- a/lib/pkcs11_privkey.c -+++ b/lib/pkcs11_privkey.c -@@ -443,7 +443,6 @@ _gnutls_pkcs11_privkey_sign(gnutls_pkcs11_privkey_t key, - } - - gnutls_free(tmp.data); -- tmp.data = NULL; - } else { - signature->size = siglen; - signature->data = tmp.data; -@@ -521,10 +520,8 @@ gnutls_pkcs11_privkey_import_url(gnutls_pkcs11_privkey_t pkey, - - memset(&pkey->sinfo, 0, sizeof(pkey->sinfo)); - -- if (pkey->url) { -+ if (pkey->url) - gnutls_free(pkey->url); -- pkey->url = NULL; -- } - - if (pkey->uinfo) { - p11_kit_uri_free(pkey->uinfo); -@@ -613,7 +610,6 @@ gnutls_pkcs11_privkey_import_url(gnutls_pkcs11_privkey_t pkey, - pkey->uinfo = NULL; - } - gnutls_free(pkey->url); -- pkey->url = NULL; - - return ret; - } -diff --git a/lib/pkcs11_write.c b/lib/pkcs11_write.c -index 35207d554..6e866e2d4 100644 ---- a/lib/pkcs11_write.c -+++ b/lib/pkcs11_write.c -@@ -268,7 +268,6 @@ static void clean_pubkey(struct ck_attribute *a, unsigned a_val) - case CKA_EC_PARAMS: - case CKA_EC_POINT: - gnutls_free(a[i].value); -- a[i].value = NULL; - break; - } - } -diff --git a/lib/session_pack.c b/lib/session_pack.c -index c5801fb32..5d475ea59 100644 ---- a/lib/session_pack.c -+++ b/lib/session_pack.c -@@ -562,8 +562,6 @@ unpack_certificate_auth_info(gnutls_session_t session, - - gnutls_free(info->raw_certificate_list); - gnutls_free(info->raw_ocsp_list); -- info->raw_certificate_list = NULL; -- info->raw_ocsp_list = NULL; - } - - return ret; -diff --git a/lib/srp.c b/lib/srp.c -index c3eb8e684..670642d64 100644 ---- a/lib/srp.c -+++ b/lib/srp.c -@@ -608,7 +608,6 @@ gnutls_srp_set_server_credentials_file(gnutls_srp_server_credentials_t res, - if (res->password_conf_file == NULL) { - gnutls_assert(); - gnutls_free(res->password_file); -- res->password_file = NULL; - return GNUTLS_E_MEMORY_ERROR; - } - -diff --git a/lib/str.c b/lib/str.c -index c8d742e91..7408ea6ac 100644 ---- a/lib/str.c -+++ b/lib/str.c -@@ -81,7 +81,7 @@ void _gnutls_buffer_clear(gnutls_buffer_st * str) - return; - gnutls_free(str->allocd); - -- str->data = str->allocd = NULL; -+ str->data = NULL; - str->max_length = 0; - str->length = 0; - } -diff --git a/lib/tls13/certificate_request.c b/lib/tls13/certificate_request.c -index a7ec0e2fd..823adc87f 100644 ---- a/lib/tls13/certificate_request.c -+++ b/lib/tls13/certificate_request.c -@@ -152,7 +152,6 @@ int _gnutls13_recv_certificate_request_int(gnutls_session_t session, gnutls_buff - return gnutls_assert_val(ret); - - gnutls_free(session->internals.post_handshake_cr_context.data); -- session->internals.post_handshake_cr_context.data = NULL; - ret = _gnutls_set_datum(&session->internals.post_handshake_cr_context, - context.data, context.size); - if (ret < 0) -@@ -279,7 +278,6 @@ int _gnutls13_send_certificate_request(gnutls_session_t session, unsigned again) - } - - gnutls_free(session->internals.post_handshake_cr_context.data); -- session->internals.post_handshake_cr_context.data = NULL; - ret = _gnutls_set_datum(&session->internals.post_handshake_cr_context, - rnd, sizeof(rnd)); - if (ret < 0) { -diff --git a/lib/tpm.c b/lib/tpm.c -index ee53c7154..03565acb0 100644 ---- a/lib/tpm.c -+++ b/lib/tpm.c -@@ -1645,10 +1645,8 @@ gnutls_tpm_privkey_generate(gnutls_pk_algorithm_t pk, unsigned int bits, - gnutls_pubkey_deinit(pub); - privkey_cleanup: - gnutls_free(privkey->data); -- privkey->data = NULL; - cleanup: - gnutls_free(tmpkey.data); -- tmpkey.data = NULL; - err_sa: - pTspi_Context_CloseObject(s.tpm_ctx, key_ctx); - err_cc: -diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c -index db54b3ea2..55cae94c3 100644 ---- a/lib/x509/ocsp.c -+++ b/lib/x509/ocsp.c -@@ -162,7 +162,6 @@ void gnutls_ocsp_resp_deinit(gnutls_ocsp_resp_t resp) - asn1_delete_structure(&resp->basicresp); - - resp->resp = NULL; -- resp->response_type_oid.data = NULL; - resp->basicresp = NULL; - - gnutls_free(resp->der.data); -@@ -299,7 +298,6 @@ gnutls_ocsp_resp_import2(gnutls_ocsp_resp_t resp, - } - - gnutls_free(resp->der.data); -- resp->der.data = NULL; - } - - resp->init = 1; -@@ -1668,18 +1666,12 @@ gnutls_ocsp_resp_get_single(gnutls_ocsp_resp_t resp, - - return GNUTLS_E_SUCCESS; - fail: -- if (issuer_name_hash) { -+ if (issuer_name_hash) - gnutls_free(issuer_name_hash->data); -- issuer_name_hash->data = NULL; -- } -- if (issuer_key_hash) { -+ if (issuer_key_hash) - gnutls_free(issuer_key_hash->data); -- issuer_key_hash->data = NULL; -- } -- if (serial_number) { -+ if (serial_number) - gnutls_free(serial_number->data); -- serial_number->data = NULL; -- } - return ret; - } - -@@ -1955,7 +1947,6 @@ gnutls_ocsp_resp_get_certs(gnutls_ocsp_resp_t resp, - } - - gnutls_free(c.data); -- c.data = NULL; - } - - tmpcerts[ctr] = NULL; -diff --git a/lib/x509/pkcs12_bag.c b/lib/x509/pkcs12_bag.c -index 26d2142ea..35d12ac4b 100644 ---- a/lib/x509/pkcs12_bag.c -+++ b/lib/x509/pkcs12_bag.c -@@ -62,7 +62,6 @@ static inline void _pkcs12_bag_free_data(gnutls_pkcs12_bag_t bag) - _gnutls_free_datum(&bag->element[i].data); - _gnutls_free_datum(&bag->element[i].local_key_id); - gnutls_free(bag->element[i].friendly_name); -- bag->element[i].friendly_name = NULL; - bag->element[i].type = 0; - } - -diff --git a/lib/x509/pkcs7-crypt.c b/lib/x509/pkcs7-crypt.c -index c2b00e61c..39eb7784b 100644 ---- a/lib/x509/pkcs7-crypt.c -+++ b/lib/x509/pkcs7-crypt.c -@@ -1269,7 +1269,6 @@ _gnutls_pkcs_raw_decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn, - _gnutls_cipher_init(&ch, ce, &dkey, &d_iv, 0); - - gnutls_free(key); -- key = NULL; - - if (ret < 0) { - gnutls_assert(); -diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c -index 955cb5ae9..8ae7b3e78 100644 ---- a/lib/x509/pkcs7.c -+++ b/lib/x509/pkcs7.c -@@ -692,7 +692,6 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx, - - ret = gnutls_pkcs7_add_attr(&info->signed_attrs, oid, &tmp, 0); - gnutls_free(tmp.data); -- tmp.data = NULL; - - if (ret < 0) { - gnutls_assert(); -@@ -730,7 +729,6 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx, - ret = - gnutls_pkcs7_add_attr(&info->unsigned_attrs, oid, &tmp, 0); - gnutls_free(tmp.data); -- tmp.data = NULL; - - if (ret < 0) { - gnutls_assert(); -@@ -842,9 +840,7 @@ static int verify_hash_attr(gnutls_pkcs7_t pkcs7, const char *root, - } - - gnutls_free(tmp.data); -- tmp.data = NULL; - gnutls_free(tmp2.data); -- tmp2.data = NULL; - } - - if (msg_digest_ok) -@@ -1087,7 +1083,6 @@ static gnutls_x509_crt_t find_verified_issuer_of(gnutls_pkcs7_t pkcs7, - gnutls_x509_crt_deinit(issuer); - issuer = NULL; - gnutls_free(tmp.data); -- tmp.data = NULL; - continue; - } - -@@ -1204,7 +1199,6 @@ static gnutls_x509_crt_t find_child_of_with_serial(gnutls_pkcs7_t pkcs7, - gnutls_x509_crt_deinit(crt); - crt = NULL; - gnutls_free(tmpdata.data); -- tmpdata.data = NULL; - continue; - } - } else { -diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c -index 92dea06b0..56000ff12 100644 ---- a/lib/x509/privkey_pkcs8.c -+++ b/lib/x509/privkey_pkcs8.c -@@ -600,7 +600,6 @@ gnutls_pkcs8_info(const gnutls_datum_t * data, gnutls_x509_crt_fmt_t format, - cleanup: - if (ret != GNUTLS_E_UNKNOWN_CIPHER_TYPE && oid) { - gnutls_free(*oid); -- *oid = NULL; - } - if (need_free) - _gnutls_free_datum(&_data); -diff --git a/lib/x509/verify-high2.c b/lib/x509/verify-high2.c -index 8ba2f2a3e..b9aed5cf4 100644 ---- a/lib/x509/verify-high2.c -+++ b/lib/x509/verify-high2.c -@@ -178,7 +178,6 @@ int remove_pkcs11_url(gnutls_x509_trust_list_t list, const char *ca_file) - { - if (strcmp(ca_file, list->pkcs11_token) == 0) { - gnutls_free(list->pkcs11_token); -- list->pkcs11_token = NULL; - } - return 0; - } -diff --git a/lib/x509/virt-san.c b/lib/x509/virt-san.c -index f3b87135b..a81337e25 100644 ---- a/lib/x509/virt-san.c -+++ b/lib/x509/virt-san.c -@@ -70,7 +70,6 @@ int _gnutls_alt_name_assign_virt_type(struct name_st *name, unsigned type, gnutl - if (ret < 0) - return gnutls_assert_val(ret); - gnutls_free(san->data); -- san->data = NULL; - - if (othername_oid) { - name->othername_oid.data = (uint8_t *) othername_oid; -diff --git a/lib/x509/x509.c b/lib/x509/x509.c -index 4aff55eba..c149881f6 100644 ---- a/lib/x509/x509.c -+++ b/lib/x509/x509.c -@@ -383,7 +383,6 @@ static int cache_alt_names(gnutls_x509_crt_t cert) - if (ret >= 0) { - ret = gnutls_x509_ext_import_subject_alt_names(&tmpder, cert->san, 0); - gnutls_free(tmpder.data); -- tmpder.data = NULL; - if (ret < 0) - return gnutls_assert_val(ret); - } -@@ -3680,7 +3679,6 @@ gnutls_x509_crt_list_import2(gnutls_x509_crt_t ** certs, - - if (ret < 0) { - gnutls_free(*certs); -- *certs = NULL; - return ret; - } - -@@ -4310,7 +4308,6 @@ gnutls_x509_crt_list_import_url(gnutls_x509_crt_t **certs, - - if (gnutls_x509_crt_equals2(crts[i-1], &issuer)) { - gnutls_free(issuer.data); -- issuer.data = NULL; - break; - } - -@@ -4331,7 +4328,6 @@ gnutls_x509_crt_list_import_url(gnutls_x509_crt_t **certs, - } - - gnutls_free(issuer.data); -- issuer.data = NULL; - } - - *certs = gnutls_malloc(total*sizeof(gnutls_x509_crt_t)); -diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c -index 58c3263d1..477cf03c4 100644 ---- a/lib/x509/x509_ext.c -+++ b/lib/x509/x509_ext.c -@@ -1994,7 +1994,6 @@ int gnutls_x509_ext_import_policies(const gnutls_datum_t * ext, - ret = - decode_user_notice(td.data, td.size, &txt); - gnutls_free(td.data); -- td.data = NULL; - - if (ret < 0) { - gnutls_assert(); -diff --git a/lib/x509_b64.c b/lib/x509_b64.c -index 9a1037405..3117843be 100644 ---- a/lib/x509_b64.c -+++ b/lib/x509_b64.c -@@ -302,7 +302,6 @@ _gnutls_base64_decode(const uint8_t * data, size_t data_size, - - fail: - gnutls_free(result->data); -- result->data = NULL; - - cleanup: - gnutls_free(pdata.data); -diff --git a/tests/cert.c b/tests/cert.c -index da0ab23df..ec566a4a4 100644 ---- a/tests/cert.c -+++ b/tests/cert.c -@@ -89,7 +89,6 @@ static int getnextcert(DIR **dirp, gnutls_datum_t *der, int *exp_ret) - *exp_ret = atoi((char*)local.data); - success("expecting error code %d\n", *exp_ret); - gnutls_free(local.data); -- local.data = NULL; - } - - return 0; -@@ -135,7 +134,6 @@ void doit(void) - - gnutls_x509_crt_deinit(cert); - gnutls_free(der.data); -- der.data = NULL; - der.size = 0; - exp_ret = -1; - } -diff --git a/tests/name-constraints-ip.c b/tests/name-constraints-ip.c -index 3dd4ff2cb..ed96109c7 100644 ---- a/tests/name-constraints-ip.c -+++ b/tests/name-constraints-ip.c -@@ -78,7 +78,6 @@ static void check_test_result(int ret, int expected_outcome, - static void parse_cidr(const char* cidr, gnutls_datum_t *datum) { - if (datum->data != NULL) { - gnutls_free(datum->data); -- datum->data = NULL; - } - int ret = gnutls_x509_cidr_to_rfc5280(cidr, datum); - check_for_error(ret); -@@ -699,7 +698,7 @@ static int teardown(void **state) { - gnutls_free(test_vars->ip.data); - gnutls_x509_name_constraints_deinit(test_vars->nc); - gnutls_x509_name_constraints_deinit(test_vars->nc2); -- gnutls_free(test_vars); -+ gnutls_free(*state); - return 0; - } - -diff --git a/tests/pkcs11/pkcs11-import-url-privkey.c b/tests/pkcs11/pkcs11-import-url-privkey.c -index cb44fb1e5..c7e06eb1a 100644 ---- a/tests/pkcs11/pkcs11-import-url-privkey.c -+++ b/tests/pkcs11/pkcs11-import-url-privkey.c -@@ -85,7 +85,6 @@ void doit(void) - for (i=0;i<obj_list_size;i++) - gnutls_pkcs11_obj_deinit(obj_list[i]); - gnutls_free(obj_list); -- obj_list = NULL; - obj_list_size = 0; - - #ifndef _WIN32 -@@ -116,7 +115,6 @@ void doit(void) - for (i=0;i<obj_list_size;i++) - gnutls_pkcs11_obj_deinit(obj_list[i]); - gnutls_free(obj_list); -- obj_list = NULL; - obj_list_size = 0; - } - #endif -diff --git a/tests/pkcs11/pkcs11-privkey-always-auth.c b/tests/pkcs11/pkcs11-privkey-always-auth.c -index 3561c412f..441f63722 100644 ---- a/tests/pkcs11/pkcs11-privkey-always-auth.c -+++ b/tests/pkcs11/pkcs11-privkey-always-auth.c -@@ -175,7 +175,6 @@ void doit(void) - pin_called = 0; - - gnutls_free(sig.data); -- sig.data = NULL; - - /* call again - should re-authenticate */ - ret = gnutls_privkey_sign_hash(key, GNUTLS_DIG_SHA1, 0, &data, &sig); -@@ -190,7 +189,6 @@ void doit(void) - pin_called = 0; - - gnutls_free(sig.data); -- sig.data = NULL; - - if (debug) - printf("done\n\n\n"); -diff --git a/tests/pkcs11/pkcs11-privkey-fork-reinit.c b/tests/pkcs11/pkcs11-privkey-fork-reinit.c -index 1535d644f..a72584225 100644 ---- a/tests/pkcs11/pkcs11-privkey-fork-reinit.c -+++ b/tests/pkcs11/pkcs11-privkey-fork-reinit.c -@@ -123,7 +123,6 @@ void doit(void) - } - - gnutls_free(sig.data); -- sig.data = NULL; - - pid = fork(); - if (pid != 0) { -diff --git a/tests/pkcs11/pkcs11-privkey-fork.c b/tests/pkcs11/pkcs11-privkey-fork.c -index 9d301d7d6..b99755c73 100644 ---- a/tests/pkcs11/pkcs11-privkey-fork.c -+++ b/tests/pkcs11/pkcs11-privkey-fork.c -@@ -123,7 +123,6 @@ void doit(void) - } - - gnutls_free(sig.data); -- sig.data = NULL; - - pid = fork(); - if (pid != 0) { -diff --git a/tests/pkcs11/pkcs11-privkey-safenet-always-auth.c b/tests/pkcs11/pkcs11-privkey-safenet-always-auth.c -index 1b5b34054..a4ab5b5aa 100644 ---- a/tests/pkcs11/pkcs11-privkey-safenet-always-auth.c -+++ b/tests/pkcs11/pkcs11-privkey-safenet-always-auth.c -@@ -157,7 +157,6 @@ void doit(void) - pin_called = 0; - - gnutls_free(sig.data); -- sig.data = NULL; - - /* call again - should re-authenticate */ - ret = gnutls_privkey_sign_hash(key, GNUTLS_DIG_SHA1, 0, &data, &sig); -@@ -172,7 +171,6 @@ void doit(void) - pin_called = 0; - - gnutls_free(sig.data); -- sig.data = NULL; - - if (debug) - printf("done\n\n\n"); -diff --git a/tests/pkcs7.c b/tests/pkcs7.c -index a490976fc..2d5a5548d 100644 ---- a/tests/pkcs7.c -+++ b/tests/pkcs7.c -@@ -90,7 +90,6 @@ static int getnextfile(DIR **dirp, gnutls_datum_t *der, int *exp_ret) - *exp_ret = atoi((char*)local.data); - success("expecting error code %d\n", *exp_ret); - gnutls_free(local.data); -- local.data = NULL; - } - - return 0; -@@ -134,7 +133,6 @@ void doit(void) - - gnutls_pkcs7_deinit(cert); - gnutls_free(der.data); -- der.data = NULL; - der.size = 0; - exp_ret = -1; - } -diff --git a/tests/resume-dtls.c b/tests/resume-dtls.c -index 9e6327c7f..b5b214313 100644 ---- a/tests/resume-dtls.c -+++ b/tests/resume-dtls.c -@@ -363,7 +363,6 @@ static void server(int sds[], struct params_res *params) - } - - gnutls_free(session_ticket_key.data); -- session_ticket_key.data = NULL; - gnutls_anon_free_server_credentials(anoncred); - - if (debug) -diff --git a/tests/resume.c b/tests/resume.c -index 84314b836..3dc225136 100644 ---- a/tests/resume.c -+++ b/tests/resume.c -@@ -873,7 +873,6 @@ static void server(int sds[], struct params_res *params) - } - - gnutls_free(session_ticket_key.data); -- session_ticket_key.data = NULL; - - if (debug) - success("server: finished\n"); -diff --git a/tests/sign-verify-data.c b/tests/sign-verify-data.c -index 3aa261175..558ad2253 100644 ---- a/tests/sign-verify-data.c -+++ b/tests/sign-verify-data.c -@@ -153,7 +153,6 @@ void doit(void) - - /* test the raw interface */ - gnutls_free(signature.data); -- signature.data = NULL; - - gnutls_free(signature.data); - gnutls_x509_crt_deinit(crt); -diff --git a/tests/sign-verify-ext.c b/tests/sign-verify-ext.c -index eecb1f357..cc80bf907 100644 ---- a/tests/sign-verify-ext.c -+++ b/tests/sign-verify-ext.c -@@ -186,9 +186,7 @@ void doit(void) - - /* test the raw interface */ - gnutls_free(signature.data); -- signature.data = NULL; - gnutls_free(signature2.data); -- signature2.data = NULL; - - if (gnutls_pubkey_get_pk_algorithm(pubkey, NULL) == - GNUTLS_PK_RSA) { -diff --git a/tests/sign-verify-ext4.c b/tests/sign-verify-ext4.c -index 81aa345bf..be582ec14 100644 ---- a/tests/sign-verify-ext4.c -+++ b/tests/sign-verify-ext4.c -@@ -227,7 +227,6 @@ void doit(void) - testfail("gnutls_pubkey_verify_data2\n"); - - gnutls_free(signature.data); -- signature.data = NULL; - - - if (!tests[i].data_only) { -@@ -243,7 +242,6 @@ void doit(void) - testfail("gnutls_pubkey_verify_hash2-1 (hashed data)\n"); - - gnutls_free(signature2.data); -- signature2.data = NULL; - } - - if (gnutls_pubkey_get_pk_algorithm(pubkey, NULL) == -diff --git a/tests/sign-verify.c b/tests/sign-verify.c -index 1fbed5ece..5a14741fc 100644 ---- a/tests/sign-verify.c -+++ b/tests/sign-verify.c -@@ -206,7 +206,6 @@ void doit(void) - - /* test the raw interface */ - gnutls_free(signature.data); -- signature.data = NULL; - - if (gnutls_pubkey_get_pk_algorithm(pubkey, NULL) == - GNUTLS_PK_RSA) { -diff --git a/tests/x509-extensions.c b/tests/x509-extensions.c -index d480f8364..a062c1ba8 100644 ---- a/tests/x509-extensions.c -+++ b/tests/x509-extensions.c -@@ -767,7 +767,6 @@ void doit(void) - } - } - gnutls_free(ext.data); -- ext.data = NULL; - } - - if (debug) -diff --git a/tests/x509sign-verify-error.c b/tests/x509sign-verify-error.c -index 54bdc40ab..97c966685 100644 ---- a/tests/x509sign-verify-error.c -+++ b/tests/x509sign-verify-error.c -@@ -181,7 +181,6 @@ void doit(void) - fail("gnutls_privkey_sign_hash\n"); - - gnutls_free(signature2.data); -- signature2.data = NULL; - - _gnutls_lib_simulate_error(); - ret = gnutls_privkey_sign_hash(privkey, GNUTLS_DIG_SHA1, 0, --- -2.22.0.vfs.1.1.57.gbaf16c8 diff --git a/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3829_p3.patch b/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3829_p3.patch deleted file mode 100644 index d27ea4a9..00000000 --- a/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3829_p3.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bf616850cf20af2bec3d68b82e6ac610ee8fc404 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Tue, 12 Feb 2019 15:20:23 +0100 -Subject: [PATCH 3/3] gnutls_x509_crt_init: Fix dereference of NULL pointer -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de> - -CVE: CVE-2019-3829 -Upstream-Status: Backport -[https://gitlab.com/gnutls/gnutls/commit/6b5cbc9ea5bdca704bdbe2f8fb551f720d634bc6] - -Signed-off-by: Dan Tran <dantran@microsoft.com> ---- - lib/x509/x509.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/x509/x509.c b/lib/x509/x509.c -index c149881f6..cc232ea50 100644 ---- a/lib/x509/x509.c -+++ b/lib/x509/x509.c -@@ -224,8 +224,8 @@ int gnutls_x509_crt_init(gnutls_x509_crt_t * cert) - if (result < 0) { - gnutls_assert(); - asn1_delete_structure(&tmp->cert); -- gnutls_free(tmp); - gnutls_subject_alt_names_deinit(tmp->san); -+ gnutls_free(tmp); - return result; - } - --- -2.22.0.vfs.1.1.57.gbaf16c8 - diff --git a/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3836.patch b/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3836.patch deleted file mode 100644 index 4aeb6893..00000000 --- a/external/poky/meta/recipes-support/gnutls/gnutls/CVE-2019-3836.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c68195f0ff65144d7e0c32f4de5f264c4012983a Mon Sep 17 00:00:00 2001 -From: Daiki Ueno <dueno@redhat.com> -Date: Mon, 25 Mar 2019 16:06:39 +0100 -Subject: [PATCH] handshake: add missing initialization of local variable - -Resolves: #704 - -Signed-off-by: Daiki Ueno <dueno@redhat.com> -Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com> - -CVE: CVE-2019-3836 -Upstream-Status: Backport -[https://gitlab.com/gnutls/gnutls/commit/96e07075e8f105b13e76b11e493d5aa2dd937226] - -Signed-off-by: Dan Tran <dantran@microsoft.com> ---- - lib/handshake-tls13.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/handshake-tls13.c b/lib/handshake-tls13.c -index 06c7c01d2..82689b5d8 100644 ---- a/lib/handshake-tls13.c -+++ b/lib/handshake-tls13.c -@@ -534,6 +534,8 @@ _gnutls13_recv_async_handshake(gnutls_session_t session) - return gnutls_assert_val(GNUTLS_E_UNEXPECTED_PACKET); - - do { -+ _gnutls_handshake_buffer_init(&hsk); -+ - /* the received handshake message has already been pushed into - * handshake buffers. As we do not need to use the handshake hash - * buffers we call the lower level receive functions */ --- -2.22.0.vfs.1.1.57.gbaf16c8 - diff --git a/external/poky/meta/recipes-support/gnutls/gnutls_3.6.4.bb b/external/poky/meta/recipes-support/gnutls/gnutls_3.6.14.bb index 30873f00..cc0454a5 100644 --- a/external/poky/meta/recipes-support/gnutls/gnutls_3.6.4.bb +++ b/external/poky/meta/recipes-support/gnutls/gnutls_3.6.14.bb @@ -9,7 +9,7 @@ LICENSE_${PN}-bin = "GPLv3+" LICENSE_${PN}-openssl = "GPLv3+" LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ - file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" DEPENDS = "nettle gmp virtual/libiconv libunistring" @@ -19,16 +19,12 @@ 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://CVE-2019-3829_p1.patch \ - file://CVE-2019-3829_p2.patch \ - file://CVE-2019-3829_p3.patch \ - file://CVE-2019-3836.patch \ + file://0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch \ " -SRC_URI[md5sum] = "63363d1c00601f4d11a5cadc8b5e0799" -SRC_URI[sha256sum] = "c663a792fbc84349c27c36059181f2ca86c9442e75ee8b0ad72f5f9b35deab3a" +SRC_URI[sha256sum] = "5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63" -inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc +inherit autotools texinfo pkgconfig gettext lib_package gtk-doc PACKAGECONFIG ??= "libidn" @@ -48,9 +44,12 @@ EXTRA_OECONF = " \ --enable-local-libopts \ --enable-openssl-compatibility \ --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ - --without-libunistring-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() { diff --git a/external/poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch b/external/poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch deleted file mode 100644 index 1e52d6ab..00000000 --- a/external/poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch +++ /dev/null @@ -1,63 +0,0 @@ -From b17dbb8d3c5605db3a1d82861fcaeef4636d1117 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Thu, 26 Jan 2017 18:54:48 +0200 -Subject: [PATCH] stdint.m4: reintroduce GNULIB_OVERRIDES_WINT_T check - -Partially revert the gnulib commit: 5a400b3f5a1f5483dbfd75d38bdb7080218a063b -to fix the build error with musl library. - -Upstream-Status: Inappropriate - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - gl/m4/stdint.m4 | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4 -index 4ac854d..3dc3da1 100644 ---- a/gl/m4/stdint.m4 -+++ b/gl/m4/stdint.m4 -@@ -355,6 +355,32 @@ int32_t i32 = INT32_C (0x7fffffff); - gl_STDINT_TYPE_PROPERTIES - fi - -+ dnl Determine whether gnulib's <wchar.h> or <wctype.h> would, if present, -+ dnl override 'wint_t'. -+ AC_CACHE_CHECK([whether wint_t is too small], -+ [gl_cv_type_wint_t_too_small], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[ -+ /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before -+ <wchar.h>. -+ BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be -+ included before <wchar.h>. */ -+ #if !(defined __GLIBC__ && !defined __UCLIBC__) -+ # include <stddef.h> -+ # include <stdio.h> -+ # include <time.h> -+ #endif -+ #include <wchar.h> -+ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; -+ ]])], -+ [gl_cv_type_wint_t_too_small=no], -+ [gl_cv_type_wint_t_too_small=yes])]) -+ if test $gl_cv_type_wint_t_too_small = yes; then -+ GNULIB_OVERRIDES_WINT_T=1 -+ else -+ GNULIB_OVERRIDES_WINT_T=0 -+ fi -+ - dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. - LIMITS_H=limits.h - AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) -@@ -363,6 +389,7 @@ int32_t i32 = INT32_C (0x7fffffff); - AC_SUBST([HAVE_SYS_BITYPES_H]) - AC_SUBST([HAVE_SYS_INTTYPES_H]) - AC_SUBST([STDINT_H]) -+ AC_SUBST([GNULIB_OVERRIDES_WINT_T]) - AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"]) - ]) - --- -2.4.0 - diff --git a/external/poky/meta/recipes-support/gnutls/libtasn1_4.13.bb b/external/poky/meta/recipes-support/gnutls/libtasn1_4.13.bb deleted file mode 100644 index 9ee19130..00000000 --- a/external/poky/meta/recipes-support/gnutls/libtasn1_4.13.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Library for ASN.1 and DER manipulation" -HOMEPAGE = "http://www.gnu.org/software/libtasn1/" - -LICENSE = "GPLv3+ & LGPLv2.1+" -LICENSE_${PN}-bin = "GPLv3+" -LICENSE_${PN} = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ - file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351" - -SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ - file://dont-depend-on-help2man.patch \ - file://0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch \ - " - -DEPENDS = "bison-native" - -SRC_URI[md5sum] = "ce2ba4d3088119b48e7531a703669c52" -SRC_URI[sha256sum] = "7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca" - -inherit autotools texinfo lib_package gtk-doc - -BBCLASSEXTEND = "native" diff --git a/external/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb b/external/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb new file mode 100644 index 00000000..8337b702 --- /dev/null +++ b/external/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Library for ASN.1 and DER manipulation" +HOMEPAGE = "http://www.gnu.org/software/libtasn1/" + +LICENSE = "GPLv3+ & LGPLv2.1+" +LICENSE_${PN}-bin = "GPLv3+" +LICENSE_${PN} = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE;md5=75ac100ec923f959898182307970c360" + +SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ + file://dont-depend-on-help2man.patch \ + " + +DEPENDS = "bison-native" + +SRC_URI[md5sum] = "531208de3729d42e2af0a32890f08736" +SRC_URI[sha256sum] = "0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d" + +inherit autotools texinfo lib_package gtk-doc + +CFLAGS_append_class-native = " -std=gnu99" + +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch new file mode 100644 index 00000000..0ed4eb68 --- /dev/null +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch @@ -0,0 +1,134 @@ +From a001b3c23bf80fd752044615b9bba6b926ff9666 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." + +This reverts commit 60828a505a1c74fd34476c181df2a588ea6f9c83. + +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(-) + +diff --git a/src/gpgme.m4 b/src/gpgme.m4 +index 2a72f18..6c2be44 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: 2018-11-12 ++# Last-changed: 2014-10-02 + + + AC_DEFUN([_AM_PATH_GPGME_CONFIG], +@@ -36,24 +36,10 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], + fi + fi + +- use_gpgrt_config="" +- if test x"${GPGME_CONFIG}" = x -a 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]) +- use_gpgrt_config=yes +- fi +- fi +- if test -z "$use_gpgrt_config"; then +- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) +- fi ++ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) + + if test "$GPGME_CONFIG" != "no" ; then +- if test -z "$use_gpgrt_config"; then +- gpgme_version=`$GPGME_CONFIG --version` +- else +- gpgme_version=`$GPGME_CONFIG --modversion` +- fi ++ gpgme_version=`$GPGME_CONFIG --version` + 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], + + AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK], + [ +- if test -z "$use_gpgrt_config"; then +- gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none` +- else +- gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo none` +- fi ++ gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none` + if test x"$gpgme_config_host" != xnone ; then + if test x"$gpgme_config_host" != x"$host" ; then + AC_MSG_WARN([[ + *** +-*** The config script "$GPGME_CONFIG" was ++*** The config script $GPGME_CONFIG was + *** 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], + # If we have a recent GPGME, we should also check that the + # API is compatible. + if test "$req_gpgme_api" -gt 0 ; then +- 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=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` + 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], + # If we have a recent GPGME, we should also check that the + # API is compatible. + if test "$req_gpgme_api" -gt 0 ; then +- 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=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` + 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], + fi + fi + if test $ok = yes; then +- if test -z "$use_gpgrt_config"; then +- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` +- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` +- else +- if $GPGRT_CONFIG gpgme-glib --exists; then +- GPGME_CONFIG="$GPGRT_CONFIG gpgme-glib" +- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --cflags` +- GPGME_GLIB_LIBS=`$GPGME_CONFIG --libs` +- else +- ok = no +- fi +- fi +- fi +- if test $ok = yes; then ++ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` ++ GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + _AM_PATH_GPGME_CONFIG_HOST_CHECK +-- +2.7.4 + diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index ae9a46ed..827d95a1 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,7 +1,7 @@ -From c452ba58dd2f99d6e624421697417cc018f9a67a Mon Sep 17 00:00:00 2001 +From 98ce65902b197faa8f660564613ca2e504c2f8f8 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Fri, 29 Jun 2018 14:35:41 +0800 -Subject: [PATCH 1/7] pkgconfig +Date: Fri, 10 May 2019 14:23:55 +0800 +Subject: [PATCH] pkgconfig Update gpgme to use pkgconfig instead of -config files since its simpler and less error prone when cross compiling. @@ -11,7 +11,7 @@ RP 2015/4/17 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Rebase to 1.11.1 +Rebase to 1.13.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- @@ -19,43 +19,40 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> src/Makefile.am | 4 +- src/gpgme-pthread.pc.in | 15 +++++++ src/gpgme.m4 | 114 ++++-------------------------------------------- - src/gpgme.pc.in | 15 +++++++ - 5 files changed, 42 insertions(+), 107 deletions(-) + src/gpgme.pc.in | 4 +- + 5 files changed, 28 insertions(+), 110 deletions(-) create mode 100644 src/gpgme-pthread.pc.in - create mode 100644 src/gpgme.pc.in diff --git a/configure.ac b/configure.ac -index 2a35404..7485cdf 100644 +index 25184f4..1c0a386 100644 --- a/configure.ac +++ b/configure.ac -@@ -886,6 +886,7 @@ AC_CONFIG_FILES(Makefile src/Makefile - src/versioninfo.rc +@@ -899,6 +899,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) -+AC_CONFIG_FILES(src/gpgme.pc src/gpgme-pthread.pc) ++AC_CONFIG_FILES(src/gpgme-pthread.pc) AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile) + AC_CONFIG_FILES(lang/cpp/tests/Makefile) AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) - AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in) diff --git a/src/Makefile.am b/src/Makefile.am -index 0a196e0..cecaf8f 100644 +index d85a85c..d942f3e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -19,12 +19,14 @@ +@@ -20,11 +20,11 @@ ## Process this file with automake to produce Makefile.in + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = gpgme.pc gpgme-glib.pc ++pkgconfig_DATA = gpgme.pc gpgme-glib.pc gpgme-pthread.pc + EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ -- gpgme.h.in versioninfo.rc.in gpgme.def -+ gpgme.h.in versioninfo.rc.in gpgme.def gpgme.pc.in gpgme-pthread.pc.in + gpgme.h.in versioninfo.rc.in gpgme.def \ +- 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 - m4data_DATA = gpgme.m4 - nodist_include_HEADERS = gpgme.h -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = gpgme.pc gpgme-pthread.pc - - bin_PROGRAMS = gpgme-tool gpgme-json - diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in new file mode 100644 index 0000000..074bbf6 @@ -277,27 +274,18 @@ index 6c2be44..d8a75cb 100644 - AC_SUBST(GPGME_GLIB_LIBS) ]) diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in -new file mode 100644 -index 0000000..b69539f ---- /dev/null +index be288b8..16f56ac 100644 +--- a/src/gpgme.pc.in +++ b/src/gpgme.pc.in -@@ -0,0 +1,15 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+# API info -+api_version=@GPGME_CONFIG_API_VERSION@ -+host=@GPGME_CONFIG_HOST@ -+ -+Name: gpgme -+Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program. -+Version: @VERSION@ -+Libs: -L${libdir} -lgpgme +@@ -9,6 +9,6 @@ Name: gpgme + Description: GnuPG Made Easy to access GnuPG + Requires: gpg-error, libassuan + Version: @PACKAGE_VERSION@ +-Cflags: @GPGME_CONFIG_CFLAGS@ +-Libs: @GPGME_CONFIG_LIBS@ +Cflags: -I${includedir} -+Requires: libassuan gpg-error -\ No newline at end of file ++Libs: -L${libdir} -lgpgme + URL: https://www.gnupg.org/software/gpgme/index.html -- 2.7.4 diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch index 4f5cedac..ecd1793a 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch @@ -1,6 +1,6 @@ -From 45d828356efc140a1492befb1e6dc59a9f4e16b5 Mon Sep 17 00:00:00 2001 +From 52f8fd2010b900c7d382a7c4e6c1a317d8160585 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 31 Jan 2018 10:44:19 +0800 +Date: Fri, 10 May 2019 14:30:36 +0800 Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used gpg-error-config was modified by OE to always return an error. @@ -11,38 +11,39 @@ Upstream-Status: Inappropriate [changes are specific to OE] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Rework to 1.10.0 +Rebase to 1.13.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - lang/python/setup.py.in | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) + lang/python/setup.py.in | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in -index 2595073..60b5257 100755 +index 9785a28..006216d 100755 --- a/lang/python/setup.py.in +++ b/lang/python/setup.py.in -@@ -26,7 +26,6 @@ import shutil - import subprocess +@@ -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 = "" -@@ -157,14 +156,7 @@ class BuildExtFirstHack(build): +-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): def _generate_errors_i(self): - try: -- subprocess.check_call(gpg_error_config + ['--version'], -- stdout=devnull) +- 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.") -- -- gpg_error_content = self._read_header("gpg-error.h", getconfig("cflags", config=gpg_error_config)) -+ gpg_error_content = self._read_header("gpg-error.h", os.environ.get('CFLAGS').split()) +- sys.exit('Could not find gpg-error-config. ' + +- 'Please install the libgpg-error development package.') + + gpg_error_content = self._read_header( +- 'gpg-error.h', getconfig('cflags', config=gpg_error_config)) ++ "gpg-error.h", os.environ.get('CFLAGS').split()) filter_re = re.compile(r'GPG_ERR_[^ ]* =') rewrite_re = re.compile(r' *(.*) = .*') diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch index 330bec65..de1689ec 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch @@ -1,4 +1,4 @@ -From 60baf9ebf30bed0e2ee3c7c5a74d5b6d50035862 Mon Sep 17 00:00:00 2001 +From f632148fcc8757bb9a9601a6dab275e88cd309d2 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 @@ -17,10 +17,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 8d74cbd..ce4f0a5 100644 +index 6988faf..36c6f7b 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -91,6 +91,7 @@ install-exec-local: +@@ -93,6 +93,7 @@ install-exec-local: --build-base="$$(basename "$${PYTHON}")-gpg" \ install \ --prefix "$(DESTDIR)$(prefix)" \ diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch index 1a60f79b..fa0eccfc 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch @@ -1,4 +1,4 @@ -From fd7dcceeee439eb479edbb418bab635343414ee6 Mon Sep 17 00:00:00 2001 +From f51bf1114bee6d56a950dcc6ebb46d6138b3faed Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Wed, 16 Aug 2017 02:06:45 -0400 Subject: [PATCH 4/7] python import diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch index 2da79043..50bf2146 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch @@ -1,4 +1,4 @@ -From a58d90632a9907be3e8001800a143ac19075241a Mon Sep 17 00:00:00 2001 +From 8d9613c34ae495bbcbd725a2e7ac48138ba53c30 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 diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch index 26ff4723..1471184d 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch @@ -1,4 +1,4 @@ -From 4f83750ce402b65d16cc09f8a0274a7ec76fc634 Mon Sep 17 00:00:00 2001 +From ef920688bfe1c7328c9e97229d62ccd35304ad84 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 @@ -17,10 +17,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index ce4f0a5..5a468f1 100644 +index 36c6f7b..ce9a108 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -90,8 +90,9 @@ install-exec-local: +@@ -92,8 +92,9 @@ install-exec-local: build \ --build-base="$$(basename "$${PYTHON}")-gpg" \ install \ diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch new file mode 100644 index 00000000..4c97f63c --- /dev/null +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch @@ -0,0 +1,52 @@ +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/external/poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch deleted file mode 100644 index 63eeacf3..00000000 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch +++ /dev/null @@ -1,78 +0,0 @@ -From d3087348348b4a7fcfb05bf2a75b4a63453e1c77 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 1 Feb 2018 10:14:30 +0800 -Subject: [PATCH 7/7] qt/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 - -* configure.ac, lang/qt/Makefile.am: - New variable to `lang/qt', set to `lang/qt' if RUN_LANG_QT_TESTS - -Upstream-Status: Submitted [gnupg-devel@gnupg.org] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 11 +++++++++++ - lang/python/Makefile.am | 3 +++ - lang/qt/Makefile.am | 8 +++++++- - 3 files changed, 21 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7485cdf..4aa216d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -535,6 +535,17 @@ 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") -+ -+run_lang_qt_test="yes" -+AC_ARG_ENABLE(lang-qt-test, -+ AC_HELP_STRING([--disable-lang-qt-test], [disable Qt regression test]), -+ run_lang_qt_test=$enableval) -+AM_CONDITIONAL(RUN_LANG_QT_TESTS, test "$run_lang_qt_test" = "yes") - - # Checks for header files. - AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 5a468f1..43b9788 100644 ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -24,7 +24,10 @@ EXTRA_DIST = \ - examples \ - src - -+if RUN_LANG_PYTHON_TESTS - SUBDIRS = . tests -+endif -+ - - .PHONY: prepare - prepare: copystamp -diff --git a/lang/qt/Makefile.am b/lang/qt/Makefile.am -index ab85960..a244ede 100644 ---- a/lang/qt/Makefile.am -+++ b/lang/qt/Makefile.am -@@ -19,6 +19,12 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - # 02111-1307, USA - --SUBDIRS = src tests doc -+if RUN_LANG_QT_TESTS -+qttests = tests -+else -+qttests = -+endif -+ -+SUBDIRS = src ${qttests} doc - - EXTRA_DIST = README --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch new file mode 100644 index 00000000..3afbfc86 --- /dev/null +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch @@ -0,0 +1,36 @@ +From fc3d9cc218e60582fd158d21a1cd537a3dc1b007 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 + +Upstream auto check the version of python rather than specify option +[ff6ff61 python: Auto-check for all installed python versions.] + +In oe-core, don't check var-PYTHON, use the setting from recipe, +only check specific python 2.7 and 3.7 + +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(-) + +diff --git a/configure.ac b/configure.ac +index cb2f073..7d74a6d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -423,8 +423,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],[all]], +- [unset PYTHON ++ [[2.7],[3.7]], ++ [ + unset PYTHON_VERSION + unset PYTHON_CPPFLAGS + unset PYTHON_LDFLAGS +-- +2.7.4 + diff --git a/external/poky/meta/recipes-support/gpgme/gpgme_1.11.1.bb b/external/poky/meta/recipes-support/gpgme/gpgme_1.13.1.bb index 86fae946..9fc1ae24 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme_1.11.1.bb +++ b/external/poky/meta/recipes-support/gpgme/gpgme_1.13.1.bb @@ -6,22 +6,24 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index" LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://src/gpgme.h.in;endline=23;md5=4d6319e587fd944adfe61a41a8f15b36 \ + file://src/gpgme.h.in;endline=23;md5=2f0bf06d1c7dcb28532a9d0f94a7ca1d \ file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ + file://0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch \ file://0001-pkgconfig.patch \ file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \ file://0003-Correctly-install-python-modules.patch \ 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-qt-python-Add-variables-to-tests.patch \ + file://0007-python-Add-variables-to-tests.patch \ + file://0008-do-not-auto-check-var-PYTHON.patch \ " -SRC_URI[md5sum] = "129c46fb85a7ffa41e43345e48aee884" -SRC_URI[sha256sum] = "2d1b111774d2e3dd26dcd7c251819ce4ef774ec5e566251eb9308fa7542fbd6f" +SRC_URI[md5sum] = "198f0a908ec3cd8f0ce9a4f3a4489645" +SRC_URI[sha256sum] = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46" DEPENDS = "libgpg-error libassuan" RDEPENDS_${PN}-cpp += "libstdc++" @@ -44,9 +46,7 @@ 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}" -LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' python2', '', d)}" -LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d)}" +LANGUAGES ?= "${DEFAULT_LANGUAGES} python" PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" @@ -56,7 +56,6 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ --disable-gpg-test \ --disable-gpgsm-test \ --disable-g13-test \ - --disable-lang-qt-test \ --disable-lang-python-test \ ' diff --git a/external/poky/meta/recipes-support/icu/icu.inc b/external/poky/meta/recipes-support/icu/icu.inc index e20085fb..670cbedb 100644 --- a/external/poky/meta/recipes-support/icu/icu.inc +++ b/external/poky/meta/recipes-support/icu/icu.inc @@ -35,13 +35,6 @@ TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' ASNEEDED = "" -# strtod_l() is not supported by musl; also xlocale.h is missing -# It is not possible to disable its use via configure switches or env vars -# so monkey patching is needed. -do_configure_prepend_libc-musl () { - sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' ${S}/configure.ac -} - do_compile_prepend_class-target () { # Make sure certain build host references do not end up being compiled # in the image. This only affects libicutu and icu-dbg @@ -66,7 +59,9 @@ do_install_append_class-target() { # 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 + if [ -f ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ]; then + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi fi # Remove build host references... diff --git a/external/poky/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch b/external/poky/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch new file mode 100644 index 00000000..91d68848 --- /dev/null +++ b/external/poky/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch @@ -0,0 +1,28 @@ +From 9be0b489a94b57419202c552022f25cb95bfac51 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 17 Apr 2019 16:41:58 +0200 +Subject: [PATCH] Fix big-endian build + +Bug-report: https://unicode-org.atlassian.net/browse/ICU-20533 +Patch taken from: https://bugs.gentoo.org/682170 + +it is applied upstream and will be in version 67+ + +Upstream-Status: Backport [https://github.com/unicode-org/icu/commit/4a3a457b38cd828b7b3fa4fdbc6e2504a57275e9] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + data/Makefile.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/data/Makefile.in ++++ b/data/Makefile.in +@@ -148,7 +148,8 @@ ICUDATA_ARCHIVE = $(firstword $(wildcard + # and convert it to the current type.
+ ifneq ($(ICUDATA_ARCHIVE),)
+ ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat
+-$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR)
++$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE)
++ $(MKINSTALLDIRS) $(OUTDIR)
+ $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
+ endif
+ else
diff --git a/external/poky/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch b/external/poky/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch new file mode 100644 index 00000000..299689d9 --- /dev/null +++ b/external/poky/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch @@ -0,0 +1,30 @@ +From 500321387ceca48934bb0f323779117cd518bab6 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. + +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/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h +index 1e44fca..e4f2a8b 100644 +--- a/i18n/double-conversion-utils.h ++++ b/i18n/double-conversion-utils.h +@@ -92,7 +92,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__) || \ +- defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ ++ defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ +-- +2.7.4 + diff --git a/external/poky/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch b/external/poky/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch deleted file mode 100644 index 20e3d835..00000000 --- a/external/poky/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fcfd57105b4bdb30d906df152ef01748fa95daff Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin <abrodkin@synopsys.com> -Date: Thu, 13 Sep 2018 17:13:20 +0300 -Subject: [PATCH] icu: Add ARC support - -Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> - -Upstream-Status: Submitted [ https://github.com/unicode-org/icu/pull/149 ] ---- - i18n/double-conversion-utils.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h -index 57fc49b231a3..0bd3e8340673 100644 ---- a/i18n/double-conversion-utils.h -+++ b/i18n/double-conversion-utils.h -@@ -86,7 +86,7 @@ inline void abort_noreturn() { abort(); } - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || defined(__aarch64__) || \ -- defined(__riscv) -+ defined(__riscv) || defined(__arc__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) - #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS -2.17.1 - diff --git a/external/poky/meta/recipes-support/icu/icu/CVE-2020-10531.patch b/external/poky/meta/recipes-support/icu/icu/CVE-2020-10531.patch new file mode 100644 index 00000000..6697b27d --- /dev/null +++ b/external/poky/meta/recipes-support/icu/icu/CVE-2020-10531.patch @@ -0,0 +1,128 @@ +From b7d08bc04a4296982fcef8b6b8a354a9e4e7afca Mon Sep 17 00:00:00 2001 +From: Frank Tang <ftang@chromium.org> +Date: Sat, 1 Feb 2020 02:39:04 +0000 +Subject: [PATCH] ICU-20958 Prevent SEGV_MAPERR in append + +See #971 + +Upstream-Status: Accepted +CVE: CVE-2020-10531 + +Reference to upstream patch: +https://github.com/unicode-org/icu/commit/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca + +--- + common/unistr.cpp | 6 ++- + test/intltest/ustrtest.cpp | 62 +++++++++++++++++++++++++++++++ + test/intltest/ustrtest.h | 1 + + 3 files changed, 68 insertions(+), 1 deletion(-) + +diff --git a/common/unistr.cpp b/common/unistr.cpp +index 901bb33..6ea0915 100644 +--- a/common/unistr.cpp ++++ b/common/unistr.cpp +@@ -1563,7 +1563,11 @@ UnicodeString::doAppend(const UChar *srcChars, int32_t srcStart, int32_t srcLeng + } + + int32_t oldLength = length(); +- int32_t newLength = oldLength + srcLength; ++ int32_t newLength; ++ if (uprv_add32_overflow(oldLength, srcLength, &newLength)) { ++ setToBogus(); ++ return *this; ++ } + + // Check for append onto ourself + const UChar* oldArray = getArrayStart(); +diff --git a/test/intltest/ustrtest.cpp b/test/intltest/ustrtest.cpp +index b6515ea..ad38bdf 100644 +--- a/test/intltest/ustrtest.cpp ++++ b/test/intltest/ustrtest.cpp +@@ -67,6 +67,7 @@ void UnicodeStringTest::runIndexedTest( int32_t index, UBool exec, const char* & + TESTCASE_AUTO(TestWCharPointers); + TESTCASE_AUTO(TestNullPointers); + TESTCASE_AUTO(TestUnicodeStringInsertAppendToSelf); ++ TESTCASE_AUTO(TestLargeAppend); + TESTCASE_AUTO_END; + } + +@@ -2310,3 +2311,64 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() { + str.insert(2, sub); + assertEquals("", u"abbcdcde", str); + } ++ ++void UnicodeStringTest::TestLargeAppend() { ++ if(quick) return; ++ ++ IcuTestErrorCode status(*this, "TestLargeAppend"); ++ // Make a large UnicodeString ++ int32_t len = 0xAFFFFFF; ++ UnicodeString str; ++ char16_t *buf = str.getBuffer(len); ++ // A fast way to set buffer to valid Unicode. ++ // 4E4E is a valid unicode character ++ uprv_memset(buf, 0x4e, len * 2); ++ str.releaseBuffer(len); ++ UnicodeString dest; ++ // Append it 16 times ++ // 0xAFFFFFF times 16 is 0xA4FFFFF1, ++ // which is greater than INT32_MAX, which is 0x7FFFFFFF. ++ int64_t total = 0; ++ for (int32_t i = 0; i < 16; i++) { ++ dest.append(str); ++ total += len; ++ if (total <= INT32_MAX) { ++ assertFalse("dest is not bogus", dest.isBogus()); ++ } else { ++ assertTrue("dest should be bogus", dest.isBogus()); ++ } ++ } ++ dest.remove(); ++ total = 0; ++ for (int32_t i = 0; i < 16; i++) { ++ dest.append(str); ++ total += len; ++ if (total + len <= INT32_MAX) { ++ assertFalse("dest is not bogus", dest.isBogus()); ++ } else if (total <= INT32_MAX) { ++ // Check that a string of exactly the maximum size works ++ UnicodeString str2; ++ int32_t remain = INT32_MAX - total; ++ char16_t *buf2 = str2.getBuffer(remain); ++ if (buf2 == nullptr) { ++ // if somehow memory allocation fail, return the test ++ return; ++ } ++ uprv_memset(buf2, 0x4e, remain * 2); ++ str2.releaseBuffer(remain); ++ dest.append(str2); ++ total += remain; ++ assertEquals("When a string of exactly the maximum size works", (int64_t)INT32_MAX, total); ++ assertEquals("When a string of exactly the maximum size works", INT32_MAX, dest.length()); ++ assertFalse("dest is not bogus", dest.isBogus()); ++ ++ // Check that a string size+1 goes bogus ++ str2.truncate(1); ++ dest.append(str2); ++ total++; ++ assertTrue("dest should be bogus", dest.isBogus()); ++ } else { ++ assertTrue("dest should be bogus", dest.isBogus()); ++ } ++ } ++} +diff --git a/test/intltest/ustrtest.h b/test/intltest/ustrtest.h +index 218befd..4a356a9 100644 +--- a/test/intltest/ustrtest.h ++++ b/test/intltest/ustrtest.h +@@ -97,6 +97,7 @@ public: + void TestWCharPointers(); + void TestNullPointers(); + void TestUnicodeStringInsertAppendToSelf(); ++ void TestLargeAppend(); + }; + + #endif +-- +2.17.1 + diff --git a/external/poky/meta/recipes-support/icu/icu/filter.json b/external/poky/meta/recipes-support/icu/icu/filter.json new file mode 100644 index 00000000..2c63c085 --- /dev/null +++ b/external/poky/meta/recipes-support/icu/icu/filter.json @@ -0,0 +1,2 @@ +{ +} diff --git a/external/poky/meta/recipes-support/icu/icu/fix-install-manx.patch b/external/poky/meta/recipes-support/icu/icu/fix-install-manx.patch index 8186fb41..925b064e 100644 --- a/external/poky/meta/recipes-support/icu/icu/fix-install-manx.patch +++ b/external/poky/meta/recipes-support/icu/icu/fix-install-manx.patch @@ -1,7 +1,7 @@ -From 3063a9211669bee673840ee81f81d30699b9b702 Mon Sep 17 00:00:00 2001 +From a6ddabc8cadb76bfe2d2e374a6702442cfe51cce 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 2/4] icu: fix install race +Subject: [PATCH] icu: fix install race The generic recursive target calls target-local so also adding it to the dependency list results in races due to install-local being executed twice in @@ -18,11 +18,11 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> source/Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/source/Makefile.in b/source/Makefile.in -index c1db15b..4948deb 100644 +diff --git a/Makefile.in b/Makefile.in +index be9435b..ada20d7 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -73,7 +73,7 @@ EXTRA_DATA = +@@ -77,7 +77,7 @@ EXTRA_DATA = ## List of phony targets .PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \ @@ -31,7 +31,7 @@ index c1db15b..4948deb 100644 distclean-local distclean-recursive doc dist dist-local dist-recursive \ check check-local check-recursive clean-recursive-with-twist install-icu \ doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles xcheck-local xcheck-recursive xperf xcheck xperf-recursive \ -@@ -84,9 +84,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist +@@ -88,9 +88,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist ## List of standard targets all: all-local all-recursive @@ -43,15 +43,12 @@ index c1db15b..4948deb 100644 dist: dist-recursive check: all check-recursive check-recursive: all -@@ -350,7 +350,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h - +@@ -357,7 +357,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h install-manx: $(MANX_FILES) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) + ifneq ($(MANX_FILES),) - $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) + $(INSTALL_DATA) $^ $(DESTDIR)$(mandir)/man$(SECTION) + endif config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in - cd $(top_builddir) \ --- -2.14.2 - diff --git a/external/poky/meta/recipes-support/icu/icu_62.1.bb b/external/poky/meta/recipes-support/icu/icu_62.1.bb deleted file mode 100644 index 4e3750b9..00000000 --- a/external/poky/meta/recipes-support/icu/icu_62.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -require icu.inc - -LIC_FILES_CHKSUM = "file://../LICENSE;md5=63752c57bd0b365c9af9f427ef79c819" - -def icu_download_version(d): - pvsplit = d.getVar('PV').split('.') - return pvsplit[0] + "_" + pvsplit[1] - -ICU_PV = "${@icu_download_version(d)}" - -# http://errors.yoctoproject.org/Errors/Details/20486/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" -SRC_URI = "${BASE_SRC_URI} \ - file://icu-pkgdata-large-cmd.patch \ - file://fix-install-manx.patch \ - file://0002-Add-ARC-support.patch \ - " - -SRC_URI_append_class-target = "\ - file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ - " -SRC_URI[md5sum] = "490ad9d920158e0314e10ba74ae9a150" -SRC_URI[sha256sum] = "3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3" - -UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" diff --git a/external/poky/meta/recipes-support/icu/icu_66.1.bb b/external/poky/meta/recipes-support/icu/icu_66.1.bb new file mode 100644 index 00000000..08254648 --- /dev/null +++ b/external/poky/meta/recipes-support/icu/icu_66.1.bb @@ -0,0 +1,71 @@ +require icu.inc + +LIC_FILES_CHKSUM = "file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0" + +def icu_download_version(d): + pvsplit = d.getVar('PV').split('.') + return pvsplit[0] + "_" + pvsplit[1] + +def icu_download_folder(d): + pvsplit = d.getVar('PV').split('.') + return pvsplit[0] + "-" + pvsplit[1] + +ICU_PV = "${@icu_download_version(d)}" +ICU_FOLDER = "${@icu_download_folder(d)}" + +# http://errors.yoctoproject.org/Errors/Details/20486/ +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" +SRC_URI = "${BASE_SRC_URI};name=code \ + ${DATA_SRC_URI};name=data \ + file://filter.json \ + file://icu-pkgdata-large-cmd.patch \ + file://fix-install-manx.patch \ + file://0001-Fix-big-endian-build.patch;apply=no \ + file://0001-icu-Added-armeb-support.patch \ + file://CVE-2020-10531.patch \ + " + +SRC_URI_append_class-target = "\ + file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ + " +SRC_URI[code.sha256sum] = "52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e" +SRC_URI[data.sha256sum] = "8be647f738891d2beb79d48f99077b3499948430eae6f1be112553b15ab0243e" + +UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src" +UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" + +EXTRA_OECONF_append_libc-musl = " ac_cv_func_strtod_l=no" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[make-icudata] = ",,," + +do_make_icudata_class-target () { + cd ${S} + rm -rf data + cp -a ${WORKDIR}/data . + patch -p1 < ${WORKDIR}/0001-Fix-big-endian-build.patch + ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} + AR='${BUILD_AR}' \ + CC='${BUILD_CC}' \ + CPP='${BUILD_CPP}' \ + CXX='${BUILD_CXX}' \ + RANLIB='${BUILD_RANLIB}' \ + CFLAGS='${BUILD_CFLAGS}' \ + CPPFLAGS='${BUILD_CPPFLAGS}' \ + CXXFLAGS='${BUILD_CXXFLAGS}' \ + LDFLAGS='${BUILD_LDFLAGS}' \ + ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \ + ./runConfigureICU Linux --with-data-packaging=archive + oe_runmake + install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat +} + +do_make_icudata() { + : +} + +addtask make_icudata before do_configure after do_patch diff --git a/external/poky/meta/recipes-support/iso-codes/iso-codes_4.1.bb b/external/poky/meta/recipes-support/iso-codes/iso-codes_4.4.bb index 1761ded4..4767dea8 100644 --- a/external/poky/meta/recipes-support/iso-codes/iso-codes_4.1.bb +++ b/external/poky/meta/recipes-support/iso-codes/iso-codes_4.4.bb @@ -5,8 +5,8 @@ BUGTRACKER = "https://salsa.debian.org/iso-codes-team/iso-codes/issues" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://salsa.debian.org/iso-codes-team/iso-codes.git;protocol=http" -SRCREV = "164802d5fd8c7a8167816fd86a62b286680619f0" +SRC_URI = "git://salsa.debian.org/iso-codes-team/iso-codes.git;protocol=http;branch=main;" +SRCREV = "38edb926592954b87eb527124da0ec68d2a748f3" # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which # are inhibited by allarch diff --git a/external/poky/meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch b/external/poky/meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch new file mode 100644 index 00000000..19a858bd --- /dev/null +++ b/external/poky/meta/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch @@ -0,0 +1,35 @@ +From 335ef14fc801c9dfbe7e5692dc71cfbe72049d2b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 27 Oct 2019 16:38:52 +0100 +Subject: [PATCH] Native: Don't use build time hardcoded python binary path. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is same patch as used for target build except that we do not use the +'-S' and '-s' option because '-S' is relatively young [1] and elder build-host +don't support it [2] + +[1] https://github.com/coreutils/coreutils/commit/668306ed86c8c79b0af0db8b9c882654ebb66db2#diff-83d9d52b1f12ac589739ab1334ae4f30 +[2] https://errors.yoctoproject.org/Errors/Details/274743/ + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + itstool.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/itstool.in b/itstool.in +index e64cd34..05d264f 100755 +--- a/itstool.in ++++ b/itstool.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ -s ++#!/usr/bin/env python3 + # + # Copyright (c) 2010-2018 Shaun McCance <shaunm@gnome.org> + # +-- +2.21.0 + diff --git a/external/poky/meta/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch b/external/poky/meta/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch new file mode 100644 index 00000000..b9110533 --- /dev/null +++ b/external/poky/meta/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch @@ -0,0 +1,29 @@ +From cd9b56224895576125e91cca317ace8a80f3eb77 Mon Sep 17 00:00:00 2001 +From: Piotr Tworek <tworaz@tworaz.net> +Date: Sat, 27 Jul 2019 10:19:11 +0200 +Subject: [PATCH] Don't use build time hardcoded python binary path. + +This path obviously won't work on target since they refer to build +machine directory structure. Native builds will also fail if local.conf +has INHERIT+=rm_work. Instread of hardcoding path to python binary use +whatever is found in PATH first. This should also allow the tool to use +python3 binary provided in recipe-sysroot-native. + +Upstream-Status: Inappropriate [OE specific] +--- + itstool.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/itstool.in b/itstool.in +index b3c0033..7df2476 100755 +--- a/itstool.in ++++ b/itstool.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ -s ++#!/usr/bin/env -S python3 -s + # + # Copyright (c) 2010-2018 Shaun McCance <shaunm@gnome.org> + # +-- +2.21.0 + diff --git a/external/poky/meta/recipes-support/itstool/itstool_2.0.6.bb b/external/poky/meta/recipes-support/itstool/itstool_2.0.6.bb new file mode 100644 index 00000000..5f358f46 --- /dev/null +++ b/external/poky/meta/recipes-support/itstool/itstool_2.0.6.bb @@ -0,0 +1,21 @@ +SUMMARY = "ITS Tool allows you to translate your XML documents with PO files" +HOMEPAGE = "http://itstool.org/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5" + +inherit autotools python3native + +DEPENDS = "libxml2-native" + +SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI_append_class-native = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch" +SRC_URI_append_class-nativesdk = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch" +SRC_URI_append_class-target = " file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch" + +SRC_URI[md5sum] = "4306eeba4f4aee6b393d14f9c3c57ca1" +SRC_URI[sha256sum] = "6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN} += "libxml2-python" +RDEPENDS_${PN}_class-native = "" diff --git a/external/poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch b/external/poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch index 525b0762..0e81454c 100644 --- a/external/poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch +++ b/external/poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch @@ -9,60 +9,11 @@ Signed-off-by: Constantin Musca <constantinx.musca@intel.com> forward ported to 2.4.4 Signed-off-by: Armin Kuster <akuster@mvista.com> -Index: libassuan-2.4.4/libassuan.pc.in +Index: libassuan-2.5.2/src/libassuan.m4 =================================================================== ---- /dev/null -+++ libassuan-2.4.4/libassuan.pc.in -@@ -0,0 +1,13 @@ -+prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+api_version=@LIBASSUAN_CONFIG_API_VERSION@ -+host=@LIBASSUAN_CONFIG_HOST@ -+ -+Name: libassuan -+Description: IPC library used by GnuPG and GPGME -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lassuan -+Libs.private: -lgpg-error -+Cflags: -I${includedir} -Index: libassuan-2.4.4/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,10 +25,13 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-doc - # (A suitable gitlog-to-changelog script can be found in GnuPG master.) - GITLOG_TO_CHANGELOG=gitlog-to-changelog - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = libassuan.pc -+ - EXTRA_DIST = autogen.sh autogen.rc README.GIT VERSION \ - ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \ - tests/ChangeLog-2011 contrib/ChangeLog-2011 \ -- build-aux/git-log-footer build-aux/git-log-fix -+ build-aux/git-log-footer build-aux/git-log-fix libassuan.pc.in - - if BUILD_DOC - doc = doc -Index: 2.4.4-r0/libassuan-2.4.4/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -485,6 +485,7 @@ AC_CONFIG_FILES([doc/Makefile]) - AC_CONFIG_FILES([tests/Makefile]) - AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config]) - AC_CONFIG_FILES([src/versioninfo.rc]) -+AC_CONFIG_FILES([libassuan.pc]) - - AC_OUTPUT - -Index: libassuan-2.4.4/src/libassuan.m4 -=================================================================== ---- a/src/libassuan.m4 -+++ b/src/libassuan.m4 -@@ -16,18 +16,6 @@ dnl Returns ok set to yes or no. +--- libassuan-2.5.2.orig/src/libassuan.m4 ++++ libassuan-2.5.2/src/libassuan.m4 +@@ -16,27 +16,6 @@ dnl Returns ok set to yes or no. dnl AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -71,24 +22,32 @@ Index: libassuan-2.4.4/src/libassuan.m4 - [prefix where LIBASSUAN is installed (optional)]), - libassuan_config_prefix="$withval", libassuan_config_prefix="") - if test x$libassuan_config_prefix != x ; then -- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix" - if test x${LIBASSUAN_CONFIG+set} != xset ; then - LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config - fi - fi - -- AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no) +- use_gpgrt_config="" +- if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if $GPGRT_CONFIG libassuan --exists; then +- LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan" +- AC_MSG_NOTICE([Use gpgrt-config as libassuan-config]) +- use_gpgrt_config=yes +- fi +- fi +- if test -z "$use_gpgrt_config"; then +- AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no) +- fi tmp=ifelse([$1], ,1:0.9.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then -@@ -38,51 +26,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -47,58 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], min_libassuan_version="$tmp" fi - AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) - ok=no -- if test "$LIBASSUAN_CONFIG" != "no" \ -- && test -f "$LIBASSUAN_CONFIG" ; then +- if test "$LIBASSUAN_CONFIG" != "no"; then - req_major=`echo $min_libassuan_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - req_minor=`echo $min_libassuan_version | \ @@ -96,7 +55,11 @@ Index: libassuan-2.4.4/src/libassuan.m4 - req_micro=`echo $min_libassuan_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - -- libassuan_config_version=`$LIBASSUAN_CONFIG --version` +- if test -z "$use_gpgrt_config"; then +- libassuan_config_version=`$LIBASSUAN_CONFIG --version` +- else +- libassuan_config_version=`$LIBASSUAN_CONFIG --modversion` +- fi - major=`echo $libassuan_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $libassuan_config_version | \ @@ -130,26 +93,32 @@ Index: libassuan-2.4.4/src/libassuan.m4 if test $ok = yes; then if test "$req_libassuan_api" -gt 0 ; then - tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` +- if test -z "$use_gpgrt_config"; then +- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` +- else +- tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0` +- fi + tmp=`$PKG_CONFIG --variable=api_version libassuan` if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([LIBASSUAN API version]) if test "$req_libassuan_api" -eq "$tmp" ; then -@@ -97,7 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], - +@@ -114,9 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], if test $ok = yes; then if test x"$host" != x ; then -- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` -+ libassuan_config_host=`$PKG_CONFIG --variable=host libassuan` + if test -z "$use_gpgrt_config"; then +- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` +- else +- libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none` ++ libassuan_config_host=`$PKG_CONFIG --variable=host libassuan` + fi if test x"$libassuan_config_host" != xnone ; then if test x"$libassuan_config_host" != x"$host" ; then - AC_MSG_WARN([[ -@@ -138,12 +87,8 @@ dnl +@@ -158,12 +88,8 @@ dnl AC_DEFUN([AM_PATH_LIBASSUAN], [ _AM_PATH_LIBASSUAN_COMMON($1) if test $ok = yes; then -- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags` -- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs` +- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags` +- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs` ifelse([$2], , :, [$2]) else - LIBASSUAN_CFLAGS="" diff --git a/external/poky/meta/recipes-support/libassuan/libassuan_2.5.1.bb b/external/poky/meta/recipes-support/libassuan/libassuan_2.5.3.bb index 34d5f164..52b4c0f1 100644 --- a/external/poky/meta/recipes-support/libassuan/libassuan_2.5.1.bb +++ b/external/poky/meta/recipes-support/libassuan/libassuan_2.5.3.bb @@ -17,16 +17,20 @@ SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \ file://libassuan-add-pkgconfig-support.patch \ " -SRC_URI[md5sum] = "4354b7ae296894f232ada226a062d7d7" -SRC_URI[sha256sum] = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449" +SRC_URI[md5sum] = "226c504ea78a232224bf3b6846b3adb9" +SRC_URI[sha256sum] = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702" BINCONFIG = "${bindir}/libassuan-config" -inherit autotools texinfo binconfig-disabled pkgconfig +inherit autotools texinfo binconfig-disabled pkgconfig multilib_header do_configure_prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/*.m4 } +do_install_append () { + oe_multilib_header assuan.h +} + BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.8.bb b/external/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb index b40e5671..7628eedb 100644 --- a/external/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.8.bb +++ b/external/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb @@ -8,9 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " 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[md5sum] = "99128f05e3e3f4e0cd39aa23f23bbe0c" -SRC_URI[sha256sum] = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665" +SRC_URI[md5sum] = "90a78a84d9c28ce11f331c25289bfbd0" +SRC_URI[sha256sum] = "587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af" S = "${WORKDIR}/libatomic_ops-${PV}" diff --git a/external/poky/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch b/external/poky/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch deleted file mode 100644 index 8abb876c..00000000 --- a/external/poky/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 13c32916b4baab58d93940d57fea9ff0777f1931 Mon Sep 17 00:00:00 2001 -From: Baruch Siach <baruch@tkos.co.il> -Date: Tue, 5 Jun 2018 19:21:46 +0300 -Subject: [PATCH] flopen: Add missing <fcntl.h> include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 993828d84ee (Add flopenat() function from FreeBSD) dropped the -fcntl.h header. This breaks the build with musl libc: - -flopen.c: In function ‘vflopenat’: -flopen.c:60:14: error: ‘O_CREAT’ undeclared (first use in this function) - if (flags & O_CREAT) { - ^~~~~~~ - -Restore the fcntl.h header include to fix the build. - -Fixes: commit 993828d84eed0468c6c15b2818e534e6b134b8e4 -Submitted-also-by: parazyd <parazyd@dyne.org> -Signed-off-by: Baruch Siach <baruch@tkos.co.il> -Signed-off-by: Guillem Jover <guillem@hadrons.org> - -Upstream-Status: Backport -[https://gitlab.freedesktop.org/libbsd/libbsd/commit/13c32916b4baab58d93940d57fea9ff0777f1931] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - src/flopen.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/flopen.c b/src/flopen.c -index b9972c9..ff20d07 100644 ---- a/src/flopen.c -+++ b/src/flopen.c -@@ -32,6 +32,7 @@ - #include <sys/stat.h> - - #include <errno.h> -+#include <fcntl.h> - #include <stdarg.h> - #include <unistd.h> - --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/libbsd/libbsd_0.9.1.bb b/external/poky/meta/recipes-support/libbsd/libbsd_0.10.0.bb index 2b75cdf9..3b9ac5a0 100644 --- a/external/poky/meta/recipes-support/libbsd/libbsd_0.9.1.bb +++ b/external/poky/meta/recipes-support/libbsd/libbsd_0.10.0.bb @@ -7,7 +7,7 @@ DESCRIPTION = "This library provides useful functions commonly found on BSD syst projects with strong BSD origins, without needing to embed the same \ code over and over again on each project." -HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" +HOMEPAGE = "https://libbsd.freedesktop.org/wiki/" # There seems to be more licenses used in the code, I don't think we want to list them all here, complete list: # OE @ ~/projects/libbsd $ grep ^License: COPYING | sort -u # License: BSD-2-clause @@ -28,16 +28,13 @@ HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" # License: public-domain # License: public-domain-Colin-Plumb LICENSE = "BSD-4-Clause & ISC & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=b552602fda69e34c753d26de383f33c5" +LIC_FILES_CHKSUM = "file://COPYING;md5=2120be0173469a06ed185b688e0e1ae0" SECTION = "libs" -SRC_URI = " \ - http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-flopen-Add-missing-fcntl.h-include.patch \ -" +SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "a74b80c4143afa032c90226a4518fffe" -SRC_URI[sha256sum] = "56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4" +SRC_URI[md5sum] = "ead96d240d02faa5b921c0aa50c812b5" +SRC_URI[sha256sum] = "34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887" inherit autotools pkgconfig diff --git a/external/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb b/external/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb new file mode 100644 index 00000000..43f76dc5 --- /dev/null +++ b/external/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb @@ -0,0 +1,29 @@ +require libcap-ng.inc + +FILESEXTRAPATHS_prepend := "${THISDIR}/libcap-ng:" + +SUMMARY .= " - python" + +inherit lib_package autotools python3native + +DEPENDS += "libcap-ng python3 swig-native" + +S = "${WORKDIR}/libcap-ng-${PV}" + +EXTRA_OECONF += "--with-python --with-python3" +EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" + +do_install_append() { + rm -rf ${D}${bindir} + rm -rf ${D}${libdir}/.debug + rm -f ${D}${libdir}/lib* + rm -rf ${D}${libdir}/pkgconfig + rm -rf ${D}${datadir} + rm -rf ${D}${includedir} +} + +# PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}" +FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/.debug/_capng.so" + diff --git a/external/poky/meta/recipes-support/libcap-ng/libcap-ng.inc b/external/poky/meta/recipes-support/libcap-ng/libcap-ng.inc new file mode 100644 index 00000000..002915ad --- /dev/null +++ b/external/poky/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -0,0 +1,19 @@ +SUMMARY = "An alternate posix capabilities library" +DESCRIPTION = "The libcap-ng library is intended to make programming \ +with POSIX capabilities much easier than the traditional libcap library." +HOMEPAGE = "http://freecode.com/projects/libcap-ng" +SECTION = "base" +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" + +SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ + file://python.patch \ + file://0001-configure.ac-add-library-if-header-found.patch \ + file://0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch \ +" + +SRC_URI[md5sum] = "57dc267e2949cdecb651a929f9206572" +SRC_URI[sha256sum] = "a84ca7b4e0444283ed269b7a29f5b6187f647c82e2b876636b49b9a744f0ffbf" + +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch b/external/poky/meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch new file mode 100644 index 00000000..6b155cce --- /dev/null +++ b/external/poky/meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch @@ -0,0 +1,31 @@ +From 0230e2e374bb71aed0181ccd9ebd13c0c5125a5d Mon Sep 17 00:00:00 2001 +From: Trevor Woerner <twoerner@gmail.com> +Date: Fri, 25 Oct 2019 17:01:20 -0400 +Subject: [PATCH] configure.ac: add library if header found + +If the pthread.h header is found, make sure library containing +"pthread_atfork" is added to the list of libraries against which to link. +On some hosts (e.g. openSUSE 15.1) "-lpthread" needs to be explicitly added +in order for the code to compile correctly. + +Upstream-Status: Submitted [https://github.com/stevegrubb/libcap-ng/pull/10] +Signed-off-by: Trevor Woerner <twoerner@gmail.com> +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 63088f4..639b464 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,9 @@ AC_CHECK_HEADERS(sys/xattr.h, [], [ + AC_CHECK_HEADERS(attr/xattr.h, [], [AC_MSG_WARN(attr/xattr.h not found, disabling file system capabilities.)]) + ]) + AC_CHECK_HEADERS(linux/securebits.h, [], []) +-AC_CHECK_HEADERS(pthread.h, [], [AC_MSG_WARN(pthread.h not found, disabling pthread_atfork.)]) ++AC_CHECK_HEADERS(pthread.h, ++ [AC_SEARCH_LIBS(pthread_atfork, pthread)], ++ [AC_MSG_WARN(pthread.h not found, disabling pthread_atfork.)]) + + AC_C_CONST + AC_C_INLINE diff --git a/external/poky/meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch b/external/poky/meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch new file mode 100644 index 00000000..c68254ff --- /dev/null +++ b/external/poky/meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch @@ -0,0 +1,25 @@ +From d95c4018ad57c37f6272dbedfa5217776567c329 Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Tue, 26 Nov 2019 22:34:34 +0500 +Subject: [PATCH] Wrap pthread_atfork usage in HAVE_PTHREAD_H + +Upstream-Status: Pending +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +--- + src/cap-ng.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/cap-ng.c b/src/cap-ng.c +index 35fcd7a..97a3dbd 100644 +--- a/src/cap-ng.c ++++ b/src/cap-ng.c +@@ -166,7 +166,9 @@ static void deinit(void) + static void init_lib(void) __attribute__ ((constructor)); + static void init_lib(void) + { ++#ifdef HAVE_PTHREAD_H + pthread_atfork(NULL, NULL, deinit); ++#endif + } + + static void init(void) diff --git a/external/poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb b/external/poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb new file mode 100644 index 00000000..6e6de454 --- /dev/null +++ b/external/poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb @@ -0,0 +1,17 @@ +require libcap-ng.inc + +inherit lib_package autotools + +EXTRA_OECONF += "--without-python --without-python3" + +BBCLASSEXTEND = "native nativesdk" + +do_install_append() { + # Moving libcap-ng to base_libdir + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mkdir -p ${D}/${base_libdir}/ + mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/ + relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} + ln -sf ${relpath}/libcap-ng.so.0.0.0 ${D}${libdir}/libcap-ng.so + fi +} diff --git a/external/poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb b/external/poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb deleted file mode 100644 index aff6259d..00000000 --- a/external/poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "An alternate posix capabilities library" -DESCRIPTION = "The libcap-ng library is intended to make programming \ -with POSIX capabilities much easier than the traditional libcap library." -HOMEPAGE = "http://freecode.com/projects/libcap-ng" -SECTION = "base" -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" - -SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ - file://python.patch" - -inherit lib_package autotools python3native - -SRC_URI[md5sum] = "2398d695508fab9ce33668c53a89b0e9" -SRC_URI[sha256sum] = "4a1532bcf3731aade40936f6d6a586ed5a66ca4c7455e1338d1f6c3e09221328" - -DEPENDS += "swig-native python3" - -EXTRA_OECONF += "--with-python --with-python3" -EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" - -PACKAGES += "${PN}-python" - -FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" - -BBCLASSEXTEND = "native" - -do_install_append() { - # Moving libcap-ng to base_libdir - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mkdir -p ${D}/${base_libdir}/ - mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/ - relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} - ln -sf ${relpath}/libcap-ng.so.0.0.0 ${D}${libdir}/libcap-ng.so - fi -} diff --git a/external/poky/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch b/external/poky/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch deleted file mode 100644 index 110ef902..00000000 --- a/external/poky/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a05eba68c42222f02465d7ba376015926433c531 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 26 Jul 2017 13:37:49 +0300 -Subject: [PATCH] Fix build with gperf 3.1 - -The generated gperf file refers to size_t which needs to be -provided by stddef.h include. Also, adjust the makefile -to match the declaration in the gperf file. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - libcap/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libcap/Makefile b/libcap/Makefile -index d189777..1a57206 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -22,7 +22,7 @@ all: $(MINLIBNAME) $(STALIBNAME) libcap.pc - - ifeq ($(BUILD_GPERF),yes) - USE_GPERF_OUTPUT = $(GPERF_OUTPUT) --INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT) -+INCLUDE_GPERF_OUTPUT = -include stddef.h -include $(GPERF_OUTPUT) - endif - - libcap.pc: libcap.pc.in -@@ -41,7 +41,7 @@ cap_names.h: _makenames - ./_makenames > cap_names.h - - $(GPERF_OUTPUT): cap_names.list.h -- perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@ -+ perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, register size_t);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@ - - cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h - @echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h" --- -2.13.2 - diff --git a/external/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch b/external/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch new file mode 100644 index 00000000..e568cc47 --- /dev/null +++ b/external/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch @@ -0,0 +1,26 @@ +From 1179b423cce8d119b42cebfb3daa77c540fdca43 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 15 Jan 2020 17:16:28 +0100 +Subject: [PATCH] tests: do not statically link a test + +This fails on e.g. centos 7 + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + tests/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Makefile b/tests/Makefile +index 7162cf0..6af47af 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -29,7 +29,7 @@ psx_test_wrap: psx_test.c $(DEPS) + run_libcap_psx_test: libcap_psx_test + + libcap_psx_test: libcap_psx_test.c $(DEPS) +- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static ++ $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create + + clean: + rm -f psx_test psx_test_wrap libcap_psx_test diff --git a/external/poky/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch b/external/poky/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch new file mode 100644 index 00000000..26d108c2 --- /dev/null +++ b/external/poky/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch @@ -0,0 +1,33 @@ +From 6309554225e05e76167eda4e0df383fb3d1a62c3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 20 Dec 2019 16:54:05 +0100 +Subject: [PATCH] tests: do not run target executables + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + tests/Makefile | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/tests/Makefile b/tests/Makefile +index 95e4ca6..7162cf0 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -19,8 +19,6 @@ sudotest: test + install: all + + run_psx_test: psx_test psx_test_wrap +- ./psx_test +- ./psx_test_wrap + + psx_test: psx_test.c $(DEPS) + $(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB) +@@ -29,7 +27,6 @@ psx_test_wrap: psx_test.c $(DEPS) + $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create + + run_libcap_psx_test: libcap_psx_test +- ./libcap_psx_test + + libcap_psx_test: libcap_psx_test.c $(DEPS) + $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static diff --git a/external/poky/meta/recipes-support/libcap/libcap_2.25.bb b/external/poky/meta/recipes-support/libcap/libcap_2.32.bb index 6df67454..d78a58f7 100644 --- a/external/poky/meta/recipes-support/libcap/libcap_2.25.bb +++ b/external/poky/meta/recipes-support/libcap/libcap_2.32.bb @@ -9,10 +9,13 @@ DEPENDS = "hostperl-runtime-native gperf-native" SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \ file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \ - file://0001-Fix-build-with-gperf-3.1.patch \ + file://0002-tests-do-not-run-target-executables.patch \ + file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[md5sum] = "6666b839e5d46c2ad33fc8aa2ceb5f77" -SRC_URI[sha256sum] = "693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162" +SRC_URI[md5sum] = "7416119c9fdcfd0e8dd190a432c668e9" +SRC_URI[sha256sum] = "1005e3d227f2340ad1e3360ef8b69d15e3c72a29c09f4894d7aac038bd26e2be" + +UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" inherit lib_package diff --git a/external/poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb b/external/poky/meta/recipes-support/libcheck/libcheck_0.14.0.bb index 3bb48a75..a88f009c 100644 --- a/external/poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb +++ b/external/poky/meta/recipes-support/libcheck/libcheck_0.14.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Check - unit testing framework for C code" -HOMEPAGE = "http://check.sourceforge.net/" +HOMEPAGE = "https://libcheck.github.io/check/" SECTION = "devel" LICENSE = "LGPLv2.1+" @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ file://not-echo-compiler-info-to-check_stdint.h.patch" -SRC_URI[md5sum] = "31b17c6075820a434119592941186f70" -SRC_URI[sha256sum] = "464201098bee00e90f5c4bdfa94a5d3ead8d641f9025b560a27755a83b824234" +SRC_URI[md5sum] = "270e82a445be6026040267a5e11cc94b" +SRC_URI[sha256sum] = "bd0f0ca1be65b70238b32f8e9fe5d36dc2fbf7a759b7edf28e75323a7d74f30b" UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" S = "${WORKDIR}/check-${PV}" @@ -18,7 +18,12 @@ inherit autotools pkgconfig texinfo CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk" RREPLACES_${PN} = "check (<= 0.9.5)" -RDEPENDS_${PN} += "gawk" -RDEPENDS_${PN}_class-native = "" BBCLASSEXTEND = "native nativesdk" + +PACKAGES =+ "checkmk" + +FILES_checkmk = "${bindir}/checkmk" + +RDEPENDS_checkmk = "gawk" + diff --git a/external/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7960.patch b/external/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7960.patch deleted file mode 100644 index f6f43c3d..00000000 --- a/external/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7960.patch +++ /dev/null @@ -1,56 +0,0 @@ -input: check end of input before reading a byte - -When reading bytes we weren't check that the index wasn't -out of bound and this could produce an invalid read which -could deal to a security bug. - -Upstream-Status: Backport[https://gitlab.gnome.org/GNOME/libcroco/ - commit/898e3a8c8c0314d2e6b106809a8e3e93cf9d4394] - -CVE: CVE-2017-7960 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -diff --git a/src/cr-input.c b/src/cr-input.c -index 49000b1f5f07fe057135f1b8fc69bdcf9613e300..3b63a88ee3b1c56778e58172d147d958951bf099 100644 ---- a/src/cr-input.c -+++ b/src/cr-input.c -@@ -256,7 +256,7 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc) - *we should free buf here because it's own by CRInput. - *(see the last parameter of cr_input_new_from_buf(). - */ -- buf = NULL ; -+ buf = NULL; - } - - cleanup: -@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this) - enum CRStatus - cr_input_read_byte (CRInput * a_this, guchar * a_byte) - { -+ gulong nb_bytes_left = 0; -+ - g_return_val_if_fail (a_this && PRIVATE (a_this) - && a_byte, CR_BAD_PARAM_ERROR); - -@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte) - if (PRIVATE (a_this)->end_of_input == TRUE) - return CR_END_OF_INPUT_ERROR; - -+ nb_bytes_left = cr_input_get_nb_bytes_left (a_this); -+ -+ if (nb_bytes_left < 1) { -+ return CR_END_OF_INPUT_ERROR; -+ } -+ - *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index]; - - if (PRIVATE (a_this)->nb_bytes - -@@ -477,7 +485,6 @@ cr_input_read_char (CRInput * a_this, guint32 * a_char) - if (*a_char == '\n') { - PRIVATE (a_this)->end_of_line = TRUE; - } -- - } - - return status; diff --git a/external/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch b/external/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch deleted file mode 100644 index 35471ec7..00000000 --- a/external/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch +++ /dev/null @@ -1,45 +0,0 @@ -CVE: CVE-2017-7961 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro <qignacio@amazon.com> -Date: Sun, 16 Apr 2017 13:56:09 +0200 -Subject: [PATCH] tknzr: support only max long rgb values - -This fixes a possible out of bound when reading rgbs which -are longer than the support MAXLONG ---- - src/cr-tknzr.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c -index 1a7cfeb..1548c35 100644 ---- a/src/cr-tknzr.c -+++ b/src/cr-tknzr.c -@@ -1279,6 +1279,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - red = num->val; - cr_num_destroy (num); - num = NULL; -@@ -1298,6 +1303,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - PEEK_BYTE (a_this, 1, &next_bytes[0]); - if (next_bytes[0] == '%') { - SKIP_CHARS (a_this, 1); --- -2.18.1 diff --git a/external/poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb b/external/poky/meta/recipes-support/libcroco/libcroco_0.6.13.bb index f95a5831..9171a9de 100644 --- a/external/poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb +++ b/external/poky/meta/recipes-support/libcroco/libcroco_0.6.13.bb @@ -16,9 +16,5 @@ BINCONFIG = "${bindir}/croco-0.6-config" inherit gnomebase gtk-doc binconfig-disabled -SRC_URI += "file://CVE-2017-7960.patch \ - file://CVE-2017-7961.patch \ - " - -SRC_URI[archive.md5sum] = "bc0984fce078ba2ce29f9500c6b9ddce" -SRC_URI[archive.sha256sum] = "ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860" +SRC_URI[archive.md5sum] = "c80c5a8385011a0260dce6bd0da93dce" +SRC_URI[archive.sha256sum] = "767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4" diff --git a/external/poky/meta/recipes-support/libevdev/libevdev/determinism.patch b/external/poky/meta/recipes-support/libevdev/libevdev/determinism.patch new file mode 100644 index 00000000..33a6076b --- /dev/null +++ b/external/poky/meta/recipes-support/libevdev/libevdev/determinism.patch @@ -0,0 +1,34 @@ +The order of dict values is not deterministic leading to differing header file generation. +Sort to remove this inconsistency. + +RP 2020/2/7 + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Pending + +Index: a/libevdev/make-event-names.py +=================================================================== +--- a/libevdev/make-event-names.py ++++ b/libevdev/make-event-names.py +@@ -67,10 +67,10 @@ def print_bits(bits, prefix): + if not hasattr(bits, prefix): + return + print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) +- for val, name in list(getattr(bits, prefix).items()): ++ for val, name in sorted(list(getattr(bits, prefix).items())): + print(" [%s] = \"%s\"," % (name, name)) + if prefix == "key": +- for val, name in list(getattr(bits, "btn").items()): ++ for val, name in sorted(list(getattr(bits, "btn").items())): + print(" [%s] = \"%s\"," % (name, name)) + print("};") + print("") +@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): + if not hasattr(bits, prefix): + return + +- names = list(getattr(bits, prefix).items()) ++ names = sorted(list(getattr(bits, prefix).items())) + if prefix == "btn": + names = names + btn_additional; + diff --git a/external/poky/meta/recipes-support/libevdev/libevdev_1.5.9.bb b/external/poky/meta/recipes-support/libevdev/libevdev_1.8.0.bb index f59c60ee..3523dc09 100644 --- a/external/poky/meta/recipes-support/libevdev/libevdev_1.5.9.bb +++ b/external/poky/meta/recipes-support/libevdev/libevdev_1.8.0.bb @@ -6,9 +6,11 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" -SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" - -SRC_URI[md5sum] = "a1ca11e961c1efed720fac4130881904" -SRC_URI[sha256sum] = "e1663751443bed9d3e76a4fe2caf6fa866a79705d91cacad815c04e706198a75" +SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ + file://determinism.patch" +SRC_URI[md5sum] = "879631080be18526737e33b63d848039" +SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" inherit autotools pkgconfig + +UPSTREAM_CHECK_REGEX = "libevdev-(?P<pver>(\d+\.)+(?!90\d+)\d+)" diff --git a/external/poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch b/external/poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch deleted file mode 100644 index 36d08204..00000000 --- a/external/poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 69a3813c513c84e02212250c3d5b8a02ecefa698 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <Mingli.Yu@windriver.com> -Date: Mon, 15 Jan 2018 08:00:33 +0000 -Subject: [PATCH] test: fix 32bit linux regress - -This patch comes from https://github.com/libevent/libevent.git, -the commit is 63c4bf78d6af3c6ff46d2e8e4b53dd9f577a9ca9 - -Upstream-Status: Backport - -Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> ---- - configure.ac | 1 + - test/regress_util.c | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 7528d37..e64cb1f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -663,6 +663,7 @@ AC_CHECK_SIZEOF(short) - AC_CHECK_SIZEOF(size_t) - AC_CHECK_SIZEOF(void *) - AC_CHECK_SIZEOF(off_t) -+AC_CHECK_SIZEOF(time_t) - - AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t, struct addrinfo, struct sockaddr_storage], , , - [#define _GNU_SOURCE -diff --git a/test/regress_util.c b/test/regress_util.c -index ef6a148..0c7eafb 100644 ---- a/test/regress_util.c -+++ b/test/regress_util.c -@@ -1412,10 +1412,12 @@ static struct date_rfc1123_case { - { 1289433600, "Thu, 11 Nov 2010 00:00:00 GMT"}, - { 1323648000, "Mon, 12 Dec 2011 00:00:00 GMT"}, - #ifndef _WIN32 -+#if EVENT__SIZEOF_TIME_T > 4 - /** In win32 case we have max "23:59:59 January 18, 2038, UTC" for time32 */ - { 4294967296, "Sun, 07 Feb 2106 06:28:16 GMT"} /* 2^32 */, - /** In win32 case we have max "23:59:59, December 31, 3000, UTC" for time64 */ - {253402300799, "Fri, 31 Dec 9999 23:59:59 GMT"} /* long long future no one can imagine */, -+#endif /* time_t != 32bit */ - { 1456704000, "Mon, 29 Feb 2016 00:00:00 GMT"} /* leap year */, - #endif - { 1435708800, "Wed, 01 Jul 2015 00:00:00 GMT"} /* leap second */, --- -2.13.3 - diff --git a/external/poky/meta/recipes-support/libevent/libevent/0001-test-regress_dns.c-patch-out-tests-that-require-a-wo.patch b/external/poky/meta/recipes-support/libevent/libevent/0001-test-regress_dns.c-patch-out-tests-that-require-a-wo.patch new file mode 100644 index 00000000..505153d2 --- /dev/null +++ b/external/poky/meta/recipes-support/libevent/libevent/0001-test-regress_dns.c-patch-out-tests-that-require-a-wo.patch @@ -0,0 +1,37 @@ +From 7c17967b8fd2d18b74a8934fd9bb8212ebd6a271 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 9 Jan 2020 13:22:46 +0100 +Subject: [PATCH] test/regress_dns.c: patch out tests that require a working + DNS + +This is not guaranteed for ptests under qemu, and in the absence +of a DNS that can reach to the internet, these tests fail. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + test/regress_dns.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/test/regress_dns.c b/test/regress_dns.c +index d2084b7..a1a8f3b 100644 +--- a/test/regress_dns.c ++++ b/test/regress_dns.c +@@ -2394,8 +2394,6 @@ struct testcase_t dns_testcases[] = { + { "reissue_disable_when_inactive", dns_reissue_disable_when_inactive_test, + TT_FORK|TT_NEED_BASE|TT_NO_LOGS, &basic_setup, NULL }, + { "inflight", dns_inflight_test, TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, +- { "bufferevent_connect_hostname", test_bufferevent_connect_hostname, +- TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, + #ifdef EVENT__HAVE_SETRLIMIT + { "bufferevent_connect_hostname_emfile", test_bufferevent_connect_hostname, + TT_FORK|TT_NEED_BASE, &basic_setup, (char*)"emfile" }, +@@ -2405,8 +2403,6 @@ struct testcase_t dns_testcases[] = { + { "disable_when_inactive_no_ns", dns_disable_when_inactive_no_ns_test, + TT_FORK|TT_NEED_BASE|TT_NO_LOGS, &basic_setup, NULL }, + +- { "initialize_nameservers", dns_initialize_nameservers_test, +- TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, + #ifndef _WIN32 + { "nameservers_no_default", dns_nameservers_no_default_test, + TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, diff --git a/external/poky/meta/recipes-support/libevent/libevent/run-ptest b/external/poky/meta/recipes-support/libevent/libevent/run-ptest index 0241851c..d3b5e793 100644 --- a/external/poky/meta/recipes-support/libevent/libevent/run-ptest +++ b/external/poky/meta/recipes-support/libevent/libevent/run-ptest @@ -1,18 +1,29 @@ #!/bin/sh -fail=0 -for test in ./test/* -do - $test - if [ $? -ne 0 ] - then - fail=1 - fi -done +# run-ptest - 'ptest' test infrastructure shell script that +# wraps the libevent test scripts +# +# Trevor Gamblin <trevor.gamblin@windriver.com> +############################################################### +LIBEVENTLIB=@libdir@/libevent +LOG="${LIBEVENTLIB}/ptest/libevent_ptest_$(date +%Y%m%d-%H%M%S).log" -if [ $fail -eq 0 ] -then - echo "PASS: libevent" -else - echo "FAIL: libevent" -fi +cd ${LIBEVENTLIB}/ptest + +# Run only the libevent "regress" test. All other test scripts in the +# libevent "test" folder are related to performance, e.g. read/write +# rates, and/or do not provide a pass/fail output that can be recorded +# in the ptest log. +./test/regress 2>&1| sed -e '/TESTS/d' -e '/tests/d' -e '/OK/ s/^/PASS: / ; /FAILED/ s/^/FAIL: / ; /SKIPPED/ s/^/SKIP: / ; /DISABLED/ s/^/SKIP: /' | cut -f1,2 -d ':' | tee -a ${LOG} + +passed=`grep PASS ${LOG}|wc -l` +failed=`grep FAIL ${LOG}|wc -l` +skipped=`grep -E SKIP ${LOG}|wc -l` +all=$((passed + failed + skipped)) + +( echo "=== Test Summary ===" + echo "TOTAL: ${all}" + echo "PASSED: ${passed}" + echo "FAILED: ${failed}" + echo "SKIPPED: ${skipped}" +) | tee -a ${LOG} diff --git a/external/poky/meta/recipes-support/libevent/libevent_2.1.8.bb b/external/poky/meta/recipes-support/libevent/libevent_2.1.11.bb index 0f91e05a..fb186eb8 100644 --- a/external/poky/meta/recipes-support/libevent/libevent_2.1.8.bb +++ b/external/poky/meta/recipes-support/libevent/libevent_2.1.11.bb @@ -6,15 +6,14 @@ SECTION = "libs" LICENSE = "BSD & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=17f20574c0b154d12236d5fbe964f549" -SRC_URI = " \ - https://github.com/libevent/libevent/releases/download/release-${PV}-stable/${BP}-stable.tar.gz \ - file://Makefile-missing-test-dir.patch \ - file://0001-test-fix-32bit-linux-regress.patch \ - file://run-ptest \ -" +SRC_URI = "https://github.com/libevent/libevent/releases/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 \ + " -SRC_URI[md5sum] = "f3eeaed018542963b7d2416ef1135ecc" -SRC_URI[sha256sum] = "965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2" +SRC_URI[md5sum] = "7f35cfe69b82d879111ec0d7b7b1c531" +SRC_URI[sha256sum] = "a65bac6202ea8c5609fd5c7e480e6d25de467ea1917c08290c521752f147283d" UPSTREAM_CHECK_URI = "http://libevent.org/" @@ -32,9 +31,17 @@ inherit ptest multilib_header DEPENDS = "zlib" +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 " + BBCLASSEXTEND = "native nativesdk" do_install_append() { + rm ${D}${bindir}/event_rpcgen.py + rmdir ${D}${bindir} oe_multilib_header event2/event-config.h } @@ -44,4 +51,7 @@ do_install_ptest() { do install -m 0755 $file ${D}${PTEST_PATH}/test done + + # handle multilib + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest } diff --git a/external/poky/meta/recipes-support/libexif/libexif/CVE-2016-6328.patch b/external/poky/meta/recipes-support/libexif/libexif/CVE-2016-6328.patch deleted file mode 100644 index a6f30743..00000000 --- a/external/poky/meta/recipes-support/libexif/libexif/CVE-2016-6328.patch +++ /dev/null @@ -1,64 +0,0 @@ -CVE: CVE-2016-6328 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001 -From: Marcus Meissner <marcus@jet.franken.de> -Date: Tue, 25 Jul 2017 23:44:44 +0200 -Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax - makernote entries. - -This should fix: -https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328 ---- - libexif/pentax/mnote-pentax-entry.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c -index d03d159..ea0429a 100644 ---- a/libexif/pentax/mnote-pentax-entry.c -+++ b/libexif/pentax/mnote-pentax-entry.c -@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - case EXIF_FORMAT_SHORT: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; k<entry->components; k++) { -+ if (sizeleft < 2) -+ break; - vs = exif_get_short (data, entry->order); - snprintf (val+len, maxlen-len, "%i ", vs); - len = strlen(val); - data += 2; -+ sizeleft -= 2; - } - } - break; - case EXIF_FORMAT_LONG: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; k<entry->components; k++) { -+ if (sizeleft < 4) -+ break; - vl = exif_get_long (data, entry->order); - snprintf (val+len, maxlen-len, "%li", (long int) vl); - len = strlen(val); - data += 4; -+ sizeleft -= 4; - } - } - break; -@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - break; - } - -- return (val); -+ return val; - } diff --git a/external/poky/meta/recipes-support/libexif/libexif/CVE-2017-7544.patch b/external/poky/meta/recipes-support/libexif/libexif/CVE-2017-7544.patch deleted file mode 100644 index e49481ff..00000000 --- a/external/poky/meta/recipes-support/libexif/libexif/CVE-2017-7544.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8a92f964a66d476ca8907234359e92a70fc1325b Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 28 Aug 2018 15:12:10 +0800 -Subject: [PATCH] On saving makernotes, make sure the makernote container tags - has a type with 1 byte components. - -Fixes (at least): - https://sourceforge.net/p/libexif/bugs/130 - https://sourceforge.net/p/libexif/bugs/129 - -Upstream-Status: Backport[https://github.com/libexif/libexif/commit/ -c39acd1692023b26290778a02a9232c873f9d71a#diff-830e348923810f00726700b083ec00cd] - -CVE: CVE-2017-7544 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - libexif/exif-data.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index 67df4db..6bf89eb 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e, - exif_mnote_data_set_offset (data->priv->md, *ds - 6); - exif_mnote_data_save (data->priv->md, &e->data, &e->size); - e->components = e->size; -+ if (exif_format_get_size (e->format) != 1) { -+ /* e->format is taken from input code, -+ * but we need to make sure it is a 1 byte -+ * entity due to the multiplication below. */ -+ e->format = EXIF_FORMAT_UNDEFINED; -+ } - } - } - --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/libexif/libexif/CVE-2018-20030.patch b/external/poky/meta/recipes-support/libexif/libexif/CVE-2018-20030.patch deleted file mode 100644 index 76233e6d..00000000 --- a/external/poky/meta/recipes-support/libexif/libexif/CVE-2018-20030.patch +++ /dev/null @@ -1,115 +0,0 @@ -CVE: CVE-2018-20030 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 6aa11df549114ebda520dde4cdaea2f9357b2c89 Mon Sep 17 00:00:00 2001 -From: Dan Fandrich <dan@coneharvesters.com> -Date: Fri, 12 Oct 2018 16:01:45 +0200 -Subject: [PATCH] Improve deep recursion detection in - exif_data_load_data_content. - -The existing detection was still vulnerable to pathological cases -causing DoS by wasting CPU. The new algorithm takes the number of tags -into account to make it harder to abuse by cases using shallow recursion -but with a very large number of tags. This improves on commit 5d28011c -which wasn't sufficient to counter this kind of case. - -The limitation in the previous fix was discovered by Laurent Delosieres, -Secunia Research at Flexera (Secunia Advisory SA84652) and is assigned -the identifier CVE-2018-20030. - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index 67df4db..8d9897e 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -35,6 +35,7 @@ - #include <libexif/olympus/exif-mnote-data-olympus.h> - #include <libexif/pentax/exif-mnote-data-pentax.h> - -+#include <math.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -344,6 +345,20 @@ if (data->ifd[(i)]->count) { \ - break; \ - } - -+/*! Calculate the recursion cost added by one level of IFD loading. -+ * -+ * The work performed is related to the cost in the exponential relation -+ * work=1.1**cost -+ */ -+static unsigned int -+level_cost(unsigned int n) -+{ -+ static const double log_1_1 = 0.09531017980432493; -+ -+ /* Adding 0.1 protects against the case where n==1 */ -+ return ceil(log(n + 0.1)/log_1_1); -+} -+ - /*! Load data for an IFD. - * - * \param[in,out] data #ExifData -@@ -351,13 +366,13 @@ if (data->ifd[(i)]->count) { \ - * \param[in] d pointer to buffer containing raw IFD data - * \param[in] ds size of raw data in buffer at \c d - * \param[in] offset offset into buffer at \c d at which IFD starts -- * \param[in] recursion_depth number of times this function has been -- * recursively called without returning -+ * \param[in] recursion_cost factor indicating how expensive this recursive -+ * call could be - */ - static void - exif_data_load_data_content (ExifData *data, ExifIfd ifd, - const unsigned char *d, -- unsigned int ds, unsigned int offset, unsigned int recursion_depth) -+ unsigned int ds, unsigned int offset, unsigned int recursion_cost) - { - ExifLong o, thumbnail_offset = 0, thumbnail_length = 0; - ExifShort n; -@@ -372,9 +387,20 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT)) - return; - -- if (recursion_depth > 30) { -+ if (recursion_cost > 170) { -+ /* -+ * recursion_cost is a logarithmic-scale indicator of how expensive this -+ * recursive call might end up being. It is an indicator of the depth of -+ * recursion as well as the potential for worst-case future recursive -+ * calls. Since it's difficult to tell ahead of time how often recursion -+ * will occur, this assumes the worst by assuming every tag could end up -+ * causing recursion. -+ * The value of 170 was chosen to limit typical EXIF structures to a -+ * recursive depth of about 6, but pathological ones (those with very -+ * many tags) to only 2. -+ */ - exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", -- "Deep recursion detected!"); -+ "Deep/expensive recursion detected!"); - return; - } - -@@ -416,15 +442,18 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - switch (tag) { - case EXIF_TAG_EXIF_IFD_POINTER: - CHECK_REC (EXIF_IFD_EXIF); -- exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_GPS_INFO_IFD_POINTER: - CHECK_REC (EXIF_IFD_GPS); -- exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: - CHECK_REC (EXIF_IFD_INTEROPERABILITY); -- exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: - thumbnail_offset = o; diff --git a/external/poky/meta/recipes-support/libexif/libexif/CVE-2020-13114.patch b/external/poky/meta/recipes-support/libexif/libexif/CVE-2020-13114.patch new file mode 100644 index 00000000..06b8b46c --- /dev/null +++ b/external/poky/meta/recipes-support/libexif/libexif/CVE-2020-13114.patch @@ -0,0 +1,73 @@ +From 47f51be021f4dfd800d4ff4630659887378baa3a Mon Sep 17 00:00:00 2001 +From: Dan Fandrich <dan@coneharvesters.com> +Date: Sat, 16 May 2020 19:32:30 +0200 +Subject: [PATCH] Add a failsafe on the maximum number of Canon MakerNote + + subtags. + +A malicious file could be crafted to cause extremely large values in some +tags without tripping any buffer range checks. This is bad with the libexif +representation of Canon MakerNotes because some arrays are turned into +individual tags that the application must loop around. + +The largest value I've seen for failsafe_size in a (very small) sample of valid +Canon files is <5000. The limit is set two orders of magnitude larger to avoid +tripping up falsely in case some models use much larger values. + +Patch from Google. + +CVE-2020-13114 + +Upstream-Status: Backport [https://github.com/libexif/libexif/commit/e6a38a1a23ba94d139b1fa2cd4519fdcfe3c9bab] +CVE: CVE-2020-13114 +Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> +--- + libexif/canon/exif-mnote-data-canon.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/libexif/canon/exif-mnote-data-canon.c b/libexif/canon/exif-mnote-data-canon.c +index eb53598..72fd7a3 100644 +--- a/libexif/canon/exif-mnote-data-canon.c ++++ b/libexif/canon/exif-mnote-data-canon.c +@@ -32,6 +32,9 @@ + + #define DEBUG + ++/* Total size limit to prevent abuse by DoS */ ++#define FAILSAFE_SIZE_MAX 1000000L ++ + static void + exif_mnote_data_canon_clear (ExifMnoteDataCanon *n) + { +@@ -202,6 +205,7 @@ exif_mnote_data_canon_load (ExifMnoteData *ne, + ExifMnoteDataCanon *n = (ExifMnoteDataCanon *) ne; + ExifShort c; + size_t i, tcount, o, datao; ++ long failsafe_size = 0; + + if (!n || !buf || !buf_size) { + exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA, +@@ -280,6 +284,23 @@ exif_mnote_data_canon_load (ExifMnoteData *ne, + memcpy (n->entries[tcount].data, buf + dataofs, s); + } + ++ /* Track the size of decoded tag data. A malicious file could ++ * be crafted to cause extremely large values here without ++ * tripping any buffer range checks. This is especially bad ++ * with the libexif representation of Canon MakerNotes because ++ * some arrays are turned into individual tags that the ++ * application must loop around. */ ++ failsafe_size += mnote_canon_entry_count_values(&n->entries[tcount]); ++ ++ if (failsafe_size > FAILSAFE_SIZE_MAX) { ++ /* Abort if the total size of the data in the tags extraordinarily large, */ ++ exif_mem_free (ne->mem, n->entries[tcount].data); ++ exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA, ++ "ExifMnoteCanon", "Failsafe tag size overflow (%lu > %ld)", ++ failsafe_size, FAILSAFE_SIZE_MAX); ++ break; ++ } ++ + /* Tag was successfully parsed */ + ++tcount; + } diff --git a/external/poky/meta/recipes-support/libexif/libexif_0.6.21.bb b/external/poky/meta/recipes-support/libexif/libexif_0.6.21.bb deleted file mode 100644 index 4cb7e6b8..00000000 --- a/external/poky/meta/recipes-support/libexif/libexif_0.6.21.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Library for reading extended image information (EXIF) from JPEG files" -HOMEPAGE = "http://sourceforge.net/projects/libexif" -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2 \ - file://CVE-2017-7544.patch \ - file://CVE-2016-6328.patch \ - file://CVE-2018-20030.patch" - -SRC_URI[md5sum] = "27339b89850f28c8f1c237f233e05b27" -SRC_URI[sha256sum] = "16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a" - -inherit autotools gettext - -do_configure_append() { - sed -i s:doc\ binary:binary:g Makefile -} - diff --git a/external/poky/meta/recipes-support/libexif/libexif_0.6.22.bb b/external/poky/meta/recipes-support/libexif/libexif_0.6.22.bb new file mode 100644 index 00000000..a520d5c9 --- /dev/null +++ b/external/poky/meta/recipes-support/libexif/libexif_0.6.22.bb @@ -0,0 +1,19 @@ +SUMMARY = "Library for reading extended image information (EXIF) from JPEG files" +HOMEPAGE = "https://libexif.github.io/" +SECTION = "libs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" + +def version_underscore(v): + return "_".join(v.split(".")) + +SRC_URI = "https://github.com/libexif/libexif/releases/download/libexif-${@version_underscore("${PV}")}-release/libexif-${PV}.tar.xz \ + " + +SRC_URI[sha256sum] = "5048f1c8fc509cc636c2f97f4b40c293338b6041a5652082d5ee2cf54b530c56" + +UPSTREAM_CHECK_URI = "https://github.com/libexif/libexif/releases/" + +inherit autotools gettext + +EXTRA_OECONF += "--disable-docs" diff --git a/external/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128-part2.patch b/external/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128-part2.patch new file mode 100644 index 00000000..6b5b7d47 --- /dev/null +++ b/external/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128-part2.patch @@ -0,0 +1,34 @@ +Address platforms with no __int128. + +Fixes remaining pieces from +https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/src/powerpc/ffi_linux64.c.org 2019-12-05 14:48:33.140579431 -0800 ++++ a/src/powerpc/ffi_linux64.c 2019-12-05 14:53:58.827244495 -0800 +@@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, uns + { + if (vecarg_count < NUM_VEC_ARG_REGISTERS64 + && i < nfixedargs) +- *vec_base.f128++ = *arg.f128++; ++ memcpy (vec_base.f128++, arg.f128, sizeof (float128)); + else +- *next_arg.f128 = *arg.f128++; ++ memcpy (next_arg.f128, arg.f128++, sizeof (float128)); + if (++next_arg.f128 == gpr_end.f128) + next_arg.f128 = rest.f128; + vecarg_count++; +@@ -986,9 +986,9 @@ ffi_closure_helper_LINUX64 (ffi_cif *cif + do + { + if (pvec < end_pvec && i < nfixedargs) +- *to.f128 = *pvec++; ++ memcpy (to.f128, pvec++, sizeof (float128)); + else +- *to.f128 = *from.f128; ++ memcpy (to.f128, from.f128, sizeof (float128)); + to.f128++; + from.f128++; + } diff --git a/external/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128.patch b/external/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128.patch new file mode 100644 index 00000000..2e32a502 --- /dev/null +++ b/external/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128.patch @@ -0,0 +1,27 @@ +From 68f45b9049dffb54f5a29a3a495ab3dfcf010634 Mon Sep 17 00:00:00 2001 +From: Anthony Green <green@moxielogic.com> +Date: Fri, 29 Nov 2019 07:00:35 -0500 +Subject: [PATCH] Address platforms with no __int128. + +Upstream-Status: Backport [https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/powerpc/ffi_linux64.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c +index de0d033..7364770 100644 +--- a/src/powerpc/ffi_linux64.c ++++ b/src/powerpc/ffi_linux64.c +@@ -547,9 +547,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) + if (next_arg.ul == gpr_end.ul) + next_arg.ul = rest.ul; + if (vecarg_count < NUM_VEC_ARG_REGISTERS64 && i < nfixedargs) +- *vec_base.f128++ = **p_argv.f128; ++ memcpy (vec_base.f128++, *p_argv.f128, sizeof (float128)); + else +- *next_arg.f128 = **p_argv.f128; ++ memcpy (next_arg.f128, *p_argv.f128, sizeof (float128)); + if (++next_arg.f128 == gpr_end.f128) + next_arg.f128 = rest.f128; + vecarg_count++; diff --git a/external/poky/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch b/external/poky/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch new file mode 100644 index 00000000..397194bc --- /dev/null +++ b/external/poky/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch @@ -0,0 +1,27 @@ +From 14e2e74682db3bfcf057688f738fdd842a02ff2d Mon Sep 17 00:00:00 2001 +From: Carl Hurd <carl@Carls-MacBook-Pro.local> +Date: Wed, 18 Jul 2018 09:04:32 -0400 +Subject: [PATCH] Fixed missed #ifndef for __mips_soft_float + +Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> +Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/442] +--- + src/mips/o32.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/mips/o32.S b/src/mips/o32.S +index 44e74cb..799139b 100644 +--- a/src/mips/o32.S ++++ b/src/mips/o32.S +@@ -282,9 +282,11 @@ $LCFI12: + li $13, 1 # FFI_O32 + bne $16, $13, 1f # Skip fp save if FFI_O32_SOFT_FLOAT + ++#ifndef __mips_soft_float + # Store all possible float/double registers. + s.d $f12, FA_0_0_OFF2($fp) + s.d $f14, FA_1_0_OFF2($fp) ++#endif + 1: + # prepare arguments for ffi_closure_mips_inner_O32 + REG_L a0, 4($15) # cif diff --git a/external/poky/meta/recipes-support/libffi/libffi/0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch b/external/poky/meta/recipes-support/libffi/libffi/0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch new file mode 100644 index 00000000..52e6e453 --- /dev/null +++ b/external/poky/meta/recipes-support/libffi/libffi/0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch @@ -0,0 +1,62 @@ +From de93adfb6f48100946bba2c3abad2a77a0cfde0b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Sun, 24 Nov 2019 09:52:01 +0100 +Subject: [PATCH] ffi_powerpc.h: fix build failure with powerpc7 + +This is a patch pulled down from the following: +https://github.com/buildroot/buildroot/blob/78926f610b1411b03464152472fd430012deb9ac/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch + +This issue is being hit on OpenBMC code when pulling the latest +libffi tag and building on a P8 ppc64le machine. I verified this +patch fixes the issue we are seeing. + +Below is the original commit message: + +Sicne commit 73dd43afc8a447ba98ea02e9aad4c6898dc77fb0, build on powerpc7 +fails on: + +In file included from ../src/powerpc/ffi.c:33:0: +../src/powerpc/ffi_powerpc.h:61:9: error: '_Float128' is not supported on this target + typedef _Float128 float128; + ^~~~~~~~~ + +Fix this build failure by checking for __HAVE_FLOAT128 before using +_Float128, as _Float128 is enabled only on specific conditions, see +output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/floatn.h: + + /* Defined to 1 if the current compiler invocation provides a + floating-point type with the IEEE 754 binary128 format, and this glibc + includes corresponding *f128 interfaces for it. */ + #if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \ + && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH + # define __HAVE_FLOAT128 1 + #else + # define __HAVE_FLOAT128 0 + #endif + +Fixes: + - http://autobuild.buildroot.org/results/5c9dd8fb3b6a128882b6250f197c80232d8a3b53 + +Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/561] +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Signed-off-by: Andrew Geissler <geissonator@yahoo.com> +--- + src/powerpc/ffi_powerpc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h +index 8e2f2f0..960a5c4 100644 +--- a/src/powerpc/ffi_powerpc.h ++++ b/src/powerpc/ffi_powerpc.h +@@ -57,7 +57,7 @@ typedef union + double d; + } ffi_dblfl; + +-#if defined(__FLOAT128_TYPE__) ++#if defined(__FLOAT128_TYPE__) && defined(__HAVE_FLOAT128) + typedef _Float128 float128; + #elif defined(__FLOAT128__) + typedef __float128 float128; +-- +2.21.0 (Apple Git-122) + diff --git a/external/poky/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch b/external/poky/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch deleted file mode 100644 index 6b167c84..00000000 --- a/external/poky/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 69c3906c85c791716bf650aa36d9361d22acf3fb Mon Sep 17 00:00:00 2001 -From: sweeaun <swee.aun.khor@intel.com> -Date: Thu, 6 Jul 2017 16:32:46 -0700 -Subject: [PATCH] libffi: Support musl x32 build - -Support libffi build with target musl-x32. - -Upstream-Status: Pending - -Signed-off-by: sweeaun <swee.aun.khor@intel.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a7bf5ee..8ebe99c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -177,7 +177,7 @@ case "$host" in - TARGETDIR=x86 - if test $ac_cv_sizeof_size_t = 4; then - case "$host" in -- *-gnux32) -+ *-gnux32 | *-muslx32) - TARGET=X86_64 - ;; - *) --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch b/external/poky/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch deleted file mode 100644 index db96e635..00000000 --- a/external/poky/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a5efaa96fd934eb245c234a5275fcf62698ef986 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 2 Apr 2015 21:38:03 -0700 -Subject: [PATCH] mips: Use compiler internal define for linux - -__linux__ is defined by compiler when building for -linux platforms, lets use it - - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/mips/ffitarget.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mips/ffitarget.h b/src/mips/ffitarget.h -index 717d659..6faa358 100644 ---- a/src/mips/ffitarget.h -+++ b/src/mips/ffitarget.h -@@ -32,7 +32,7 @@ - #error "Please do not include ffitarget.h directly into your source. Use ffi.h instead." - #endif - --#ifdef linux -+#ifdef __linux__ - # include <asm/sgidefs.h> - #elif defined(__rtems__) - /* --- -2.1.4 - diff --git a/external/poky/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch b/external/poky/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch deleted file mode 100644 index 61c9eb31..00000000 --- a/external/poky/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 655e82c92d5c3875aee04322f1993d6b0774a7bf Mon Sep 17 00:00:00 2001 -From: Yousong Zhou <yszhou4tech@gmail.com> -Date: Mon, 15 Aug 2016 15:00:13 +0800 -Subject: [PATCH] mips: fix MIPS softfloat build issue - -The patch for o32.S is taken from OpenWrt packages repo 3a7a4bf "libffi: -fix MIPS softfloat build issue with current binutils" - -Signed-off-by: Felix Fietkau <nbd@openwrt.org> -Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> ---- -Upstream-Status: Backport [https://github.com/libffi/libffi/commit/2ded2a4f494165c93293afc14ab0be1243cf8c49] - src/mips/n32.S | 17 +++++++++++++++++ - src/mips/o32.S | 17 +++++++++++++++++ - 2 files changed, 34 insertions(+) - -diff --git a/src/mips/n32.S b/src/mips/n32.S -index c6985d3..8f25994 100644 ---- a/src/mips/n32.S -+++ b/src/mips/n32.S -@@ -107,6 +107,16 @@ loadregs: - - REG_L t6, 3*FFI_SIZEOF_ARG($fp) # load the flags word into t6. - -+#ifdef __mips_soft_float -+ REG_L a0, 0*FFI_SIZEOF_ARG(t9) -+ REG_L a1, 1*FFI_SIZEOF_ARG(t9) -+ REG_L a2, 2*FFI_SIZEOF_ARG(t9) -+ REG_L a3, 3*FFI_SIZEOF_ARG(t9) -+ REG_L a4, 4*FFI_SIZEOF_ARG(t9) -+ REG_L a5, 5*FFI_SIZEOF_ARG(t9) -+ REG_L a6, 6*FFI_SIZEOF_ARG(t9) -+ REG_L a7, 7*FFI_SIZEOF_ARG(t9) -+#else - and t4, t6, ((1<<FFI_FLAG_BITS)-1) - REG_L a0, 0*FFI_SIZEOF_ARG(t9) - beqz t4, arg1_next -@@ -193,6 +203,7 @@ arg7_next: - arg8_doublep: - l.d $f19, 7*FFI_SIZEOF_ARG(t9) - arg8_next: -+#endif - - callit: - # Load the function pointer -@@ -214,6 +225,7 @@ retint: - b epilogue - - retfloat: -+#ifndef __mips_soft_float - bne t6, FFI_TYPE_FLOAT, retdouble - jal t9 - REG_L t4, 4*FFI_SIZEOF_ARG($fp) -@@ -272,6 +284,7 @@ retstruct_f_d: - s.s $f0, 0(t4) - s.d $f2, 8(t4) - b epilogue -+#endif - - retstruct_d_soft: - bne t6, FFI_TYPE_STRUCT_D_SOFT, retstruct_f_soft -@@ -429,6 +442,7 @@ ffi_closure_N32: - REG_S a6, A6_OFF2($sp) - REG_S a7, A7_OFF2($sp) - -+#ifndef __mips_soft_float - # Store all possible float/double registers. - s.d $f12, F12_OFF2($sp) - s.d $f13, F13_OFF2($sp) -@@ -438,6 +452,7 @@ ffi_closure_N32: - s.d $f17, F17_OFF2($sp) - s.d $f18, F18_OFF2($sp) - s.d $f19, F19_OFF2($sp) -+#endif - - # Call ffi_closure_mips_inner_N32 to do the real work. - LA t9, ffi_closure_mips_inner_N32 -@@ -458,6 +473,7 @@ cls_retint: - b cls_epilogue - - cls_retfloat: -+#ifndef __mips_soft_float - bne v0, FFI_TYPE_FLOAT, cls_retdouble - l.s $f0, V0_OFF2($sp) - b cls_epilogue -@@ -500,6 +516,7 @@ cls_retstruct_f_d: - l.s $f0, V0_OFF2($sp) - l.d $f2, V1_OFF2($sp) - b cls_epilogue -+#endif - - cls_retstruct_small2: - REG_L v0, V0_OFF2($sp) -diff --git a/src/mips/o32.S b/src/mips/o32.S -index eb27981..429dd0a 100644 ---- a/src/mips/o32.S -+++ b/src/mips/o32.S -@@ -82,13 +82,16 @@ sixteen: - - ADDU $sp, 4 * FFI_SIZEOF_ARG # adjust $sp to new args - -+#ifndef __mips_soft_float - bnez t0, pass_d # make it quick for int -+#endif - REG_L a0, 0*FFI_SIZEOF_ARG($sp) # just go ahead and load the - REG_L a1, 1*FFI_SIZEOF_ARG($sp) # four regs. - REG_L a2, 2*FFI_SIZEOF_ARG($sp) - REG_L a3, 3*FFI_SIZEOF_ARG($sp) - b call_it - -+#ifndef __mips_soft_float - pass_d: - bne t0, FFI_ARGS_D, pass_f - l.d $f12, 0*FFI_SIZEOF_ARG($sp) # load $fp regs from args -@@ -130,6 +133,7 @@ pass_f_d: - # bne t0, FFI_ARGS_F_D, call_it - l.s $f12, 0*FFI_SIZEOF_ARG($sp) # load $fp regs from args - l.d $f14, 2*FFI_SIZEOF_ARG($sp) # passing double and float -+#endif - - call_it: - # Load the function pointer -@@ -158,14 +162,23 @@ retfloat: - bne t2, FFI_TYPE_FLOAT, retdouble - jalr t9 - REG_L t0, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp) -+#ifndef __mips_soft_float - s.s $f0, 0(t0) -+#else -+ REG_S v0, 0(t0) -+#endif - b epilogue - - retdouble: - bne t2, FFI_TYPE_DOUBLE, noretval - jalr t9 - REG_L t0, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp) -+#ifndef __mips_soft_float - s.d $f0, 0(t0) -+#else -+ REG_S v1, 4(t0) -+ REG_S v0, 0(t0) -+#endif - b epilogue - - noretval: -@@ -261,9 +274,11 @@ $LCFI7: - li $13, 1 # FFI_O32 - bne $16, $13, 1f # Skip fp save if FFI_O32_SOFT_FLOAT - -+#ifndef __mips_soft_float - # Store all possible float/double registers. - s.d $f12, FA_0_0_OFF2($fp) - s.d $f14, FA_1_0_OFF2($fp) -+#endif - 1: - # Call ffi_closure_mips_inner_O32 to do the work. - la t9, ffi_closure_mips_inner_O32 -@@ -281,6 +296,7 @@ $LCFI7: - li $13, 1 # FFI_O32 - bne $16, $13, 1f # Skip fp restore if FFI_O32_SOFT_FLOAT - -+#ifndef __mips_soft_float - li $9, FFI_TYPE_FLOAT - l.s $f0, V0_OFF2($fp) - beq $8, $9, closure_done -@@ -288,6 +304,7 @@ $LCFI7: - li $9, FFI_TYPE_DOUBLE - l.d $f0, V0_OFF2($fp) - beq $8, $9, closure_done -+#endif - 1: - REG_L $3, V1_OFF2($fp) - REG_L $2, V0_OFF2($fp) --- -2.9.3 - diff --git a/external/poky/meta/recipes-support/libffi/libffi/0001-powerpc-fix-build-failure-on-power7-and-older-532.patch b/external/poky/meta/recipes-support/libffi/libffi/0001-powerpc-fix-build-failure-on-power7-and-older-532.patch new file mode 100644 index 00000000..8a7aea43 --- /dev/null +++ b/external/poky/meta/recipes-support/libffi/libffi/0001-powerpc-fix-build-failure-on-power7-and-older-532.patch @@ -0,0 +1,38 @@ +From 4dc6cc961300b9deffb648b1237390a5bea1c6d6 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Thu, 28 Nov 2019 12:42:41 +0000 +Subject: [PATCH] powerpc: fix build failure on power7 and older (#532) + +Build failure looks as: +``` +libtool: compile: powerpc-unknown-linux-gnu-gcc \ + -O2 -mcpu=powerpc -mtune=powerpc -pipe ... -c src/powerpc/ffi.c ... +In file included from src/powerpc/ffi.c:33: +src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target + 65 | typedef __int128 float128; + | ^~~~~~~~ +``` + +The fix avoids using __int128 in favour of aligned char[16]. + +Closes: https://github.com/libffi/libffi/issues/531 +Upstream-Status: Backport [https://github.com/libffi/libffi/commit/01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd] +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/powerpc/ffi_powerpc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h +index 5ee2a70..8e2f2f0 100644 +--- a/src/powerpc/ffi_powerpc.h ++++ b/src/powerpc/ffi_powerpc.h +@@ -62,7 +62,7 @@ typedef _Float128 float128; + #elif defined(__FLOAT128__) + typedef __float128 float128; + #else +-typedef __int128 float128; ++typedef char float128[16] __attribute__((aligned(16))); + #endif + + void FFI_HIDDEN ffi_closure_SYSV (void); diff --git a/external/poky/meta/recipes-support/libffi/libffi/not-win32.patch b/external/poky/meta/recipes-support/libffi/libffi/not-win32.patch index 80c40a47..62daaf4b 100644 --- a/external/poky/meta/recipes-support/libffi/libffi/not-win32.patch +++ b/external/poky/meta/recipes-support/libffi/libffi/not-win32.patch @@ -1,3 +1,8 @@ +From 306719369a0d3608b4ff2737de74ae284788a14b 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 + libffi's configure assumes that cross-compiled builds are complicated and introduces convoluted path manipulation involving gcc search paths to the install paths, resulting in paths like -L/usr/lib/../lib/ appearing in @@ -11,16 +16,20 @@ As this block is generally pointless, disable it. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@intel.com> -Index: libffi-3.2.1/configure.ac -=================================================================== ---- libffi-3.2.1.orig/configure.ac -+++ libffi-3.2.1/configure.ac -@@ -592,7 +592,7 @@ AC_ARG_ENABLE(purify-safety, - +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b764368..d51ce91 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -354,7 +354,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 +if false; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then - toolexecdir="${exec_prefix}"/'$(target_alias)' + toolexecdir='${exec_prefix}'/'$(target_alias)' diff --git a/external/poky/meta/recipes-support/libffi/libffi_3.2.1.bb b/external/poky/meta/recipes-support/libffi/libffi_3.3.bb index a0b1fcd1..e5beb985 100644 --- a/external/poky/meta/recipes-support/libffi/libffi_3.2.1.bb +++ b/external/poky/meta/recipes-support/libffi/libffi_3.3.bb @@ -8,21 +8,28 @@ 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=3610bb17683a0089ed64055416b2ae1b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=492385fe22195952f5b9b197868ba268" -SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.tar.gz \ +SRC_URI = "https://github.com/libffi/libffi/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ file://not-win32.patch \ - file://0001-mips-Use-compiler-internal-define-for-linux.patch \ - file://0001-mips-fix-MIPS-softfloat-build-issue.patch \ - file://0001-libffi-Support-musl-x32-build.patch \ - " - -SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43" -SRC_URI[sha256sum] = "d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37" + file://0001-Fixed-missed-ifndef-for-__mips_soft_float.patch \ + file://0001-powerpc-fix-build-failure-on-power7-and-older-532.patch \ + file://0001-Address-platforms-with-no-__int128.patch \ + file://0001-Address-platforms-with-no-__int128-part2.patch \ + file://0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch \ + " +SRC_URI[md5sum] = "6313289e32f1d38a9df4770b014a2ca7" +SRC_URI[sha256sum] = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056" +UPSTREAM_CHECK_URI = "https://github.com/libffi/libffi/releases/" +UPSTREAM_CHECK_REGEX = "libffi-(?P<pver>\d+(\.\d+)+)\.tar" EXTRA_OECONF += "--disable-builddir" EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'" -inherit autotools texinfo +inherit autotools texinfo multilib_header + +do_install_append() { + oe_multilib_header ffi.h +} FILES_${PN}-dev += "${libdir}/libffi-${PV}" diff --git a/external/poky/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb b/external/poky/meta/recipes-support/libfm/libfm-extra_1.3.1.bb index 734d010d..85102a1a 100644 --- a/external/poky/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb +++ b/external/poky/meta/recipes-support/libfm/libfm-extra_1.3.1.bb @@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ " -SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b" -SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72" +SRC_URI[md5sum] = "c15ecd2c9317e2c385cd3f046d0b61ba" +SRC_URI[sha256sum] = "96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4" S = "${WORKDIR}/libfm-${PV}" diff --git a/external/poky/meta/recipes-support/libfm/libfm_1.3.0.2.bb b/external/poky/meta/recipes-support/libfm/libfm_1.3.1.bb index 62d6a51e..63ae7874 100644 --- a/external/poky/meta/recipes-support/libfm/libfm_1.3.0.2.bb +++ b/external/poky/meta/recipes-support/libfm/libfm_1.3.1.bb @@ -16,10 +16,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-Do-not-add-library-path-to-avoid-host-contamination.patch \ " -SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b" -SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72" +SRC_URI[md5sum] = "c15ecd2c9317e2c385cd3f046d0b61ba" +SRC_URI[sha256sum] = "96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4" -inherit autotools pkgconfig gtk-doc gettext distro_features_check +inherit autotools pkgconfig gtk-doc gettext features_check mime mime-xdg ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OECONF = "--with-gtk=3" diff --git a/external/poky/meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch b/external/poky/meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch new file mode 100644 index 00000000..4df96f00 --- /dev/null +++ b/external/poky/meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch @@ -0,0 +1,90 @@ +From 1374254c2904ab5b18ba4a890856824a102d4705 Mon Sep 17 00:00:00 2001 +From: Jussi Kivilinna <jussi.kivilinna@iki.fi> +Date: Sat, 27 Apr 2019 19:33:28 +0300 +Subject: [PATCH 1/3] Prefetch GCM look-up tables + +* cipher/cipher-gcm.c (prefetch_table, do_prefetch_tables) +(prefetch_tables): New. +(ghash_internal): Call prefetch_tables. +-- + +Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> + +Upstream-Status: Backport +[https://github.com/gpg/libgcrypt/commit/1374254c2904ab5b18ba4a890856824a102d4705] + +CVE: CVE-2019-12904 + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + cipher/cipher-gcm.c | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +diff --git a/cipher/cipher-gcm.c b/cipher/cipher-gcm.c +index c19f09f..11f119a 100644 +--- a/cipher/cipher-gcm.c ++++ b/cipher/cipher-gcm.c +@@ -118,6 +118,34 @@ static const u16 gcmR[256] = { + 0xbbf0, 0xba32, 0xb874, 0xb9b6, 0xbcf8, 0xbd3a, 0xbf7c, 0xbebe, + }; + ++static inline ++void prefetch_table(const void *tab, size_t len) ++{ ++ const volatile byte *vtab = tab; ++ size_t i; ++ ++ for (i = 0; i < len; i += 8 * 32) ++ { ++ (void)vtab[i + 0 * 32]; ++ (void)vtab[i + 1 * 32]; ++ (void)vtab[i + 2 * 32]; ++ (void)vtab[i + 3 * 32]; ++ (void)vtab[i + 4 * 32]; ++ (void)vtab[i + 5 * 32]; ++ (void)vtab[i + 6 * 32]; ++ (void)vtab[i + 7 * 32]; ++ } ++ ++ (void)vtab[len - 1]; ++} ++ ++static inline void ++do_prefetch_tables (const void *gcmM, size_t gcmM_size) ++{ ++ prefetch_table(gcmM, gcmM_size); ++ prefetch_table(gcmR, sizeof(gcmR)); ++} ++ + #ifdef GCM_TABLES_USE_U64 + static void + bshift (u64 * b0, u64 * b1) +@@ -365,6 +393,8 @@ do_ghash (unsigned char *result, const unsigned char *buf, const u32 *gcmM) + #define fillM(c) \ + do_fillM (c->u_mode.gcm.u_ghash_key.key, c->u_mode.gcm.gcm_table) + #define GHASH(c, result, buf) do_ghash (result, buf, c->u_mode.gcm.gcm_table) ++#define prefetch_tables(c) \ ++ do_prefetch_tables(c->u_mode.gcm.gcm_table, sizeof(c->u_mode.gcm.gcm_table)) + + #else + +@@ -430,6 +460,7 @@ do_ghash (unsigned char *hsub, unsigned char *result, const unsigned char *buf) + + #define fillM(c) do { } while (0) + #define GHASH(c, result, buf) do_ghash (c->u_mode.gcm.u_ghash_key.key, result, buf) ++#define prefetch_tables(c) do {} while (0) + + #endif /* !GCM_USE_TABLES */ + +@@ -441,6 +472,8 @@ ghash_internal (gcry_cipher_hd_t c, byte *result, const byte *buf, + const unsigned int blocksize = GCRY_GCM_BLOCK_LEN; + unsigned int burn = 0; + ++ prefetch_tables (c); ++ + while (nblocks) + { + burn = GHASH (c, result, buf); +-- +2.7.4 + diff --git a/external/poky/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch b/external/poky/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch index d41c3de3..cd8a5993 100644 --- a/external/poky/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch +++ b/external/poky/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch @@ -1,41 +1,26 @@ -From 72b9e9040d58c15f0302bd8abda28179f04e1c5f Mon Sep 17 00:00:00 2001 -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Wed, 16 Aug 2017 10:43:18 +0800 -Subject: [PATCH 1/4] Add and use pkg-config for libgcrypt instead of -config - scripts. +From bee26d7c4ea0b4a397c289b819b89e78bc325ba0 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 -Upstream-Status: Denied [upstream have indicated they don't want a -pkg-config dependency] +Modify libgcrypt pkgconfig specifically for oe-core. Changes +are based on a previous patch from RP, using wiggle to +incorporate the parts that aren't in the upstream pkgconfig +settings. -RP 2014/5/22 +Upstream-Status: Inappropriate [oe-specific] -Rebase to 1.8.0 +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - configure.ac | 1 + - src/libgcrypt.m4 | 71 +++-------------------------------------------------- - src/libgcrypt.pc.in | 33 +++++++++++++++++++++++++ - 3 files changed, 38 insertions(+), 67 deletions(-) - create mode 100644 src/libgcrypt.pc.in + src/libgcrypt.m4 | 90 +++--------------------------------------------- + 1 file changed, 4 insertions(+), 86 deletions(-) -diff --git a/configure.ac b/configure.ac -index bbe8104..3d2de73 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2607,6 +2607,7 @@ random/Makefile - doc/Makefile - src/Makefile - src/gcrypt.h -+src/libgcrypt.pc - src/libgcrypt-config - src/versioninfo.rc - tests/Makefile diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4 -index c67cfec..4ea5f2c 100644 +index 37dfbea2..3d2e90a8 100644 --- a/src/libgcrypt.m4 +++ b/src/libgcrypt.m4 -@@ -29,30 +29,6 @@ dnl is added to the gpg_config_script_warn variable. +@@ -29,41 +29,6 @@ dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_LIBGCRYPT], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -46,8 +31,20 @@ index c67cfec..4ea5f2c 100644 - if test x"${LIBGCRYPT_CONFIG}" = x ; then - if test x"${libgcrypt_config_prefix}" != x ; then - LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config" -- else -- case "${SYSROOT}" in +- fi +- fi +- +- use_gpgrt_config="" +- if test x"${LIBGCRYPT_CONFIG}" = x -a 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]) +- use_gpgrt_config=yes +- fi +- fi +- if test -z "$use_gpgrt_config"; then +- if test x"${LIBGCRYPT_CONFIG}" = x ; then +- case "${SYSROOT}" in - /*) - if test -x "${SYSROOT}/bin/libgcrypt-config" ; then - LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config" @@ -58,15 +55,14 @@ index c67cfec..4ea5f2c 100644 - *) - AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) - ;; -- esac -- fi +- esac +- fi +- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) - fi -- -- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) + tmp=ifelse([$1], ,1:1.2.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -62,48 +38,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], +@@ -74,56 +39,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], min_libgcrypt_version="$tmp" fi @@ -79,7 +75,11 @@ index c67cfec..4ea5f2c 100644 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - req_micro=`echo $min_libgcrypt_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` +- if test -z "$use_gpgrt_config"; then +- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` +- else +- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --modversion` +- fi - major=`echo $libgcrypt_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $libgcrypt_config_version | \ @@ -113,24 +113,29 @@ index c67cfec..4ea5f2c 100644 # If we have a recent libgcrypt, we should also check that the # API is compatible if test "$req_libgcrypt_api" -gt 0 ; then -- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` +- if test -z "$use_gpgrt_config"; then +- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` +- else +- tmp=`$LIBGCRYPT_CONFIG --variable=api_version 2>/dev/null || echo 0` +- fi + tmp=`$PKG_CONFIG --variable=api_version libgcrypt` if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([LIBGCRYPT API version]) if test "$req_libgcrypt_api" -eq "$tmp" ; then -@@ -116,10 +57,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], +@@ -136,11 +58,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], fi fi if test $ok = yes; then - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` ifelse([$2], , :, [$2]) -- libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` -+ libgcrypt_config_host=`$PKG_CONFIG --variable=host libgcrypt` - if test x"$libgcrypt_config_host" != xnone ; then - if test x"$libgcrypt_config_host" != x"$host" ; then - AC_MSG_WARN([[ -@@ -134,8 +73,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], + if test -z "$use_gpgrt_config"; then +- libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` ++ libgcrypt_config_host=`$PKG_CONFIG --variable=host libgcrypt` + else + libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none` + fi +@@ -158,8 +78,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], fi fi else @@ -139,45 +144,6 @@ index c67cfec..4ea5f2c 100644 ifelse([$3], , :, [$3]) fi AC_SUBST(LIBGCRYPT_CFLAGS) -diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in -new file mode 100644 -index 0000000..2fc8f53 ---- /dev/null -+++ b/src/libgcrypt.pc.in -@@ -0,0 +1,33 @@ -+# Process this file with autoconf to produce a pkg-config metadata file. -+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation -+# Author: Simon Josefsson -+# -+# This file is free software; as a special exception the author gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+# -+# This file is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+# API info -+api_version=@LIBGCRYPT_CONFIG_API_VERSION@ -+host=@LIBGCRYPT_CONFIG_HOST@ -+ -+# Misc information. -+symmetric_ciphers=@LIBGCRYPT_CIPHERS@ -+asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@ -+digests=@LIBGCRYPT_DIGESTS@ -+ -+Name: libgcrypt -+Description: GNU crypto library -+URL: http://www.gnupg.org -+Version: @VERSION@ -+Libs: -L${libdir} -lgcrypt -+Libs.private: -L${libdir} -lgpg-error -+Cflags: -I${includedir} -- -1.8.3.1 +2.17.1 diff --git a/external/poky/meta/recipes-support/libgcrypt/files/CVE-2019-12904_p2.patch b/external/poky/meta/recipes-support/libgcrypt/files/0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch index 0cb503ed..c82c5b5c 100644 --- a/external/poky/meta/recipes-support/libgcrypt/files/CVE-2019-12904_p2.patch +++ b/external/poky/meta/recipes-support/libgcrypt/files/0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch @@ -1,13 +1,8 @@ -From a5c359cc68a4def9bf39f63070837d89711b4e17 Mon Sep 17 00:00:00 2001 +From 119348dd9aa52ab229afb5e2d3342d2b76fe81bf Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna <jussi.kivilinna@iki.fi> Date: Fri, 31 May 2019 17:18:09 +0300 -Subject: [PATCH] AES: move look-up tables to .data section and unshare between processes -Reply-To: shuagr@microsoft.com - -CVE: CVE-2019-12904_p2 -Upstream-status: Backport -Signed-off-by: Shubham Agrawal<shuagr@microsoft.com> -Upstream-commit: https://github.com/gpg/libgcrypt/commit/daedbbb5541cd8ecda1459d3b843ea4d92788762 +Subject: [PATCH 2/3] AES: move look-up tables to .data section and unshare between + processes * cipher/rijndael-internal.h (ATTR_ALIGNED_64): New. * cipher/rijndael-tables.h (encT): Move to 'enc_tables' structure. @@ -26,6 +21,13 @@ to unshare look-up table pages between processes. GnuPG-bug-id: 4541 Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> + +Upstream-Status: Backport +[https://github.com/gpg/libgcrypt/commit/daedbbb5541cd8ecda1459d3b843ea4d92788762] + +CVE: CVE-2019-12904 + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- cipher/rijndael-internal.h | 4 +- cipher/rijndael-tables.h | 155 +++++++++++++++++++++++++-------------------- diff --git a/external/poky/meta/recipes-support/libgcrypt/files/CVE-2019-12904_p1.patch b/external/poky/meta/recipes-support/libgcrypt/files/0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch index cda52119..b580b7b1 100644 --- a/external/poky/meta/recipes-support/libgcrypt/files/CVE-2019-12904_p1.patch +++ b/external/poky/meta/recipes-support/libgcrypt/files/0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch @@ -1,13 +1,8 @@ -From 263ad8ae08f287e32656d4e3e0116479f3d9ad9d Mon Sep 17 00:00:00 2001 +From a4c561aab1014c3630bc88faf6f5246fee16b020 Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna <jussi.kivilinna@iki.fi> Date: Fri, 31 May 2019 17:27:25 +0300 -Subject: [PATCH] GCM: move look-up table to .data section and unshare between processes -Reply-To: shuagr@microsoft.com - -CVE: CVE-2019-12904_p1 -Upstream-Status: Backport -Signed-off-by: Shubham Agrawal<shuagr@microsoft.com> -Upstream-commit : https://github.com/gpg/libgcrypt/commit/a4c561aab1014c3630bc88faf6f5246fee16b020 +Subject: [PATCH 3/3] GCM: move look-up table to .data section and unshare + between processes * cipher/cipher-gcm.c (ATTR_ALIGNED_64): New. (gcmR): Move to 'gcm_table' structure. @@ -18,14 +13,22 @@ after. (do_prefetch_tables): Modify pre- and post-table counters to unshare look-up table pages between processes. -- + GnuPG-bug-id: 4541 Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> + +Upstream-Status: Backport +[https://github.com/gpg/libgcrypt/commit/a4c561aab1014c3630bc88faf6f5246fee16b020] + +CVE: CVE-2019-12904 + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - cipher/cipher-gcm.c | 129 ++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 95 insertions(+), 34 deletions(-) + cipher/cipher-gcm.c | 106 ++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 70 insertions(+), 36 deletions(-) diff --git a/cipher/cipher-gcm.c b/cipher/cipher-gcm.c -index 6169d14..97a8015 100644 +index 11f119a..194e2ec 100644 --- a/cipher/cipher-gcm.c +++ b/cipher/cipher-gcm.c @@ -30,6 +30,14 @@ @@ -43,7 +46,7 @@ index 6169d14..97a8015 100644 #ifdef GCM_USE_INTEL_PCLMUL extern void _gcry_ghash_setup_intel_pclmul (gcry_cipher_hd_t c); -@@ -63,40 +71,93 @@ ghash_armv8_ce_pmull (gcry_cipher_hd_t c, byte *result, const byte *buf, +@@ -83,40 +91,54 @@ ghash_armv7_neon (gcry_cipher_hd_t c, byte *result, const byte *buf, #ifdef GCM_USE_TABLES @@ -129,34 +132,33 @@ index 6169d14..97a8015 100644 + }; + +#define gcmR gcm_table.R -+static inline -+void prefetch_table(const void *tab, size_t len) -+{ -+ const volatile byte *vtab = tab; -+ size_t i; -+ + + static inline + void prefetch_table(const void *tab, size_t len) +@@ -124,7 +146,7 @@ void prefetch_table(const void *tab, size_t len) + const volatile byte *vtab = tab; + size_t i; + +- for (i = 0; i < len; i += 8 * 32) + for (i = 0; len - i >= 8 * 32; i += 8 * 32) -+ { -+ (void)vtab[i + 0 * 32]; -+ (void)vtab[i + 1 * 32]; -+ (void)vtab[i + 2 * 32]; -+ (void)vtab[i + 3 * 32]; -+ (void)vtab[i + 4 * 32]; -+ (void)vtab[i + 5 * 32]; -+ (void)vtab[i + 6 * 32]; -+ (void)vtab[i + 7 * 32]; -+ } + { + (void)vtab[i + 0 * 32]; + (void)vtab[i + 1 * 32]; +@@ -135,6 +157,10 @@ void prefetch_table(const void *tab, size_t len) + (void)vtab[i + 6 * 32]; + (void)vtab[i + 7 * 32]; + } + for (; i < len; i += 32) + { + (void)vtab[i]; + } -+ -+ (void)vtab[len - 1]; -+} -+ -+static inline void -+do_prefetch_tables (const void *gcmM, size_t gcmM_size) -+{ + + (void)vtab[len - 1]; + } +@@ -142,8 +168,16 @@ void prefetch_table(const void *tab, size_t len) + static inline void + do_prefetch_tables (const void *gcmM, size_t gcmM_size) + { + /* Modify counters to trigger copy-on-write and unsharing if physical pages + * of look-up table are shared between processes. Modifying counters also + * causes checksums for pages to change and hint same-page merging algorithm @@ -165,12 +167,12 @@ index 6169d14..97a8015 100644 + gcm_table.counter_tail++; + + /* Prefetch look-up tables to cache. */ -+ prefetch_table(gcmM, gcmM_size); + prefetch_table(gcmM, gcmM_size); +- prefetch_table(gcmR, sizeof(gcmR)); + prefetch_table(&gcm_table, sizeof(gcm_table)); -+} + } #ifdef GCM_TABLES_USE_U64 - static void -- 2.7.4 diff --git a/external/poky/meta/recipes-support/libgcrypt/files/determinism.patch b/external/poky/meta/recipes-support/libgcrypt/files/determinism.patch new file mode 100644 index 00000000..ad0b8c79 --- /dev/null +++ b/external/poky/meta/recipes-support/libgcrypt/files/determinism.patch @@ -0,0 +1,32 @@ +gnutls detects our outer git trees and injects that revision into its objects. +That isn't deterministic so stop it. Also ensure we're not marked as a development +build as its git detection is faulty. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + + +Index: libgcrypt-1.8.5/configure.ac +=================================================================== +--- libgcrypt-1.8.5.orig/configure.ac ++++ libgcrypt-1.8.5/configure.ac +@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec], + m4_define([mym4_betastring], + m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ + awk -F- '$3!=0{print"-beta"$3}'])) +-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) ++m4_define([mym4_isgit],[no]) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) + + AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org]) +@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui + # + # Provide information about the build. + # +-BUILD_REVISION="mym4_revision" ++BUILD_REVISION="None" + AC_SUBST(BUILD_REVISION) + AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION", + [GIT commit id revision used to build this package]) diff --git a/external/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb b/external/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb index 13d03788..4e0eb0a1 100644 --- a/external/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb +++ b/external/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb @@ -17,15 +17,17 @@ DEPENDS = "libgpg-error" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ - file://0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch \ + 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://CVE-2019-12904_p1.patch \ - file://CVE-2019-12904_p2.patch \ + file://0001-Prefetch-GCM-look-up-tables.patch \ + file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \ + file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ + file://determinism.patch \ " -SRC_URI[md5sum] = "fbfdaebbbc6d7e5fbbf6ffdb3e139573" -SRC_URI[sha256sum] = "f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227" +SRC_URI[md5sum] = "348cc4601ca34307fc6cd6c945467743" +SRC_URI[sha256sum] = "3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3" BINCONFIG = "${bindir}/libgcrypt-config" diff --git a/external/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch b/external/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch new file mode 100644 index 00000000..a0ab4f23 --- /dev/null +++ b/external/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch @@ -0,0 +1,27 @@ +From 137805890951b6b585c1d23097e0a51e8c7a8a50 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 + +In previous versions this was not a hard a failure, and so went +unnoticed. The test is unsuitable for building with sysroots anyway as the +failure is due to that. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 9303954..7630540 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -344,7 +344,6 @@ gpg-error-config: gpgrt-config gpg-error-config-old + 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/external/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch b/external/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch deleted file mode 100644 index 03b0ce77..00000000 --- a/external/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch +++ /dev/null @@ -1,298 +0,0 @@ -From d4fd6975671477721936060771aa4d7d07fb0910 Mon Sep 17 00:00:00 2001 -From: Werner Koch <wk@gnupg.org> -Date: Tue, 18 Sep 2018 14:54:08 +0200 -Subject: [PATCH libgpg-error] syscfg: Support ARC CPUs and simplify aliasing - table. - -* src/mkheader.c (xmalloc): New. -(xstrdup): Implement using xmalloc. -(canon_host_triplet): Add supporr for arc CPU. Adjust alias table to -also alias *-pc-*. Rename ibm to unknown. Add internal arg. Add -unknown vendor hack. -(main): New mode to just print the canonicalized form. -* src/Makefile.am (lock_obj_pub): s/-(pc|ibm)-/-unknown/. Also rename -files accordingly. --- - -config.sub does no real aliasing and thus we would need to add several -vendors to the alising tables despite that this has no technical -meanding. Instead we now replace the vendor with "unknown" for the -4-part-"triplets". This change will make maintenace easier. - -Signed-off-by: Werner Koch <wk@gnupg.org> - -Upstream-Status: Backport [ http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=48c8f8ddfc80 ] ---- - src/Makefile.am | 16 ++-- - src/mkheader.c | 92 ++++++++++++++++--- - ...-gnu.h => lock-obj-pub.i686-unknown-gnu.h} | 0 - ... lock-obj-pub.i686-unknown-kfreebsd-gnu.h} | 0 - ... => lock-obj-pub.i686-unknown-linux-gnu.h} | 0 - ...=> lock-obj-pub.s390x-unknown-linux-gnu.h} | 0 - ...ock-obj-pub.x86_64-unknown-kfreebsd-gnu.h} | 0 - ...> lock-obj-pub.x86_64-unknown-linux-gnu.h} | 0 - ...ock-obj-pub.x86_64-unknown-linux-gnux32.h} | 0 - ... lock-obj-pub.x86_64-unknown-linux-musl.h} | 0 - 10 files changed, 85 insertions(+), 23 deletions(-) - rename src/syscfg/{lock-obj-pub.i686-pc-gnu.h => lock-obj-pub.i686-unknown-gnu.h} (100%) - rename src/syscfg/{lock-obj-pub.i686-pc-kfreebsd-gnu.h => lock-obj-pub.i686-unknown-kfreebsd-gnu.h} (100%) - rename src/syscfg/{lock-obj-pub.i686-pc-linux-gnu.h => lock-obj-pub.i686-unknown-linux-gnu.h} (100%) - rename src/syscfg/{lock-obj-pub.s390x-ibm-linux-gnu.h => lock-obj-pub.s390x-unknown-linux-gnu.h} (100%) - rename src/syscfg/{lock-obj-pub.x86_64-pc-kfreebsd-gnu.h => lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h} (100%) - rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-gnu.h => lock-obj-pub.x86_64-unknown-linux-gnu.h} (100%) - rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-gnux32.h => lock-obj-pub.x86_64-unknown-linux-gnux32.h} (100%) - rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-musl.h => lock-obj-pub.x86_64-unknown-linux-musl.h} (100%) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 42998e46a3bc..8ec582ef99fb 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -52,9 +52,9 @@ lock_obj_pub = \ - syscfg/lock-obj-pub.arm-apple-darwin.h \ - syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.i386-apple-darwin.h \ -- syscfg/lock-obj-pub.i686-pc-gnu.h \ -- syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h \ -- syscfg/lock-obj-pub.i686-pc-linux-gnu.h \ -+ syscfg/lock-obj-pub.i686-unknown-gnu.h \ -+ syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h \ -+ syscfg/lock-obj-pub.i686-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.m68k-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.mips-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.mips64el-unknown-linux-gnuabi64.h \ -@@ -66,16 +66,16 @@ lock_obj_pub = \ - syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ - syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ -- syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ -+ syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.sparc64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.x86_64-apple-darwin.h \ -- syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h \ -- syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h \ -- syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h \ -- syscfg/lock-obj-pub.x86_64-pc-linux-musl.h \ -+ syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h \ -+ syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h \ -+ syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h \ -+ syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h \ - syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.ia64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.mingw32.h -diff --git a/src/mkheader.c b/src/mkheader.c -index 2fc5fada66a4..7a38a1bec1a4 100644 ---- a/src/mkheader.c -+++ b/src/mkheader.c -@@ -51,17 +51,27 @@ xfree (void *a) - - - static char * --xstrdup (const char *string) -+xmalloc (size_t n) - { - char *p; -- size_t len = strlen (string) + 1; - -- p = malloc (len); -+ p = malloc (n); - if (!p) - { - fputs (PGM ": out of core\n", stderr); - exit (1); - } -+ return p; -+} -+ -+ -+static char * -+xstrdup (const char *string) -+{ -+ char *p; -+ size_t len = strlen (string) + 1; -+ -+ p = xmalloc (len); - memcpy (p, string, len); - return p; - } -@@ -69,23 +79,31 @@ xstrdup (const char *string) - - /* Return a malloced string with TRIPLET. If TRIPLET has an alias - return that instead. In general build-aux/config.sub should do the -- aliasing but some returned triplets are anyway identical and thus we -- use this function to map it to the canonical form. */ -+ aliasing but some returned triplets are anyway identical and thus -+ we use this function to map it to the canonical form. -+ NO_VENDOR_HACK is for internal use; caller must call with 0. */ - static char * --canon_host_triplet (const char *triplet) -+canon_host_triplet (const char *triplet, int no_vendor_hack) - { - struct { - const char *name; - const char *alias; - } tbl[] = { -- {"i486-pc-linux-gnu", "i686-pc-linux-gnu" }, -+ {"i486-pc-linux-gnu", "i686-unknown-linux-gnu" }, - {"i586-pc-linux-gnu" }, -- {"i486-pc-gnu", "i686-pc-gnu"}, -+ {"i686-pc-linux-gnu" }, -+ {"arc-oe-linux-uclibc" }, /* Other CPU but same struct. */ -+ -+ {"i486-pc-gnu", "i686-unknown-gnu"}, - {"i586-pc-gnu"}, -- {"i486-pc-kfreebsd-gnu", "i686-pc-kfreebsd-gnu"}, -+ {"i686-pc-gnu"}, -+ -+ {"i486-pc-kfreebsd-gnu", "i686-unknown-kfreebsd-gnu"}, - {"i586-pc-kfreebsd-gnu"}, -+ {"i686-pc-kfreebsd-gnu"}, - -- {"x86_64-pc-linux-gnuhardened1", "x86_64-pc-linux-gnu" }, -+ {"x86_64-pc-linux-gnuhardened1", "x86_64-unknown-linux-gnu" }, -+ {"x86_64-pc-linux-gnu" }, - - {"powerpc-unknown-linux-gnuspe", "powerpc-unknown-linux-gnu" }, - -@@ -98,6 +116,7 @@ canon_host_triplet (const char *triplet) - }; - int i; - const char *lastalias = NULL; -+ const char *s; - - for (i=0; tbl[i].name; i++) - { -@@ -110,6 +129,36 @@ canon_host_triplet (const char *triplet) - return xstrdup (lastalias); - } - } -+ for (i=0, s=triplet; *s; s++) -+ if (*s == '-') -+ i++; -+ if (i > 2 && !no_vendor_hack) -+ { -+ /* We have a 4 part "triplet": CPU-VENDOR-KERNEL-SYSTEM where -+ * the last two parts replace the OS part of a real triplet. -+ * The VENDOR part is then in general useless because -+ * KERNEL-SYSTEM is specific enough. We now do a second pass by -+ * replacing VENDOR with "unknown". */ -+ char *p; -+ char *buf = xmalloc (strlen (triplet) + 7 + 1); -+ -+ for (p=buf,s=triplet,i=0; *s; s++) -+ { -+ *p++ = *s; -+ if (*s == '-' && ++i == 1) -+ { -+ memcpy (p, "unknown-",8); -+ p += 8; -+ for (s++; *s != '-'; s++) -+ ; -+ } -+ } -+ *p = 0; -+ p = canon_host_triplet (buf, 1); -+ xfree (buf); -+ return p; -+ } -+ - return xstrdup (triplet); - } - -@@ -558,7 +607,7 @@ write_special (const char *fname, int lnr, const char *tag) - int - main (int argc, char **argv) - { -- FILE *fp; -+ FILE *fp = NULL; - char line[LINESIZE]; - int lnr = 0; - const char *fname, *s; -@@ -571,11 +620,22 @@ main (int argc, char **argv) - argc--; argv++; - } - -- if (argc != 6) -+ if (argc == 1) -+ { -+ /* Print just the canonicalized host triplet. */ -+ host_triplet = canon_host_triplet (argv[0], 0); -+ printf ("%s\n", host_triplet); -+ goto leave; -+ } -+ else if (argc == 6) -+ ; /* Standard operation. */ -+ else - { - fputs ("usage: " PGM - " host_os host_triplet template.h config.h" -- " version version_number\n", -+ " version version_number\n" -+ " " PGM -+ " host_triplet\n", - stderr); - return 1; - } -@@ -586,7 +646,7 @@ main (int argc, char **argv) - hdr_version = argv[4]; - hdr_version_number = argv[5]; - -- host_triplet = canon_host_triplet (host_triplet_raw); -+ host_triplet = canon_host_triplet (host_triplet_raw, 0); - - srcdir = malloc (strlen (fname) + 2 + 1); - if (!srcdir) -@@ -677,13 +737,15 @@ main (int argc, char **argv) - "End:\n" - "*/\n", stdout); - -+ leave: - if (ferror (stdout)) - { - fprintf (stderr, PGM ": error writing to stdout: %s\n", strerror (errno)); - return 1; - } - -- fclose (fp); -+ if (fp) -+ fclose (fp); - - xfree (host_triplet); - return 0; -diff --git a/src/syscfg/lock-obj-pub.i686-pc-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-gnu.h -similarity index 100% -rename from src/syscfg/lock-obj-pub.i686-pc-gnu.h -rename to src/syscfg/lock-obj-pub.i686-unknown-gnu.h -diff --git a/src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h -similarity index 100% -rename from src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h -rename to src/syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h -diff --git a/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-linux-gnu.h -similarity index 100% -rename from src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h -rename to src/syscfg/lock-obj-pub.i686-unknown-linux-gnu.h -diff --git a/src/syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h b/src/syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h -similarity index 100% -rename from src/syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h -rename to src/syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h -diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h -similarity index 100% -rename from src/syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h -rename to src/syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h -diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h -similarity index 100% -rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h -rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h -diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h -similarity index 100% -rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h -rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h -diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-musl.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h -similarity index 100% -rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-musl.h -rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h --- -2.17.1 - diff --git a/external/poky/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch b/external/poky/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch deleted file mode 100644 index 197652f2..00000000 --- a/external/poky/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ae6a3f20345dac4b9daab8c39ac2d3fb3f2c21e3 Mon Sep 17 00:00:00 2001 -From: Werner Koch <wk@gnupg.org> -Date: Fri, 21 Sep 2018 14:37:21 +0200 -Subject: [PATCH Libgpg-error] syscfg: Add support for arc-unknown-linux-gnu - -* src/mkheader.c (canon_host_triplet): Add to table. --- - -Note that unknown in the above triplet is actually a wildcard for 4 -part triplets. - -Signed-off-by: Werner Koch <wk@gnupg.org> - -Upstream-Status: Backport [http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=f4f0da74f526d7e35cedbc2e93454df6440dbfa5] ---- - src/mkheader.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/mkheader.c b/src/mkheader.c -index 7a38a1bec1a4..a4866e96ef43 100644 ---- a/src/mkheader.c -+++ b/src/mkheader.c -@@ -92,7 +92,8 @@ canon_host_triplet (const char *triplet, int no_vendor_hack) - {"i486-pc-linux-gnu", "i686-unknown-linux-gnu" }, - {"i586-pc-linux-gnu" }, - {"i686-pc-linux-gnu" }, -- {"arc-oe-linux-uclibc" }, /* Other CPU but same struct. */ -+ {"arc-oe-linux-gnu" }, /* Other CPU but same struct. */ -+ {"arc-oe-linux-uclibc" }, /* and uclibc is also the same. */ - - {"i486-pc-gnu", "i686-unknown-gnu"}, - {"i586-pc-gnu"}, --- -2.17.1 - diff --git a/external/poky/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch b/external/poky/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch deleted file mode 100644 index dc3d558e..00000000 --- a/external/poky/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch +++ /dev/null @@ -1,161 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Sean Nyekjaer <sean@geanix.com> - -From 37069826e497d6af01e3e48fe5d2220ae7f85449 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk -index ae29043..9a1fc18 100644 ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/Makefile.am b/src/Makefile.am -index 42998e4..0ceac9f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - -diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk -index 46d436c..e9c857c 100644 ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk -index a771a73..4578e29 100644 ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk -index ea58503..188f7a4 100644 ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk -index f79df66..15b1aad 100644 ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk -index c9de9c1..285e45f 100644 ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - --- -2.23.0 - diff --git a/external/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/external/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 3066613d..ca5f6b5c 100644 --- a/external/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/external/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch @@ -8,53 +8,21 @@ Upstream-Status: Pending Rebase to 1.28 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Refactored for 1.33 +Signed-off-by: Armin Kuster <akuster808@gmail.com> + --- configure.ac | 1 + - src/Makefile.am | 4 ++- src/gpg-error.m4 | 71 +++-------------------------------------------------- - src/gpg-error.pc.in | 11 +++++++++ 4 files changed, 18 insertions(+), 69 deletions(-) create mode 100644 src/gpg-error.pc.in -diff --git a/configure.ac b/configure.ac -index aca9300..f7794e9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -621,6 +621,7 @@ AC_CONFIG_FILES([src/Makefile tests/Makefile]) - AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) - AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest]) - AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) -+AC_CONFIG_FILES([src/gpg-error.pc]) - - AC_OUTPUT - -diff --git a/src/Makefile.am b/src/Makefile.am -index 268c2ab..95f8459 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -87,6 +87,8 @@ bin_SCRIPTS = gpg-error-config - nodist_bin_SCRIPTS = gpgrt-config - m4datadir = $(datadir)/aclocal - m4data_DATA = gpg-error.m4 gpgrt.m4 -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = gpg-error.pc - - EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ - mkerrnos.awk errnos.in README \ -@@ -94,7 +96,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ - mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ - err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 gpgrt.m4 \ - gpg-error.vers gpg-error.def.in \ -- versioninfo.rc.in gpg-error.w32-manifest.in \ -+ versioninfo.rc.in gpg-error.w32-manifest.in gpg-error.pc \ - $(lock_obj_pub) - - BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ -diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 -index 60c88d8..2ef7e3e 100644 ---- a/src/gpg-error.m4 -+++ b/src/gpg-error.m4 -@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_warn variable. +Index: libgpg-error-1.33/src/gpg-error.m4 +=================================================================== +--- libgpg-error-1.33.orig/src/gpg-error.m4 ++++ libgpg-error-1.33/src/gpg-error.m4 +@@ -26,139 +26,13 @@ dnl is added to the gpg_config_script_wa dnl AC_DEFUN([AM_PATH_GPG_ERROR], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -66,14 +34,15 @@ index 60c88d8..2ef7e3e 100644 - AC_HELP_STRING([--with-libgpg-error-prefix=PFX], - [prefix where GPG Error is installed (optional)]), - [gpg_error_config_prefix="$withval"]) -- ++ min_gpg_error_version=ifelse([$1], ,0.0,$1) ++ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) + - dnl Accept --with-gpg-error-prefix and make it work the same as - dnl --with-libgpg-error-prefix above, for backwards compatibility, - dnl but do not document this old, inconsistently-named option. - AC_ARG_WITH(gpg-error-prefix,, - [gpg_error_config_prefix="$withval"]) -+ min_gpg_error_version=ifelse([$1], ,0.0,$1) - +- - if test x"${GPG_ERROR_CONFIG}" = x ; then - if test x"${gpg_error_config_prefix}" != x ; then - GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" @@ -92,19 +61,57 @@ index 60c88d8..2ef7e3e 100644 - esac - fi - fi -+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) - +- - AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) -- min_gpg_error_version=ifelse([$1], ,0.0,$1) -- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) +- min_gpg_error_version=ifelse([$1], ,1.33,$1) - ok=no -- if test "$GPG_ERROR_CONFIG" != "no" \ -- && test -f "$GPG_ERROR_CONFIG" ; then +- +- if test "$prefix" = NONE ; then +- prefix_option_expanded=/usr/local +- else +- prefix_option_expanded="$prefix" +- fi +- if test "$exec_prefix" = NONE ; then +- exec_prefix_option_expanded=$prefix_option_expanded +- else +- exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix) +- fi +- libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir) +- +- if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then +- gpgrt_libdir=$libdir_option_expanded +- else +- if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then +- if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then +- if test -f $possible_libdir/pkgconfig/gpg-error.pc; then +- gpgrt_libdir=$possible_libdir +- fi +- fi +- fi +- fi +- +- if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then +- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) +- if test "$GPGRT_CONFIG" = "no"; then +- unset GPGRT_CONFIG +- else +- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" +- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then +- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" +- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) +- gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` +- else +- unset GPGRT_CONFIG +- fi +- fi +- else +- gpg_error_config_version=`$GPG_ERROR_CONFIG --version` +- fi +- if test "$GPG_ERROR_CONFIG" != "no"; then - req_major=`echo $min_gpg_error_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - req_minor=`echo $min_gpg_error_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version` - major=`echo $gpg_error_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $gpg_error_config_version | \ @@ -118,20 +125,47 @@ index 60c88d8..2ef7e3e 100644 - fi - fi - fi +- if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then +- if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then +- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) +- if test "$GPGRT_CONFIG" = "no"; then +- unset GPGRT_CONFIG +- else +- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" +- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then +- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" +- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) +- else +- unset GPGRT_CONFIG +- fi +- fi +- fi +- fi - fi +- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) if test $ok = yes; then -- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` -- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` -- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` -- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` +- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` +- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` +- if test -z "$GPGRT_CONFIG"; then +- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null` +- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null` +- else +- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null` +- GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS" +- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null` +- GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS" +- fi - AC_MSG_RESULT([yes ($gpg_error_config_version)]) ifelse([$2], , :, [$2]) -- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` -+ gpg_error_config_host=`$PKG_CONFIG --variable=host gpg-error` + if test -z "$GPGRT_CONFIG"; then +- gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none` +- else +- gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none` ++ gpg_error_config_host=`$PKG_CONFIG --variable=host gpg-error` + fi if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != x"$host" ; then - AC_MSG_WARN([[ -@@ -107,11 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], +@@ -174,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], fi fi else @@ -142,24 +176,8 @@ index 60c88d8..2ef7e3e 100644 - AC_MSG_RESULT(no) ifelse([$3], , :, [$3]) fi - AC_SUBST(GPG_ERROR_CFLAGS) -diff --git a/src/gpg-error.pc.in b/src/gpg-error.pc.in -new file mode 100644 -index 0000000..bc0b174 ---- /dev/null -+++ b/src/gpg-error.pc.in -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+host=@GPG_ERROR_CONFIG_HOST@ -+ -+Name: gpg-error -+Description: a library that defines common error values for all GnuPG components -+Version: @VERSION@ -+Libs: -L${libdir} -lgpg-error -+Cflags: -I${includedir} --- -1.8.3.1 - +- AC_SUBST(GPG_ERROR_CFLAGS) +- AC_SUBST(GPG_ERROR_LIBS) +- AC_SUBST(GPG_ERROR_MT_CFLAGS) +- AC_SUBST(GPG_ERROR_MT_LIBS) + ]) diff --git a/external/poky/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb b/external/poky/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb index 52ae11a9..b9a2b01c 100644 --- a/external/poky/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb +++ b/external/poky/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb @@ -5,7 +5,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index" LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/gpg-error.h.in;beginline=2;endline=18;md5=524d4e810c4dcdc38e4fa28e70a13bf8 \ + file://src/gpg-error.h.in;beginline=2;endline=18;md5=cd91e3ad1265a0c268efad541a39345e \ file://src/init.c;beginline=2;endline=17;md5=f01cdfcf747af5380590cfd9bbfeaaf7" @@ -14,12 +14,11 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ - file://0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch \ - file://0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch \ - file://libgpg-error-1.35-gawk5-support.patch \ - " -SRC_URI[md5sum] = "ef3d928a5a453fa701ecc3bb22be1c64" -SRC_URI[sha256sum] = "c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca" + file://0001-Do-not-fail-when-testing-config-scripts.patch \ + " + +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7" +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" BINCONFIG = "${bindir}/gpg-error-config" @@ -49,6 +48,7 @@ do_compile_prepend() { mips*el) TUPLE=mipsel-unknown-linux-gnu ;; mips*) TUPLE=mips-unknown-linux-gnu ;; x86_64) TUPLE=x86_64-unknown-linux-gnu ;; + ppc) TUPLE=powerpc-unknown-linux-gnu ;; ppc64) TUPLE=powerpc64-unknown-linux-gnu ;; ppc64le) TUPLE=powerpc64le-unknown-linux-gnu ;; *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; diff --git a/external/poky/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch b/external/poky/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch deleted file mode 100644 index 6db75f50..00000000 --- a/external/poky/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d Mon Sep 17 00:00:00 2001 -From: Allen Winter <allen.winter@kdab.com> -Date: Sat, 3 Sep 2016 16:56:29 -0400 -Subject: [PATCH] CMakeLists.txt, libical.pc.in - fix iculibs (remove full path) ISSUE: 227 - -Upstream-Status: Backport - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ----- -diff -Naur libical-2.0.0-orig/CMakeLists.txt libical-2.0.0/CMakeLists.txt ---- libical-2.0.0-orig/CMakeLists.txt 2016-09-08 18:05:06.166049345 +0300 -+++ libical-2.0.0/CMakeLists.txt 2016-09-08 18:05:45.201561334 +0300 -@@ -128,6 +128,7 @@ - # RSCALE info at http://tools.ietf.org/html/rfc7529 - find_package(ICU) - if(ICU_FOUND) -+ set(ICUUC_LIBS "-licuuc") #for libical.pc - set(HAVE_LIBICU 1) - if(ICU_MAJOR_VERSION VERSION_GREATER 50) - set(HAVE_ICU_DANGI TRUE) -@@ -137,6 +138,7 @@ - endif() - if(ICU_I18N_FOUND) - set(HAVE_LIBICU_I18N 1) -+ set(ICUI18N_LIBS "-licui18n") #for libical.pc - endif() - - # MSVC specific definitions -diff -Naur libical-2.0.0-orig/libical.pc.in libical-2.0.0/libical.pc.in ---- libical-2.0.0-orig/libical.pc.in 2015-12-28 23:44:53.000000000 +0200 -+++ libical-2.0.0/libical.pc.in 2016-09-08 18:09:12.991963597 +0300 -@@ -3,10 +3,10 @@ - libdir=@libdir@ - includedir=@includedir@ - threadslib=@PTHREAD_LIBS@ --iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@ -+iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@ - - Name: libical - Description: An implementation of basic iCAL protocols - Version: @VERSION@ --Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib} -+Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs} - Cflags: -I${includedir} diff --git a/external/poky/meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch b/external/poky/meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch new file mode 100644 index 00000000..b7b757d7 --- /dev/null +++ b/external/poky/meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch @@ -0,0 +1,33 @@ +From e33bc310238bba1690f2c71ad333e10b9e422ea9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 19 Oct 2019 14:23:06 +0200 +Subject: [PATCH] Use our hand-build native src-generator +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + src/libical-glib/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt +index f3704e6..ce9db16 100644 +--- a/src/libical-glib/CMakeLists.txt ++++ b/src/libical-glib/CMakeLists.txt +@@ -63,8 +63,8 @@ endforeach() + + add_custom_command ( + OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h +- COMMAND ${EXECUTABLE_OUTPUT_PATH}/src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api" +- DEPENDS ${EXECUTABLE_OUTPUT_PATH}/src-generator ${xml_files} ++ COMMAND ${CMAKE_BINARY_DIR}/src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api" ++ DEPENDS ${CMAKE_BINARY_DIR}/src-generator ${xml_files} + ) + + configure_file( +-- +2.21.0 + diff --git a/external/poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch b/external/poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch deleted file mode 100644 index b50f50e7..00000000 --- a/external/poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 918cd8764a845a9d25918a444fbaa5070d2be609 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Fri, 21 Aug 2015 16:38:05 +0300 -Subject: [PATCH] Remove cmake check for Perl - -We set "CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY" in cmake bbclass to -make sure cmake does not find host programs. In this case we actually -are fine with host perl: remove the check. - -Upstream-Status: Inappropriate [workaround] - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -Index: libical-2.0.0/CMakeLists.txt -=================================================================== ---- libical-2.0.0.orig/CMakeLists.txt -+++ libical-2.0.0/CMakeLists.txt -@@ -116,8 +116,7 @@ if(SHARED_ONLY) - set(LIBRARY_TYPE SHARED) - endif() - --# must have Perl to create the derived stuff --find_package(Perl REQUIRED) -+set(PERL_EXECUTABLE perl) - - # Ensure finding 64bit libs when using 64-bit compilers - if(CMAKE_CL_64) diff --git a/external/poky/meta/recipes-support/libical/libical_2.0.0.bb b/external/poky/meta/recipes-support/libical/libical_2.0.0.bb deleted file mode 100644 index daa47abc..00000000 --- a/external/poky/meta/recipes-support/libical/libical_2.0.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" -HOMEPAGE = "https://github.com/libical/libical" -BUGTRACKER = "https://github.com/libical/libical/issues" -LICENSE = "LGPLv2.1 | MPL-1" -LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ - file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" -SECTION = "libs" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ - file://Remove-cmake-check-for-Perl.patch \ - file://0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch \ - " -DEPENDS = "icu" - -SRC_URI[md5sum] = "6bf8e5f5a3ba88baf390d0134e05d76e" -SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da" -UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" - -inherit cmake pkgconfig - -do_install_append_class-target () { - # Remove build host references - sed -i \ - -e 's,${STAGING_LIBDIR},${libdir},g' \ - ${D}${libdir}/cmake/LibIcal/LibIcalTargets-noconfig.cmake -} diff --git a/external/poky/meta/recipes-support/libical/libical_3.0.7.bb b/external/poky/meta/recipes-support/libical/libical_3.0.7.bb new file mode 100644 index 00000000..a50473e9 --- /dev/null +++ b/external/poky/meta/recipes-support/libical/libical_3.0.7.bb @@ -0,0 +1,45 @@ +SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" +HOMEPAGE = "https://github.com/libical/libical" +BUGTRACKER = "https://github.com/libical/libical/issues" +LICENSE = "LGPLv2.1 | MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ + file://LICENSE.LGPL21.txt;md5=933adb561f159e7c3da079536f0ed871 \ + file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640 \ + " +SECTION = "libs" + +SRC_URI = " \ + https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-Use-our-hand-build-native-src-generator.patch \ +" +SRC_URI[md5sum] = "8a5d07a7fba9e73a85e67f76258bf042" +SRC_URI[sha256sum] = "0abe66df1ea826e57db7f281c704ede834c84139012e6c686ea7adafd4e763fc" +UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" + +inherit cmake pkgconfig + +do_compile_prepend() { + # As long as https://github.com/libical/libical/issues/394 is open build native src-generator manually + NATIVE_CFLAGS="${BUILD_CFLAGS} `pkg-config-native --cflags glib-2.0` `pkg-config-native --cflags libxml-2.0`" + NATIVE_LDFLAGS="${BUILD_LDFLAGS} `pkg-config-native --libs glib-2.0` `pkg-config-native --libs libxml-2.0`" + ${BUILD_CC} $NATIVE_CFLAGS ${S}/src/libical-glib/tools/generator.c ${S}/src/libical-glib/tools/xml-parser.c -o ${B}/src-generator $NATIVE_LDFLAGS +} + +PACKAGECONFIG ??= "icu glib" +PACKAGECONFIG[bdb] = ",-DCMAKE_DISABLE_FIND_PACKAGE_BDB=True,db" +PACKAGECONFIG[glib] = "-DICAL_GLIB=True,-DICAL_GLIB=False,glib-2.0-native libxml2-native glib-2.0 libxml2" +# ICU is used for RSCALE (RFC7529) support +PACKAGECONFIG[icu] = ",-DCMAKE_DISABLE_FIND_PACKAGE_ICU=True,icu" + +# No need to use perl-native, the host perl is sufficient. +EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl" +# doc build fails with linker error (??) for libical-glib so disable it +EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" + +do_install_append () { + # Remove build host references + sed -i \ + -e 's,${STAGING_LIBDIR},${libdir},g' \ + -e 's,${STAGING_INCDIR},${includedir},g' \ + ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake +} diff --git a/external/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch b/external/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch new file mode 100644 index 00000000..886fd26d --- /dev/null +++ b/external/poky/meta/recipes-support/libjitterentropy/files/0001-Make-man-pages-reproducible.patch @@ -0,0 +1,30 @@ +From ce091718716400119d6be6bd637c0e3f4f6ca315 Mon Sep 17 00:00:00 2001 +From: Joshua Watt <JPEWhacker@gmail.com> +Date: Thu, 21 Nov 2019 08:07:41 -0600 +Subject: [PATCH] Make man pages reproducible + +Instructs the man page to be gzip'ed without the file name or timestamp +so that it builds reproducibly. + +Upstream-Status: Accepted [https://github.com/smuellerDD/jitterentropy-library/pull/14] +Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 2e78607..860b720 100644 +--- a/Makefile ++++ b/Makefile +@@ -60,7 +60,7 @@ cppcheck: + install: + install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 + install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ +- gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 ++ gzip -n -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 + install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) + $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ + install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) +-- +2.23.0 + diff --git a/external/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch b/external/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch new file mode 100644 index 00000000..a19b2522 --- /dev/null +++ b/external/poky/meta/recipes-support/libjitterentropy/files/0001-Makefile-cleanup-install-for-rebuilds.patch @@ -0,0 +1,56 @@ +From 060b9b4147f6e5ff386a8b017796118d783e59fa Mon Sep 17 00:00:00 2001 +From: Matt Weber <matthew.weber@rockwellcollins.com> +Date: Tue, 22 Oct 2019 12:44:30 -0500 +Subject: [PATCH] Makefile: cleanup install for rebuilds + +Support the ability to rebuild and redeploy without a clean. This +required some force linking and man archive creation. + +Provide the ability to override the stripping of the shared lib for +cases where a embedded target build may want to control stripping +or provide cross arch tools. + +Upstream-Status: Accepted [060b9b4147f6e5ff386a8b017796118d783e59fa] +Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> +Signed-off-by: Stephan Mueller <smueller@chronox.de> +Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> +--- + Makefile | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 4ff069b..2e78607 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,8 @@ LIBDIR := lib + # include target directory + INCDIR := include + ++INSTALL_STRIP ?= install -s ++ + NAME := jitterentropy + LIBMAJOR=$(shell cat jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}') + LIBMINOR=$(shell cat jitterentropy-base.c | grep define | grep MINVERSION | awk '{print $$3}') +@@ -58,15 +60,15 @@ cppcheck: + install: + install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 + install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ +- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 ++ gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 + install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) +- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ ++ $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ + install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) + install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ + install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ + $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) +- ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) +- ln -s lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so ++ ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) ++ ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so + + clean: + @- $(RM) $(NAME) +-- +2.23.0 + diff --git a/external/poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb b/external/poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb new file mode 100644 index 00000000..710ef017 --- /dev/null +++ b/external/poky/meta/recipes-support/libjitterentropy/libjitterentropy_2.2.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "Hardware RNG based on CPU timing jitter" +DESCRIPTION = "The Jitter RNG provides a noise source using the CPU execution timing jitter. \ +It does not depend on any system resource other than a high-resolution time \ +stamp. It is a small-scale, yet fast entropy source that is viable in almost \ +all environments and on a lot of CPU architectures." +HOMEPAGE = "http://www.chronox.de/jent.html" +LICENSE = "GPLv2+ | BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=a95aadbdfae7ed812bb2b7b86eb5981c \ + file://COPYING.gplv2;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.bsd;md5=66a5cedaf62c4b2637025f049f9b826f \ + " +SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git \ + file://0001-Makefile-cleanup-install-for-rebuilds.patch \ + file://0001-Make-man-pages-reproducible.patch" +SRCREV = "933a44f33ed3d6612f7cfaa7ad1207c8da4886ba" +S = "${WORKDIR}/git" + +do_configure[noexec] = "1" + +LDFLAGS += "-Wl,-O0" + +do_install () { + oe_runmake install INCDIR="/include" \ + DESTDIR="${D}" \ + PREFIX="${exec_prefix}" \ + LIBDIR="${baselib}" \ + INSTALL_STRIP="install" +} + diff --git a/external/poky/meta/recipes-support/libksba/libksba_1.3.5.bb b/external/poky/meta/recipes-support/libksba/libksba_1.3.5.bb index a7ea53fe..336d7f81 100644 --- a/external/poky/meta/recipes-support/libksba/libksba_1.3.5.bb +++ b/external/poky/meta/recipes-support/libksba/libksba_1.3.5.bb @@ -1,6 +1,8 @@ SUMMARY = "Easy API to create and parse X.509 and CMS related objects" HOMEPAGE = "http://www.gnupg.org/related_software/libksba/" -LICENSE = "GPLv2+ | LGPLv3+ | GPLv3+" +LICENSE = "GPLv3+ & (GPLv2+ | LGPLv3+)" +LICENSE_${PN} = "GPLv2+ | LGPLv3+" +LICENSE_${PN}-doc = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=fd541d83f75d038c4e0617b672ed8bda \ file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ @@ -25,4 +27,4 @@ do_configure_prepend () { rm -f ${S}/m4/gpg-error.m4 } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/libmpc/libmpc_1.1.0.bb b/external/poky/meta/recipes-support/libmpc/libmpc_1.1.0.bb index 2d25d388..bbc673ff 100644 --- a/external/poky/meta/recipes-support/libmpc/libmpc_1.1.0.bb +++ b/external/poky/meta/recipes-support/libmpc/libmpc_1.1.0.bb @@ -3,13 +3,11 @@ require libmpc.inc DEPENDS = "gmp mpfr" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI = "https://ftp.gnu.org/gnu/mpc/mpc-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/mpc/mpc-${PV}.tar.gz" SRC_URI[md5sum] = "4125404e41e482ec68282a2e687f6c73" SRC_URI[sha256sum] = "6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e" -UPSTREAM_CHECK_URI = "http://www.multiprecision.org/mpc/download.html" - S = "${WORKDIR}/mpc-${PV}" BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch b/external/poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch deleted file mode 100644 index b20a2996..00000000 --- a/external/poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch +++ /dev/null @@ -1,38 +0,0 @@ -Subject: [PATCH] fix libnl-3.4.0 musl compile problem -Avoid in6_addr redefinition - -Upstream-Status: Pending - -Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> ---- - include/linux-private/linux/if_bridge.h | 1 - - include/linux-private/linux/ipv6.h | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/include/linux-private/linux/if_bridge.h b/include/linux-private/linux/if_bridge.h -index f24050b..8f7490c 100644 ---- a/include/linux-private/linux/if_bridge.h -+++ b/include/linux-private/linux/if_bridge.h -@@ -15,7 +15,6 @@ - - #include <linux/types.h> - #include <linux/if_ether.h> --#include <linux/in6.h> - - #define SYSFS_BRIDGE_ATTR "bridge" - #define SYSFS_BRIDGE_FDB "brforward" -diff --git a/include/linux-private/linux/ipv6.h b/include/linux-private/linux/ipv6.h -index e05e684..f16349d 100644 ---- a/include/linux-private/linux/ipv6.h -+++ b/include/linux-private/linux/ipv6.h -@@ -2,7 +2,6 @@ - #define _IPV6_H - - #include <asm/byteorder.h> --#include <linux/in6.h> - - /* The latest drafts declared increase in minimal mtu up to 1280. */ - --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch b/external/poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch deleted file mode 100644 index fe8b833a..00000000 --- a/external/poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -Some packages are asking only for libnl-2.0, but expects to get also -libnl-genl, libnl-nf libnl-route, easiest way to fix them is here. - -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> -Index: libnl-3.2.14/libnl-3.0.pc.in -=================================================================== ---- libnl-3.2.14.orig/libnl-3.0.pc.in -+++ libnl-3.2.14/libnl-3.0.pc.in -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: libnl - Description: Convenience library for netlink sockets - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lnl-@MAJ_VERSION@ -+Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@ - Cflags: -I${includedir}/libnl@MAJ_VERSION@ diff --git a/external/poky/meta/recipes-support/libnl/libnl_3.4.0.bb b/external/poky/meta/recipes-support/libnl/libnl_3.5.0.bb index 90dc644b..9d0e1441 100644 --- a/external/poky/meta/recipes-support/libnl/libnl_3.4.0.bb +++ b/external/poky/meta/recipes-support/libnl/libnl_3.5.0.bb @@ -9,16 +9,12 @@ 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://fix-pc-file.patch \ - file://0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch \ -" +SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz" +SRC_URI[md5sum] = "74ba57b1b1d6f9f92268aa8141d8e8e4" +SRC_URI[sha256sum] = "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa" UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" -SRC_URI[md5sum] = "8f71910c03db363b41e2ea62057a4311" -SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf" - inherit autotools pkgconfig FILES_${PN} = "${libdir}/libnl-3.so.* \ @@ -44,3 +40,5 @@ FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" FILES_${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*" RREPLACES_${PN}-genl = "libnl-genl2" RCONFLICTS_${PN}-genl = "libnl-genl2" + +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch b/external/poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch deleted file mode 100644 index 83880f70..00000000 --- a/external/poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch +++ /dev/null @@ -1,48 +0,0 @@ -Upstream-Status: Pending - ---- pcre-8.32.orig/Makefile.am -+++ pcre-8.32/Makefile.am -@@ -197,8 +197,18 @@ bin_SCRIPTS = pcre-config - -+CC_FOR_BUILD = @CC_FOR_BUILD@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ -+CCLD_FOR_BUILD = @CCLD_FOR_BUILD@ -+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ -+ - if WITH_REBUILD_CHARTABLES - - noinst_PROGRAMS += dftables - dftables_SOURCES = dftables.c -+dftables_LINK = $(CCLD_FOR_BUILD) -o $@ -+dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD) -+ -+dftables.o: $(srcdir)/dftables.c -+ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/dftables.c - - pcre_chartables.c: dftables$(EXEEXT) - ./dftables$(EXEEXT) $@ ---- pcre-8.32.orig/configure.ac -+++ pcre-8.32/configure.ac -@@ -72,6 +72,22 @@ then - fi - fi - -+if test x"$cross_compiling" = xyes; then -+ CC_FOR_BUILD="${CC_FOR_BUILD-gcc}" -+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-gcc}" -+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}" -+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD}" -+else -+ CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}" -+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-\$(CCLD)}" -+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-\$(CFLAGS)}" -+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD-\$(LDFLAGS)}" -+fi -+AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler]) -+AC_ARG_VAR(CCLD_FOR_BUILD, [build system C linker frontend]) -+AC_ARG_VAR(CFLAGS_FOR_BUILD, [build system C compiler arguments]) -+AC_ARG_VAR(LDFLAGS_FOR_BUILD, [build system C linker frontend arguments]) -+ - # AC_PROG_CXX will return "g++" even if no c++ compiler is installed. - # Check for that case, and just disable c++ code if g++ doesn't run. - AC_LANG_PUSH(C++) diff --git a/external/poky/meta/recipes-support/libpcre/libpcre2_10.31.bb b/external/poky/meta/recipes-support/libpcre/libpcre2_10.34.bb index a10c312e..fa8655e0 100644 --- a/external/poky/meta/recipes-support/libpcre/libpcre2_10.31.bb +++ b/external/poky/meta/recipes-support/libpcre/libpcre2_10.34.bb @@ -7,15 +7,15 @@ not the original PCRE 8.x series." SUMMARY = "Perl Compatible Regular Expressions version 2" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=f5e4bde9fd0493d0967b4dba9899590f" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENCE;md5=b1588d3bb4cb0e1f5a597d908f8c5b37" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ file://pcre-cross.patch \ " -SRC_URI[md5sum] = "e0b91c891a3c49050f7fd15de33d0ba4" -SRC_URI[sha256sum] = "e07d538704aa65e477b6a392b32ff9fc5edf75ab9a40ddfc876186c4ff4d68ac" +SRC_URI[md5sum] = "d280b62ded13f9ccf2fac16ee5286366" +SRC_URI[sha256sum] = "74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca" CVE_PRODUCT = "pcre2" diff --git a/external/poky/meta/recipes-support/libpcre/libpcre_8.42.bb b/external/poky/meta/recipes-support/libpcre/libpcre_8.44.bb index 3a488c00..e5471e81 100644 --- a/external/poky/meta/recipes-support/libpcre/libpcre_8.42.bb +++ b/external/poky/meta/recipes-support/libpcre/libpcre_8.44.bb @@ -5,17 +5,16 @@ to the POSIX regular expression API." SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=fc5026403b44c868c25fc9546f7feb05" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ - file://pcre-cross.patch \ file://fix-pcre-name-collision.patch \ file://run-ptest \ file://Makefile \ -" + " -SRC_URI[md5sum] = "085b6aa253e0f91cae70b3cdbe8c1ac2" -SRC_URI[sha256sum] = "2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301" +SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" +SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" CVE_PRODUCT = "pcre" @@ -24,33 +23,20 @@ S = "${WORKDIR}/pcre-${PV}" PROVIDES += "pcre" DEPENDS += "bzip2 zlib" -PACKAGECONFIG ??= "pcre8 unicode-properties" +PACKAGECONFIG ??= "pcre8 unicode-properties jit" PACKAGECONFIG[pcre8] = "--enable-pcre8,--disable-pcre8" PACKAGECONFIG[pcre16] = "--enable-pcre16,--disable-pcre16" PACKAGECONFIG[pcre32] = "--enable-pcre32,--disable-pcre32" PACKAGECONFIG[pcretest-readline] = "--enable-pcretest-libreadline,--disable-pcretest-libreadline,readline," PACKAGECONFIG[unicode-properties] = "--enable-unicode-properties,--disable-unicode-properties" +PACKAGECONFIG[jit] = "--enable-jit=auto,--disable-jit" BINCONFIG = "${bindir}/pcre-config" inherit autotools binconfig-disabled ptest -EXTRA_OECONF = "\ - --enable-newline-is-lf \ - --enable-rebuild-chartables \ - --enable-utf \ - --with-link-size=2 \ - --with-match-limit=10000000 \ -" - -# Set LINK_SIZE in BUILD_CFLAGS given that the autotools bbclass use it to -# set CFLAGS_FOR_BUILD, required for the libpcre build. -BUILD_CFLAGS =+ "-DLINK_SIZE=2 -I${B}" -CFLAGS += "-D_REENTRANT" -CXXFLAGS_append_powerpc = " -lstdc++" - -export CCLD_FOR_BUILD ="${BUILD_CCLD}" +EXTRA_OECONF = "--enable-utf" PACKAGES =+ "libpcrecpp libpcreposix pcregrep pcregrep-doc pcretest pcretest-doc" @@ -85,3 +71,5 @@ do_install_ptest() { # locale so the test fails if fr_FR is UTF-8 locale. sed -i -e 's:do3=yes:do3=no:g' ${D}${PTEST_PATH}/RunTest } + +RDEPENDS_${PN}-ptest += "make" diff --git a/external/poky/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch b/external/poky/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch new file mode 100644 index 00000000..fedda9dd --- /dev/null +++ b/external/poky/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch @@ -0,0 +1,31 @@ +From 2d73469c7a17ebfe4330ac6643b0c8abdc125d05 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 30 Jan 2019 09:29:44 -0800 +Subject: [PATCH] get-pac-test: Fix build with clang/libc++ + +get-pac-test.cpp:55:10: error: assigning to 'int' from incompatible type '__bind<int &, sockaddr *, unsigned int>' + ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/libproxy/libproxy/pull/97] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libproxy/test/get-pac-test.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libproxy/test/get-pac-test.cpp b/libproxy/test/get-pac-test.cpp +index 0059dfb..911f296 100644 +--- a/libproxy/test/get-pac-test.cpp ++++ b/libproxy/test/get-pac-test.cpp +@@ -52,7 +52,7 @@ class TestServer { + + setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); + +- ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ++ ret = ::bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); + assert(!ret); + + ret = listen(m_sock, 1); +-- +2.20.1 + diff --git a/external/poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb b/external/poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb index dd7ad922..19dddebd 100644 --- a/external/poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb +++ b/external/poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb @@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "glib-2.0" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://0001-get-pac-test-Fix-build-with-clang-libc.patch \ + " SRC_URI[md5sum] = "f6b1d2a1e17a99cd3debaae6d04ab152" SRC_URI[sha256sum] = "654db464120c9534654590b6683c7fa3887b3dad0ca1c4cd412af24fbfca6d4f" diff --git a/external/poky/meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch b/external/poky/meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch new file mode 100644 index 00000000..6d6ccf4d --- /dev/null +++ b/external/poky/meta/recipes-support/libpsl/libpsl/0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch @@ -0,0 +1,50 @@ +From a0e6f0ec9dc6dd1db1c03f7f273cc16cb3af5561 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 11 Jul 2019 17:47:11 +0100 +Subject: [PATCH] Makefile.am: use PYTHON when invoking psl-make-dafsa + +In an environment where only Python 3 is installed, configure.ac finds and sets +PYTHON=python3 correctly but src/psl-make-dafsa is called directly, so the hashbang of +`#!/usr/bin/env python` is used which doesn't exist. + +Fix this by explicitly running $(PYTHON) when using the tool. + +Upstream-Status: Backport [https://github.com/rockdaboot/libpsl/commit/b4fec5d0ddb70fc4f5360eb14f2f5c5e91194333] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/Makefile.am | 2 +- + tests/Makefile.am | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index f9c0a3d..a05ea05 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -19,7 +19,7 @@ libpsl_la_LDFLAGS = -no-undefined -version-info $(LIBPSL_SO_VERSION) + # Build rule for suffix_dafsa.c + # PSL_FILE can be set by ./configure --with-psl-file=[PATH] + suffixes_dafsa.h: $(PSL_FILE) $(srcdir)/psl-make-dafsa +- $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h ++ $(PYTHON) $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h + + EXTRA_DIST = psl-make-dafsa LICENSE.chromium + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8b29b61..28a9a0b 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -34,9 +34,9 @@ TESTS = $(PSL_TESTS) + # check-local target works in parallel to the tests, so the test suite will likely fail + BUILT_SOURCES = psl.dafsa psl_ascii.dafsa + psl.dafsa: $(top_srcdir)/list/public_suffix_list.dat +- $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa ++ $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa + psl_ascii.dafsa: $(top_srcdir)/list/public_suffix_list.dat +- $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa ++ $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa + + clean-local: + rm -f psl.dafsa psl_ascii.dafsa +-- +2.17.1 + diff --git a/external/poky/meta/recipes-support/libpsl/libpsl/0001-gtk-doc-do-not-include-tree_index.sgml.patch b/external/poky/meta/recipes-support/libpsl/libpsl/0001-gtk-doc-do-not-include-tree_index.sgml.patch new file mode 100644 index 00000000..c78d6fd9 --- /dev/null +++ b/external/poky/meta/recipes-support/libpsl/libpsl/0001-gtk-doc-do-not-include-tree_index.sgml.patch @@ -0,0 +1,28 @@ +From 8691105e1808ec9b031b6c25f70204a0908ae9c1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Sat, 1 Jun 2019 13:09:41 +0200 +Subject: [PATCH] gtk-doc: do not include tree_index.sgml + +gtk-doc 1.30 no longer generates the file if the object tree is empty + +Upstream-Status: Backport [87d1add318b5e5d09977f7f374e923577b6ff3be] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + docs/libpsl/libpsl-docs.sgml | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/docs/libpsl/libpsl-docs.sgml b/docs/libpsl/libpsl-docs.sgml +index 1eca9a2..1c38dbc 100644 +--- a/docs/libpsl/libpsl-docs.sgml ++++ b/docs/libpsl/libpsl-docs.sgml +@@ -22,10 +22,6 @@ + </para> + <xi:include href="xml/libpsl.xml"/> + </chapter> +- <chapter id="object-tree"> +- <title>Object Hierarchy</title> +- <xi:include href="xml/tree_index.sgml"/> +- </chapter> + <index id="api-index-full"> + <title>API Index</title> + <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> diff --git a/external/poky/meta/recipes-support/libpsl/libpsl_0.21.0.bb b/external/poky/meta/recipes-support/libpsl/libpsl_0.21.0.bb new file mode 100644 index 00000000..9831b4b9 --- /dev/null +++ b/external/poky/meta/recipes-support/libpsl/libpsl_0.21.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "Public Suffix List library" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5437030d9e4fbe7267ced058ddb8a7f5 \ + file://COPYING;md5=f41d10997a12da5ee3c24ceeb0148d18" + +SRC_URI = "https://github.com/rockdaboot/${BPN}/releases/download/${BP}/${BP}.tar.gz \ + file://0001-gtk-doc-do-not-include-tree_index.sgml.patch \ + file://0001-Makefile.am-use-PYTHON-when-invoking-psl-make-dafsa.patch \ + " +SRC_URI[md5sum] = "171e96d887709e36a57f4ee627bf82d2" +SRC_URI[sha256sum] = "41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12" + +UPSTREAM_CHECK_URI = "https://github.com/rockdaboot/libpsl/releases" + +DEPENDS = "libidn2" + +inherit autotools gettext gtk-doc manpages pkgconfig lib_package + +PACKAGECONFIG ??= "" +PACKAGECONFIG[manpages] = "--enable-man,--disable-man,libxslt-native" + +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/libsoup/libsoup-2.4_2.62.3.bb b/external/poky/meta/recipes-support/libsoup/libsoup-2.4_2.68.4.bb index aaa3cc51..6731b337 100644 --- a/external/poky/meta/recipes-support/libsoup/libsoup-2.4_2.62.3.bb +++ b/external/poky/meta/recipes-support/libsoup/libsoup-2.4_2.68.4.bb @@ -5,24 +5,31 @@ SECTION = "x11/gnome/libs" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" -DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native" +DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native 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[md5sum] = "dfbf30af5fb6190bfafc5aa6abcc9dce" -SRC_URI[sha256sum] = "d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172" +SRC_URI[md5sum] = "603f3a945cd6ecc1fda644d7853b3b81" +SRC_URI[sha256sum] = "2d50b12922cc516ab6a7c35844d42f9c8a331668bbdf139232743d82582b3294" + +CVE_PRODUCT = "libsoup" S = "${WORKDIR}/libsoup-${PV}" -inherit autotools gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc +inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc + +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[gnome] = "--with-gnome,--without-gnome" -PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" +PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false" +PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" -EXTRA_OECONF = "--disable-vala" +EXTRA_OEMESON_append = " -Dvapi=disabled -Dtls_check=false" + +GTKDOC_MESON_OPTION = "gtk_doc" # When built without gnome support, libsoup-2.4 will contain only one shared lib # and will therefore become subject to renaming by debian.bbclass. Prevent @@ -32,3 +39,5 @@ DEBIAN_NOAUTONAME_${PN} = "1" # glib-networking is needed for SSL, proxies, etc. RRECOMMENDS_${PN} = "glib-networking" + +BBCLASSEXTEND = "native" diff --git a/external/poky/meta/recipes-support/libunwind/libunwind.inc b/external/poky/meta/recipes-support/libunwind/libunwind.inc index 36851d07..76a1bf62 100644 --- a/external/poky/meta/recipes-support/libunwind/libunwind.inc +++ b/external/poky/meta/recipes-support/libunwind/libunwind.inc @@ -2,7 +2,7 @@ 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;beginline=3;md5=3fced11d6df719b47505837a51c16ae5" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f" DEPENDS += "libatomic-ops" inherit autotools multilib_header @@ -12,6 +12,7 @@ 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 () { diff --git a/external/poky/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/external/poky/meta/recipes-support/libunwind/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch index c8faca47..437b8783 100644 --- a/external/poky/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch +++ b/external/poky/meta/recipes-support/libunwind/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch @@ -1,7 +1,7 @@ -From 24484e80b3e329c9edee1995e102f8612eedb79c Mon Sep 17 00:00:00 2001 +From 599f10ac3a24e419a93f97fddbe14de01b1185ea Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Tue, 13 May 2014 23:32:27 +0200 -Subject: [PATCH] Add AO_REQUIRE_CAS to fix build on ARM < v6 +Subject: [PATCH 1/6] Add AO_REQUIRE_CAS to fix build on ARM < v6 ARM earlier than ARMv6, such as ARMv4 and ARMv5 do not provide optimize atomic operations in libatomic_ops. Since libunwind is using @@ -28,10 +28,10 @@ https://raw.githubusercontent.com/rdnetto/teapot-buildroot/master/package/libunw include/libunwind_i.h | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) -Index: libunwind-1.2.1/acinclude.m4 -=================================================================== ---- libunwind-1.2.1.orig/acinclude.m4 -+++ libunwind-1.2.1/acinclude.m4 +diff --git a/acinclude.m4 b/acinclude.m4 +index 497f7c2..9c15af1 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 @@ -22,11 +22,5 @@ fi]) AC_DEFUN([CHECK_ATOMIC_OPS], [dnl Check whether the system has the atomic_ops package installed. @@ -45,11 +45,11 @@ Index: libunwind-1.2.1/acinclude.m4 -# AC_CHECK_LIB(atomic_ops, main) + AC_CHECK_LIB(atomic_ops, main) ]) -Index: libunwind-1.2.1/include/libunwind_i.h -=================================================================== ---- libunwind-1.2.1.orig/include/libunwind_i.h -+++ libunwind-1.2.1/include/libunwind_i.h -@@ -116,6 +116,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE +diff --git a/include/libunwind_i.h b/include/libunwind_i.h +index 36cf7a1..33b4ca3 100644 +--- a/include/libunwind_i.h ++++ b/include/libunwind_i.h +@@ -124,6 +124,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ (pthread_mutex_unlock != NULL ? pthread_mutex_unlock (l) : 0) #ifdef HAVE_ATOMIC_OPS_H @@ -57,3 +57,6 @@ Index: libunwind-1.2.1/include/libunwind_i.h # include <atomic_ops.h> static inline int cmpxchg_ptr (void *addr, void *old, void *new) +-- +2.20.1 + diff --git a/external/poky/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch b/external/poky/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch deleted file mode 100644 index 673a5bb9..00000000 --- a/external/poky/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 459e471fcc33d300f7bbcdaf3e0dc338d9dc15b9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Apr 2016 16:56:34 +0000 -Subject: [PATCH] add knobs to disable/enable tests - -Some tests do not compile on musl libc -in general its good to have such a knob -since not all builds may want to enable -tests - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile.am | 6 +++++- - configure.ac | 12 ++++++++++-- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6a3ed9e..0c29b3e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -42,7 +42,11 @@ endif - - nodist_include_HEADERS = include/libunwind-common.h - --SUBDIRS = src tests -+SUBDIRS = src -+ -+if CONFIG_TESTS -+SUBDIRS += tests -+endif - - if CONFIG_DOCS - SUBDIRS += doc -diff --git a/configure.ac b/configure.ac -index 85d78f8..d362387 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -129,6 +129,10 @@ AC_ARG_ENABLE(documentation, - AS_HELP_STRING([--disable-documentation],[Disable generating the man pages]),, - [enable_documentation=yes]) - -+AC_ARG_ENABLE(tests, -+ AS_HELP_STRING([--disable-tests],[Disable building tests]),, -+ [enable_tests=yes]) -+ - AC_MSG_CHECKING([if we should build libunwind-setjmp]) - AC_MSG_RESULT([$enable_setjmp]) - -@@ -395,9 +399,13 @@ AM_CONDITIONAL([CONFIG_DOCS], [test x$enable_documentation = xyes]) - if test "x$enable_documentation" = "xyes"; then - AC_CONFIG_FILES(doc/Makefile doc/common.tex) - fi -+AM_CONDITIONAL([CONFIG_TESTS], [test x$enable_tests = xyes]) -+if test "x$enable_tests" = "xyes"; then -+ AC_CONFIG_FILES(tests/Makefile tests/check-namespace.sh) -+fi -+ - --AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh -- include/libunwind-common.h -+AC_CONFIG_FILES(Makefile src/Makefile include/libunwind-common.h - include/libunwind.h include/tdep/libunwind_i.h) - AC_CONFIG_FILES(src/unwind/libunwind.pc src/coredump/libunwind-coredump.pc - src/ptrace/libunwind-ptrace.pc src/setjmp/libunwind-setjmp.pc --- -1.8.3.1 - diff --git a/external/poky/meta/recipes-support/libunwind/libunwind/0001-backtrace-Use-only-with-glibc-and-uclibc.patch b/external/poky/meta/recipes-support/libunwind/libunwind/0002-backtrace-Use-only-with-glibc-and-uclibc.patch index 9aed419a..1b862dcc 100644 --- a/external/poky/meta/recipes-support/libunwind/libunwind/0001-backtrace-Use-only-with-glibc-and-uclibc.patch +++ b/external/poky/meta/recipes-support/libunwind/libunwind/0002-backtrace-Use-only-with-glibc-and-uclibc.patch @@ -1,20 +1,20 @@ -From 04437142399662b576bd55a85485c6dcc14d0812 Mon Sep 17 00:00:00 2001 +From b61446add7ae1c041266c2fa5ba2f51cb3b65d35 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 31 Dec 2015 06:44:07 +0000 -Subject: [PATCH] backtrace: Use only with glibc and uclibc +Subject: [PATCH 2/6] backtrace: Use only with glibc and uclibc backtrace API is glibc specific not linux specific so make it behave so. -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- tests/test-coredump-unwind.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c -index 5254708..8767b42 100644 +index 5349823..3b153cb 100644 --- a/tests/test-coredump-unwind.c +++ b/tests/test-coredump-unwind.c @@ -57,7 +57,9 @@ @@ -41,5 +41,5 @@ index 5254708..8767b42 100644 #endif } -- -2.6.4 +2.20.1 diff --git a/external/poky/meta/recipes-support/libunwind/libunwind/0001-x86-Stub-out-x86_local_resume.patch b/external/poky/meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch index 371013aa..508ed6af 100644 --- a/external/poky/meta/recipes-support/libunwind/libunwind/0001-x86-Stub-out-x86_local_resume.patch +++ b/external/poky/meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch @@ -1,7 +1,7 @@ -From f5df01655a4b76d4fe415747de581d94ac593e6a Mon Sep 17 00:00:00 2001 +From f6866b9e4a6341c50eb1d923dbf48eca2ca40140 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() +Subject: [PATCH 3/6] x86: Stub out x86_local_resume() its purpose seems to be unwinding across signal handler boundaries, which cannot happen @@ -9,18 +9,18 @@ in correct programs anyway. Replacing the whole function with something like *(volatile char *)0=0; (i.e. crash), gets a working libunwind -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- src/x86/Gos-linux.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/x86/Gos-linux.c b/src/x86/Gos-linux.c -index 31f83ba..3aaa34e 100644 +index fb9a5e3..c25ae0c 100644 --- a/src/x86/Gos-linux.c +++ b/src/x86/Gos-linux.c -@@ -281,27 +281,7 @@ x86_r_uc_addr (ucontext_t *uc, int reg) +@@ -284,27 +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) { @@ -38,7 +38,7 @@ index 31f83ba..3aaa34e 100644 - struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr; - - Debug (8, "resuming at ip=%x via sigreturn(%p)\n", c->dwarf.ip, sc); -- sigreturn (sc); +- x86_sigreturn (sc); - } - else - { @@ -48,7 +48,7 @@ index 31f83ba..3aaa34e 100644 + *(volatile char *)0=0; return -UNW_EINVAL; } - #endif + -- -1.8.3.1 +2.20.1 diff --git a/external/poky/meta/recipes-support/libunwind/libunwind/0001-Fix-build-on-mips-musl.patch b/external/poky/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch index 8bcc252b..124d0e00 100644 --- a/external/poky/meta/recipes-support/libunwind/libunwind/0001-Fix-build-on-mips-musl.patch +++ b/external/poky/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch @@ -1,25 +1,25 @@ -From e623c7703945a5eb6c9a30586ec5e23b2f7396f6 Mon Sep 17 00:00:00 2001 +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] Fix build on mips/musl +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 -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> - src/coredump/_UCD_internal.h | 34 ++++++++++++++++++++++++++++++++++ +--- + src/coredump/_UCD_internal.h | 35 +++++++++++++++++++++++++++++++++++ src/mips/getcontext.S | 3 +-- - 2 files changed, 35 insertions(+), 2 deletions(-) + 2 files changed, 36 insertions(+), 2 deletions(-) -Index: git/src/coredump/_UCD_internal.h -=================================================================== ---- git.orig/src/coredump/_UCD_internal.h -+++ git/src/coredump/_UCD_internal.h -@@ -44,6 +44,41 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE +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" @@ -61,11 +61,11 @@ Index: git/src/coredump/_UCD_internal.h #if SIZEOF_OFF_T == 4 typedef uint32_t uoff_t; -Index: git/src/mips/getcontext.S -=================================================================== ---- git.orig/src/mips/getcontext.S -+++ git/src/mips/getcontext.S -@@ -24,12 +24,11 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING +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" @@ -79,3 +79,6 @@ Index: git/src/mips/getcontext.S # define OFFSET 4 # else # define OFFSET 0 +-- +2.20.1 + diff --git a/external/poky/meta/recipes-support/libunwind/libunwind/0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch b/external/poky/meta/recipes-support/libunwind/libunwind/0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch index ca0641f5..edaa822b 100644 --- a/external/poky/meta/recipes-support/libunwind/libunwind/0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch +++ b/external/poky/meta/recipes-support/libunwind/libunwind/0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch @@ -1,7 +1,8 @@ -From e0eea53c77fce8537c58a072b684043507987bcc Mon Sep 17 00:00:00 2001 +From 02919d74b1599979884f9cee466ed392d9fc4819 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 9 Jul 2016 01:07:53 +0000 -Subject: [PATCH] ppc32: Consider ucontext mismatches between glibc and musl +Subject: [PATCH 5/6] ppc32: Consider ucontext mismatches between glibc and + musl This helps in porting libunwind onto musl based systems ptrace.h change is required again an error that surfaces @@ -18,17 +19,17 @@ In file included from /mnt/oe/openembedded-core/build/tmp-musl/sysroots/qemuppc/ struct pt_regs { ^~~~~~~ -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- src/ppc32/Ginit.c | 6 +- - src/ppc32/ucontext_i.h | 158 ++++++++++++++++++++++--------------------- + src/ppc32/ucontext_i.h | 158 ++++++++++++++++++----------------- src/ptrace/_UPT_reg_offset.c | 7 ++ 3 files changed, 92 insertions(+), 79 deletions(-) diff --git a/src/ppc32/Ginit.c b/src/ppc32/Ginit.c -index f2e6e82..617aaa1 100644 +index ba30244..c5312d9 100644 --- a/src/ppc32/Ginit.c +++ b/src/ppc32/Ginit.c @@ -48,12 +48,12 @@ uc_addr (ucontext_t *uc, int reg) @@ -226,7 +227,7 @@ index c6ba806..b79f15c 100644 #endif diff --git a/src/ptrace/_UPT_reg_offset.c b/src/ptrace/_UPT_reg_offset.c -index 68461a2..fcc43f7 100644 +index c82d1c9..6c31baa 100644 --- a/src/ptrace/_UPT_reg_offset.c +++ b/src/ptrace/_UPT_reg_offset.c @@ -27,6 +27,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ @@ -244,5 +245,5 @@ index 68461a2..fcc43f7 100644 #ifdef HAVE_ASM_PTRACE_OFFSETS_H # include <asm/ptrace_offsets.h> -- -1.8.3.1 +2.20.1 diff --git a/external/poky/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch b/external/poky/meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch index 32516464..37ae8124 100644 --- a/external/poky/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch +++ b/external/poky/meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch @@ -1,21 +1,22 @@ -From 506bd37bd580d7382d7c58257dac4b1e502a887c Mon Sep 17 00:00:00 2001 +From 7a4fd5933cc795df85cdd85168fe54fbaec4dcec 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 +Subject: [PATCH 6/6] 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 9e1acfc..8169d5a 100644 +index bd14234..be1cb5b 100644 --- a/src/x86_64/Gos-linux.c +++ b/src/x86_64/Gos-linux.c -@@ -143,8 +143,8 @@ x86_64_sigreturn (unw_cursor_t *cursor) +@@ -145,8 +145,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); @@ -27,5 +28,5 @@ index 9e1acfc..8169d5a 100644 :: "r"(sc), "i"(SYS_rt_sigreturn) : "memory"); -- -2.8.0 +2.20.1 diff --git a/external/poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb b/external/poky/meta/recipes-support/libunwind/libunwind_1.3.1.bb index e7fb2b21..037e04c3 100644 --- a/external/poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb +++ b/external/poky/meta/recipes-support/libunwind/libunwind_1.3.1.bb @@ -1,20 +1,19 @@ require libunwind.inc -SRC_URI[md5sum] = "06ba9e60d92fd6f55cd9dadb084df19e" -SRC_URI[sha256sum] = "3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb" - SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ - file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ - file://0001-backtrace-Use-only-with-glibc-and-uclibc.patch \ - file://0001-x86-Stub-out-x86_local_resume.patch \ - file://0001-Fix-build-on-mips-musl.patch \ - file://0001-add-knobs-to-disable-enable-tests.patch \ - file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ - file://libunwind-1.1-x32.patch \ + file://0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ + file://0002-backtrace-Use-only-with-glibc-and-uclibc.patch \ + file://0003-x86-Stub-out-x86_local_resume.patch \ + file://0004-Fix-build-on-mips-musl.patch \ + file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ + file://0006-Fix-for-X32.patch \ " - SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" -EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests " + +SRC_URI[md5sum] = "a04f69d66d8e16f8bf3ab72a69112cd6" +SRC_URI[sha256sum] = "43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8" + +EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enable-static" # http://errors.yoctoproject.org/Errors/Details/20487/ ARM_INSTRUCTION_SET_armv4 = "arm" diff --git a/external/poky/meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch b/external/poky/meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch deleted file mode 100644 index b026782b..00000000 --- a/external/poky/meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch +++ /dev/null @@ -1,157 +0,0 @@ -From fdfad81006c2c964781b616f0a75578507be809c Mon Sep 17 00:00:00 2001 -From: Michael Jeanson <mjeanson@efficios.com> -Date: Wed, 21 Mar 2018 17:38:41 -0400 -Subject: [PATCH] Add support for the RISC-V architecture - -Tested in QEMU 2.12.0-rc0, requires --disable-compiler-tls to go -through the benchmarks reliably. - -Signed-off-by: Michael Jeanson <mjeanson@efficios.com> -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Upstream-Status: Backport ---- - configure.ac | 1 + - include/Makefile.am | 2 ++ - include/urcu/arch/riscv.h | 49 ++++++++++++++++++++++++++++++++++++++++++++ - include/urcu/uatomic/riscv.h | 44 +++++++++++++++++++++++++++++++++++++++ - 4 files changed, 96 insertions(+) - create mode 100644 include/urcu/arch/riscv.h - create mode 100644 include/urcu/uatomic/riscv.h - -diff --git a/configure.ac b/configure.ac -index d0b4a9ac..9145081a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -151,6 +151,7 @@ AS_CASE([$host_cpu], - [tile*], [ARCHTYPE="tile"], - [hppa*], [ARCHTYPE="hppa"], - [m68k], [ARCHTYPE="m68k"], -+ [riscv*], [ARCHTYPE="riscv"], - [ARCHTYPE="unknown"] - ) - -diff --git a/include/Makefile.am b/include/Makefile.am -index dcdf304b..36667b43 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -27,6 +27,7 @@ EXTRA_DIST = urcu/arch/aarch64.h \ - urcu/arch/mips.h \ - urcu/arch/nios2.h \ - urcu/arch/ppc.h \ -+ urcu/arch/riscv.h \ - urcu/arch/s390.h \ - urcu/arch/sparc64.h \ - urcu/arch/tile.h \ -@@ -43,6 +44,7 @@ EXTRA_DIST = urcu/arch/aarch64.h \ - urcu/uatomic/mips.h \ - urcu/uatomic/nios2.h \ - urcu/uatomic/ppc.h \ -+ urcu/uatomic/riscv.h \ - urcu/uatomic/s390.h \ - urcu/uatomic/sparc64.h \ - urcu/uatomic/tile.h \ -diff --git a/include/urcu/arch/riscv.h b/include/urcu/arch/riscv.h -new file mode 100644 -index 00000000..1fd7d62b ---- /dev/null -+++ b/include/urcu/arch/riscv.h -@@ -0,0 +1,49 @@ -+#ifndef _URCU_ARCH_RISCV_H -+#define _URCU_ARCH_RISCV_H -+ -+/* -+ * arch/riscv.h: definitions for the RISC-V architecture -+ * -+ * Copyright (c) 2018 Michael Jeanson <mjeanson@efficios.com> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#include <urcu/compiler.h> -+#include <urcu/config.h> -+#include <urcu/syscall-compat.h> -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#include <stdlib.h> -+#include <sys/time.h> -+ -+/* -+ * On Linux, define the membarrier system call number if not yet available in -+ * the system headers. -+ */ -+#if (defined(__linux__) && !defined(__NR_membarrier)) -+#define __NR_membarrier 283 -+#endif -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#include <urcu/arch/generic.h> -+ -+#endif /* _URCU_ARCH_RISCV_H */ -diff --git a/include/urcu/uatomic/riscv.h b/include/urcu/uatomic/riscv.h -new file mode 100644 -index 00000000..a6700e17 ---- /dev/null -+++ b/include/urcu/uatomic/riscv.h -@@ -0,0 +1,44 @@ -+/* -+ * Atomic exchange operations for the RISC-V architecture. Let GCC do it. -+ * -+ * Copyright (c) 2018 Michael Jeanson <mjeanson@efficios.com> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to -+ * deal in the Software without restriction, including without limitation the -+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS OR COPYRIGHT HOLDERS BE 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. -+ */ -+ -+#ifndef _URCU_ARCH_UATOMIC_RISCV_H -+#define _URCU_ARCH_UATOMIC_RISCV_H -+ -+#include <urcu/compiler.h> -+#include <urcu/system.h> -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#define UATOMIC_HAS_ATOMIC_BYTE -+#define UATOMIC_HAS_ATOMIC_SHORT -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#include <urcu/uatomic/generic.h> -+ -+#endif /* _URCU_ARCH_UATOMIC_RISCV_H */ diff --git a/external/poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb b/external/poky/meta/recipes-support/liburcu/liburcu_0.11.1.bb index 5eb91e14..6a517e6f 100644 --- a/external/poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb +++ b/external/poky/meta/recipes-support/liburcu/liburcu_0.11.1.bb @@ -4,15 +4,13 @@ BUGTRACKER = "http://lttng.org/project/issues" LICENSE = "LGPLv2.1+ & MIT-style" LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \ - file://src/urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ + file://include/urcu/urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ file://include/urcu/uatomic/x86.h;beginline=4;endline=21;md5=58e50bbd8a2f073bb5500e6554af0d0b" -SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ - file://Add-support-for-the-RISC-V-architecture.patch \ - " +SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2" -SRC_URI[md5sum] = "281a2f92fdc39c40ad6b76f6631fdbd7" -SRC_URI[sha256sum] = "9c09220be4435dc27fcd22d291707b94b97f159e0c442fbcd60c168f8f79eb06" +SRC_URI[md5sum] = "91c75d5902127f94ab556ce039b369ca" +SRC_URI[sha256sum] = "92b9971bf3f1c443edd6c09e7bf5ff3b43531e778841f16377a812c8feeb3350" S = "${WORKDIR}/userspace-rcu-${PV}" inherit autotools multilib_header diff --git a/external/poky/meta/recipes-support/libusb/libusb1_1.0.22.bb b/external/poky/meta/recipes-support/libusb/libusb1_1.0.22.bb index 0c6e116d..1d9d7725 100644 --- a/external/poky/meta/recipes-support/libusb/libusb1_1.0.22.bb +++ b/external/poky/meta/recipes-support/libusb/libusb1_1.0.22.bb @@ -20,9 +20,10 @@ S = "${WORKDIR}/libusb-${PV}" inherit autotools pkgconfig ptest -# Don't configure udev by default since it will cause a circular -# dependecy with udev package, which depends on libusb -EXTRA_OECONF = "--libdir=${base_libdir} --disable-udev" +PACKAGECONFIG_class-target ??= "udev" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" + +EXTRA_OECONF = "--libdir=${base_libdir}" do_install_append() { install -d ${D}${libdir} diff --git a/external/poky/meta/recipes-support/libxslt/files/CVE-2019-13117.patch b/external/poky/meta/recipes-support/libxslt/files/CVE-2019-13117.patch deleted file mode 100644 index ef3f2709..00000000 --- a/external/poky/meta/recipes-support/libxslt/files/CVE-2019-13117.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c5eb6cf3aba0af048596106ed839b4ae17ecbcb1 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <wellnhofer@aevum.de> -Date: Sat, 27 Apr 2019 11:19:48 +0200 -Subject: [PATCH] Fix uninitialized read of xsl:number token - -Found by OSS-Fuzz. - -CVE: CVE-2019-13117 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxslt/commit/c5eb6cf3aba0af048596106ed839b4ae17ecbcb1] -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - libxslt/numbers.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/libxslt/numbers.c b/libxslt/numbers.c -index 89e1f668..75c31eba 100644 ---- a/libxslt/numbers.c -+++ b/libxslt/numbers.c -@@ -382,7 +382,10 @@ xsltNumberFormatTokenize(const xmlChar *format, - tokens->tokens[tokens->nTokens].token = val - 1; - ix += len; - val = xmlStringCurrentChar(NULL, format+ix, &len); -- } -+ } else { -+ tokens->tokens[tokens->nTokens].token = (xmlChar)'0'; -+ tokens->tokens[tokens->nTokens].width = 1; -+ } - } else if ( (val == (xmlChar)'A') || - (val == (xmlChar)'a') || - (val == (xmlChar)'I') || --- -2.21.0 - diff --git a/external/poky/meta/recipes-support/libxslt/files/CVE-2019-13118.patch b/external/poky/meta/recipes-support/libxslt/files/CVE-2019-13118.patch deleted file mode 100644 index 595e6c2f..00000000 --- a/external/poky/meta/recipes-support/libxslt/files/CVE-2019-13118.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 6ce8de69330783977dd14f6569419489875fb71b Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <wellnhofer@aevum.de> -Date: Mon, 3 Jun 2019 13:14:45 +0200 -Subject: [PATCH] Fix uninitialized read with UTF-8 grouping chars - -The character type in xsltFormatNumberConversion was too narrow and -an invalid character/length combination could be passed to -xsltNumberFormatDecimal, resulting in an uninitialized read. - -Found by OSS-Fuzz. - -CVE: CVE-2019-13118 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxslt/commit/6ce8de69330783977dd14f6569419489875fb71b] -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> - ---- - libxslt/numbers.c | 5 +++-- - tests/docs/bug-222.xml | 1 + - tests/general/bug-222.out | 2 ++ - tests/general/bug-222.xsl | 6 ++++++ - 4 files changed, 12 insertions(+), 2 deletions(-) - create mode 100644 tests/docs/bug-222.xml - create mode 100644 tests/general/bug-222.out - create mode 100644 tests/general/bug-222.xsl - -diff --git a/libxslt/numbers.c b/libxslt/numbers.c -index f1ed8846..20b99d5a 100644 ---- a/libxslt/numbers.c -+++ b/libxslt/numbers.c -@@ -1298,13 +1298,14 @@ OUTPUT_NUMBER: - number = floor((scale * number + 0.5)) / scale; - if ((self->grouping != NULL) && - (self->grouping[0] != 0)) { -+ int gchar; - - len = xmlStrlen(self->grouping); -- pchar = xsltGetUTF8Char(self->grouping, &len); -+ gchar = xsltGetUTF8Char(self->grouping, &len); - xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0], - format_info.integer_digits, - format_info.group, -- pchar, len); -+ gchar, len); - } else - xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0], - format_info.integer_digits, -diff --git a/tests/docs/bug-222.xml b/tests/docs/bug-222.xml -new file mode 100644 -index 00000000..69d62f2c ---- /dev/null -+++ b/tests/docs/bug-222.xml -@@ -0,0 +1 @@ -+<doc/> -diff --git a/tests/general/bug-222.out b/tests/general/bug-222.out -new file mode 100644 -index 00000000..e3139698 ---- /dev/null -+++ b/tests/general/bug-222.out -@@ -0,0 +1,2 @@ -+<?xml version="1.0"?> -+1â ¢0 -diff --git a/tests/general/bug-222.xsl b/tests/general/bug-222.xsl -new file mode 100644 -index 00000000..e32dc473 ---- /dev/null -+++ b/tests/general/bug-222.xsl -@@ -0,0 +1,6 @@ -+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> -+ <xsl:decimal-format name="f" grouping-separator="â ¢"/> -+ <xsl:template match="/"> -+ <xsl:value-of select="format-number(10,'#â ¢0','f')"/> -+ </xsl:template> -+</xsl:stylesheet> --- -2.21.0 - diff --git a/external/poky/meta/recipes-support/libxslt/libxslt/CVE-2019-11068.patch b/external/poky/meta/recipes-support/libxslt/libxslt/CVE-2019-11068.patch deleted file mode 100644 index 83ca8a3c..00000000 --- a/external/poky/meta/recipes-support/libxslt/libxslt/CVE-2019-11068.patch +++ /dev/null @@ -1,128 +0,0 @@ -From aed812d8dbbb6d1337312652aa72aa7f44d2b07d Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <wellnhofer@aevum.de> -Date: Sun, 24 Mar 2019 09:51:39 +0100 -Subject: [PATCH] Fix security framework bypass - -xsltCheckRead and xsltCheckWrite return -1 in case of error but callers -don't check for this condition and allow access. With a specially -crafted URL, xsltCheckRead could be tricked into returning an error -because of a supposedly invalid URL that would still be loaded -succesfully later on. - -Fixes #12. - -Thanks to Felix Wilhelm for the report. - -Signed-off-by: Muminul Islam <muminul.islam@microsoft.com> - -CVE: CVE-2019-11068 - -Upstream-Status: Backport - -https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6 ---- - libxslt/documents.c | 18 ++++++++++-------- - libxslt/imports.c | 9 +++++---- - libxslt/transform.c | 9 +++++---- - libxslt/xslt.c | 9 +++++---- - 4 files changed, 25 insertions(+), 20 deletions(-) - -diff --git a/libxslt/documents.c b/libxslt/documents.c -index 3f3a7312..4aad11bb 100644 ---- a/libxslt/documents.c -+++ b/libxslt/documents.c -@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const xmlChar *URI) { - int res; - - res = xsltCheckRead(ctxt->sec, ctxt, URI); -- if (res == 0) { -- xsltTransformError(ctxt, NULL, NULL, -- "xsltLoadDocument: read rights for %s denied\n", -- URI); -+ if (res <= 0) { -+ if (res == 0) -+ xsltTransformError(ctxt, NULL, NULL, -+ "xsltLoadDocument: read rights for %s denied\n", -+ URI); - return(NULL); - } - } -@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const xmlChar *URI) { - int res; - - res = xsltCheckRead(sec, NULL, URI); -- if (res == 0) { -- xsltTransformError(NULL, NULL, NULL, -- "xsltLoadStyleDocument: read rights for %s denied\n", -- URI); -+ if (res <= 0) { -+ if (res == 0) -+ xsltTransformError(NULL, NULL, NULL, -+ "xsltLoadStyleDocument: read rights for %s denied\n", -+ URI); - return(NULL); - } - } -diff --git a/libxslt/imports.c b/libxslt/imports.c -index 7262aab9..b62e0877 100644 ---- a/libxslt/imports.c -+++ b/libxslt/imports.c -@@ -131,10 +131,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, xmlNodePtr cur) { - int secres; - - secres = xsltCheckRead(sec, NULL, URI); -- if (secres == 0) { -- xsltTransformError(NULL, NULL, NULL, -- "xsl:import: read rights for %s denied\n", -- URI); -+ if (secres <= 0) { -+ if (secres == 0) -+ xsltTransformError(NULL, NULL, NULL, -+ "xsl:import: read rights for %s denied\n", -+ URI); - goto error; - } - } -diff --git a/libxslt/transform.c b/libxslt/transform.c -index 560f43ca..46eef553 100644 ---- a/libxslt/transform.c -+++ b/libxslt/transform.c -@@ -3485,10 +3485,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node, - */ - if (ctxt->sec != NULL) { - ret = xsltCheckWrite(ctxt->sec, ctxt, filename); -- if (ret == 0) { -- xsltTransformError(ctxt, NULL, inst, -- "xsltDocumentElem: write rights for %s denied\n", -- filename); -+ if (ret <= 0) { -+ if (ret == 0) -+ xsltTransformError(ctxt, NULL, inst, -+ "xsltDocumentElem: write rights for %s denied\n", -+ filename); - xmlFree(URL); - xmlFree(filename); - return; -diff --git a/libxslt/xslt.c b/libxslt/xslt.c -index 54a39de9..359913e4 100644 ---- a/libxslt/xslt.c -+++ b/libxslt/xslt.c -@@ -6763,10 +6763,11 @@ xsltParseStylesheetFile(const xmlChar* filename) { - int res; - - res = xsltCheckRead(sec, NULL, filename); -- if (res == 0) { -- xsltTransformError(NULL, NULL, NULL, -- "xsltParseStylesheetFile: read rights for %s denied\n", -- filename); -+ if (res <= 0) { -+ if (res == 0) -+ xsltTransformError(NULL, NULL, NULL, -+ "xsltParseStylesheetFile: read rights for %s denied\n", -+ filename); - return(NULL); - } - } --- -2.23.0 - diff --git a/external/poky/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch b/external/poky/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch deleted file mode 100644 index ea3ae51e..00000000 --- a/external/poky/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch +++ /dev/null @@ -1,80 +0,0 @@ -libxslt-1.1.32: Fix handling of RVTs returned from nested EXSLT functions - -[No upstream tracking] -- https://bugzilla.gnome.org/show_bug.cgi?id=792580 - -Set the context variable to NULL when evaluating EXSLT functions. -Fixes potential use-after-free errors or memory leaks. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxslt/commit/8bd32f7753ac253a54279a0b6a88d15a57076bb0] -bug: 792580 -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> - -diff --git a/libexslt/functions.c b/libexslt/functions.c -index dc794e3..8511cb0 100644 ---- a/libexslt/functions.c -+++ b/libexslt/functions.c -@@ -280,6 +280,7 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) { - exsltFuncFunctionData *func; - xmlNodePtr paramNode, oldInsert, fake; - int oldBase; -+ void *oldCtxtVar; - xsltStackElemPtr params = NULL, param; - xsltTransformContextPtr tctxt = xsltXPathGetTransformContext(ctxt); - int i, notSet; -@@ -418,11 +419,14 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) { - fake = xmlNewDocNode(tctxt->output, NULL, - (const xmlChar *)"fake", NULL); - oldInsert = tctxt->insert; -+ oldCtxtVar = tctxt->contextVariable; - tctxt->insert = fake; -+ tctxt->contextVariable = NULL; - xsltApplyOneTemplate (tctxt, tctxt->node, - func->content, NULL, NULL); - xsltLocalVariablePop(tctxt, tctxt->varsBase, -2); - tctxt->insert = oldInsert; -+ tctxt->contextVariable = oldCtxtVar; - tctxt->varsBase = oldBase; /* restore original scope */ - if (params != NULL) - xsltFreeStackElemList(params); -diff --git a/tests/docs/bug-209.xml b/tests/docs/bug-209.xml -new file mode 100644 -index 0000000..69d62f2 ---- /dev/null -+++ b/tests/docs/bug-209.xml -@@ -0,0 +1 @@ -+<doc/> -diff --git a/tests/general/bug-209.out b/tests/general/bug-209.out -new file mode 100644 -index 0000000..e829790 ---- /dev/null -+++ b/tests/general/bug-209.out -@@ -0,0 +1,2 @@ -+<?xml version="1.0"?> -+<result/> -diff --git a/tests/general/bug-209.xsl b/tests/general/bug-209.xsl -new file mode 100644 -index 0000000..fe69ac6 ---- /dev/null -+++ b/tests/general/bug-209.xsl -@@ -0,0 +1,21 @@ -+<xsl:stylesheet -+ version="1.0" -+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" -+ xmlns:func="http://exslt.org/functions" -+ extension-element-prefixes="func"> -+ -+ <xsl:template match="/"> -+ <xsl:variable name="v" select="func:a()" /> -+ <xsl:copy-of select="$v"/> -+ </xsl:template> -+ -+ <func:function name="func:a"> -+ <func:result select="func:b()" /> -+ </func:function> -+ -+ <func:function name="func:b"> -+ <func:result> -+ <result/> -+ </func:result> -+ </func:function> -+</xsl:stylesheet> diff --git a/external/poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb b/external/poky/meta/recipes-support/libxslt/libxslt_1.1.34.bb index e2a515f8..1961bb5b 100644 --- a/external/poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb +++ b/external/poky/meta/recipes-support/libxslt/libxslt_1.1.34.bb @@ -9,14 +9,10 @@ SECTION = "libs" DEPENDS = "libxml2" SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz \ - file://fix-rvts-handling.patch \ - file://CVE-2019-11068.patch \ - file://CVE-2019-13117.patch \ - file://CVE-2019-13118.patch \ -" + " -SRC_URI[md5sum] = "1fc72f98e98bf4443f1651165f3aa146" -SRC_URI[sha256sum] = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460" +SRC_URI[md5sum] = "db8765c8d076f1b6caafd9f2542a304a" +SRC_URI[sha256sum] = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f" UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar" @@ -24,10 +20,11 @@ S = "${WORKDIR}/libxslt-${PV}" BINCONFIG = "${bindir}/xslt-config" -inherit autotools pkgconfig binconfig-disabled lib_package +inherit autotools pkgconfig binconfig-disabled lib_package multilib_header -# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header do_configure_prepend () { + # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header. + # This can be removed when upgrading to 1.1.34. sed -i -e 's/ansidecl.h//' ${S}/configure.ac # The timestamps in the 1.1.28 tarball are messed up causing this file to @@ -35,15 +32,19 @@ do_configure_prepend () { touch ${S}/doc/xsltproc.1 } -EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" +EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto --with-html-subdir=${BPN}" # older versions of this recipe had ${PN}-utils RPROVIDES_${PN}-bin += "${PN}-utils" RCONFLICTS_${PN}-bin += "${PN}-utils" RREPLACES_${PN}-bin += "${PN}-utils" - +# This is only needed until libxml can load the relocated catalog itself do_install_append_class-native () { - create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml + create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog +} + +do_install_append () { + oe_multilib_header libxslt/xsltconfig.h } FILES_${PN} += "${libdir}/libxslt-plugins" diff --git a/external/poky/meta/recipes-support/libyaml/libyaml_0.2.1.bb b/external/poky/meta/recipes-support/libyaml/libyaml_0.2.1.bb deleted file mode 100644 index d7789182..00000000 --- a/external/poky/meta/recipes-support/libyaml/libyaml_0.2.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "LibYAML is a YAML 1.1 parser and emitter written in C." -DESCRIPTION = "LibYAML is a C library for parsing and emitting data in YAML 1.1, \ -a human-readable data serialization format. " -HOMEPAGE = "http://pyyaml.org/wiki/LibYAML" -SECTION = "libs/devel" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5591701d32590f9fa94f3bfee820b634" - -SRC_URI = "http://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz" -SRC_URI[md5sum] = "72724b9736923c517e5a8fc6757ef03d" -SRC_URI[sha256sum] = "78281145641a080fb32d6e7a87b9c0664d611dcb4d542e90baf731f51cbb59cd" - -S = "${WORKDIR}/yaml-${PV}" - -inherit autotools - -BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/libyaml/libyaml_0.2.2.bb b/external/poky/meta/recipes-support/libyaml/libyaml_0.2.2.bb new file mode 100644 index 00000000..5105ce69 --- /dev/null +++ b/external/poky/meta/recipes-support/libyaml/libyaml_0.2.2.bb @@ -0,0 +1,18 @@ +SUMMARY = "LibYAML is a YAML 1.1 parser and emitter written in C." +DESCRIPTION = "LibYAML is a C library for parsing and emitting data in YAML 1.1, \ +a human-readable data serialization format. " +HOMEPAGE = "https://pyyaml.org/wiki/LibYAML" +SECTION = "libs/devel" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a76b4c69bfcf82313bbdc0393b04438a" + +SRC_URI = "https://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz" +SRC_URI[md5sum] = "54bf11ccb8bc488b5b3bec931f5b70dc" +SRC_URI[sha256sum] = "4a9100ab61047fd9bd395bcef3ce5403365cafd55c1e0d0299cde14958e47be9" + +S = "${WORKDIR}/yaml-${PV}" + +inherit autotools + +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/lz4/lz4_1.8.2.bb b/external/poky/meta/recipes-support/lz4/lz4_1.9.2.bb index 5ad17e1f..6510156e 100644 --- a/external/poky/meta/recipes-support/lz4/lz4_1.8.2.bb +++ b/external/poky/meta/recipes-support/lz4/lz4_1.9.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \ PE = "1" -SRCREV = "b3692db46d2b23a7c0af2d5e69988c94f126e10a" +SRCREV = "fdf2ef5809ca875c454510610764d9125ef2ebbd" SRC_URI = "git://github.com/lz4/lz4.git \ file://run-ptest \ @@ -18,7 +18,10 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" S = "${WORKDIR}/git" -EXTRA_OEMAKE = "PREFIX=${prefix} CC='${CC}' DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir}" +# Fixed in r118, which is larger than the current version. +CVE_CHECK_WHITELIST += "CVE-2014-4715" + +EXTRA_OEMAKE = "PREFIX=${prefix} CC='${CC}' DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir} BUILD_STATIC=no" do_install() { oe_runmake install diff --git a/external/poky/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch b/external/poky/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch deleted file mode 100644 index 867b88b3..00000000 --- a/external/poky/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch +++ /dev/null @@ -1,100 +0,0 @@ -From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 16 Aug 2015 10:35:47 -0700 -Subject: [PATCH] use static inlines as the external inline definition has - changed with gcc5 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/miniacc.h | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -diff --git a/src/miniacc.h b/src/miniacc.h -index 09e6f0c..cae98d1 100644 ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } --- -2.5.0 - diff --git a/external/poky/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch b/external/poky/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch deleted file mode 100644 index 72b33970..00000000 --- a/external/poky/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch +++ /dev/null @@ -1,37 +0,0 @@ -gcc-6 has additional errors e.g. - -./test.c:1:12: error: variably modified '__acc_cta' at file scope - extern int __acc_cta[1-2*!((1l << (8*8 -1)) < 0)]; - ^~~~~~~~~ - -This is rightly pointed out since that index is undefined - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - ---- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 -+++ a/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/external/poky/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch b/external/poky/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch deleted file mode 100644 index 739be823..00000000 --- a/external/poky/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix get of FLAGS register in x32 ABI, - -x32 ABI requires to have 64-bit variable to store FLAGS register -instead of size_t that is 32-bit variable, this fix operand -type mismatch when try to pop previous pushf value. - -Upstream-Status: Submitted - -Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> - -Index: lzop-1.03/src/miniacc.h -=================================================================== ---- lzop-1.03.orig/src/miniacc.h -+++ lzop-1.03/src/miniacc.h -@@ -754,6 +754,9 @@ - #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) - # define ACC_ARCH_AMD64 1 - # define ACC_INFO_ARCH "amd64" -+# if defined(__ILP32__) -+# define ACC_ARCH_AMD64_X32 1 -+# endif - #elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB)) - # define ACC_ARCH_ARM 1 - # define ACC_ARCH_ARM_THUMB 1 -@@ -6787,7 +6790,11 @@ ACCLIB_PUBLIC_NOINLINE(void, acc_debug_n - ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void) - { - #if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC) -+# if defined(ACC_ARCH_AMD64_X32) -+ unsigned long long r; -+# else - size_t r; -+# endif - __asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER); - return (int)(r >> 18) & 1; - #elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC) diff --git a/external/poky/meta/recipes-support/lzop/lzop_1.03.bb b/external/poky/meta/recipes-support/lzop/lzop_1.04.bb index 6f09002f..b50c2304 100644 --- a/external/poky/meta/recipes-support/lzop/lzop_1.03.bb +++ b/external/poky/meta/recipes-support/lzop/lzop_1.04.bb @@ -8,17 +8,14 @@ to gzip." DEPENDS += "lzo" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=dfeaf3dc4beef4f5a7bdbc35b197f39e \ - file://src/lzop.c;beginline=5;endline=21;md5=6797bd3ed0a1a49327b7ebf9366ebd86" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://src/lzop.c;beginline=5;endline=21;md5=23d767de7754eb24b9e900b025cf7fc8" SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \ file://acinclude.m4 \ - file://x32_abi_miniacc_h.patch \ - file://0001-use-static-inlines-as-the-external-inline-definition.patch \ - file://lzop-1.03-gcc6.patch \ " -SRC_URI[md5sum] = "006c5e27fb78cdd14a628fdfa5aa1905" -SRC_URI[sha256sum] = "c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9" +SRC_URI[md5sum] = "271eb10fde77a0a96b9cbf745e719ddf" +SRC_URI[sha256sum] = "7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41" inherit autotools diff --git a/external/poky/meta/recipes-support/mpfr/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch b/external/poky/meta/recipes-support/mpfr/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch deleted file mode 100644 index 59d1b0db..00000000 --- a/external/poky/meta/recipes-support/mpfr/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch +++ /dev/null @@ -1,45 +0,0 @@ -mpfr-longlong.h: Fix obsolete ARC asm constraints - -This patch replaces obsolete ARC "J" asm constraint with -up-to-date "Cal" constraint. - -"J" constraint only existed in pre-upstream GCC port for ARC. -In current upstream port "Cal" constraint is used which leads -to compile-time error. - -Proposed fix is known to work in Buildroot, Crosstool-NG etc. - -[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=09cb6a17e71bd40d2fbfaf82a1502fc210e33c87 - -Signed-off-by: Claudiu Zissulescu <claziss@synopsys.com> -Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com> -Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> - -Upstream-Status: Backport [https://gforge.inria.fr/scm/viewvc.php/mpfr?view=revision&revision=13251] ---- -Index: src/mpfr-longlong.h -=================================================================== ---- a/src/mpfr-longlong.h (revision 10963) -+++ b/src/mpfr-longlong.h (working copy) -@@ -416,17 +416,17 @@ - : "=r" (sh), \ - "=&r" (sl) \ - : "r" ((USItype) (ah)), \ -- "rIJ" ((USItype) (bh)), \ -+ "rICal" ((USItype) (bh)), \ - "%r" ((USItype) (al)), \ -- "rIJ" ((USItype) (bl))) -+ "rICal" ((USItype) (bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ - __asm__ ("sub.f\t%1, %4, %5\n\tsbc\t%0, %2, %3" \ - : "=r" (sh), \ - "=&r" (sl) \ - : "r" ((USItype) (ah)), \ -- "rIJ" ((USItype) (bh)), \ -+ "rICal" ((USItype) (bh)), \ - "r" ((USItype) (al)), \ -- "rIJ" ((USItype) (bl))) -+ "rICal" ((USItype) (bl))) - #endif - - #if defined (__arm__) && (defined (__thumb2__) || !defined (__thumb__)) \ diff --git a/external/poky/meta/recipes-support/mpfr/mpfr_4.0.1.bb b/external/poky/meta/recipes-support/mpfr/mpfr_4.0.1.bb deleted file mode 100644 index 2eee76a3..00000000 --- a/external/poky/meta/recipes-support/mpfr/mpfr_4.0.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "C library for multiple-precision floating-point computations with exact rounding" -HOMEPAGE = "http://www.mpfr.org/" -LICENSE = "LGPLv3+" -SECTION = "devel" - -inherit autotools texinfo - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" -DEPENDS = "gmp autoconf-archive" - -SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz \ - file://0001-Fix-obsolete-ARC-asm-constraints.patch" -SRC_URI[md5sum] = "b8dd19bd9bb1ec8831a6a582a7308073" -SRC_URI[sha256sum] = "67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e" - -UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/" - -BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/mpfr/mpfr_4.0.2.bb b/external/poky/meta/recipes-support/mpfr/mpfr_4.0.2.bb new file mode 100644 index 00000000..00c2dc2f --- /dev/null +++ b/external/poky/meta/recipes-support/mpfr/mpfr_4.0.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "C library for multiple-precision floating-point computations with exact rounding" +HOMEPAGE = "https://www.mpfr.org/" +LICENSE = "LGPLv3+" +SECTION = "devel" + +inherit autotools texinfo + +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ + file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ + " +DEPENDS = "gmp autoconf-archive" + +SRC_URI = "https://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz" +SRC_URI[md5sum] = "320fbc4463d4c8cb1e566929d8adc4f8" +SRC_URI[sha256sum] = "1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a" + +UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/" + +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch b/external/poky/meta/recipes-support/nettle/nettle-3.5.1/Add-target-to-only-build-tests-not-run-them.patch index c007060e..c007060e 100644 --- a/external/poky/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch +++ b/external/poky/meta/recipes-support/nettle/nettle-3.5.1/Add-target-to-only-build-tests-not-run-them.patch diff --git a/external/poky/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch b/external/poky/meta/recipes-support/nettle/nettle-3.5.1/check-header-files-of-openssl-only-if-enable_.patch index d5f26668..d5f26668 100644 --- a/external/poky/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch +++ b/external/poky/meta/recipes-support/nettle/nettle-3.5.1/check-header-files-of-openssl-only-if-enable_.patch diff --git a/external/poky/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch b/external/poky/meta/recipes-support/nettle/nettle-3.5.1/dlopen-test.patch index c4f0b7ea..fea57742 100644 --- a/external/poky/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch +++ b/external/poky/meta/recipes-support/nettle/nettle-3.5.1/dlopen-test.patch @@ -1,4 +1,4 @@ -Replace relative path of libnettle.so with absolute path so the test +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. @@ -6,6 +6,7 @@ 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> --- a/testsuite/dlopen-test.c 2016-10-01 00:28:38.000000000 -0700 +++ b/testsuite/dlopen-test.c 2017-10-13 11:08:57.227572860 -0700 @@ -14,7 +15,7 @@ Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> { #if HAVE_LIBDL - void *handle = dlopen ("../libnettle.so", RTLD_NOW); -+ void *handle = dlopen ("/usr/lib/libnettle.so", RTLD_NOW); ++ void *handle = dlopen ("libnettle.so", RTLD_NOW); int (*get_version)(void); if (!handle) { diff --git a/external/poky/meta/recipes-support/nettle/nettle-3.4/run-ptest b/external/poky/meta/recipes-support/nettle/nettle-3.5.1/run-ptest index b90bed66..b90bed66 100644 --- a/external/poky/meta/recipes-support/nettle/nettle-3.4/run-ptest +++ b/external/poky/meta/recipes-support/nettle/nettle-3.5.1/run-ptest diff --git a/external/poky/meta/recipes-support/nettle/nettle_3.4.bb b/external/poky/meta/recipes-support/nettle/nettle_3.5.1.bb index ca8450ea..d92db0ef 100644 --- a/external/poky/meta/recipes-support/nettle/nettle_3.4.bb +++ b/external/poky/meta/recipes-support/nettle/nettle_3.5.1.bb @@ -20,8 +20,8 @@ SRC_URI_append_class-target = "\ file://dlopen-test.patch \ " -SRC_URI[md5sum] = "dc0f13028264992f58e67b4e8915f53d" -SRC_URI[sha256sum] = "ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94" +SRC_URI[md5sum] = "0e5707b418c3826768d41130fbe4ee86" +SRC_URI[sha256sum] = "75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419" UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" @@ -30,13 +30,14 @@ inherit autotools ptest multilib_header EXTRA_AUTORECONF += "--exclude=aclocal" EXTRA_OECONF = "--disable-openssl" +CFLAGS_append = " -std=gnu99" do_compile_ptest() { oe_runmake buildtest } do_install_append() { - oe_multilib_header nettle/nettle-stdint.h nettle/version.h + oe_multilib_header nettle/version.h } do_install_ptest() { @@ -48,4 +49,7 @@ do_install_ptest() { install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ } +RDEPENDS_${PN}-ptest += "${PN}-dev" +INSANE_SKIP_${PN}-ptest += "dev-deps" + BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/npth/npth_1.6.bb b/external/poky/meta/recipes-support/npth/npth_1.6.bb index 8310efb1..233e0dc4 100644 --- a/external/poky/meta/recipes-support/npth/npth_1.6.bb +++ b/external/poky/meta/recipes-support/npth/npth_1.6.bb @@ -24,4 +24,4 @@ do_install_append() { oe_multilib_header npth.h } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/external/poky/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch deleted file mode 100644 index f3cd6700..00000000 --- a/external/poky/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 18 Sep 2017 17:22:43 -0700 -Subject: [PATCH] md: Fix build with musl - -The MIPS specific header <sgidefs.h> is not provided by musl -linux kernel headers provide <asm/sgidefs.h> which has same definitions - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - pr/include/md/_linux.cfg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg -index 640b19c..31296a8 100644 ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -499,7 +499,7 @@ - #elif defined(__mips__) - - /* For _ABI64 */ --#include <sgidefs.h> -+#include <asm/sgidefs.h> - - #ifdef __MIPSEB__ - #define IS_BIG_ENDIAN 1 --- -2.14.1 - diff --git a/external/poky/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/external/poky/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch deleted file mode 100644 index 23228067..00000000 --- a/external/poky/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 -From: Marek Vasut <marex@denx.de> -Date: Sat, 30 Jan 2016 07:18:02 +0100 -Subject: [PATCH] Add nios2 support - -Add support for the nios2 CPU. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] ---- - nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ - nspr/pr/include/md/_linux.h | 14 ++++++++++++++ - 2 files changed, 59 insertions(+) - -diff --git a/pr/include/md/_linux.cfg b/nspr/pr/include/md/_linux.cfg -index 8cbf0cb..150676b 100644 ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -972,6 +972,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nios2__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #elif defined(__or1k__) - - #undef IS_LITTLE_ENDIAN -diff --git a/pr/include/md/_linux.h b/nspr/pr/include/md/_linux.h -index d378db5..18260be 100644 ---- a/pr/include/md/_linux.h -+++ b/pr/include/md/_linux.h -@@ -55,6 +55,8 @@ - #define _PR_SI_ARCHITECTURE "avr32" - #elif defined(__m32r__) - #define _PR_SI_ARCHITECTURE "m32r" -+#elif defined(__nios2__) -+#define _PR_SI_ARCHITECTURE "nios2" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" - #else -@@ -125,6 +127,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); - #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet - #endif - -+#if defined(__nios2__) -+#if defined(__GNUC__) -+/* Use GCC built-in functions */ -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) -+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) -+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) -+#endif -+#endif -+ - #if defined(__or1k__) - #if defined(__GNUC__) - /* Use GCC built-in functions */ --- -2.7.0.rc3 - diff --git a/external/poky/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch b/external/poky/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch deleted file mode 100644 index 47e1475e..00000000 --- a/external/poky/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch +++ /dev/null @@ -1,150 +0,0 @@ -# HG changeset patch -# User Karsten Merker <merker@debian.org> -# Date 1523974333 -7200 -# Node ID f47871e2aeb16b39d4f516690e25c81b04d6d05a -# Parent 776db96f834cb86e8863052201d55f60a2da91cb -Bug 1308584, Add type definitions for the RISC-V architecture, r=kaie - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -[ Changes by AF: - - Rebase on other Yocto patches -] -Upstream-Status: Backport [ https://hg.mozilla.org/projects/nspr/rev/f47871e2aeb1 ] - -diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -1015,16 +1015,108 @@ - #define PR_ALIGN_OF_FLOAT 4 - #define PR_ALIGN_OF_DOUBLE 4 - #define PR_ALIGN_OF_POINTER 4 - #define PR_ALIGN_OF_WORD 4 - - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__riscv) && (__riscv_xlen == 32) -+ -+#undef IS_BIG_ENDIAN -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__riscv) && (__riscv_xlen == 64) -+ -+#undef IS_BIG_ENDIAN -+#define IS_LITTLE_ENDIAN 1 -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" - - #endif - - #ifndef HAVE_LONG_LONG - #define HAVE_LONG_LONG -diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h ---- a/pr/include/md/_linux.h -+++ b/pr/include/md/_linux.h -@@ -54,16 +54,20 @@ - #elif defined(__avr32__) - #define _PR_SI_ARCHITECTURE "avr32" - #elif defined(__m32r__) - #define _PR_SI_ARCHITECTURE "m32r" - #elif defined(__nios2__) - #define _PR_SI_ARCHITECTURE "nios2" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" -+#elif defined(__riscv) && (__riscv_xlen == 32) -+#define _PR_SI_ARCHITECTURE "riscv32" -+#elif defined(__riscv) && (__riscv_xlen == 64) -+#define _PR_SI_ARCHITECTURE "riscv64" - #else - #error "Unknown CPU architecture" - #endif - #define PR_DLL_SUFFIX ".so" - - #define _PR_VMBASE 0x30000000 - #define _PR_STACK_VMBASE 0x50000000 - #define _MD_DEFAULT_STACK_SIZE 65536L - diff --git a/external/poky/meta/recipes-support/nspr/nspr/0004-Add-ARC-support.patch b/external/poky/meta/recipes-support/nspr/nspr/0004-Add-ARC-support.patch deleted file mode 100644 index 9d686017..00000000 --- a/external/poky/meta/recipes-support/nspr/nspr/0004-Add-ARC-support.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 6cb5b0be8837222a1e01745f2cf57cd0e593186d Mon Sep 17 00:00:00 2001 -From: Antoine Tenart <antoine.tenart@free-electrons.com> -Date: Mon, 23 Oct 2017 10:28:20 +0200 -Subject: [PATCH] Add ARC support - -[Alexey: Rebased on top of other patches like RiscV, NIOS2 etc]. - -Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> -Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> - -Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1492378 ] ---- - pr/include/md/_linux.cfg | 45 ++++++++++++++++++++++++++++++++++++++++ - pr/include/md/_linux.h | 2 ++ - 2 files changed, 47 insertions(+) - -diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg -index fec8525378dc..5f4fa0eac783 100644 ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -1157,6 +1157,51 @@ - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__arc__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" -diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h -index 8e04fad479a1..628b1217e9c8 100644 ---- a/pr/include/md/_linux.h -+++ b/pr/include/md/_linux.h -@@ -63,6 +63,8 @@ - #define _PR_SI_ARCHITECTURE "riscv32" - #elif defined(__riscv) && (__riscv_xlen == 64) - #define _PR_SI_ARCHITECTURE "riscv64" -+#elif defined(__arc__) -+#define _PR_SI_ARCHITECTURE "arc" - #else - #error "Unknown CPU architecture" - #endif --- -2.17.1 - diff --git a/external/poky/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/external/poky/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch deleted file mode 100644 index 90fe45f3..00000000 --- a/external/poky/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <Mingli.Yu@windriver.com> -Date: Fri, 16 Nov 2018 13:52:49 +0800 -Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME - -Remove _BUILD_STRING and _BUILD_TIME to avoid -adding timestamp to _pl_bld.h which can result -in adding timestamp in library file such as -libnspr4.so. - $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so - [snip] - 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 - [snip] - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> ---- - lib/ds/Makefile.in | 8 +------- - lib/libc/src/Makefile.in | 8 +------- - lib/prstreams/Makefile.in | 8 +------- - pr/src/Makefile.in | 8 +------- - 4 files changed, 4 insertions(+), 28 deletions(-) - -diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in -index e737791..b578476 100644 ---- a/lib/ds/Makefile.in -+++ b/lib/ds/Makefile.in -@@ -114,13 +114,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in -index e8a6d9f..978ed28 100644 ---- a/lib/libc/src/Makefile.in -+++ b/lib/libc/src/Makefile.in -@@ -116,13 +116,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in -index aeb2944..f318097 100644 ---- a/lib/prstreams/Makefile.in -+++ b/lib/prstreams/Makefile.in -@@ -116,13 +116,7 @@ endif - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in -index 19c5a69..b4ac31c 100644 ---- a/pr/src/Makefile.in -+++ b/pr/src/Makefile.in -@@ -326,13 +326,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/external/poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch deleted file mode 100644 index f12acc85..00000000 --- a/external/poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build failure on x86_64 - -When the target_cpu is x86_64, we should assume that the pkg uses 64bit, -only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a -opposite logic before. - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - -Upstream-Status: Pending ---- - configure.in | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve - PR_MD_ASFILES=os_Linux_ia64.s - ;; - x86_64) -- if test -n "$USE_64"; then -- PR_MD_ASFILES=os_Linux_x86_64.s -- elif test -n "$USE_X32"; then -+ if test -n "$USE_X32"; then -+ AC_DEFINE(i386) - PR_MD_ASFILES=os_Linux_x86_64.s - CC="$CC -mx32" - CXX="$CXX -mx32" - else -- AC_DEFINE(i386) -- PR_MD_ASFILES=os_Linux_x86.s -- CC="$CC -m32" -- CXX="$CXX -m32" -+ PR_MD_ASFILES=os_Linux_x86_64.s - fi - ;; - ppc|powerpc) - PR_MD_ASFILES=os_Linux_ppc.s - ;; - powerpc64) -- if test -n "$USE_64"; then -+ if test -n "$USE_N32"; then -+ PR_MD_ASFILES=os_Linux_ppc.s -+ else - CC="$CC -m64" - CXX="$CXX -m64" -- else -- PR_MD_ASFILES=os_Linux_ppc.s - fi - ;; - esac diff --git a/external/poky/meta/recipes-support/nspr/nspr/nspr.pc.in b/external/poky/meta/recipes-support/nspr/nspr/nspr.pc.in deleted file mode 100644 index d74caabe..00000000 --- a/external/poky/meta/recipes-support/nspr/nspr/nspr.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -os_libs=-lpthread -ldl -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSPR -Description: The Netscape Portable Runtime -Version: NSPRVERSION -Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Cflags: diff --git a/external/poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/external/poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch deleted file mode 100644 index ecc6d318..00000000 --- a/external/poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Andrei Gherzan <andrei@gherzan.ro> -Date: Thu Feb 9 00:03:38 2012 +0200 - -Avoid QA warnings by removing hardcoded rpath from binaries. - -[...] -WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib -in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait -[...] - -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> -Upstream-Status: Pending - -Index: nspr/pr/tests/Makefile.in -=================================================================== ---- nspr.orig/pr/tests/Makefile.in -+++ nspr/pr/tests/Makefile.in -@@ -315,7 +315,7 @@ ifeq ($(OS_ARCH), SunOS) - endif # SunOS - - ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) -- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) -+ LDOPTS += -Xlinker - ifeq ($(USE_PTHREADS),1) - EXTRA_LIBS = -lpthread - endif diff --git a/external/poky/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/external/poky/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch deleted file mode 100644 index bde715c5..00000000 --- a/external/poky/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -the $srcdir is not defined at the time of gnu-configurize. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -8,7 +8,7 @@ AC_PREREQ(2.61) - AC_INIT - AC_CONFIG_SRCDIR([pr/include/nspr.h]) - --AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) -+AC_CONFIG_AUX_DIR(build/autoconf) - AC_CANONICAL_TARGET - - dnl ======================================================== diff --git a/external/poky/meta/recipes-support/nspr/nspr_4.19.bb b/external/poky/meta/recipes-support/nspr/nspr_4.19.bb deleted file mode 100644 index 9263f688..00000000 --- a/external/poky/meta/recipes-support/nspr/nspr_4.19.bb +++ /dev/null @@ -1,195 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ - file://0002-Add-nios2-support.patch \ - file://0001-md-Fix-build-with-musl.patch \ - file://0003-Add-type-definitions-for-the-RISC-V-architecture.patch \ - file://0004-Add-ARC-support.patch \ - file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ - file://nspr.pc.in \ -" - -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" - -UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" -UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" - -SRC_URI[md5sum] = "e1d27282ad6286b69d6b9fd07201d3dd" -SRC_URI[sha256sum] = "2ed95917fa2277910d1d1cf36030607dccc0ba522bba08e2af13c113dcd8f729" - -CVE_PRODUCT = "netscape_portable_runtime" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = " \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc - sed -i \ - -e 's:NSPRVERSION:${PV}:g' \ - -e 's:OEPREFIX:${prefix}:g' \ - -e 's:OELIBDIR:${libdir}:g' \ - -e 's:OEINCDIR:${includedir}:g' \ - -e 's:OEEXECPREFIX:${exec_prefix}:g' \ - ${D}${libdir}/pkgconfig/nspr.pc - - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests - cd ${B}/pr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " - -BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch b/external/poky/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch deleted file mode 100644 index 82f25743..00000000 --- a/external/poky/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d1345871b992f9a055c968963967e728da1a7ffb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Jan 2016 20:29:06 +0000 -Subject: [PATCH] nss-myhostname: Check for nss.h presense before use - -We do not have nss.h on musl e.g. and configury is already checking for -nss.h presence, use this to define needed data structures if nss.h is -missing on a given libc implementation on a platform - -include stdint.h for uint32_h definition - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - nss-myhostname.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/nss-myhostname.c b/nss-myhostname.c -index 293166c..6f287f5 100644 ---- a/nss-myhostname.c -+++ b/nss-myhostname.c -@@ -21,7 +21,27 @@ - ***/ - - #include <limits.h> -+#include <stdint.h> -+#ifdef HAVE_NSS_H - #include <nss.h> -+#else -+enum nss_status { -+ NSS_STATUS_TRYAGAIN = -2, -+ NSS_STATUS_UNAVAIL, -+ NSS_STATUS_NOTFOUND, -+ NSS_STATUS_SUCCESS, -+ NSS_STATUS_RETURN -+}; -+/* Data structure used for the 'gethostbyname4_r' function. */ -+struct gaih_addrtuple -+ { -+ struct gaih_addrtuple *next; -+ char *name; -+ int family; -+ uint32_t addr[4]; -+ uint32_t scopeid; -+ }; -+#endif - #include <sys/types.h> - #include <netdb.h> - #include <errno.h> --- -2.7.0 - diff --git a/external/poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb b/external/poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb index de5b7cf5..074f7132 100644 --- a/external/poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb +++ b/external/poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb @@ -7,13 +7,14 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${PV}.tar.gz \ - file://0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch \ " SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f" SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67e7caf2" -inherit autotools distro_features_check +inherit autotools features_check + +COMPATIBLE_HOST_libc-musl = 'null' # The systemd has its own copy of nss-myhostname CONFLICT_DISTRO_FEATURES = "systemd" diff --git a/external/poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/external/poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch deleted file mode 100644 index d5403397..00000000 --- a/external/poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 22 Feb 2017 11:36:11 +0200 -Subject: [PATCH] nss: fix support cross compiling - -Let some make variables be assigned from outside makefile. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - nss/coreconf/arch.mk | 2 +- - nss/lib/freebl/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 ---- a/nss/coreconf/arch.mk -+++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -- OS_RELEASE := $(shell uname -r) -+ OS_RELEASE ?= $(shell uname -r) - endif - - # -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -36,6 +36,12 @@ ifdef USE_64 - DEFINES += -DNSS_USE_64 - endif - -+ifeq ($(OS_TEST),mips) -+ifndef USE_64 -+ DEFINES += -DNS_PTR_LE_32 -+endif -+endif -+ - ifdef USE_ABI32_FPU - DEFINES += -DNSS_USE_ABI32_FPU - endif --- -2.11.0 - diff --git a/external/poky/meta/recipes-support/nss/nss/blank-cert9.db b/external/poky/meta/recipes-support/nss/nss/blank-cert9.db Binary files differdeleted file mode 100644 index 7d4bcf25..00000000 --- a/external/poky/meta/recipes-support/nss/nss/blank-cert9.db +++ /dev/null diff --git a/external/poky/meta/recipes-support/nss/nss/blank-key4.db b/external/poky/meta/recipes-support/nss/nss/blank-key4.db Binary files differdeleted file mode 100644 index d47f08d0..00000000 --- a/external/poky/meta/recipes-support/nss/nss/blank-key4.db +++ /dev/null diff --git a/external/poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/external/poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch deleted file mode 100644 index de812d27..00000000 --- a/external/poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -clang 3.9 add this warning to rightly flag undefined -behavior, we relegate this to be just a warning instead -of error and keep the behavior as it was. Right fix would -be to not pass enum to the function with variadic arguments -as last named argument - -Fixes errors like -ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] - va_start(ap, responseType0); - ^ -ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here - SECOidTag responseType0, ...) - -see -https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start -for more details - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk -@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS - ifdef CC_IS_CLANG - # -Qunused-arguments : clang objects to arguments that it doesn't understand - # and fixing this would require rearchitecture -- WARNING_CFLAGS += -Qunused-arguments -+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs - # -Wno-parentheses-equality : because clang warns about macro expansions - WARNING_CFLAGS += $(call disable_warning,parentheses-equality) - ifdef BUILD_OPT diff --git a/external/poky/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch b/external/poky/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch deleted file mode 100644 index bb1c6e3b..00000000 --- a/external/poky/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch +++ /dev/null @@ -1,34 +0,0 @@ -Subject: [PATCH] Fix SHA_HTONL bug for arm 32be. - -In arm 32be, there is no need to reverse the host value. - -Upstream-Status: Pending - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - lib/freebl/sha_fast.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/nss/lib/freebl/sha_fast.h b/nss/lib/freebl/sha_fast.h -index 4f37d13..8072eda 100644 ---- a/nss/lib/freebl/sha_fast.h -+++ b/nss/lib/freebl/sha_fast.h -@@ -99,6 +99,7 @@ swap4b(PRUint32 value) - defined(__ARM_ARCH_7__) || \ - defined(__ARM_ARCH_7A__) || \ - defined(__ARM_ARCH_7R__))) -+#if defined(IS_LITTLE_ENDIAN) - static __inline__ PRUint32 - swap4b(PRUint32 value) - { -@@ -109,6 +110,7 @@ swap4b(PRUint32 value) - return ret; - } - #define SHA_HTONL(x) swap4b(x) -+#endif - - #endif /* x86 family */ - --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/external/poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch deleted file mode 100644 index 547594d5..00000000 --- a/external/poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ /dev/null @@ -1,110 +0,0 @@ -nss: fix incorrect shebang of perl - -Replace incorrect shebang of perl with `#!/usr/bin/env perl'. - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Upstream-Status: Pending ---- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 ---- a/nss/coreconf/version.pl -+++ b/nss/coreconf/version.pl -@@ -1,4 +1,4 @@ --#!/usr/sbin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 ---- a/nss/tests/clean_tbx -+++ b/nss/tests/clean_tbx -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ####################################################################### - # -diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 ---- a/nss/tests/path_uniq -+++ b/nss/tests/path_uniq -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ######################################################################## - # --- -1.8.1.2 - diff --git a/external/poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/external/poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch deleted file mode 100644 index 181c69ad..00000000 --- a/external/poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix nss multilib build on openSUSE 11.x 32bit - -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will -fail with error: - -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled - -It caused by the '-m64' option which passed to host gcc. - -The nsinstall was built first while nss starting to build, it only runs -on host to install built files, it doesn't need any cross-compling or -multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this -error. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> -=================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 - - include $(DEPTH)/coreconf/config.mk - -+# nsinstall is unfit for cross-compiling/multilib-build since it was -+# always run on local host to install built files. This change intends -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. -+ARCHFLAG = -+LDFLAGS = -+CFLAGS = -+ - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) - PROGRAM = - else diff --git a/external/poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/external/poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch deleted file mode 100644 index 7661dc93..00000000 --- a/external/poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ /dev/null @@ -1,26 +0,0 @@ -nss:no rpath for cross compiling - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Upstream-Status: Inappropriate [configuration] ---- - nss/cmd/platlibs.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk ---- a/nss/cmd/platlibs.mk -+++ b/nss/cmd/platlibs.mk -@@ -18,9 +18,9 @@ endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' - endif - endif - --- -1.8.1.2 - diff --git a/external/poky/meta/recipes-support/nss/nss/nss.pc.in b/external/poky/meta/recipes-support/nss/nss/nss.pc.in deleted file mode 100644 index 200f635c..00000000 --- a/external/poky/meta/recipes-support/nss/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 -Cflags: -IOEINCDIR diff --git a/external/poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/external/poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch deleted file mode 100644 index 3a817faa..00000000 --- a/external/poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ /dev/null @@ -1,23 +0,0 @@ -nss does not build on mips with clang because wrong types are used? - -pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] - if (addend < MP_DIGIT_MAX) { - ~~~~~~ ^ ~~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in - - static SECStatus - addToSeed(const SECItem *seed, -- unsigned long addend, -- int seedlen, /* g in 186-1 */ -+ unsigned long long addend, -+ int seedlen, /* g in 186-1 */ - SECItem *seedout) - { - mp_int s, sum, modulus, tmp; diff --git a/external/poky/meta/recipes-support/nss/nss/signlibs.sh b/external/poky/meta/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499f..00000000 --- a/external/poky/meta/recipes-support/nss/nss/signlibs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# signlibs.sh -# -# (c)2010 Wind River Systems, Inc. -# -# regenerates the .chk files for the NSS libraries that require it -# since the ones that are built have incorrect checksums that were -# calculated on the host where they really need to be done on the -# target - -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` -SIGN_BINARY=`which shlibsign` -for I in $CHK_FILES -do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - $SIGN_BINARY -i $FN -done diff --git a/external/poky/meta/recipes-support/nss/nss/system-pkcs11.txt b/external/poky/meta/recipes-support/nss/nss/system-pkcs11.txt deleted file mode 100644 index 1a264e9c..00000000 --- a/external/poky/meta/recipes-support/nss/nss/system-pkcs11.txt +++ /dev/null @@ -1,5 +0,0 @@ -library= -name=NSS Internal PKCS #11 Module -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' -NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) - diff --git a/external/poky/meta/recipes-support/nss/nss_3.39.bb b/external/poky/meta/recipes-support/nss/nss_3.39.bb deleted file mode 100644 index 3a8e5d4b..00000000 --- a/external/poky/meta/recipes-support/nss/nss_3.39.bb +++ /dev/null @@ -1,265 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://signlibs.sh \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://nss-fix-nsinstall-build.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-SHA_HTONL-bug-for-arm-32be.patch \ - " - -SRC_URI[md5sum] = "10720fc70fd483de1b085402fb10ed59" -SRC_URI[sha256sum] = "6be64dd76f212415cc8bc34343ac1e7389048db4db9a023a84873c411dc5864b" - -UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" -UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" - -inherit siteinfo - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" -RDEPENDS_${PN}-smime = "perl" - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE} - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} - export NSS_ENABLE_WERROR=0 -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export NATIVE_FLAGS="${BUILD_CFLAGS}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" -} -do_compile[vardepsexclude] += "SITEINFO_BITS" - - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - CPU_ARCH=aarch64 - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { - if [ -n "$D" ]; then - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi - done - else - signlibs.sh - fi -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -BBCLASSEXTEND = "native nativesdk" - diff --git a/external/poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch b/external/poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch deleted file mode 100644 index e902b0b5..00000000 --- a/external/poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c6bb4b99af39daa3221c3bdc0686987ae0f31693 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 31 Jan 2018 16:47:44 +0200 -Subject: [PATCH] LINGUAS: drop the languages for which upstream does not - supply .po files - -Regenerating them proved to be too painful. -Upstream has been notified: https://github.com/p11-glue/p11-kit/issues/127 - -Upstream-Status: Inappropriate [missing upstream distribution files] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - po/LINGUAS | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/po/LINGUAS b/po/LINGUAS -index 767a806c2e20..6ab48001c409 100644 ---- a/po/LINGUAS -+++ b/po/LINGUAS -@@ -12,8 +12,6 @@ cy - da - de - el --en@boldquot --en@quot - en_GB - eo - es diff --git a/external/poky/meta/recipes-support/p11-kit/p11-kit_0.23.14.bb b/external/poky/meta/recipes-support/p11-kit/p11-kit_0.23.14.bb deleted file mode 100644 index dd25c381..00000000 --- a/external/poky/meta/recipes-support/p11-kit/p11-kit_0.23.14.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" - -inherit autotools gettext pkgconfig gtk-doc - -DEPENDS = "libtasn1 libffi" - -SRC_URI = "git://github.com/p11-glue/p11-kit \ - file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \ - " -SRCREV = "3770793f026e46a000d2d8816d56122598289d5c" -S = "${WORKDIR}/git" - -AUTOTOOLS_AUXDIR = "${S}/build/litter" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[trust-paths] = "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt,--without-trust-paths,,ca-certificates" - -# This recipe does not use the standard gtk-doc m4 macros, and so the ./configure flags -# that control gtk-doc build are non-standard -EXTRA_OECONF_prepend_class-target = "${@bb.utils.contains('GTKDOC_ENABLED', 'True', '--enable-doc --enable-doc-html --disable-doc-pdf', \ - '--disable-doc', d)} " - -# When building native recipes, disable gtkdoc, as it is not necessary, -# pulls in additional dependencies, and makes build times longer -EXTRA_OECONF_prepend_class-native = "--disable-doc " -EXTRA_OECONF_prepend_class-nativesdk = "--disable-doc " - -UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-gtk-doc-html --disable-gtk-doc-pdf --enable-gtk-doc --disable-gtk-doc" - -# p11-kit relies on these two being copied from source tree -# instead of being regenerated by gtkdoc-scan, but doesn't setup -# dependencies correctly when there is a parallel build. Let's pre-copy -# them instead. -do_compile_prepend () { - cp ${S}/doc/manual/p11-kit-overrides.txt ${S}/doc/manual/p11-kit-sections.txt ${B}/doc/manual/ -} - -FILES_${PN} += " \ - ${libdir}/p11-kit-proxy.so \ - ${libdir}/pkcs11/*.so \ - ${libdir}/pkcs11/*.la" - -# PN contains p11-kit-proxy.so, a symlink to a loadable module -INSANE_SKIP_${PN} = "dev-so" diff --git a/external/poky/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb b/external/poky/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb new file mode 100644 index 00000000..4ba93f99 --- /dev/null +++ b/external/poky/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb @@ -0,0 +1,29 @@ +SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" + +inherit meson gettext pkgconfig gtk-doc bash-completion + +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" +SRCREV = "762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,,,ca-certificates" + +GTKDOC_MESON_OPTION = 'gtk_doc' + +FILES_${PN} += " \ + ${libdir}/p11-kit-proxy.so \ + ${libdir}/pkcs11/*.so \ + ${libdir}/pkcs11/*.la \ + ${systemd_user_unitdir}/*" + +# PN contains p11-kit-proxy.so, a symlink to a loadable module +INSANE_SKIP_${PN} = "dev-so" + +BBCLASSEXTEND = "nativesdk" diff --git a/external/poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb b/external/poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb index 4116efc7..8c500dca 100644 --- a/external/poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb +++ b/external/poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb @@ -25,7 +25,7 @@ PACKAGECONFIG ??= "ncurses libcap" 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, qt4-x11" +PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" #To use libsecret, add meta-gnome @@ -33,7 +33,6 @@ PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" EXTRA_OECONF = " \ --disable-rpath \ - --disable-pinentry-qt5 \ " -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/popt/popt_1.16.bb b/external/poky/meta/recipes-support/popt/popt_1.16.bb index 377d1084..27e49c2c 100644 --- a/external/poky/meta/recipes-support/popt/popt_1.16.bb +++ b/external/poky/meta/recipes-support/popt/popt_1.16.bb @@ -8,7 +8,7 @@ PR = "r3" DEPENDS = "virtual/libiconv" -SRC_URI = "https://fossies.org/linux/misc/popt-${PV}.tar.gz \ +SRC_URI = "http://anduin.linuxfromscratch.org/BLFS/popt/popt-${PV}.tar.gz \ file://pkgconfig_fix.patch \ file://popt_fix_for_automake-1.12.patch \ file://disable_tests.patch \ diff --git a/external/poky/meta/recipes-support/ptest-runner/ptest-runner_2.2.bb b/external/poky/meta/recipes-support/ptest-runner/ptest-runner_2.3.2.bb index 622d23ba..187f22df 100644 --- a/external/poky/meta/recipes-support/ptest-runner/ptest-runner_2.2.bb +++ b/external/poky/meta/recipes-support/ptest-runner/ptest-runner_2.3.2.bb @@ -7,15 +7,17 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "49956f65bb53ea2a2c1b394e5e59ffdfcdcc490f" -PV = "2.2+git${SRCPV}" +SRCREV = "7015e9199ce748c0717addeebe7a8c47448bab03" +PV = "2.3.2+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/ptest-runner2 \ +" -SRC_URI = "git://git.yoctoproject.org/ptest-runner2" S = "${WORKDIR}/git" FILES_${PN} = "${bindir}/ptest-runner" -EXTRA_OEMAKE = "-e MAKEFLAGS=" +EXTRA_OEMAKE = "-e MAKEFLAGS= CFLAGS="${CFLAGS} -DDEFAULT_DIRECTORY=\\\"${libdir}\\\""" do_compile () { oe_runmake diff --git a/external/poky/meta/recipes-support/re2c/re2c_1.0.1.bb b/external/poky/meta/recipes-support/re2c/re2c_1.0.1.bb index 4ed8d257..35200ecd 100644 --- a/external/poky/meta/recipes-support/re2c/re2c_1.0.1.bb +++ b/external/poky/meta/recipes-support/re2c/re2c_1.0.1.bb @@ -5,9 +5,10 @@ SECTION = "devel" LICENSE = "PD" LIC_FILES_CHKSUM = "file://README;beginline=146;md5=881056c9add17f8019ccd8c382ba963a" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI = "https://github.com/skvadrik/re2c/releases/download/${PV}/${BPN}-${PV}.tar.gz" SRC_URI[md5sum] = "e2c6cf52fc6a21595f21bc82db5324f8" SRC_URI[sha256sum] = "605058d18a00e01bfc32aebf83af35ed5b13180b4e9f279c90843afab2c66c7c" +UPSTREAM_CHECK_URI = "https://github.com/skvadrik/re2c/releases" BBCLASSEXTEND = "native" diff --git a/external/poky/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch b/external/poky/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch deleted file mode 100644 index 4bd9d31c..00000000 --- a/external/poky/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 99679fda405e535a282f04a4decc2381154a749f Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Mon, 15 Feb 2016 15:59:58 -0700 -Subject: [PATCH 1/2] If the libc is lacking argp, use libargp - -Patch pulled from Gentoo: - - On glibc systems, argp is provided by libc. However, on - uclibc and other systems which lack argp in their C library, - argp might be provided by a stand alone library, libargp. - This patch adds tests to the build system to find who provides - argp. - - X-Gentoo-Bug: 292191 - X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=292191 - Reported-by: Ed Wildgoose <gentoo@wildgooses.com> - Signed-off-by: Anthony G. Basile <blueness@gentoo.org> - -Upstream-Status: Pending -Signed-off-by: Christopher Larson <chris_larson@mentor.com> ---- - configure.ac | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 27a2dba..04fcd25 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -82,6 +82,28 @@ AS_IF( - ] - ) - -+dnl First check if we have argp available from libc -+AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [#include <argp.h>], -+ [int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;] -+ )], -+ [libc_has_argp="true"], -+ [libc_has_argp="false"] -+) -+ -+dnl If libc doesn't provide argp, then test for libargp -+if test "$libc_has_argp" = "false" ; then -+ AC_MSG_WARN("libc does not have argp") -+ AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"]) -+ -+ if test "$have_argp" = "false"; then -+ AC_MSG_ERROR("no libargp found") -+ else -+ LIBS+=" -largp" -+ fi -+fi -+ - dnl ----------------- - dnl Configure options - dnl ----------------- --- -2.2.1 - diff --git a/external/poky/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch b/external/poky/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch deleted file mode 100644 index 1c8a79ce..00000000 --- a/external/poky/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch +++ /dev/null @@ -1,92 +0,0 @@ -From afc8712a9e6c72fbd03c36f84ecf8703e5d22a8c Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Mon, 15 Feb 2016 16:11:32 -0700 -Subject: [PATCH 2/2] Add argument to control the libargp dependency - -This ensures that the builds are always deterministic. If the argument isn't -passed, the default behavior is to use libargp if the libc doesn't have argp. - -Upstream-Status: Pending -Signed-off-by: Christopher Larson <chris_larson@mentor.com> ---- - configure.ac | 55 ++++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 36 insertions(+), 19 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 04fcd25..11a5321 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -32,6 +32,13 @@ AC_ARG_WITH([libgcrypt], - [with_libgcrypt=check] - ) - -+AC_ARG_WITH([libargp], -+ AS_HELP_STRING([--without-libargp], -+ [Disable libargp support. Systems whose libc lacks argp can use libargp instead. (Default: check if libc lacks argp)]), -+ [with_libargp=$withval], -+ [with_libargp=check] -+) -+ - dnl Make sure anyone changing configure.ac/Makefile.am has a clue - AM_MAINTAINER_MODE - -@@ -82,27 +89,37 @@ AS_IF( - ] - ) - --dnl First check if we have argp available from libc --AC_LINK_IFELSE( -- [AC_LANG_PROGRAM( -- [#include <argp.h>], -- [int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;] -- )], -- [libc_has_argp="true"], -- [libc_has_argp="false"] -+dnl Determine if we need libargp: either user requested, or libc has no argp -+AS_IF( -+ [test "x$with_libargp" != "xyes"], -+ [ -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [#include <argp.h>], -+ [int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;] -+ )], -+ [need_libargp=no], -+ [need_libargp=yes -+ if test "x$with_libargp" = "xno"; then -+ AC_MSG_FAILURE([libargp disabled and libc does not have argp]) -+ fi] -+ ) -+ ], -+ [need_libargp=yes], - ) - --dnl If libc doesn't provide argp, then test for libargp --if test "$libc_has_argp" = "false" ; then -- AC_MSG_WARN("libc does not have argp") -- AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"]) -- -- if test "$have_argp" = "false"; then -- AC_MSG_ERROR("no libargp found") -- else -- LIBS+=" -largp" -- fi --fi -+dnl Check for libargp -+AS_IF( -+ [test "x$need_libargp" = "xyes"], -+ [ -+ AC_CHECK_LIB( -+ [argp], -+ [argp_parse], -+ [LIBS="$LIBS -largp"], -+ [AC_MSG_FAILURE([libargp not found])] -+ ) -+ ] -+) - - dnl ----------------- - dnl Configure options --- -2.2.1 - diff --git a/external/poky/meta/recipes-support/rng-tools/rng-tools/default b/external/poky/meta/recipes-support/rng-tools/rng-tools/default index ab7cd932..b9f8e036 100644 --- a/external/poky/meta/recipes-support/rng-tools/rng-tools/default +++ b/external/poky/meta/recipes-support/rng-tools/rng-tools/default @@ -1,2 +1 @@ -# Specify rng device -RNG_DEVICE=/dev/hwrng +EXTRA_ARGS="-r /dev/hwrng" diff --git a/external/poky/meta/recipes-support/rng-tools/rng-tools/init b/external/poky/meta/recipes-support/rng-tools/rng-tools/init index 7cf78393..13f0ecd3 100644 --- a/external/poky/meta/recipes-support/rng-tools/rng-tools/init +++ b/external/poky/meta/recipes-support/rng-tools/rng-tools/init @@ -1,26 +1,19 @@ -#! /bin/sh +#!/bin/sh # # This is an init script for openembedded -# Copy it to /etc/init.d/rng-tools and type +# Copy it to @SYSCONFDIR@/init.d/rng-tools and type # > update-rc.d rng-tools defaults 60 # -rngd=/usr/sbin/rngd +rngd=@SBINDIR@/rngd test -x "$rngd" || exit 1 -if [ -e /etc/default/rng-tools ]; then - . /etc/default/rng-tools -fi - -if [ -n "$RNG_DEVICE" ]; then - EXTRA_ARGS="-- -r $RNG_DEVICE" -fi - +[ -r @SYSCONFDIR@/default/rng-tools ] && . "@SYSCONFDIR@/default/rng-tools" case "$1" in start) echo -n "Starting random number generator daemon" - start-stop-daemon -S -q -x $rngd $EXTRA_ARGS + start-stop-daemon -S -q -x $rngd -- $EXTRA_ARGS echo "." ;; stop) @@ -38,11 +31,11 @@ case "$1" in start-stop-daemon -K -q -n rngd echo "." echo -n "Starting random number generator daemon" - start-stop-daemon -S -q -x $rngd $EXTRA_ARGS + start-stop-daemon -S -q -x $rngd -- $EXTRA_ARGS echo "." ;; *) - echo "Usage: /etc/init.d/rng-tools {start|stop|reload|restart|force-reload}" + echo "Usage: @SYSCONFDIR@/init.d/rng-tools {start|stop|reload|restart|force-reload}" exit 1 esac diff --git a/external/poky/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch b/external/poky/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch deleted file mode 100644 index 8aa13bf8..00000000 --- a/external/poky/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch +++ /dev/null @@ -1,98 +0,0 @@ -rng-tools: modify 'read error' message - -Make the 'read error' message more descriptive. - -Copied from https://bugzilla.redhat.com/attachment.cgi?id=1295857 -and modified in one place to apply successfully. Error message during -bootstrap modified to show device name. - -Upstream-Status: pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - - ---- a/rngd.c -+++ b/rngd.c -@@ -247,8 +247,11 @@ static void do_loop(int random_step) - continue; /* failed, no work */ - - retval = iter->xread(buf, sizeof buf, iter); -- if (retval) -+ if (retval) { -+ message(LOG_DAEMON|LOG_ERR, -+ "Error reading from entropy source\n"); - continue; /* failed, no work */ -+ } - - work_done = true; - ---- a/rngd_entsource.c -+++ b/rngd_entsource.c -@@ -63,10 +63,8 @@ int xread(void *buf, size_t size, struct - size -= r; - } - -- if (size) { -- message(LOG_DAEMON|LOG_ERR, "read error\n"); -+ if (size) - return -1; -- } - return 0; - } - -@@ -152,7 +150,7 @@ error_out: - } - - /* Initialize entropy source */ --static int discard_initial_data(struct rng *ent_src) -+static int discard_initial_data(struct rng *ent_src, int *buf) - { - /* Trash 32 bits of what is probably stale (non-random) - * initial state from the RNG. For Intel's, 8 bits would -@@ -164,10 +162,12 @@ static int discard_initial_data(struct r - xread(tempbuf, sizeof(tempbuf), ent_src); - - /* Return 32 bits of bootstrap data */ -- xread(tempbuf, sizeof(tempbuf), ent_src); -+ if (xread(tempbuf, sizeof(tempbuf), ent_src) != 0) -+ return -1; - -- return tempbuf[0] | (tempbuf[1] << 8) | -+ *buf = tempbuf[0] | (tempbuf[1] << 8) | - (tempbuf[2] << 16) | (tempbuf[3] << 24); -+ return 0; - } - - /* -@@ -175,6 +175,8 @@ static int discard_initial_data(struct r - */ - int init_entropy_source(struct rng *ent_src) - { -+ int bootstrap; -+ - ent_src->rng_fd = open(ent_src->rng_name, O_RDONLY); - if (ent_src->rng_fd == -1) { - return 1; -@@ -182,7 +184,11 @@ int init_entropy_source(struct rng *ent_ - src_list_add(ent_src); - /* Bootstrap FIPS tests */ - ent_src->fipsctx = malloc(sizeof(fips_ctx_t)); -- fips_init(ent_src->fipsctx, discard_initial_data(ent_src)); -+ if (discard_initial_data(ent_src, &bootstrap) != 0) { -+ message(LOG_ERR|LOG_INFO, "Read failure in %s during bootstrap\n",ent_src->rng_name); -+ return 1; -+ } -+ fips_init(ent_src->fipsctx, bootstrap); - return 0; - } - ---- a/rngtest.c -+++ b/rngtest.c -@@ -335,6 +335,7 @@ static int discard_initial_data(void) - - return tempbuf[0] | (tempbuf[1] << 8) | - (tempbuf[2] << 16) | (tempbuf[3] << 24); -+ - } - - static void do_rng_fips_test_loop( void ) diff --git a/external/poky/meta/recipes-support/rng-tools/rng-tools/rng-tools-5-fix-textrels-on-PIC-x86.patch b/external/poky/meta/recipes-support/rng-tools/rng-tools/rng-tools-5-fix-textrels-on-PIC-x86.patch deleted file mode 100644 index 93a5864a..00000000 --- a/external/poky/meta/recipes-support/rng-tools/rng-tools/rng-tools-5-fix-textrels-on-PIC-x86.patch +++ /dev/null @@ -1,103 +0,0 @@ -From: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org> -Subject: [PATCH] Fix assemby textrels on rdrand_asm.S on PIC x86 - -This patch updates the fixes in the assembly in rdrand_asm.S in -sys-apps/rng-tools-5 so it won't generate textrels on PIC systems. -The main fixes are in the use of leal in SETPTR for such systems, the rest is -the usual PIC support stuff. - -This should fix Gentoo bug #469962 and help fix #518210 - -This patch is released under the GPLv2 or a higher version license as is the -original file as long as the author and the tester are credited. - -Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=469962 -Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=518210 -Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org> -Reported-by: cilly <cilly@cilly.mine.nu> -Reported-by: Manuel Rüger <mrueg@gentoo.org> -Tested-by: Anthony Basile <blueness@gentoo.org> - -Upstream-Status: Pending - -Index: rng-tools-5/rdrand_asm.S -=================================================================== ---- rng-tools-5.orig/rdrand_asm.S -+++ rng-tools-5/rdrand_asm.S -@@ -2,6 +2,7 @@ - * Copyright (c) 2011-2014, Intel Corporation - * Authors: Fenghua Yu <fenghua.yu@intel.com>, - * H. Peter Anvin <hpa@linux.intel.com> -+ * PIC code by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, -@@ -174,7 +175,19 @@ ENTRY(x86_rdseed_or_rdrand_bytes) - jmp 4b - ENDPROC(x86_rdseed_or_rdrand_bytes) - -+#if defined(__PIC__) -+#define INIT_PIC() \ -+ pushl %ebx ; \ -+ call __x86.get_pc_thunk.bx ; \ -+ addl $_GLOBAL_OFFSET_TABLE_, %ebx -+#define END_PIC() \ -+ popl %ebx -+#define SETPTR(var,ptr) leal (var)@GOTOFF(%ebx),ptr -+#else -+#define INIT_PIC() -+#define END_PIC() - #define SETPTR(var,ptr) movl $(var),ptr -+#endif - #define PTR0 %eax - #define PTR1 %edx - #define PTR2 %ecx -@@ -190,6 +203,7 @@ ENTRY(x86_aes_mangle) - movl 8(%ebp), %eax - movl 12(%ebp), %edx - push %esi -+ INIT_PIC() - #endif - movl $512, CTR3 /* Number of rounds */ - -@@ -280,6 +294,7 @@ offset = offset + 16 - movdqa %xmm7, (7*16)(PTR1) - - #ifdef __i386__ -+ END_PIC() - pop %esi - pop %ebp - #endif -@@ -294,6 +309,7 @@ ENTRY(x86_aes_expand_key) - push %ebp - mov %esp, %ebp - movl 8(%ebp), %eax -+ INIT_PIC() - #endif - - SETPTR(aes_round_keys, PTR1) -@@ -323,6 +339,7 @@ ENTRY(x86_aes_expand_key) - call 1f - - #ifdef __i386__ -+ END_PIC() - pop %ebp - #endif - ret -@@ -343,6 +360,16 @@ ENTRY(x86_aes_expand_key) - - ENDPROC(x86_aes_expand_key) - -+#if defined(__i386__) && defined(__PIC__) -+ .section .text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat -+ .globl __x86.get_pc_thunk.bx -+ .hidden __x86.get_pc_thunk.bx -+ .type __x86.get_pc_thunk.bx, @function -+__x86.get_pc_thunk.bx: -+ movl (%esp), %ebx -+ ret -+#endif -+ - .bss - .balign 64 - aes_round_keys: diff --git a/external/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service b/external/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service index f0355db1..aaaaa290 100644 --- a/external/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service +++ b/external/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service @@ -2,11 +2,12 @@ Description=Hardware RNG Entropy Gatherer Daemon DefaultDependencies=no After=systemd-udev-settle.service -Before=sysinit.target +Before=sysinit.target shutdown.target +Conflicts=shutdown.target [Service] -ExecStart=@SBINDIR@/rngd -f -r /dev/hwrng -SuccessExitStatus=66 +EnvironmentFile=-@SYSCONFDIR@/default/rng-tools +ExecStart=@SBINDIR@/rngd -f $EXTRA_ARGS [Install] WantedBy=multi-user.target diff --git a/external/poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch b/external/poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch deleted file mode 100644 index afd08d57..00000000 --- a/external/poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix underquoted m4 entry. This causes a failure if gcrypt isn't present: - -| configure: libgcrypt support disabled -| ../rng-tools-5/configure: line 4345: ac_fn_c_try_link: command not found -| configure: error: in `/media/build1/poky/build/tmp/work/i586-poky-linux/rng-tools/5-r0/build': - -RP -2016/2/16 - -Upstream-Status: Pending - -Index: rng-tools-5/configure.ac -=================================================================== ---- rng-tools-5.orig/configure.ac -+++ rng-tools-5/configure.ac -@@ -71,7 +71,7 @@ AS_IF( - [test "x$with_libgcrypt" != "xno"], - [ - AC_CHECK_HEADER([gcrypt.h], -- AC_CHECK_LIB( -+ [AC_CHECK_LIB( - [gcrypt], - [gcry_check_version], , - [ -@@ -80,7 +80,7 @@ AS_IF( - AC_MSG_NOTICE([libgcrypt support disabled]) - fi - ] -- ), -+ )], - [if test "x$with_libgcrypt" != "xcheck"; then - AC_MSG_FAILURE([libgcrypt headers not found]); else - AC_MSG_NOTICE([libgcrypt support disabled]) diff --git a/external/poky/meta/recipes-support/rng-tools/rng-tools_5.bb b/external/poky/meta/recipes-support/rng-tools/rng-tools_5.bb deleted file mode 100644 index 6765667a..00000000 --- a/external/poky/meta/recipes-support/rng-tools/rng-tools_5.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "Random number generator daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0b6f033afe6db235e559456585dc8cdc" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/${BP}.tar.gz \ - file://0001-If-the-libc-is-lacking-argp-use-libargp.patch \ - file://0002-Add-argument-to-control-the-libargp-dependency.patch \ - file://underquote.patch \ - file://rng-tools-5-fix-textrels-on-PIC-x86.patch \ - file://read_error_msg.patch \ - file://init \ - file://default \ - file://rngd.service \ -" - -SRC_URI[md5sum] = "6726cdc6fae1f5122463f24ae980dd68" -SRC_URI[sha256sum] = "60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e" - -inherit autotools update-rc.d systemd - -PACKAGECONFIG = "libgcrypt" -PACKAGECONFIG_libc-musl = "libargp" -PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," -PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," - -do_install_append() { - # Only install the init script when 'sysvinit' is in DISTRO_FEATURES. - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d "${D}${sysconfdir}/init.d" - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools - sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ - ${D}${sysconfdir}/init.d/rng-tools - - install -d "${D}${sysconfdir}/default" - install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools - fi - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/rngd.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/rngd.service - fi -} - -INITSCRIPT_NAME = "rng-tools" -INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ." - -SYSTEMD_SERVICE_${PN} = "rngd.service" diff --git a/external/poky/meta/recipes-support/rng-tools/rng-tools_6.9.bb b/external/poky/meta/recipes-support/rng-tools/rng-tools_6.9.bb new file mode 100644 index 00000000..913342c3 --- /dev/null +++ b/external/poky/meta/recipes-support/rng-tools/rng-tools_6.9.bb @@ -0,0 +1,52 @@ +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 = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "sysfsutils" + +SRC_URI = "\ + git://github.com/nhorman/rng-tools.git \ + file://init \ + file://default \ + file://rngd.service \ +" +SRCREV = "4a865797a69dd38c64a86aa32884ecc9ba7b4d08" + +S = "${WORKDIR}/git" + +inherit autotools update-rc.d systemd pkgconfig + +PACKAGECONFIG ??= "libgcrypt libjitterentropy" +PACKAGECONFIG_libc-musl = "libargp libjitterentropy" + +PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," +PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," +PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterentropy,libjitterentropy" +PACKAGECONFIG[libp11] = "--with-pkcs11,--without-pkcs11,libp11 openssl" +PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2 openssl" + +INITSCRIPT_NAME = "rng-tools" +INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ." + +SYSTEMD_SERVICE_${PN} = "rngd.service" + +# Refer autogen.sh in rng-tools +do_configure_prepend() { + cp ${S}/README.md ${S}/README +} + +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 + sed -i \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${sysconfdir}/init.d/rng-tools \ + ${D}${systemd_system_unitdir}/rngd.service +} diff --git a/external/poky/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/external/poky/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch new file mode 100644 index 00000000..91640d60 --- /dev/null +++ b/external/poky/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch @@ -0,0 +1,71 @@ +stop scons trying to create directories in hosts rootfs + +* since 1522f09a4d serf: cleanup recipe + serf.do_install fails in builds with multilib enabled (with + libdir=/usr/lib64 on host where /usr/lib64 doesn't exist) + +DEBUG: Executing shell function do_install +scons: Reading SConscript files ... +PermissionError: [Errno 13] Permission denied: '/usr/lib64': + File "TOPDIR/BUILD/work/qemux86-signage-linux/serf/1.3.9-r0/serf-1.3.9/SConstruct", line 158: + ENV = os.environ, + File "/TOPDIR/BUILD/work/qemux86-signage-linux/serf/1.3.9-r0/recipe-sysroot-native/usr/bin/../../usr/lib/python3.7/site-packages/SCons/Environment.py", line 965: + variables.Update(self) + File "/TOPDIR/BUILD/work/qemux86-signage-linux/serf/1.3.9-r0/recipe-sysroot-native/usr/bin/../../usr/lib/python3.7/site-packages/SCons/Variables/__init__.py", line 227: + option.validator(option.key, env.subst('${%s}'%option.key), env) + File "TOPDIR/BUILD/work/qemux86-signage-linux/serf/1.3.9-r0/serf-1.3.9/SConstruct", line 60: + return PathVariable.PathIsDirCreate(key, val, env) + File "/TOPDIR/BUILD/work/qemux86-signage-linux/serf/1.3.9-r0/recipe-sysroot-native/usr/bin/../../usr/lib/python3.7/site-packages/SCons/Variables/PathVariable.py", line 101: + os.makedirs(val) + File "TOPDIR/BUILD/work/qemux86-signage-linux/serf/1.3.9-r0/recipe-sysroot-native/usr/lib/python3.7/os.py", line 221: + mkdir(name, mode) +ERROR: scons install execution failed. + +* I don't know how exactly --install-sandbox is supposed to work but + in this case it's trying to mkdir /usr/lib64 on the host rootfs + which is clearly wrong and if I set LIBDIR together with + --install-sandbox then the install paths are prefixed with $D twice + in some cases (not for includedir and empty libdir at the end). + So in the end I think it was an issue caused by the custom path + validator in serf's SConstruct, removing that stops touching host + and the installed paths (including the paths inside libserf*.pc) + look correct + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +--- serf-1.3.9/SConstruct 2019-06-18 15:49:19.968961108 +0000 ++++ serf-1.3.9b/SConstruct 2019-06-18 18:53:21.412337151 +0000 +@@ -51,17 +51,6 @@ + """ + return (key, '%s' % (help), default, None, lambda val: _converter(val)) + +-# Custom path validator, creates directory when a specified option is set. +-# To be used to ensure a PREFIX directory is only created when installing. +-def createPathIsDirCreateWithTarget(target): +- def my_validator(key, val, env): +- build_targets = (map(str, BUILD_TARGETS)) +- if target in build_targets: +- return PathVariable.PathIsDirCreate(key, val, env) +- else: +- return PathVariable.PathAccept(key, val, env) +- return my_validator +- + # default directories + if sys.platform == 'win32': + default_incdir='..' +@@ -77,11 +66,11 @@ + PathVariable('PREFIX', + 'Directory to install under', + default_prefix, +- createPathIsDirCreateWithTarget('install')), ++ PathVariable.PathAccept), + PathVariable('LIBDIR', + 'Directory to install architecture dependent libraries under', + default_libdir, +- createPathIsDirCreateWithTarget('install')), ++ PathVariable.PathAccept), + PathVariable('APR', + "Path to apr-1-config, or to APR's install area", + default_incdir, diff --git a/external/poky/meta/recipes-support/serf/serf_1.3.9.bb b/external/poky/meta/recipes-support/serf/serf_1.3.9.bb index 65a8114b..6a27f121 100644 --- a/external/poky/meta/recipes-support/serf/serf_1.3.9.bb +++ b/external/poky/meta/recipes-support/serf/serf_1.3.9.bb @@ -6,6 +6,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ 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 \ " SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57" @@ -14,18 +15,19 @@ SRC_URI[sha256sum] = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -DEPENDS = "python-scons-native openssl apr apr-util util-linux expat" +inherit scons -do_compile() { - ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} \ - CC="${CC}" \ - APR=`which apr-1-config` APU=`which apu-1-config` \ - CFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \ - OPENSSL="${STAGING_EXECPREFIXDIR}" -} +DEPENDS += " openssl apr apr-util util-linux expat" -do_install() { - ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} LIBDIR=${D}${libdir} install -} +EXTRA_OESCONS = " \ + LIBDIR=${libdir} \ + --install-sandbox=${D} \ + CC="${CC}" \ + CFLAGS="${CFLAGS}" \ + LINKFLAGS="${LDFLAGS}" \ + APR=`which apr-1-config` \ + APU=`which apu-1-config` \ + OPENSSL="${STAGING_EXECPREFIXDIR}" \ + " -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch deleted file mode 100644 index 262ff756..00000000 --- a/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch +++ /dev/null @@ -1,25 +0,0 @@ -fix shared-mime-info build race condition - -The definition of install-data-hook in Makefile.am leads -to multiple, overlapping, executions of install-binPROGRAMS -target. We modify the definition to avoid that. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <jslater@windriver.com> - -Index: shared-mime-info-1.9/Makefile.am -=================================================================== ---- shared-mime-info-1.9.orig/Makefile.am -+++ shared-mime-info-1.9/Makefile.am -@@ -50,7 +50,9 @@ else - update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)" - endif - --install-data-hook: install-binPROGRAMS -+# do NOT make this dependent on anything! -+# -+install-data-hook: - if ENABLE_UPDATE_MIMEDB - $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime" - endif diff --git a/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch deleted file mode 100644 index fea34a55..00000000 --- a/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch +++ /dev/null @@ -1,33 +0,0 @@ -The Makefile used by shared-mime-info is one big race with the SUBDIRS -option and the dependency specifically calling make all combining to -create multiple make instances all of which may try and build targets -like update-mime-database. - -This patch removes those options meaning make can correctly identify -dependencies and stop itself racing itself. - -RP 10/10/2011 - -Upstream-Status: Pending -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: shared-mime-info-1.9/Makefile.am -=================================================================== ---- shared-mime-info-1.9.orig/Makefile.am -+++ shared-mime-info-1.9/Makefile.am -@@ -1,5 +1,3 @@ --SUBDIRS=. po -- - AM_CPPFLAGS = $(ALL_CFLAGS) - - packagesdir = $(datadir)/mime/packages -@@ -81,8 +79,7 @@ endif - - all: $(defaultmakedeps) - --create-pot: -- $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot -+create-pot: po - - local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT) - if CROSS_COMPILING diff --git a/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb b/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb deleted file mode 100644 index 9fc210b7..00000000 --- a/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb +++ /dev/null @@ -1,7 +0,0 @@ -require shared-mime-info.inc - -SRC_URI += "file://parallelmake.patch \ - file://install-data-hook.patch" - -SRC_URI[md5sum] = "418c2ced9dc4dd5ca8b06a755e6d64e9" -SRC_URI[sha256sum] = "c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf" diff --git a/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb index 344da7ea..7a060b09 100644 --- a/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc +++ b/external/poky/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb @@ -5,11 +5,17 @@ SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" +DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native" -SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz" +SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https" +SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a" +PV = "1.15" +S = "${WORKDIR}/git" -inherit autotools pkgconfig gettext +UPSTREAM_CHECK_GITTAGREGEX = "Release-(?P<pver>(\d+(\-\d+)+))" +UPSTREAM_VERSION_UNKNOWN = "1" + +inherit autotools pkgconfig gettext python3native mime EXTRA_OECONF = "--disable-update-mimedb" @@ -30,6 +36,8 @@ do_install () { do_install_class-native () { autotools_do_install + + ${B}/update-mime-database ${D}${datadir}/mime } BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch b/external/poky/meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch deleted file mode 100644 index b0aa5d17..00000000 --- a/external/poky/meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9aa01fd5f9d8b2b98c34684dc8f68115750ef41c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 12 Jul 2016 17:15:13 +0300 -Subject: [PATCH] source-highlight.pc.in: do not add Boost's libraries and - includes - -This breaks when compiling in sysroots; a proper way is to use Depends - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - source-highlight.pc.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/source-highlight.pc.in b/source-highlight.pc.in -index 79ab63e..64114a7 100644 ---- a/source-highlight.pc.in -+++ b/source-highlight.pc.in -@@ -7,6 +7,6 @@ Name: libsource-highlight - Description: GNU Source-highlight library. - URL: http://www.gnu.org/software/src-highlite/ - Version: @VERSION@ --Libs: -L${libdir} -lsource-highlight @BOOST_LDFLAGS@ @BOOST_REGEX_LIB@ --Cflags: -I${includedir} @BOOST_CPPFLAGS@ -+Libs: -L${libdir} -lsource-highlight -+Cflags: -I${includedir} - --- -2.8.1 - diff --git a/external/poky/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb b/external/poky/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb deleted file mode 100644 index 85923e47..00000000 --- a/external/poky/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Syntax highlight utility" -DESCRIPTION = "Source-highlight converts source code to formatted text with syntax highlighting." -HOMEPAGE = "https://www.gnu.org/software/src-highlite/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb" - -SRC_URI = "${GNU_MIRROR}/src-highlite/${BPN}-${PV}.tar.gz \ - file://0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch" -SRC_URI[md5sum] = "3243470706ef5fefdc3e43b5306a4e41" -SRC_URI[sha256sum] = "01336a7ea1d1ccc374201f7b81ffa94d0aecb33afc7d6903ebf9fbf33a55ada3" - -inherit autotools - -DEPENDS_append = " boost" - -DEPENDS_append_class-target = " source-highlight-native" - -EXTRA_OECONF = "--with-boost=yes --with-boost-libdir=${STAGING_DIR_TARGET}${libdir}" - -BBCLASSEXTEND = "native" - -# source-highlight is using its own binary from the build tree to make documentation -# let's substitute the native binary instead -do_configure_prepend_class-target () { - sed -i -e 's,^SRCHILITEEXE = $(top_builddir).*,SRCHILITEEXE = source-highlight,' ${S}/doc/Makefile.am -} - -RDEPENDS_source-highlight += "bash" diff --git a/external/poky/meta/recipes-support/sqlite/files/CVE-2018-20505.patch b/external/poky/meta/recipes-support/sqlite/files/CVE-2018-20505.patch deleted file mode 100644 index d1119f3b..00000000 --- a/external/poky/meta/recipes-support/sqlite/files/CVE-2018-20505.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: D. Richard Hipp <drh@hwaci.com> -Date: Sat, 3 Nov 2018 13:11:24 +0000 (+0000) -Subject: Fix a assert() in the query planner that can arise when doing row-value -X-Git-Tag: version-3.26.0~59 -X-Git-Url: https://repo.or.cz/sqlite.git/commitdiff_plain/24298027a30cf7941f16a8cc878d0c1f9f14308f - -Fix a assert() in the query planner that can arise when doing row-value -operations on a PRIMARY KEY that contains duplicate columns. -Ticket [1a84668dcfdebaf12415d]. - -https://sqlite.org/src/info/1a84668dcfdebaf12415d - -upstream-Status: Backport -CVE: CVE-2018-20505 -affects <= 3.26.0 - -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Index: sqlite-autoconf-3230100/sqlite3.c -=================================================================== ---- sqlite-autoconf-3230100.orig/sqlite3.c -+++ sqlite-autoconf-3230100/sqlite3.c -@@ -131231,7 +131231,7 @@ static Expr *removeUnindexableInClauseTe - for(i=iEq; i<pLoop->nLTerm; i++){ - if( pLoop->aLTerm[i]->pExpr==pX ){ - int iField = pLoop->aLTerm[i]->iField - 1; -- assert( pOrigRhs->a[iField].pExpr!=0 ); -+ if( pOrigRhs->a[iField].pExpr==0 ) continue; /* Duplicate PK column */ - pRhs = sqlite3ExprListAppend(pParse, pRhs, pOrigRhs->a[iField].pExpr); - pOrigRhs->a[iField].pExpr = 0; - assert( pOrigLhs->a[iField].pExpr!=0 ); diff --git a/external/poky/meta/recipes-support/sqlite/files/CVE-2018-20506.patch b/external/poky/meta/recipes-support/sqlite/files/CVE-2018-20506.patch deleted file mode 100644 index 7919f9b5..00000000 --- a/external/poky/meta/recipes-support/sqlite/files/CVE-2018-20506.patch +++ /dev/null @@ -1,103 +0,0 @@ -From: Dan Kennedy <danielk1977@gmail.com> -Date: Sat, 3 Nov 2018 16:51:30 +0000 (+0000) -Subject: Add extra defenses against strategically corrupt databases to fts3/4. -X-Git-Tag: version-3.26.0~58 -X-Git-Url: https://repo.or.cz/sqlite.git/commitdiff_plain/19816852d4e82e115338b1997540c26a1b794d18 - -Add extra defenses against strategically corrupt databases to fts3/4. - -https://sqlite.org/src/info/940f2adc8541a838 - -Upstream-Status: Backport -CVE: CVE-2018-20506 -Affects <= 3.26.0 - -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Index: sqlite-autoconf-3230100/sqlite3.c -=================================================================== ---- sqlite-autoconf-3230100.orig/sqlite3.c -+++ sqlite-autoconf-3230100/sqlite3.c -@@ -152368,7 +152368,7 @@ static int fts3ScanInteriorNode( - const char *zCsr = zNode; /* Cursor to iterate through node */ - const char *zEnd = &zCsr[nNode];/* End of interior node buffer */ - char *zBuffer = 0; /* Buffer to load terms into */ -- int nAlloc = 0; /* Size of allocated buffer */ -+ i64 nAlloc = 0; /* Size of allocated buffer */ - int isFirstTerm = 1; /* True when processing first term on page */ - sqlite3_int64 iChild; /* Block id of child node to descend to */ - -@@ -152406,14 +152406,14 @@ static int fts3ScanInteriorNode( - zCsr += fts3GetVarint32(zCsr, &nSuffix); - - assert( nPrefix>=0 && nSuffix>=0 ); -- if( &zCsr[nSuffix]>zEnd ){ -+ if( nPrefix>zCsr-zNode || nSuffix>zEnd-zCsr ){ - rc = FTS_CORRUPT_VTAB; - goto finish_scan; - } -- if( nPrefix+nSuffix>nAlloc ){ -+ if( (i64)nPrefix+nSuffix>nAlloc ){ - char *zNew; -- nAlloc = (nPrefix+nSuffix) * 2; -- zNew = (char *)sqlite3_realloc(zBuffer, nAlloc); -+ nAlloc = ((i64)nPrefix+nSuffix) * 2; -+ zNew = (char *)sqlite3_realloc64(zBuffer, nAlloc); - if( !zNew ){ - rc = SQLITE_NOMEM; - goto finish_scan; -@@ -162012,15 +162012,19 @@ static int fts3SegReaderNext( - ** safe (no risk of overread) even if the node data is corrupted. */ - pNext += fts3GetVarint32(pNext, &nPrefix); - pNext += fts3GetVarint32(pNext, &nSuffix); -- if( nPrefix<0 || nSuffix<=0 -- || &pNext[nSuffix]>&pReader->aNode[pReader->nNode] -+ if( nSuffix<=0 -+ || (&pReader->aNode[pReader->nNode] - pNext)<nSuffix -+ || nPrefix>pReader->nTermAlloc - ){ - return FTS_CORRUPT_VTAB; - } - -- if( nPrefix+nSuffix>pReader->nTermAlloc ){ -- int nNew = (nPrefix+nSuffix)*2; -- char *zNew = sqlite3_realloc(pReader->zTerm, nNew); -+ /* Both nPrefix and nSuffix were read by fts3GetVarint32() and so are -+ ** between 0 and 0x7FFFFFFF. But the sum of the two may cause integer -+ ** overflow - hence the (i64) casts. */ -+ if( (i64)nPrefix+nSuffix>(i64)pReader->nTermAlloc ){ -+ i64 nNew = ((i64)nPrefix+nSuffix)*2; -+ char *zNew = sqlite3_realloc64(pReader->zTerm, nNew); - if( !zNew ){ - return SQLITE_NOMEM; - } -@@ -162042,7 +162046,7 @@ static int fts3SegReaderNext( - ** b-tree node. And that the final byte of the doclist is 0x00. If either - ** of these statements is untrue, then the data structure is corrupt. - */ -- if( &pReader->aDoclist[pReader->nDoclist]>&pReader->aNode[pReader->nNode] -+ if( (&pReader->aNode[pReader->nNode] - pReader->aDoclist)<pReader->nDoclist - || (pReader->nPopulate==0 && pReader->aDoclist[pReader->nDoclist-1]) - ){ - return FTS_CORRUPT_VTAB; -@@ -164367,7 +164371,9 @@ static int nodeReaderNext(NodeReader *p) - p->iOff += fts3GetVarint32(&p->aNode[p->iOff], &nPrefix); - } - p->iOff += fts3GetVarint32(&p->aNode[p->iOff], &nSuffix); -- -+ if( nPrefix>p->iOff || nSuffix>p->nNode-p->iOff ){ -+ return SQLITE_CORRUPT_VTAB; -+ } - blobGrowBuffer(&p->term, nPrefix+nSuffix, &rc); - if( rc==SQLITE_OK ){ - memcpy(&p->term.a[nPrefix], &p->aNode[p->iOff], nSuffix); -@@ -164375,6 +164381,9 @@ static int nodeReaderNext(NodeReader *p) - p->iOff += nSuffix; - if( p->iChild==0 ){ - p->iOff += fts3GetVarint32(&p->aNode[p->iOff], &p->nDoclist); -+ if( (p->nNode-p->iOff)<p->nDoclist ){ -+ return SQLITE_CORRUPT_VTAB; -+ } - p->aDoclist = &p->aNode[p->iOff]; - p->iOff += p->nDoclist; - } diff --git a/external/poky/meta/recipes-support/sqlite/files/CVE-2019-8457.patch b/external/poky/meta/recipes-support/sqlite/files/CVE-2019-8457.patch deleted file mode 100644 index 5883774e..00000000 --- a/external/poky/meta/recipes-support/sqlite/files/CVE-2019-8457.patch +++ /dev/null @@ -1,126 +0,0 @@ -From fbf2392644f0ae4282fa4583c9bb67260995d983 Mon Sep 17 00:00:00 2001 -From: Shubham Agrawal <shuagr@microsoft.com> -Date: Mon, 23 Sep 2019 20:58:47 +0000 -Subject: [PATCH] sqlite: fix for CVE-2019-8457 - -Upstream-Status: Backport -CVE: CVE-2019-8457 -Signed-off-by: Shubham Agrawal <shuagr@microsoft.com> ---- - sqlite3.c | 50 +++++++++++++++++++++++++++++++------------------- - 1 file changed, 31 insertions(+), 19 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 00513d4..5c8c7f4 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -172325,6 +172325,33 @@ - } - - -+/* Allocate and initialize a new dynamic string object */ -+StrAccum *sqlite3_str_new(sqlite3 *db){ -+ StrAccum *p = sqlite3DbMallocRaw(db, sizeof(*p)); -+ if( p ){ -+ sqlite3StrAccumInit(p, db, 0, 0, SQLITE_MAX_LENGTH); -+ } -+ return p; -+} -+ -+/* Finalize a string created using sqlite3_str_new(). -+*/ -+ -+char *sqlite3_str_finish(StrAccum *p){ -+ char *z; -+ if( p ){ -+ z = sqlite3StrAccumFinish(p); -+ sqlite3DbFree(p->db, p); -+ }else{ -+ z = 0; -+ } -+ return z; -+} -+/* Return any error code associated with p */ -+int sqlite3_str_errcode(StrAccum *p){ -+ return p ? p->accError : SQLITE_NOMEM; -+} -+ - /* - ** Implementation of a scalar function that decodes r-tree nodes to - ** human readable strings. This can be used for debugging and analysis. -@@ -172342,49 +172369,53 @@ - ** <num-dimension>*2 coordinates. - */ - static void rtreenode(sqlite3_context *ctx, int nArg, sqlite3_value **apArg){ -- char *zText = 0; -+ - RtreeNode node; - Rtree tree; - int ii; -+ int nData; -+ int errCode; -+ StrAccum *pOut; - - UNUSED_PARAMETER(nArg); - memset(&node, 0, sizeof(RtreeNode)); - memset(&tree, 0, sizeof(Rtree)); - tree.nDim = (u8)sqlite3_value_int(apArg[0]); -+ if( tree.nDim<1 || tree.nDim>5 ) return; - tree.nDim2 = tree.nDim*2; - tree.nBytesPerCell = 8 + 8 * tree.nDim; - node.zData = (u8 *)sqlite3_value_blob(apArg[1]); -+ nData = sqlite3_value_bytes(apArg[1]); -+ if( nData<4 ) return; -+ if( nData<NCELL(&node)*tree.nBytesPerCell ) return; - -+ pOut = sqlite3_str_new(0); - for(ii=0; ii<NCELL(&node); ii++){ -- char zCell[512]; -- int nCell = 0; -+ -+ - RtreeCell cell; - int jj; - - nodeGetCell(&tree, &node, ii, &cell); -- sqlite3_snprintf(512-nCell,&zCell[nCell],"%lld", cell.iRowid); -- nCell = (int)strlen(zCell); -+ if( ii>0 ) sqlite3StrAccumAppend(pOut, " ", 1); -+ sqlite3XPrintf(pOut, "{%lld", cell.iRowid); -+ - for(jj=0; jj<tree.nDim2; jj++){ - #ifndef SQLITE_RTREE_INT_ONLY -- sqlite3_snprintf(512-nCell,&zCell[nCell], " %g", -- (double)cell.aCoord[jj].f); -+ -+ sqlite3XPrintf(pOut, " %g", (double)cell.aCoord[jj].f); - #else -- sqlite3_snprintf(512-nCell,&zCell[nCell], " %d", -- cell.aCoord[jj].i); -+ -+ sqlite3XPrintf(pOut, " %d", cell.aCoord[jj].i); - #endif -- nCell = (int)strlen(zCell); -- } - -- if( zText ){ -- char *zTextNew = sqlite3_mprintf("%s {%s}", zText, zCell); -- sqlite3_free(zText); -- zText = zTextNew; -- }else{ -- zText = sqlite3_mprintf("{%s}", zCell); - } -+ sqlite3StrAccumAppend(pOut, "}", 1); - } -- -- sqlite3_result_text(ctx, zText, -1, sqlite3_free); -+ -+ errCode = sqlite3_str_errcode(pOut); -+ sqlite3_result_text(ctx, sqlite3_str_finish(pOut), -1, sqlite3_free); -+ sqlite3_result_error_code(ctx, errCode); - } - - /* This routine implements an SQL function that returns the "depth" parameter --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/sqlite/files/CVE-2020-11655.patch b/external/poky/meta/recipes-support/sqlite/files/CVE-2020-11655.patch new file mode 100644 index 00000000..e30c482b --- /dev/null +++ b/external/poky/meta/recipes-support/sqlite/files/CVE-2020-11655.patch @@ -0,0 +1,32 @@ +From a4601326d61bf1a11151ac6b78b50804bfd03b4d Mon Sep 17 00:00:00 2001 +From: Sakib Sajal <sakib.sajal@windriver.com> +Date: Thu, 30 Apr 2020 10:46:16 -0700 +Subject: [PATCH 2/2] In the event of a semantic error in an aggregate query, + early-out the resetAccumulator() function to prevent problems due to + incomplete or incorrect initialization of the AggInfo object. Fix for ticket + [af4556bb5c285c08]. + +FossilOrigin-Name: 4a302b42c7bf5e11ddb5522ca999f74aba397d3a7eb91b1844bb02852f772441 +Upstream Status: Backport [c415d91007e1680e4eb17def583b202c3c83c718] + +CVE: CVE-2020-11655 +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + sqlite3.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sqlite3.c b/sqlite3.c +index 1df6633..726adf7 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -133242,6 +133242,7 @@ static void resetAccumulator(Parse *pParse, AggInfo *pAggInfo){ + struct AggInfo_func *pFunc; + int nReg = pAggInfo->nFunc + pAggInfo->nColumn; + if( nReg==0 ) return; ++ if( pParse->nErr ) return; + #ifdef SQLITE_DEBUG + /* Verify that all AggInfo registers are within the range specified by + ** AggInfo.mnReg..AggInfo.mxReg */ +-- +2.17.1 + diff --git a/external/poky/meta/recipes-support/sqlite/files/CVE-2020-11656.patch b/external/poky/meta/recipes-support/sqlite/files/CVE-2020-11656.patch new file mode 100644 index 00000000..b88a724e --- /dev/null +++ b/external/poky/meta/recipes-support/sqlite/files/CVE-2020-11656.patch @@ -0,0 +1,70 @@ +From 2d69a520d027eb73eb6da9f2653d23e33b10e8bb Mon Sep 17 00:00:00 2001 +From: Sakib Sajal <sakib.sajal@windriver.com> +Date: Thu, 30 Apr 2020 10:14:36 -0700 +Subject: [PATCH 1/2] Fix a case when a pointer might be used after + being freed in the ALTER TABLE code. Fix for [4722bdab08cb1]. + +FossilOrigin-Name: d09f8c3621d5f7f8c6d99d7d82bcaa8421855b3f470bea2b26c858106382b906 +Upstream Status: Backport [fb99e388ec7f30fe43e4878236e3695ff24ae58d] + +[PATCH 2/2] Do not suppress errors when resolving references in an ORDER + BY clause belonging to a compound SELECT within a view or trigger within + ALTER TABLE. Fix for ticket [a10a14e9b4ba2]. + +FossilOrigin-Name: 684293882c302600e112cf52553c19d84fdb31663d96e5dd7f8ac17dda00a026 +Upstream Status: Backport [4db7ab53f9c30e2e22731ace93ab6b18eef6c4ae] + +The two patches were converted to amalgamation format. + +CVE: CVE-2020-11656 +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + sqlite3.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 64fae04..1df6633 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -97945,7 +97945,7 @@ static int resolveOrderByTermToExprList( + nc.nErr = 0; + db = pParse->db; + savedSuppErr = db->suppressErr; +- db->suppressErr = 1; ++ if( IN_RENAME_OBJECT==0 ) db->suppressErr = 1; + rc = sqlite3ResolveExprNames(&nc, pE); + db->suppressErr = savedSuppErr; + if( rc ) return 0; +@@ -105383,6 +105383,21 @@ static void renameWalkWith(Walker *pWalker, Select *pSelect){ + } + } + ++/* ++** Unmap all tokens in the IdList object passed as the second argument. ++*/ ++static void unmapColumnIdlistNames( ++ Parse *pParse, ++ IdList *pIdList ++){ ++ if( pIdList ){ ++ int ii; ++ for(ii=0; ii<pIdList->nId; ii++){ ++ sqlite3RenameTokenRemap(pParse, 0, (void*)pIdList->a[ii].zName); ++ } ++ } ++} ++ + /* + ** Walker callback used by sqlite3RenameExprUnmap(). + */ +@@ -105404,6 +105419,7 @@ static int renameUnmapSelectCb(Walker *pWalker, Select *p){ + for(i=0; i<pSrc->nSrc; i++){ + sqlite3RenameTokenRemap(pParse, 0, (void*)pSrc->a[i].zName); + if( sqlite3WalkExpr(pWalker, pSrc->a[i].pOn) ) return WRC_Abort; ++ unmapColumnIdlistNames(pParse, pSrc->a[i].pUsing); + } + } + +-- +2.17.1 + diff --git a/external/poky/meta/recipes-support/sqlite/files/CVE-2020-15358.patch b/external/poky/meta/recipes-support/sqlite/files/CVE-2020-15358.patch new file mode 100644 index 00000000..086f6ef9 --- /dev/null +++ b/external/poky/meta/recipes-support/sqlite/files/CVE-2020-15358.patch @@ -0,0 +1,47 @@ +Fix a defect in the query-flattener optimization identified by ticket [8f157e8010b22af0]. + +Upstream-Status: Backport +https://www.sqlite.org/src/info/10fa79d00f8091e5 +CVE: CVE-2020-15358 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +Index: sqlite-autoconf-3310100/sqlite3.c +=================================================================== +--- sqlite-autoconf-3310100.orig/sqlite3.c ++++ sqlite-autoconf-3310100/sqlite3.c +@@ -18349,6 +18349,7 @@ struct Select { + #define SF_WhereBegin 0x0080000 /* Really a WhereBegin() call. Debug Only */ + #define SF_WinRewrite 0x0100000 /* Window function rewrite accomplished */ + #define SF_View 0x0200000 /* SELECT statement is a view */ ++#define SF_NoopOrderBy 0x0400000 /* ORDER BY is ignored for this query */ + + /* + ** The results of a SELECT can be distributed in several ways, as defined +@@ -130607,9 +130608,7 @@ static int multiSelect( + selectOpName(p->op))); + rc = sqlite3Select(pParse, p, &uniondest); + testcase( rc!=SQLITE_OK ); +- /* Query flattening in sqlite3Select() might refill p->pOrderBy. +- ** Be sure to delete p->pOrderBy, therefore, to avoid a memory leak. */ +- sqlite3ExprListDelete(db, p->pOrderBy); ++ assert( p->pOrderBy==0 ); + pDelete = p->pPrior; + p->pPrior = pPrior; + p->pOrderBy = 0; +@@ -131958,7 +131957,7 @@ static int flattenSubquery( + ** We look at every expression in the outer query and every place we see + ** "a" we substitute "x*3" and every place we see "b" we substitute "y+10". + */ +- if( pSub->pOrderBy ){ ++ if( pSub->pOrderBy && (pParent->selFlags & SF_NoopOrderBy)==0 ){ + /* At this point, any non-zero iOrderByCol values indicate that the + ** ORDER BY column expression is identical to the iOrderByCol'th + ** expression returned by SELECT statement pSub. Since these values +@@ -133659,6 +133658,7 @@ SQLITE_PRIVATE int sqlite3Select( + sqlite3ExprListDelete(db, p->pOrderBy); + p->pOrderBy = 0; + p->selFlags &= ~SF_Distinct; ++ p->selFlags |= SF_NoopOrderBy; + } + sqlite3SelectPrep(pParse, p, 0); + if( pParse->nErr || db->mallocFailed ){ diff --git a/external/poky/meta/recipes-support/sqlite/files/CVE-2020-9327.patch b/external/poky/meta/recipes-support/sqlite/files/CVE-2020-9327.patch new file mode 100644 index 00000000..fecbbabc --- /dev/null +++ b/external/poky/meta/recipes-support/sqlite/files/CVE-2020-9327.patch @@ -0,0 +1,141 @@ +From 45d491851e1bca378de158a5e279fd584ce548e4 Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" <drh@hwaci.com> +Date: Mon, 17 Feb 2020 00:12:04 +0000 +Subject: [PATCH] [PATCH 1/2] Take care when checking the table of a TK_COLUMN + expression node to see if the table is a virtual table to first ensure that + the Expr.y.pTab pointer is not null due to generated column optimizations. + Ticket [4374860b29383380]. + +FossilOrigin-Name: 9d0d4ab95dc0c56e053c2924ed322a9ea7b25439e6f74599f706905a1994e454 + +[PATCH 2/2] A better (smaller and faster) solution to ticket + [4374860b29383380]. + +FossilOrigin-Name: abc473fb8fb999005dc79a360e34f97b3b25429decf1820dd2afa5c19577753d + +The two patches were converted to amalgamation format + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +Upstream-Status: Backport +CVE: CVE-2020-9327 +--- + sqlite3.c | 35 ++++++++++++++++++++++++----------- + sqlite3.h | 2 +- + 2 files changed, 25 insertions(+), 12 deletions(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 55dc686..64fae04 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -1167,7 +1167,7 @@ extern "C" { + */ + #define SQLITE_VERSION "3.31.1" + #define SQLITE_VERSION_NUMBER 3031001 +-#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6" ++#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837balt1" + + /* + ** CAPI3REF: Run-Time Library Version Numbers +@@ -17428,8 +17428,11 @@ struct Table { + */ + #ifndef SQLITE_OMIT_VIRTUALTABLE + # define IsVirtual(X) ((X)->nModuleArg) ++# define ExprIsVtab(X) \ ++ ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->nModuleArg) + #else + # define IsVirtual(X) 0 ++# define ExprIsVtab(X) 0 + #endif + + /* +@@ -104133,19 +104136,25 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){ + case TK_LT: + case TK_LE: + case TK_GT: +- case TK_GE: ++ case TK_GE: { ++ Expr *pLeft = pExpr->pLeft; ++ Expr *pRight = pExpr->pRight; + testcase( pExpr->op==TK_EQ ); + testcase( pExpr->op==TK_NE ); + testcase( pExpr->op==TK_LT ); + testcase( pExpr->op==TK_LE ); + testcase( pExpr->op==TK_GT ); + testcase( pExpr->op==TK_GE ); +- if( (pExpr->pLeft->op==TK_COLUMN && IsVirtual(pExpr->pLeft->y.pTab)) +- || (pExpr->pRight->op==TK_COLUMN && IsVirtual(pExpr->pRight->y.pTab)) ++ /* The y.pTab=0 assignment in wherecode.c always happens after the ++ ** impliesNotNullRow() test */ ++ if( (pLeft->op==TK_COLUMN && ALWAYS(pLeft->y.pTab!=0) ++ && IsVirtual(pLeft->y.pTab)) ++ || (pRight->op==TK_COLUMN && ALWAYS(pRight->y.pTab!=0) ++ && IsVirtual(pRight->y.pTab)) + ){ +- return WRC_Prune; ++ return WRC_Prune; + } +- ++ } + default: + return WRC_Continue; + } +@@ -142591,7 +142600,8 @@ static int isAuxiliaryVtabOperator( + ** MATCH(expression,vtab_column) + */ + pCol = pList->a[1].pExpr; +- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){ ++ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 ); ++ if( ExprIsVtab(pCol) ){ + for(i=0; i<ArraySize(aOp); i++){ + if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){ + *peOp2 = aOp[i].eOp2; +@@ -142613,7 +142623,8 @@ static int isAuxiliaryVtabOperator( + ** with function names in an arbitrary case. + */ + pCol = pList->a[0].pExpr; +- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){ ++ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 ); ++ if( ExprIsVtab(pCol) ){ + sqlite3_vtab *pVtab; + sqlite3_module *pMod; + void (*xNotUsed)(sqlite3_context*,int,sqlite3_value**); +@@ -142636,10 +142647,12 @@ static int isAuxiliaryVtabOperator( + int res = 0; + Expr *pLeft = pExpr->pLeft; + Expr *pRight = pExpr->pRight; +- if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->y.pTab) ){ ++ testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 ); ++ if( ExprIsVtab(pLeft) ){ + res++; + } +- if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->y.pTab) ){ ++ testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 ); ++ if( pRight && ExprIsVtab(pRight) ){ + res++; + SWAP(Expr*, pLeft, pRight); + } +@@ -228440,7 +228453,7 @@ SQLITE_API int sqlite3_stmt_init( + #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */ + + /************** End of stmt.c ************************************************/ +-#if __LINE__!=228443 ++#if __LINE__!=228456 + #undef SQLITE_SOURCE_ID + #define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837balt2" + #endif +diff --git a/sqlite3.h b/sqlite3.h +index cef6eea..5b9796c 100644 +--- a/sqlite3.h ++++ b/sqlite3.h +@@ -125,7 +125,7 @@ extern "C" { + */ + #define SQLITE_VERSION "3.31.1" + #define SQLITE_VERSION_NUMBER 3031001 +-#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6" ++#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837balt1" + + /* + ** CAPI3REF: Run-Time Library Version Numbers +-- +2.25.1 + diff --git a/external/poky/meta/recipes-support/sqlite/sqlite3.inc b/external/poky/meta/recipes-support/sqlite/sqlite3.inc index 1834867d..07614bdb 100644 --- a/external/poky/meta/recipes-support/sqlite/sqlite3.inc +++ b/external/poky/meta/recipes-support/sqlite/sqlite3.inc @@ -19,13 +19,24 @@ UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html" CVE_PRODUCT = "sqlite" -inherit autotools pkgconfig +inherit autotools pkgconfig siteinfo -PACKAGECONFIG ?= "" -PACKAGECONFIG_class-native = "" +# enable those which are enabled by default in configure +PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext" +PACKAGECONFIG_class-native ?= "fts4 fts5 json1 rtree dyn_ext" PACKAGECONFIG[editline] = "--enable-editline,--disable-editline,libedit" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline ncurses" +PACKAGECONFIG[fts3] = "--enable-fts3,--disable-fts3" +PACKAGECONFIG[fts4] = "--enable-fts4,--disable-fts4" +PACKAGECONFIG[fts5] = "--enable-fts5,--disable-fts5" +PACKAGECONFIG[json1] = "--enable-json1,--disable-json1" +PACKAGECONFIG[rtree] = "--enable-rtree,--disable-rtree" +PACKAGECONFIG[session] = "--enable-session,--disable-session" +PACKAGECONFIG[dyn_ext] = "--enable-dynamic-extensions,--disable-dynamic-extensions" +PACKAGECONFIG[zlib] = ",,zlib" + +CACHED_CONFIGUREVARS += "${@bb.utils.contains('PACKAGECONFIG', 'zlib', '', 'ac_cv_search_deflate=no',d)}" EXTRA_OECONF = " \ --enable-shared \ @@ -33,13 +44,15 @@ EXTRA_OECONF = " \ --disable-static-shell \ " -CFLAGS_append = " -fPIC" - # pread() is in POSIX.1-2001 so any reasonable system must surely support it -CFLAGS += "-DUSE_PREAD" +CFLAGS_append = " -DUSE_PREAD" # Provide column meta-data API -CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" +CFLAGS_append = " -DSQLITE_ENABLE_COLUMN_METADATA" + +# Unless SQLITE_BYTEORDER is predefined, the code falls back to build time +# huristics, which are not always correct +CFLAGS_append = " ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DSQLITE_BYTEORDER=1234', '-DSQLITE_BYTEORDER=4321', d)}" PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" diff --git a/external/poky/meta/recipes-support/sqlite/sqlite3_3.23.1.bb b/external/poky/meta/recipes-support/sqlite/sqlite3_3.23.1.bb deleted file mode 100644 index 7df61cd1..00000000 --- a/external/poky/meta/recipes-support/sqlite/sqlite3_3.23.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require sqlite3.inc - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" - -SRC_URI = "\ - http://www.sqlite.org/2018/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - file://CVE-2018-20505.patch \ - file://CVE-2018-20506.patch \ - file://CVE-2019-8457.patch \ - " -SRC_URI[md5sum] = "99a51b40a66872872a91c92f6d0134fa" -SRC_URI[sha256sum] = "92842b283e5e744eff5da29ed3c69391de7368fccc4d0ee6bf62490ce555ef25" diff --git a/external/poky/meta/recipes-support/sqlite/sqlite3_3.31.1.bb b/external/poky/meta/recipes-support/sqlite/sqlite3_3.31.1.bb new file mode 100644 index 00000000..e5071b48 --- /dev/null +++ b/external/poky/meta/recipes-support/sqlite/sqlite3_3.31.1.bb @@ -0,0 +1,16 @@ +require sqlite3.inc + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" + +SRC_URI = "http://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_PV}.tar.gz \ + file://CVE-2020-9327.patch \ + file://CVE-2020-11656.patch \ + file://CVE-2020-11655.patch \ + file://CVE-2020-15358.patch \ + " +SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125" +SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae" + +# -19242 is only an issue in specific development branch commits +CVE_CHECK_WHITELIST += "CVE-2019-19242" diff --git a/external/poky/meta/recipes-support/taglib/taglib_1.11.1.bb b/external/poky/meta/recipes-support/taglib/taglib_1.11.1.bb index 01dcf66d..f4e28829 100644 --- a/external/poky/meta/recipes-support/taglib/taglib_1.11.1.bb +++ b/external/poky/meta/recipes-support/taglib/taglib_1.11.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Library for reading and editing the meta-data of popular audio formats" SECTION = "libs/multimedia" HOMEPAGE = "http://taglib.github.io/" -LICENSE = "LGPLv2.1 | MPL-1" +LICENSE = "LGPLv2.1 | MPL-1.1" LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \ file://taglib/audioproperties.h;beginline=1;endline=24;md5=9df2c7399519b7310568a7c55042ecee" diff --git a/external/poky/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch b/external/poky/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch new file mode 100644 index 00000000..63a7b78f --- /dev/null +++ b/external/poky/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch @@ -0,0 +1,46 @@ +From 133ab27cdb17ca20ef6b0304cf30621d2bcbe757 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 31 Jan 2019 21:32:26 -0800 +Subject: [PATCH] src/Makefile: improve reproducibility + +Clear all_cflags, all_lflags, compiled_user +and compiled_sys to avoid introducing build +info to improve reproducibility as below: + +WARNING: vim-8.1.0347-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/vim/8.1.0347-r0/packages-split/vim/usr/bin/vim.vim in package contained reference to tmpdir [buildpaths] + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/Makefile | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index f2fafa4dc..7148d4bd9 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -2845,16 +2845,10 @@ auto/pathdef.c: Makefile auto/config.mk + -@echo '#include "vim.h"' >> $@ + -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ + -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@ +- -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@ +- -@if test -n "$(COMPILEDBY)"; then \ +- echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \ +- else ((logname) 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi +- -@echo '";' >> $@ +- -@echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@ +- -@if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi +- -@echo '";' >> $@ ++ -@echo 'char_u *all_cflags = (char_u *)"";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *all_lflags = (char_u *)"";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *compiled_user = (char_u *)"";' >> $@ ++ -@echo 'char_u *compiled_sys = (char_u *)"";' >> $@ + -@sh $(srcdir)/pathdef.sh + + GUI_GTK_RES_INPUTS = \ +-- +2.17.1 + diff --git a/external/poky/meta/recipes-support/vim/files/disable_acl_header_check.patch b/external/poky/meta/recipes-support/vim/files/disable_acl_header_check.patch new file mode 100644 index 00000000..33089162 --- /dev/null +++ b/external/poky/meta/recipes-support/vim/files/disable_acl_header_check.patch @@ -0,0 +1,39 @@ +From 5ed25c076a1fb1889a3c50dddf29f21850b59a13 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Tue, 26 Jun 2018 17:29:09 +0800 +Subject: [PATCH] disable acl header check + +Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny. + +Upstream-Status: pending + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + src/configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/configure.ac b/src/configure.ac +index 2d409b3ca06a..dbcaf6140263 100644 +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -3257,7 +3257,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \ + sys/systeminfo.h locale.h sys/stream.h termios.h \ + libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ + utime.h sys/param.h sys/ptms.h libintl.h libgen.h \ +- util/debug.h util/msg18n.h frame.h sys/acl.h \ ++ util/debug.h util/msg18n.h frame.h \ + sys/access.h sys/sysinfo.h wchar.h wctype.h) + + dnl sys/ptem.h depends on sys/stream.h on Solaris +@@ -3886,6 +3886,7 @@ AC_ARG_ENABLE(acl, + , [enable_acl="yes"]) + if test "$enable_acl" = "yes"; then + AC_MSG_RESULT(no) ++ AC_CHECK_HEADERS(sys/acl.h) + AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], + AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" + AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) +-- +2.7.4 + diff --git a/external/poky/meta/recipes-support/vim/files/no-path-adjust.patch b/external/poky/meta/recipes-support/vim/files/no-path-adjust.patch new file mode 100644 index 00000000..05c2d803 --- /dev/null +++ b/external/poky/meta/recipes-support/vim/files/no-path-adjust.patch @@ -0,0 +1,27 @@ +vim: do not adjust script pathnames + +When cross-compiling, we do not want to reference the host versions of +things like perl and awk. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +--- a/src/Makefile ++++ b/src/Makefile +@@ -2507,11 +2507,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ + 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 + -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*` + + # install the language specific files for tools, if they were unpacked diff --git a/external/poky/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch b/external/poky/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch new file mode 100644 index 00000000..37914d4c --- /dev/null +++ b/external/poky/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch @@ -0,0 +1,42 @@ +From 38de4bccdb8a861ffdd447f12fdab19d6d852c02 Mon Sep 17 00:00:00 2001 +From: Chong Lu <Chong.Lu@windriver.com> +Date: Tue, 26 Jun 2018 17:34:15 +0800 +Subject: [PATCH] vim: add knob whether elf.h are checked + +Previously, it still was checked when there was no elf library in sysroots directory. +Add knob to decide whether elf.h are checked or not. + +Upstream-Status: Pending + +Signed-off-by: Chong Lu <Chong.Lu@windriver.com> +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + src/configure.ac | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/configure.ac b/src/configure.ac +index 0ee86ad..64736f0 100644 +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -3192,11 +3192,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));], + AC_MSG_RESULT(no)) + + dnl Checks for header files. ++AC_MSG_CHECKING(whether or not to look for elf.h) ++AC_ARG_ENABLE(elf-check, ++ [ --enable-elf-check If elfutils, check for elf.h [default=no]], ++ , enable_elf_check="no") ++AC_MSG_RESULT($enable_elf_check) ++if test "x$enable_elf_check" != "xno"; then + AC_CHECK_HEADER(elf.h, HAS_ELF=1) + dnl AC_CHECK_HEADER(dwarf.h, SVR4=1) + if test "$HAS_ELF" = 1; then + AC_CHECK_LIB(elf, main) + fi ++fi + + AC_HEADER_DIRENT + +-- +2.7.4 + diff --git a/external/poky/meta/recipes-support/vim/vim-tiny_8.2.bb b/external/poky/meta/recipes-support/vim/vim-tiny_8.2.bb new file mode 100644 index 00000000..e4c26d23 --- /dev/null +++ b/external/poky/meta/recipes-support/vim/vim-tiny_8.2.bb @@ -0,0 +1,12 @@ +require vim.inc + +SUMMARY += " (with tiny features)" + +PACKAGECONFIG += "tiny" + +do_install() { + install -D -m 0755 ${S}/src/vim ${D}/${bindir}/vim.tiny +} + +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE_TARGET = "${bindir}/vim.tiny" diff --git a/external/poky/meta/recipes-support/vim/vim.inc b/external/poky/meta/recipes-support/vim/vim.inc new file mode 100644 index 00000000..4d2886c1 --- /dev/null +++ b/external/poky/meta/recipes-support/vim/vim.inc @@ -0,0 +1,144 @@ +SUMMARY = "Vi IMproved - enhanced vi editor" +SECTION = "console/utils" + +DEPENDS = "ncurses gettext-native" +# vimdiff doesn't like busybox diff +RSUGGESTS_${PN} = "diffutils" +LICENSE = "vim" +LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=a19edd7ec70d573a005d9e509375a99a" + +SRC_URI = "git://github.com/vim/vim.git \ + 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 \ +" +SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" + +# Do not consider .z in x.y.z, as that is updated with every commit +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" + +S = "${WORKDIR}/git" + +VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" + +inherit autotools-brokensep update-alternatives mime-xdg + +CLEANBROKEN = "1" + +# vim configure.in contains functions which got 'dropped' by autotools.bbclass +do_configure () { + cd src + rm -f auto/* + touch auto/config.mk + 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 +} + +#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny +PACKAGECONFIG ??= "" +PACKAGECONFIG += " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \ +" + +PACKAGECONFIG[gtkgui] = "--enable-gui=gtk3,--enable-gui=no,gtk+3" +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," +PACKAGECONFIG[x11] = "--with-x,--without-x,xt," +PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,," +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux," +PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils," + +EXTRA_OECONF = " \ + --disable-gpm \ + --disable-gtktest \ + --disable-xim \ + --disable-netbeans \ + --with-tlib=ncurses \ + ac_cv_small_wchar_t=no \ + vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=no \ + vim_cv_terminfo=yes \ + vim_cv_tgetent=non-zero \ + vim_cv_toupper_broken=no \ + vim_cv_tty_group=world \ + STRIP=/bin/true \ +" + +do_install() { + autotools_do_install + + # Work around file-rdeps picking up csh, awk, perl or python as a dep + chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132 + chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk + chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.pl + chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py + + # Install example vimrc from runtime files + install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc + + # we use --with-features=big as default + mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN} + + if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'true', 'false', d)}; then + # The mouse being autoenabled is just annoying in xfce4-terminal (mouse + # drag make vim go into visual mode and there is no right click menu), + # delete the block. + sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc + fi +} + +PARALLEL_MAKEINST = "" + +PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-tools" +FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax" +FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc" +FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor" +FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc" +FILES_${PN}-data = "${datadir}/${BPN}" + +# We do not want to complain if perl or gawk are not on the target. +# +FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools" +INSANE_SKIP_${PN}-tools = "file-rdeps" + +FILES_${PN}-common = " \ + ${datadir}/${BPN}/${VIMDIR}/*.vim \ + ${datadir}/${BPN}/${VIMDIR}/autoload \ + ${datadir}/${BPN}/${VIMDIR}/colors \ + ${datadir}/${BPN}/${VIMDIR}/compiler \ + ${datadir}/${BPN}/${VIMDIR}/ftplugin \ + ${datadir}/${BPN}/${VIMDIR}/indent \ + ${datadir}/${BPN}/${VIMDIR}/keymap \ + ${datadir}/${BPN}/${VIMDIR}/lang \ + ${datadir}/${BPN}/${VIMDIR}/macros \ + ${datadir}/${BPN}/${VIMDIR}/plugin \ + ${datadir}/${BPN}/${VIMDIR}/print \ + ${datadir}/${BPN}/${VIMDIR}/spell \ + ${datadir}/icons \ +" + +RDEPENDS_${BPN} = "ncurses-terminfo-base" +# Recommend that runtime data is installed along with vim +RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common" + +ALTERNATIVE_${PN} = "vi vim" +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}" +ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi" +ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim" diff --git a/external/poky/meta/recipes-support/vim/vim_8.2.bb b/external/poky/meta/recipes-support/vim/vim_8.2.bb new file mode 100644 index 00000000..709b6ddb --- /dev/null +++ b/external/poky/meta/recipes-support/vim/vim_8.2.bb @@ -0,0 +1,15 @@ +require vim.inc + +PROVIDES = "xxd" + +PACKAGECONFIG_class-native = "" +BBCLASSEXTEND = "native" + +ALTERNATIVE_${PN}_append = " xxd" +ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd" +ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd" + +# We override the default in security_flags.inc because vim (not vim-tiny!) will abort +# in many places for _FORTIFY_SOURCE=2. Security flags become part of CC. +# +lcl_maybe_fortify = "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=1',d)}" diff --git a/external/poky/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch b/external/poky/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch deleted file mode 100644 index 1c5630ed..00000000 --- a/external/poky/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 08ca1c48b25c332b75bba2a6b5d757da006e955b Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Fri, 7 Oct 2016 16:27:57 +0300 -Subject: [PATCH] Add m4/vapigen.m4 - -Building without vala will fail if we don't have a vapigen.m4. - -Upstream-Status: Pending -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - m4/vapigen.m4 | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 96 insertions(+) - create mode 100644 m4/vapigen.m4 - -diff --git a/m4/vapigen.m4 b/m4/vapigen.m4 -new file mode 100644 -index 0000000..f2df12f ---- /dev/null -+++ b/m4/vapigen.m4 -@@ -0,0 +1,96 @@ -+dnl vapigen.m4 -+dnl -+dnl Copyright 2012 Evan Nemerson -+dnl -+dnl This library is free software; you can redistribute it and/or -+dnl modify it under the terms of the GNU Lesser General Public -+dnl License as published by the Free Software Foundation; either -+dnl version 2.1 of the License, or (at your option) any later version. -+dnl -+dnl This library is distributed in the hope that it will be useful, -+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+dnl Lesser General Public License for more details. -+dnl -+dnl You should have received a copy of the GNU Lesser General Public -+dnl License along with this library; if not, write to the Free Software -+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ -+# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT]) -+# -------------------------------------- -+# Check vapigen existence and version -+# -+# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation -+AC_DEFUN([VAPIGEN_CHECK], -+[ -+ AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0]) -+ AC_BEFORE([GOBJECT_INTROSPECTION_REQUIRE],[$0]) -+ -+ AC_ARG_ENABLE([vala], -+ [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[ -+ AS_IF([test "x$4" = "x"], [ -+ enable_vala=auto -+ ], [ -+ enable_vala=$4 -+ ]) -+ ]) -+ -+ AS_CASE([$enable_vala], [no], [enable_vala=no], -+ [yes], [ -+ AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ -+ AC_MSG_ERROR([Vala bindings require GObject Introspection]) -+ ]) -+ ], [auto], [ -+ AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ -+ enable_vala=no -+ ]) -+ ], [ -+ AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@]) -+ ]) -+ -+ AS_IF([test "x$2" = "x"], [ -+ vapigen_pkg_name=vapigen -+ ], [ -+ vapigen_pkg_name=vapigen-$2 -+ ]) -+ AS_IF([test "x$1" = "x"], [ -+ vapigen_pkg="$vapigen_pkg_name" -+ ], [ -+ vapigen_pkg="$vapigen_pkg_name >= $1" -+ ]) -+ -+ PKG_PROG_PKG_CONFIG -+ -+ PKG_CHECK_EXISTS([$vapigen_pkg], [ -+ AS_IF([test "$enable_vala" = "auto"], [ -+ enable_vala=yes -+ ]) -+ ], [ -+ AS_CASE([$enable_vala], [yes], [ -+ AC_MSG_ERROR([$vapigen_pkg not found]) -+ ], [auto], [ -+ enable_vala=no -+ ]) -+ ]) -+ -+ AC_MSG_CHECKING([for vala]) -+ -+ AS_CASE([$enable_vala], -+ [yes], [ -+ VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen` -+ VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen -+ AS_IF([test "x$2" = "x"], [ -+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen` -+ ], [ -+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen` -+ ]) -+ ]) -+ -+ AC_MSG_RESULT([$enable_vala]) -+ -+ AC_SUBST([VAPIGEN]) -+ AC_SUBST([VAPIGEN_VAPIDIR]) -+ AC_SUBST([VAPIGEN_MAKEFILE]) -+ -+ AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes") -+]) --- -2.1.4 - diff --git a/external/poky/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch b/external/poky/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch deleted file mode 100644 index fcfc5597..00000000 --- a/external/poky/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b0a579d83e355545b64742c997fe8b1d58bf4207 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Mon, 13 Jun 2016 11:05:00 +0300 -Subject: [PATCH] Don't enable stack-protection by default - -These are set by security_flags.inc. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 068d072..d580f84 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -138,8 +138,6 @@ m4_define([compiler_flags_common],[ dnl - -fno-common dnl - -fdiagnostics-show-option dnl - -fno-strict-aliasing dnl -- -fstack-protector dnl -- -fstack-protector-strong dnl - -fno-semantic-interposition dnl - -Wno-deprecated-declarations dnl - ]) --- -2.1.4 - diff --git a/external/poky/meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch b/external/poky/meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch new file mode 100644 index 00000000..9c3f98fa --- /dev/null +++ b/external/poky/meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch @@ -0,0 +1,27 @@ +From 442da9076b52003743ffc6fd7b9d647de6d7aa8f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 17 Jan 2019 16:37:54 +0100 +Subject: [PATCH] app.cc: use old school asignment to avoid gcc 4.8 error + +This is needed to build vte-native on Centos 7, +and can be dropped once that OS is no longer supported. + +Upstream-Status: Inappropriate [ancient compiler fix] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/app/app.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/app/app.cc b/src/app/app.cc +index d424064..675d789 100644 +--- a/src/app/app.cc ++++ b/src/app/app.cc +@@ -306,7 +306,7 @@ public: + else + alpha = get_alpha(); + +- GdkRGBA color{bg_color}; ++ GdkRGBA color = bg_color; + color.alpha = alpha; + return color; + } diff --git a/external/poky/meta/recipes-support/vte/vte/0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/external/poky/meta/recipes-support/vte/vte/0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch new file mode 100644 index 00000000..0ffd92b4 --- /dev/null +++ b/external/poky/meta/recipes-support/vte/vte/0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch @@ -0,0 +1,59 @@ +From f78988d3bb5929c857e788a86c7919d6a4ffacc9 Mon Sep 17 00:00:00 2001 +From: Danilo Spinella <danyspin97@protonmail.com> +Date: Thu, 21 Mar 2019 14:19:26 +0100 +Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems + +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 | 21 +++++++++++++++++++++ + src/widget.cc | 1 + + 2 files changed, 22 insertions(+) + create mode 100644 src/missing.hh + +diff --git a/src/missing.hh b/src/missing.hh +new file mode 100644 +index 00000000..1baa993d +--- /dev/null ++++ b/src/missing.hh +@@ -0,0 +1,21 @@ ++/* Copyright 2019 Danilo Spinella ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 3 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#ifndef W_EXITCODE ++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) ++#endif ++ +diff --git a/src/widget.cc b/src/widget.cc +index 331ddba9..555a4adf 100644 +--- 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 <new> + #include <string> +-- +2.21.0 + diff --git a/external/poky/meta/recipes-support/vte/vte_0.52.2.bb b/external/poky/meta/recipes-support/vte/vte_0.52.2.bb deleted file mode 100644 index 7324c9c6..00000000 --- a/external/poky/meta/recipes-support/vte/vte_0.52.2.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Virtual terminal emulator GTK+ widget library" -BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" -LICENSE = "LGPLv2.1+" -DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native" - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -inherit gnomebase gtk-doc distro_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-Don-t-enable-stack-protection-by-default.patch \ - ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ - " -SRC_URI[archive.md5sum] = "de8181350dccb010e915e366bdd06d18" -SRC_URI[archive.sha256sum] = "0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af" - -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] = "--enable-vala,--disable-vala,vala-native vala" -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" - -CFLAGS += "-D_GNU_SOURCE" - -# libtool adds "-nostdlib" when g++ is used. This breaks PIE builds. -# Use libtool-cross (which has a hack to prevent that) instead. -EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" - -PACKAGES =+ "libvte" -FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" diff --git a/external/poky/meta/recipes-support/vte/vte_0.58.3.bb b/external/poky/meta/recipes-support/vte/vte_0.58.3.bb new file mode 100644 index 00000000..41dc2e77 --- /dev/null +++ b/external/poky/meta/recipes-support/vte/vte_0.58.3.bb @@ -0,0 +1,56 @@ +SUMMARY = "Virtual terminal emulator GTK+ widget library" +BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" +LICENSE = "GPLv3 & LGPLv3+ & LGPLv2.1+" +LICENSE_libvte = "LGPLv3+" + +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ + file://COPYING.LGPL2;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \ +" + +DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native" + +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-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \ + file://0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ + " +SRC_URI[archive.md5sum] = "f59eb0784a361c0939c03d4566255916" +SRC_URI[archive.sha256sum] = "22dcb54ac2ad1a56ab0a745e16ccfeb383f0b5860b5bfa1784561216f98d4975" + +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" +# 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" + +BBCLASSEXTEND = "native nativesdk" |