diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-support')
149 files changed, 1551 insertions, 3071 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr-util_1.6.0.bb b/import-layers/yocto-poky/meta/recipes-support/apr/apr-util_1.6.1.bb index 748d19698..88b4300f9 100644 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr-util_1.6.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr-util_1.6.1.bb @@ -15,8 +15,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "3b03dbff60728a4f4c33f5d929e8b35a" -SRC_URI[sha256sum] = "483ef4d59e6ac9a36c7d3fd87ad7b9db7ad8ae29c06b9dd8ff22dda1cc416389" +SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" +SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ @@ -29,8 +29,6 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ inherit autotools lib_package binconfig -PR = "r1" - OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" do_configure_append() { diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch new file mode 100644 index 000000000..097c195a1 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch @@ -0,0 +1,32 @@ +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/import-layers/yocto-poky/meta/recipes-support/apr/apr/configfix.patch b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch index 605c4f632..72e706f96 100644 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr/configfix.patch +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch @@ -1,10 +1,28 @@ +From 5925b20da8bbc34d9bf5a5dca123ef38864d43c6 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 30 Jan 2018 09:39:06 +0800 +Subject: [PATCH 2/7] apr: Remove workdir path references from installed apr + files + Upstream-Status: Inappropriate [configuration] -Index: apr-1.3.3/apr-config.in -=================================================================== ---- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000 -+++ apr-1.3.3/apr-config.in 2009-01-12 15:19:25.000000000 +0000 -@@ -152,14 +152,7 @@ +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +The generated `apr-1-config' is used by other recipes at build time or +packages at target run time, the workdir path caused confusion. + +Rebase to 1.6.3 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + apr-config.in | 26 ++------------------------ + 1 file changed, 2 insertions(+), 24 deletions(-) + +diff --git a/apr-config.in b/apr-config.in +index 84b4073..bbbf651 100644 +--- a/apr-config.in ++++ b/apr-config.in +@@ -152,14 +152,7 @@ while test $# -gt 0; do flags="$flags $LDFLAGS" ;; --includes) @@ -19,7 +37,7 @@ Index: apr-1.3.3/apr-config.in ;; --srcdir) echo $APR_SOURCE_DIR -@@ -181,29 +167,14 @@ +@@ -181,29 +174,14 @@ while test $# -gt 0; do exit 0 ;; --link-ld) @@ -51,3 +69,6 @@ Index: apr-1.3.3/apr-config.in ;; --shlib-path-var) echo "$SHLIBPATH_VAR" +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch new file mode 100644 index 000000000..4dd53bd8e --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch @@ -0,0 +1,63 @@ +From d5028c10f156c224475b340cfb1ba025d6797243 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 2 Feb 2018 15:51:42 +0800 +Subject: [PATCH 3/7] Makefile.in/configure.in: support cross compiling + +While cross compiling, the tools/gen_test_char could not +be executed at build time, use AX_PROG_CC_FOR_BUILD to +build native tools/gen_test_char + +Upstream-Status: Submitted [https://github.com/apache/apr/pull/8] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile.in | 10 +++------- + configure.in | 3 +++ + 2 files changed, 6 insertions(+), 7 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 5fb760e..8675f90 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -46,7 +46,7 @@ LT_VERSION = @LT_VERSION@ + + CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ + build/apr_rules.out tools/gen_test_char@EXEEXT@ \ +- tools/gen_test_char.o tools/gen_test_char.lo \ ++ tools/gen_test_char.o \ + include/private/apr_escape_test_char.h + DISTCLEAN_TARGETS = config.cache config.log config.status \ + include/apr.h include/arch/unix/apr_private.h \ +@@ -131,13 +131,9 @@ check: $(TARGET_LIB) + etags: + etags `find . -name '*.[ch]'` + +-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) +-tools/gen_test_char.lo: tools/gen_test_char.c ++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c + $(APR_MKDIR) tools +- $(LT_COMPILE) +- +-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) +- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@ + + include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ + $(APR_MKDIR) include/private +diff --git a/configure.in b/configure.in +index 719f331..361120f 100644 +--- a/configure.in ++++ b/configure.in +@@ -183,6 +183,9 @@ dnl can only be used once within a configure script, so this prevents a + dnl preload section from invoking the macro to get compiler info. + AC_PROG_CC + ++dnl Check build CC for gen_test_char compiling which is executed at build time. ++AX_PROG_CC_FOR_BUILD ++ + dnl AC_PROG_SED is only avaliable in recent autoconf versions. + dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present. + ifdef([AC_PROG_SED], +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch index 6805b8b6e..30fc07d4a 100644 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch @@ -1,4 +1,7 @@ -Fix packet discards HTTP redirect. +From 7925eb1766a00ccee05c6e80b1d34f163a04b7b1 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 30 Jan 2018 09:43:34 +0800 +Subject: [PATCH 4/7] Fix packet discards HTTP redirect. Disconnect the connection by poll() timeout. If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then @@ -8,12 +11,16 @@ Upstream-Status: Pending Signed-off-by: Noriaki Yoshitane <yoshitane.nrs@cnt.ncos.nec.co.jp> Signed-off-by: Li Wang <li.wang@windriver.com> + +Rebase to 1.6.3 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - network_io/unix/sendrecv.c | 4 ++++ + network_io/unix/sendrecv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c -index c133a26..e8faf15 100644 +index 4c0e0a6..1bdafba 100644 --- a/network_io/unix/sendrecv.c +++ b/network_io/unix/sendrecv.c @@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len) @@ -28,5 +35,5 @@ index c133a26..e8faf15 100644 *len = 0; return arv; -- -1.7.9.5 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch index 7521eeb46..02634e6fd 100644 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch @@ -1,7 +1,7 @@ -From d439093aa07a486f559206ac9e5808a6a18218cd Mon Sep 17 00:00:00 2001 +From 2e66cece0c3adff92733332111204ddc1d730a07 Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Thu, 19 Nov 2015 18:25:38 -0800 -Subject: [PATCH] configure.in: fix LTFLAGS to make it work with ccache +Subject: [PATCH 5/7] configure.in: fix LTFLAGS to make it work with ccache When ccache is enabled, libtool requires --tag=CC when use ccache, otherwise when building apr-util with ccache enabled: @@ -15,14 +15,14 @@ Upstream-Status: Pending Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index 5a4a988..9d57ae6 100644 +index 361120f..3b10422 100644 --- a/configure.in +++ b/configure.in -@@ -246,7 +246,7 @@ case $host in +@@ -249,7 +249,7 @@ case $host in ;; *) if test "x$LTFLAGS" = "x"; then @@ -32,5 +32,5 @@ index 5a4a988..9d57ae6 100644 if test "$experimental_libtool" = "yes"; then # Use a custom-made libtool replacement -- -1.7.9.5 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch index c5e92acee..5f5e7eac3 100644 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +++ b/import-layers/yocto-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 f26e8b88d2c90ed7eb9d4e276412b0923c23d10f Mon Sep 17 00:00:00 2001 +From f4d6e45ed5d2ccffd1af4c2ccdf7099ba0dce137 Mon Sep 17 00:00:00 2001 From: Dengke Du <dengke.du@windriver.com> Date: Wed, 14 Dec 2016 18:13:08 +0800 -Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross +Subject: [PATCH 6/7] apr: fix off_t size doesn't match in glibc when cross compiling In configure.in, it contains the following: @@ -34,10 +34,10 @@ Upstream-Status: Pending 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in -index 9d57ae6..5b19940 100644 +index 3b10422..a227e72 100644 --- a/configure.in +++ b/configure.in -@@ -1681,7 +1681,7 @@ else +@@ -1769,7 +1769,7 @@ else socklen_t_value="int" fi @@ -46,7 +46,7 @@ index 9d57ae6..5b19940 100644 if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then pid_t_fmt='#define APR_PID_T_FMT "hd"' -@@ -1750,7 +1750,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) +@@ -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"]) @@ -55,7 +55,7 @@ index 9d57ae6..5b19940 100644 AC_MSG_CHECKING([which format to use for apr_ssize_t]) if test -n "$ssize_t_fmt"; then -@@ -1767,7 +1767,7 @@ fi +@@ -1855,7 +1855,7 @@ fi ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" @@ -64,7 +64,7 @@ index 9d57ae6..5b19940 100644 AC_MSG_CHECKING([which format to use for apr_size_t]) if test -n "$size_t_fmt"; then -@@ -1784,7 +1784,7 @@ fi +@@ -1872,7 +1872,7 @@ fi size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" @@ -74,5 +74,5 @@ index 9d57ae6..5b19940 100644 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then # Enable LFS -- -2.7.4 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch index 7d0dddc53..8760b0140 100644 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch @@ -1,8 +1,8 @@ -From 94d1ca0266a0f9c0446f1299b54f752e87b8a695 Mon Sep 17 00:00:00 2001 +From c6afc4a4a766478cb6aa6b43a50051881b6318d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Fri, 3 Mar 2017 22:24:17 +0100 -Subject: [PATCH] explicitly link libapr against phtread to make gold happy on - test +Subject: [PATCH 7/7] explicitly link libapr against phtread to make gold happy + on test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -34,10 +34,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 1 file changed, 1 insertion(+) diff --git a/configure.in b/configure.in -index 5b19940..cdf4d58 100644 +index a227e72..cbc0f90 100644 --- a/configure.in +++ b/configure.in -@@ -766,6 +766,7 @@ else +@@ -784,6 +784,7 @@ else APR_PTHREADS_CHECK_RESTORE ] ) fi if test "$pthreadh" = "1"; then @@ -46,5 +46,5 @@ index 5b19940..cdf4d58 100644 APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG APR_CHECK_PTHREAD_RECURSIVE_MUTEX -- -2.9.3 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/cleanup.patch b/import-layers/yocto-poky/meta/recipes-support/apr/apr/cleanup.patch deleted file mode 100644 index b6784e015..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr/cleanup.patch +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: apr-1.4.2/build/buildcheck.sh -=================================================================== ---- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800 -+++ apr-1.4.2/build/buildcheck.sh 2010-11-26 15:44:00.000000000 +0800 -@@ -32,35 +32,4 @@ - echo "buildconf: autoconf version $ac_version (ok)" - fi - --# Sample libtool --version outputs: --# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11) --# 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'` --if test -z "$lt_pversion"; then --echo "buildconf: libtool not found." --echo " You need libtool version 1.4 or newer installed" --echo " to build APR from SVN." --exit 1 --fi --lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` --IFS=.; set $lt_version; IFS=' ' --lt_status="good" --if test "$1" = "1"; then -- if test "$2" -lt "4"; then -- lt_status="bad" -- fi --fi --if test $lt_status = "good"; then -- echo "buildconf: libtool version $lt_pversion (ok)" -- exit 0 --fi -- --echo "buildconf: libtool version $lt_pversion found." --echo " You need libtool version 1.4 or newer installed" --echo " to build APR from SVN." -- --exit 1 -+exit 0 diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/configure_fixes.patch b/import-layers/yocto-poky/meta/recipes-support/apr/apr/configure_fixes.patch deleted file mode 100644 index 051400059..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr/configure_fixes.patch +++ /dev/null @@ -1,68 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: apr-1.3.3/configure.in -=================================================================== ---- apr-1.3.3.orig/configure.in -+++ apr-1.3.3/configure.in -@@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm - create_area]) - - APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) --AC_CHECK_FILE(/dev/zero) -- --# Not all systems can mmap /dev/zero (such as HP-UX). Check for that. --if test "$ac_cv_func_mmap" = "yes" && -- test "$ac_cv_file__dev_zero" = "yes"; then -- AC_MSG_CHECKING(for mmap that can map /dev/zero) -- AC_TRY_RUN([ --#include <sys/types.h> --#include <sys/stat.h> --#include <fcntl.h> --#ifdef HAVE_SYS_MMAN_H --#include <sys/mman.h> --#endif -- int main() -- { -- int fd; -- void *m; -- fd = open("/dev/zero", O_RDWR); -- if (fd < 0) { -- return 1; -- } -- m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); -- if (m == (void *)-1) { /* aka MAP_FAILED */ -- return 2; -- } -- if (munmap(m, sizeof(void*)) < 0) { -- return 3; -- } -- return 0; -- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no]) -- -- AC_MSG_RESULT($ac_cv_file__dev_zero) --fi - - # Now we determine which one is our anonymous shmem preference. - haveshmgetanon="0" -@@ -1518,13 +1485,14 @@ else - bigendian=0 - fi - --APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h> --#include <sys/uio.h>],struct iovec,0) --if test "$ac_cv_sizeof_struct_iovec" = "0"; then -- have_iovec=0 --else -- have_iovec=1 --fi -+#APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h> -+##include <sys/uio.h>],struct iovec,0) -+#if test "$ac_cv_sizeof_struct_iovec" = "0"; then -+# have_iovec=0 -+#else -+# have_iovec=1 -+#fi -+have_iovec=1 - - AC_SUBST(voidp_size) - AC_SUBST(short_value) diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch b/import-layers/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch deleted file mode 100644 index 16499f5ac..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch +++ /dev/null @@ -1,45 +0,0 @@ -Makefile.in: fix cross compiling failed - -The tools/gen_test_char was invoked at build time, -and it didn't work for the cross compiling, so we -compile it with $BUILD_CC. - -Remove the 'tools' dir creation, it always existed. -And it caused gen_test_char unexpected rebuilt at -do_install time. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index a2a5194..5fe028f 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@ - - CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ - build/apr_rules.out tools/gen_test_char@EXEEXT@ \ -- tools/gen_test_char.o tools/gen_test_char.lo \ - include/private/apr_escape_test_char.h - DISTCLEAN_TARGETS = config.cache config.log config.status \ - include/apr.h include/arch/unix/apr_private.h \ -@@ -129,13 +128,8 @@ check: $(TARGET_LIB) - etags: - etags `find . -name '*.[ch]'` - --OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) --tools/gen_test_char.lo: tools/gen_test_char.c -- $(APR_MKDIR) tools -- $(LT_COMPILE) -- --tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) -- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) -+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c -+ $(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@ - - include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ - $(APR_MKDIR) include/private diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.6.2.bb b/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.6.3.bb index e2eed53c9..87b878723 100644 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.6.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.6.3.bb @@ -10,19 +10,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ - file://configure_fixes.patch \ - file://cleanup.patch \ - file://configfix.patch \ file://run-ptest \ - file://upgrade-and-fix-1.5.1.patch \ - file://Fix-packet-discards-HTTP-redirect.patch \ - file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ - file://0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ - file://0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ + 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 \ " -SRC_URI[md5sum] = "e81a851967c79b5ce9bfbc909e4bf735" -SRC_URI[sha256sum] = "09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd" +SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa" +SRC_URI[sha256sum] = "131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172" inherit autotools-brokensep lib_package binconfig multilib_header ptest @@ -35,6 +34,9 @@ CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes" # CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sctp_uio_h=no" +CACHED_CONFIGUREVARS += "ac_cv_sizeof_struct_iovec=yes" +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' @@ -50,7 +52,7 @@ do_configure_prepend() { export GREP="grep" cd ${S} - ./buildconf + libtool='${HOST_SYS}-libtool' ./buildconf } FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" @@ -69,7 +71,8 @@ do_install_append() { } do_install_append_class-target() { - sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk + sed -i -e 's,${DEBUG_PREFIX_MAP},,g' \ + -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk sed -i -e 's,${STAGING_DIR_HOST},,g' \ -e 's,APR_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \ -e 's,APR_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apr-1-config diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.24.1.bb b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb index 4a0e41149..8617bb871 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.24.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb @@ -6,8 +6,8 @@ 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] = "79388fbc4dc7f27394556dd389aeb594" -SRC_URI[sha256sum] = "60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d" +SRC_URI[md5sum] = "eeec6cead3350dca48a235271c105b3e" +SRC_URI[sha256sum] = "b4f0c27b61dbffba7a5b5ba2ff88c8cee10ff8dac774fa5b79ce906853623b75" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core" diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch index 4103eaa2e..1f8c9f374 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch +++ b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch @@ -1,4 +1,4 @@ -From 2f47c975ebe52b6916a45ade023ae3bac21bb0e0 Mon Sep 17 00:00:00 2001 +From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 21 Jun 2016 16:00:02 +0300 Subject: [PATCH] build: Add --with-systemduserunitdir @@ -8,29 +8,30 @@ allow overriding the value. Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + --- bus/Makefile.am | 2 +- - configure.ac | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) + configure.ac | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bus/Makefile.am b/bus/Makefile.am -index b189e02..52fbb0b 100644 +index 688f82a..10cde62 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am -@@ -26,7 +26,7 @@ dbusservice_DATA = org.a11y.Bus.service - org.a11y.Bus.service: org.a11y.Bus.service.in - sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ +@@ -29,7 +29,7 @@ org.a11y.Bus.service: org.a11y.Bus.service.in + EXTRA_DIST += org.a11y.Bus.service.in + CLEANFILES += org.a11y.Bus.service -systemd_userdir = $(prefix)/lib/systemd/user +systemd_userdir = $(systemduserunitdir) systemd_user_DATA = at-spi-dbus-bus.service at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile - sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ + $(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ diff --git a/configure.ac b/configure.ac -index f9061c2..2b8eeed 100644 +index 8c4fca2..1415cca 100644 --- a/configure.ac +++ b/configure.ac -@@ -183,6 +183,13 @@ else +@@ -146,6 +146,15 @@ else fi AC_SUBST(DBUS_SERVICES_DIR) @@ -41,9 +42,11 @@ index f9061c2..2b8eeed 100644 + [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)]) +AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) + - AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) ++AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) ++ + GOBJECT_INTROSPECTION_CHECK([1.32.0]) - GOBJECT_INTROSPECTION_CHECK([0.9.6]) + AC_SUBST(LIBTOOL_EXPORT_OPTIONS) -- -2.1.4 +2.14.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch deleted file mode 100644 index 69a51d566..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c320799c941d42a9b7e351805359694ea3b36d2d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 5 Apr 2015 09:08:38 -0700 -Subject: [PATCH] nls.m4: Take it from gettext-0.15 - -It otherwise expects gettext to provide it. Lets go independent - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - m4/nls.m4 | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - create mode 100644 m4/nls.m4 - -diff --git a/m4/nls.m4 b/m4/nls.m4 -new file mode 100644 -index 0000000..2c8fe69 ---- /dev/null -+++ b/m4/nls.m4 -@@ -0,0 +1,30 @@ -+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are not in the public domain. -+ -+dnl Authors: -+dnl Ulrich Drepper drepper@cygnus.com, 1995-2000. -+dnl Bruno Haible haible@clisp.cons.org, 2000-2003. -+ -+AC_PREREQ(2.50) -+ -+AC_DEFUN([AM_NLS], -+[ -+AC_MSG_CHECKING([whether NLS is requested]) -+dnl Default is enabled NLS -+AC_ARG_ENABLE(nls, -+[ --disable-nls do not use Native Language Support], -+USE_NLS=$enableval, USE_NLS=yes) -+AC_MSG_RESULT($USE_NLS) -+AC_SUBST(USE_NLS) -+]) --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.24.1.bb b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb index 1687ae341..521ee3b96 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.24.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb @@ -6,20 +6,19 @@ 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 \ - file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ file://0001-build-Add-with-systemduserunitdir.patch \ - " + " -SRC_URI[md5sum] = "61d0a471e693292934a73f288ebff35c" -SRC_URI[sha256sum] = "1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b" +SRC_URI[md5sum] = "4a042e4c801fdb793788b749eab21485" +SRC_URI[sha256sum] = "c80e0cdf5e3d713400315b63c7deffa561032a6c37289211d8afcfaa267c2615" -DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native" +DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" inherit autotools gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -EXTRA_OECONF = "--disable-xevie \ +EXTRA_OECONF = " \ --with-systemduserunitdir=${systemd_user_unitdir} \ --with-dbus-daemondir=${bindir}" diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.24.0.bb b/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.26.1.bb index d62319c1f..685b5991d 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.24.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.26.1.bb @@ -12,10 +12,8 @@ DEPENDS = "glib-2.0" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "3747a80089dfa3c0bbcf21adfff9968b" -SRC_URI[archive.sha256sum] = "bb2daa9a808c73a7a79d2983f333e0ba74be42fc51e3ba1faf2551a636487a49" +SRC_URI[archive.md5sum] = "7cddcc313b9a3efd19b2ddf079ba68f5" +SRC_URI[archive.sha256sum] = "ef00ff6b83851dddc8db38b4d9faeffb99572ba150b0664ee02e46f015ea97cb" BBCLASSEXTEND = "native" -EXTRA_OECONF = "--disable-glibtest \ - " diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch b/import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch index 0b350be56..f392465b5 100644 --- a/import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch +++ b/import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch @@ -35,61 +35,56 @@ http://git.savannah.gnu.org/cgit/acl.git/commit/?id=e98ce8acf84d12ea67a3ac76bf63 Signed-off-by: Kamil Dudka <kdudka@redhat.com> Signed-off-by: He Zhe <zhe.he@windriver.com> ---- - test/cp.test | 2 +- - test/misc.test | 6 +++--- - test/sbits-restore.test | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) -diff --git a/test/cp.test b/test/cp.test -index 0867f63..a927195 100644 ---- a/test/cp.test -+++ b/test/cp.test -@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given. +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 -diff --git a/test/misc.test b/test/misc.test -index 6e98053..29372b7 100644 ---- a/test/misc.test -+++ b/test/misc.test +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 -diff --git a/test/sbits-restore.test b/test/sbits-restore.test -index de21340..5899b0a 100644 ---- a/test/sbits-restore.test -+++ b/test/sbits-restore.test -@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works +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 @@ -103,6 +98,3 @@ index de21340..5899b0a 100644 + $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g' > -rw-r-Sr-- $ rm -Rf d --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/ea-acl.inc b/import-layers/yocto-poky/meta/recipes-support/attr/ea-acl.inc index e6f4c72e8..1339eccdb 100644 --- a/import-layers/yocto-poky/meta/recipes-support/attr/ea-acl.inc +++ b/import-layers/yocto-poky/meta/recipes-support/attr/ea-acl.inc @@ -17,7 +17,7 @@ EXTRA_OECONF_append_class-target = "${@['', ' --disable-gettext '][(d.getVar('US EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}" do_install () { - oe_runmake install install-lib install-dev DIST_ROOT="${D}" + oe_runmake install install-lib install-dev DIST_ROOT="${D}" ZIP="gzip -n" } do_install_append_class-native () { diff --git a/import-layers/yocto-poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb b/import-layers/yocto-poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb index 70b6e9134..9d8191f33 100644 --- a/import-layers/yocto-poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb +++ b/import-layers/yocto-poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb @@ -9,10 +9,12 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/intel/bmap-tools.git" -SRCREV = "9dad724104df265442226972a1e310813f9ffcba" +SRC_URI = "https://github.com/intel/${BPN}/releases/download/v${PV}/${BP}.tgz" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "883420183611aa137cbaf68a91ef0d7e" +SRC_URI[sha256sum] = "0064891270c180c190f41925b0f6fb9cecac3056f1168d2592dbe90e5f226c0a" + +UPSTREAM_CHECK_URI = "https://github.com/intel/${BPN}/releases" RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools" diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.64.0.bb b/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.66.0.bb index 46013f343..92c86a3ef 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.64.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.66.0.bb @@ -5,7 +5,8 @@ SECTION = "devel" inherit native -SRC_URI += "file://bjam-native-build-bjam.debug.patch" +SRC_URI += "file://bjam-native-build-bjam.debug.patch \ + file://0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch" do_compile() { ./bootstrap.sh --with-toolset=gcc diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.64.0.inc b/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.66.0.inc index dc7b1a9c0..fe2b8639f 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.64.0.inc +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.66.0.inc @@ -12,8 +12,8 @@ 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] = "93eecce2abed9d2442c9676914709349" -SRC_URI[sha256sum] = "7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332" +SRC_URI[md5sum] = "b2dfbd6c717be4a7bb2d88018eaccf75" +SRC_URI[sha256sum] = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost.inc b/import-layers/yocto-poky/meta/recipes-support/boost/boost.inc index 41fc90fb2..0461ec6fc 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost.inc +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost.inc @@ -135,29 +135,7 @@ BJAM_TOOLS = "--ignore-site-config \ # use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j # https://svn.boost.org/trac/boost/ticket/7634 -def get_boost_parallel_make(d): - pm = d.getVar('PARALLEL_MAKE') - if pm: - # look for '-j' and throw other options (e.g. '-l') away - # because they might have different meaning in bjam - pm = pm.split() - while pm: - v = None - opt = pm.pop(0) - if opt == '-j': - v = pm.pop(0) - elif opt.startswith('-j'): - v = opt[2:].strip() - else: - v = None - - if v: - v = min(64, int(v)) - return '-j' + str(v) - - return "" - -BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(d)}" +BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}" BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ ${BJAM_TOOLS} \ -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch deleted file mode 100644 index 8a85aac18..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 40192301130dcd913aa6d9cb9dba9e5f8dbd9d16 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com> -Date: Wed, 24 Aug 2016 21:01:43 +0100 -Subject: [PATCH 1/4] use POSIX poll.h instead of sys/poll.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -POSIX specifies that <poll.h> is the correct header to -include for poll() - http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html -whereas <sys/poll.h> is only needed for ancient glibc (<2.3), -so let's follow POSIX instead. - -As a side-effect, this silences a warning when compiling -against the musl C-library: - -In file included from ./boost/asio/detail/socket_types.hpp:61:0, - from ./boost/asio/ip/address_v4.hpp:21, - from ./boost/asio/ip/address.hpp:21, - from libs/log/src/init_from_settings.cpp:65: -<sysroot>/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp] - #warning redirecting incorrect #include <sys/poll.h> to <poll.h> - ^~~~~~~ - -etc. - -Signed-off-by: André Draszik <adraszik@tycoint.com> ---- -Upstream-Status: Submitted https://svn.boost.org/trac/boost/ticket/12419 - boost/asio/detail/socket_types.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/boost/asio/detail/socket_types.hpp b/boost/asio/detail/socket_types.hpp -index e8c7109..7e65d3c 100644 ---- a/boost/asio/detail/socket_types.hpp -+++ b/boost/asio/detail/socket_types.hpp -@@ -58,7 +58,7 @@ - #else - # include <sys/ioctl.h> - # if !defined(__SYMBIAN32__) --# include <sys/poll.h> -+# include <poll.h> - # endif - # include <sys/types.h> - # include <sys/stat.h> --- -2.9.3 - diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch deleted file mode 100644 index f96005ebc..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 02fa5cee1b8d0321787113e2dc10b162c657f333 Mon Sep 17 00:00:00 2001 -From: Robert Ramey <ramey@rrsd.com> -Date: Wed, 1 Feb 2017 16:43:59 -0800 -Subject: [PATCH] correct error which appeared when compiling non c++ compliant - code for arrays - -Upstream-Status: Backport [expected to be released in v1.65] - ---- - boost/serialization/array.hpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/boost/serialization/array.hpp b/boost/serialization/array.hpp -index 61708b3..612d1a6 100644 ---- a/boost/serialization/array.hpp -+++ b/boost/serialization/array.hpp -@@ -23,6 +23,8 @@ namespace std{ - } // namespace std - #endif - -+#include <boost/serialization/array_wrapper.hpp> -+ - #ifndef BOOST_NO_CXX11_HDR_ARRAY - - #include <array> --- -2.9.3 - diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch index e9c7e4c55..26f3cbb05 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch @@ -1,97 +1,65 @@ -From c0e785f8da2caa6617052b1c7b347e0dffb1520d Mon Sep 17 00:00:00 2001 +From e4d3a7470b307693660d0412732e7266d1738d8c Mon Sep 17 00:00:00 2001 From: Christopher Larson <chris_larson@mentor.com> Date: Tue, 13 Dec 2016 10:29:17 -0700 -Subject: [PATCH 2/3] Don't set up -m32/-m64, we do that ourselves +Subject: [PATCH 6/6] Don't set up -m32/-m64, we do that ourselves Upstream-Status: Inappropriate Signed-off-by: Christopher Larson <chris_larson@mentor.com> + --- - tools/build/src/tools/gcc.jam | 10 ---------- - 1 file changed, 10 deletions(-) + tools/build/src/tools/gcc.jam | 39 --------------------------------------- + 1 file changed, 39 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index 0f346a5..942f141 100644 +index e4fc6c32..37914fd0 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -509,7 +509,6 @@ rule compile.c++.pch ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - } - - actions compile.c++.pch -@@ -521,7 +520,6 @@ rule compile.c.pch ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - } - - actions compile.c.pch -@@ -533,7 +531,6 @@ rule compile.c++.preprocess ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - - # Some extensions are compiled as C++ by default. For others, we need to - # pass -x c++. We could always pass -x c++ but distcc does not work with it. -@@ -548,7 +545,6 @@ rule compile.c.preprocess ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - - # If we use the name g++ then default file suffix -> language mapping does - # not work. So have to pass -x option. Maybe, we can work around this by -@@ -564,7 +560,6 @@ rule compile.c++ ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - - # Some extensions are compiled as C++ by default. For others, we need to - # pass -x c++. We could always pass -x c++ but distcc does not work with it. -@@ -594,7 +589,6 @@ rule compile.c ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - - # If we use the name g++ then default file suffix -> language mapping does - # not work. So have to pass -x option. Maybe, we can work around this by -@@ -610,7 +604,6 @@ rule compile.fortran ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; +@@ -337,45 +337,6 @@ rule set-address-model-options ( targets * : sources * : properties * ) + { + local option ; + local target-os = [ feature.get-values target-os : $(properties) ] ; +- if $(target-os) = aix +- { +- if $(model) = 32 +- { +- option = -maix32 ; +- } +- else +- { +- option = -maix64 ; +- } +- } +- else if $(target-os) = hpux +- { +- if $(model) = 32 +- { +- option = -milp32 ; +- } +- else +- { +- option = -mlp64 ; +- } +- } +- else +- { +- local arch = [ feature.get-values architecture : $(properties) ] ; +- if $(arch) = power || $(arch) = sparc || $(arch) = x86 +- { +- if $(model) = 32 +- { +- option = -m32 ; +- } +- else if $(model) = 64 +- { +- option = -m64 ; +- } +- } +- # For darwin, the model can be 32_64. darwin.jam will handle that +- # on its own. +- } + OPTIONS on $(targets) += $(option) ; + } } - - actions compile.c++ bind PCH_FILE -@@ -641,7 +634,6 @@ actions compile.fortran - rule compile.asm ( targets * : sources * : properties * ) - { - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - LANG on $(<) = "-x assembler-with-cpp" ; - } - -@@ -950,7 +942,6 @@ rule quote-rpath ( targets * ) - rule link ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - SPACE on $(targets) = " " ; - # Serialize execution of the 'link' action, since running N links in - # parallel is just slower. For now, serialize only gcc links, it might be a -@@ -1018,7 +1009,6 @@ actions piecemeal archive - rule link.dll ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - SPACE on $(targets) = " " ; - JAM_SEMAPHORE on $(targets) = <s>gcc-link-semaphore ; - quote-rpath $(targets) ; -- -2.8.0 +2.15.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index 6bb25f885..fb6d9711b 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch @@ -1,20 +1,21 @@ -From 7c49525812567f1219706c4ed330b3bd2cc8e94a Mon Sep 17 00:00:00 2001 +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 3/3] Don't set up arch/instruction-set flags, we do that +Subject: [PATCH 5/6] Don't set up arch/instruction-set flags, we do that ourselves Upstream-Status: Inappropriate Signed-off-by: Christopher Larson <chris_larson@mentor.com> + --- - tools/build/src/tools/gcc.jam | 121 ------------------------------------------ - 1 file changed, 121 deletions(-) + tools/build/src/tools/gcc.jam | 127 ------------------------------------------ + 1 file changed, 127 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index 942f141..d062c20 100644 +index e3b1b952..e4fc6c32 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -1068,124 +1068,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : +@@ -1276,130 +1276,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : <architecture>$(architecture)/<instruction-set>$(instruction-set) : $(values) ; } @@ -60,6 +61,10 @@ index 942f141..d062c20 100644 -cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ; -cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ; -cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ; +-cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ; +-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 : k6 : -march=k6 ; -cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; -cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; @@ -81,8 +86,10 @@ index 942f141..d062c20 100644 -cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ; -cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ; -cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ; +-cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ; -cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ; -cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; +-cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ; -cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; -cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; -cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; @@ -140,4 +147,5 @@ index 942f141..d062c20 100644 -# AIX variant of RS/6000 & PowerPC -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; -- -2.8.0 +2.15.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.64.0.bb b/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.66.0.bb index d1c20e1d0..63b82a599 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.64.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.66.0.bb @@ -4,10 +4,8 @@ require boost.inc SRC_URI += "\ file://arm-intrinsics.patch \ file://boost-CVE-2012-2677.patch \ - file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.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://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \ - file://0001-correct-error-which-appeared-when-compiling-non-c-co.patch \ " diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch b/import-layers/yocto-poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch new file mode 100644 index 000000000..a75133d2b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch @@ -0,0 +1,37 @@ +From 5685527364198597f25fc1c6236cb64cbc3de44f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 4 Oct 2017 18:16:08 +0300 +Subject: [PATCH] Fix a strange assert typo; how was this released without + noticing? + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + tools/build/src/engine/debugger.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/build/src/engine/debugger.c b/tools/build/src/engine/debugger.c +index 802f262..152a7e6 100644 +--- a/tools/build/src/engine/debugger.c ++++ b/tools/build/src/engine/debugger.c +@@ -1092,7 +1092,7 @@ static void debug_start_child( int argc, const char * * argv ) + PROCESS_INFORMATION pi = { NULL, NULL, 0, 0 }; + STARTUPINFO si = { sizeof( STARTUPINFO ), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 }; +- assert( DEBUG_STATE == DEBUG_NO_CHILD ); ++ assert( debug_state == DEBUG_NO_CHILD ); + if ( ! CreatePipe( &pipe1[ 0 ], &pipe1[ 1 ], &sa, 0 ) ) + { + printf("internal error\n"); +@@ -1176,7 +1176,7 @@ static void debug_start_child( int argc, const char * * argv ) + int read_fd; + int pid; + int i; +- assert( DEBUG_STATE == DEBUG_NO_CHILD ); ++ assert( debug_state == DEBUG_NO_CHILD ); + pipe(pipe1); + pipe(pipe2); + pid = fork(); +-- +2.14.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch b/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch new file mode 100644 index 000000000..4bd967f78 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch @@ -0,0 +1,71 @@ +From a9fc13b2aee55655d58fcb77a3180fa99f96438a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> +Date: Wed, 28 Mar 2018 16:45:05 +0100 +Subject: [PATCH] update-ca-certificates: use relative symlinks from + $ETCCERTSDIR +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +update-ca-certificates symlinks (trusted) certificates +from $CERTSDIR or $LOCALCERTSDIR into $ETCCERTSDIR. +update-ca-certificates can call hook scripts installed +into /etc/ca-certificates/update.d. Those scripts are +passed the pem file in /etc/ssl/certs/ that was added or +removed in this run and those pem files are absolute +symlinks into $CERTSDIR or $LOCALCERTSDIR at the moment. + +When running update-ca-certificates during image build +time, they thusly all point into the host's file system, +not into the $SYSROOT. This means: +* the host's file system layout must match the one + produced by OE, and +* it also means that the host must have installed the same + (or more) certificates as the target in $CERTSDIR and + $LOCALCERTSDIR + +This is a problem when wanting to execute hook scripts, +because they all need to be taught about $SYSROOT, and +behave differently depending on whether they're called +at image build time, or on the target, as otherwise they +will be trying to actually read the host's certificates +from $CERTSDIR or $LOCALCERTSDIR. + +This also is a problem when running anything else during +image build time that depends on the trusted CA +certificates. + +Changing the symlink to be relative solves all of these +problems. Do so. + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: André Draszik <andre.draszik@jci.com> +--- + sbin/update-ca-certificates | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates +index 00f80c7..7e911a9 100755 +--- a/sbin/update-ca-certificates ++++ b/sbin/update-ca-certificates +@@ -29,6 +29,7 @@ CERTSDIR=$SYSROOT/usr/share/ca-certificates + LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates + CERTBUNDLE=ca-certificates.crt + ETCCERTSDIR=$SYSROOT/etc/ssl/certs ++FSROOT=../../../ # to get from $ETCCERTSDIR to the root of the file system + HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d + + while [ $# -gt 0 ]; +@@ -125,9 +126,10 @@ add() { + PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \ + -e 's/[()]/=/g' \ + -e 's/,/_/g').pem" +- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${CERT##$SYSROOT}" ] ++ DST="$(echo ${CERT} | sed -e "s|^$SYSROOT||" -e "s|^/|$FSROOT|" )" ++ if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${DST}" ] + then +- ln -sf "${CERT##$SYSROOT}" "$PEM" ++ ln -sf "${DST}" "$PEM" + echo "+$PEM" >> "$ADDED" + fi + # Add trailing newline to certificate, if it is missing (#635570) diff --git a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb b/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb index e4ffbd34d..350294858 100644 --- a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb +++ b/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb @@ -16,15 +16,17 @@ PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" SRCREV = "34b8e19e541b8af4076616b2e170c7a70cdaded0" -SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ +SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ file://0002-update-ca-certificates-use-SYSROOT.patch \ file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ file://update-ca-certificates-support-Toybox.patch \ file://default-sysroot.patch \ - file://sbindir.patch" + file://sbindir.patch \ + file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \ + " S = "${WORKDIR}/git" -SYSROOT_DIRS_class-native += "/etc" +SYSROOT_DIRS_class-native += "${sysconfdir} ${datadir}/ca-certificates" inherit allarch diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch index 74e5d99cf..a7db1b3c9 100644 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch +++ b/import-layers/yocto-poky/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch @@ -1,17 +1,21 @@ -[PATCH] replace krb5-config with pkg-config +From ed70f0623708b8a6c1f58a5d243d87c5ff45b24d Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 26 Apr 2016 13:13:01 +0800 +Subject: [PATCH] replace krb5-config with pkg-config Upstream-Status: Pending Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index e99b303..dc93f39 100644 +index 5569a26..56b0380 100755 --- a/configure.ac +++ b/configure.ac -@@ -1196,7 +1196,7 @@ AC_ARG_WITH(gssapi, +@@ -1290,7 +1290,7 @@ AC_ARG_WITH(gssapi, fi ]) @@ -20,7 +24,7 @@ index e99b303..dc93f39 100644 save_CPPFLAGS="$CPPFLAGS" AC_MSG_CHECKING([if GSS-API support is requested]) -@@ -1207,7 +1207,7 @@ if test x"$want_gss" = xyes; then +@@ -1301,7 +1301,7 @@ if test x"$want_gss" = xyes; then if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` elif test -f "$KRB5CONFIG"; then @@ -29,7 +33,7 @@ index e99b303..dc93f39 100644 elif test "$GSSAPI_ROOT" != "yes"; then GSSAPI_INCS="-I$GSSAPI_ROOT/include" fi -@@ -1300,7 +1300,7 @@ if test x"$want_gss" = xyes; then +@@ -1394,7 +1394,7 @@ if test x"$want_gss" = xyes; then elif test -f "$KRB5CONFIG"; then dnl krb5-config doesn't have --libs-only-L or similar, put everything dnl into LIBS @@ -38,6 +42,3 @@ index e99b303..dc93f39 100644 LIBS="$gss_libs $LIBS" else case $host in --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000099.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000099.patch deleted file mode 100644 index 96ff1b064..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000099.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c9332fa5e84f24da300b42b1a931ade929d3e27d Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.rouault@spatialys.com> -Date: Tue, 1 Aug 2017 17:17:06 +0200 -Subject: [PATCH] file: output the correct buffer to the user - -Regression brought by 7c312f84ea930d8 (April 2017) - -CVE: CVE-2017-1000099 - -Bug: https://curl.haxx.se/docs/adv_20170809C.html - -Credit to OSS-Fuzz for the discovery - -Upstream-Status: Backport -https://github.com/curl/curl/commit/c9332fa5e84f24da300b42b1a931ade929d3e27d - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - lib/file.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/file.c b/lib/file.c -index bd426eac2..666cbe75b 100644 ---- a/lib/file.c -+++ b/lib/file.c -@@ -499,11 +499,11 @@ static CURLcode file_do(struct connectdata *conn, bool *done) - Curl_month[tm->tm_mon], - tm->tm_year + 1900, - tm->tm_hour, - tm->tm_min, - tm->tm_sec); -- result = Curl_client_write(conn, CLIENTWRITE_BOTH, buf, 0); -+ result = Curl_client_write(conn, CLIENTWRITE_BOTH, header, 0); - if(!result) - /* set the file size to make it available post transfer */ - Curl_pgrsSetDownloadSize(data, expected_size); - return result; - } --- -2.13.3 - diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000100.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000100.patch deleted file mode 100644 index f74f1dd89..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000100.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 358b2b131ad6c095696f20dcfa62b8305263f898 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Tue, 1 Aug 2017 17:16:46 +0200 -Subject: [PATCH] tftp: reject file name lengths that don't fit - -... and thereby avoid telling send() to send off more bytes than the -size of the buffer! - -CVE: CVE-2017-1000100 - -Bug: https://curl.haxx.se/docs/adv_20170809B.html -Reported-by: Even Rouault - -Credit to OSS-Fuzz for the discovery - -Upstream-Status: Backport -https://github.com/curl/curl/commit/358b2b131ad6c095696f20dcfa62b8305263f898 - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - lib/tftp.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/tftp.c b/lib/tftp.c -index 02bd842..f6f4bce 100644 ---- a/lib/tftp.c -+++ b/lib/tftp.c -@@ -5,7 +5,7 @@ - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * -- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. -+ * Copyright (C) 1998 - 2017, 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 -@@ -491,6 +491,11 @@ static CURLcode tftp_send_first(tftp_state_data_t *state, tftp_event_t event) - if(result) - return result; - -+ if(strlen(filename) > (state->blksize - strlen(mode) - 4)) { -+ failf(data, "TFTP file name too long\n"); -+ return CURLE_TFTP_ILLEGAL; /* too long file name field */ -+ } -+ - snprintf((char *)state->spacket.data+2, - state->blksize, - "%s%c%s%c", filename, '\0', mode, '\0'); --- -1.7.9.5 - diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000101.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000101.patch deleted file mode 100644 index c300fff00..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000101.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 453e7a7a03a2cec749abd3878a48e728c515cca7 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Tue, 1 Aug 2017 17:16:07 +0200 -Subject: [PATCH] glob: do not continue parsing after a strtoul() overflow - range - -Added test 1289 to verify. - -CVE: CVE-2017-1000101 - -Bug: https://curl.haxx.se/docs/adv_20170809A.html -Reported-by: Brian Carpenter - -Upstream-Status: Backport -https://github.com/curl/curl/commit/453e7a7a03a2cec749abd3878a48e728c515cca7 - -Rebase the tests/data/Makefile.inc changes for curl 7.54.1. - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - src/tool_urlglob.c | 5 ++++- - tests/data/Makefile.inc | 2 +- - tests/data/test1289 | 35 +++++++++++++++++++++++++++++++++++ - 3 files changed, 40 insertions(+), 2 deletions(-) - create mode 100644 tests/data/test1289 - -diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c -index 6b1ece0..d56dcd9 100644 ---- a/src/tool_urlglob.c -+++ b/src/tool_urlglob.c -@@ -273,7 +273,10 @@ static CURLcode glob_range(URLGlob *glob, char **patternp, - } - errno = 0; - max_n = strtoul(pattern, &endp, 10); -- if(errno || (*endp == ':')) { -+ if(errno) -+ /* overflow */ -+ endp = NULL; -+ else if(*endp == ':') { - pattern = endp+1; - errno = 0; - step_n = strtoul(pattern, &endp, 10); -diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc -index 155320a..7adbee6 100644 ---- a/tests/data/Makefile.inc -+++ b/tests/data/Makefile.inc -@@ -132,7 +132,7 @@ test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \ - test1260 test1261 test1262 \ - \ - test1280 test1281 test1282 test1283 test1284 test1285 test1286 test1287 \ --test1288 \ -+test1288 test1289 \ - \ - test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \ - test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \ -diff --git a/tests/data/test1289 b/tests/data/test1289 -new file mode 100644 -index 0000000..d679cc0 ---- /dev/null -+++ b/tests/data/test1289 -@@ -0,0 +1,35 @@ -+<testcase> -+<info> -+<keywords> -+HTTP -+HTTP GET -+globbing -+</keywords> -+</info> -+ -+# -+# Server-side -+<reply> -+</reply> -+ -+# Client-side -+<client> -+<server> -+http -+</server> -+<name> -+globbing with overflow and bad syntxx -+</name> -+<command> -+http://ur%20[0-60000000000000000000 -+</command> -+</client> -+ -+# Verify data after the test has been "shot" -+<verify> -+# curl: (3) [globbing] bad range in column -+<errorcode> -+3 -+</errorcode> -+</verify> -+</testcase> --- -2.11.0 - diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000254.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000254.patch deleted file mode 100644 index 2b0798b92..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000254.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 1b2eba6f9745c064f7283e0ada8f46df9d9d6e42 Mon Sep 17 00:00:00 2001 -From: Li Zhou <li.zhou@windriver.com> -Date: Mon, 23 Oct 2017 00:26:50 -0700 -Subject: [PATCH] FTP: zero terminate the entry path even on bad input - -... a single double quote could leave the entry path buffer without a zero -terminating byte. CVE-2017-1000254 - -Test 1152 added to verify. - -Reported-by: Max Dymond -Bug: https://curl.haxx.se/docs/adv_20171004.html - -Upstream-Status: Backport -CVE: CVE-2017-1000254 -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - lib/ftp.c | 7 ++++-- - tests/data/Makefile.inc | 2 ++ - tests/data/test1152 | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 68 insertions(+), 2 deletions(-) - create mode 100644 tests/data/test1152 - -diff --git a/lib/ftp.c b/lib/ftp.c -index 5edec37..493dbf9 100644 ---- a/lib/ftp.c -+++ b/lib/ftp.c -@@ -2826,6 +2826,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) - const size_t buf_size = data->set.buffer_size; - char *dir; - char *store; -+ bool entry_extracted = FALSE; - - dir = malloc(nread + 1); - if(!dir) -@@ -2857,7 +2858,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) - } - else { - /* end of path */ -- *store = '\0'; /* zero terminate */ -+ entry_extracted = TRUE; - break; /* get out of this loop */ - } - } -@@ -2866,7 +2867,9 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) - store++; - ptr++; - } -- -+ *store = '\0'; /* zero terminate */ -+ } -+ if(entry_extracted) { - /* If the path name does not look like an absolute path (i.e.: it - does not start with a '/'), we probably need some server-dependent - adjustments. For example, this is the case when connecting to -diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc -index 7adbee6..5284654 100644 ---- a/tests/data/Makefile.inc -+++ b/tests/data/Makefile.inc -@@ -121,6 +121,8 @@ test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \ - test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \ - test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \ - test1144 test1145 test1146 \ -+test1152 \ -+\ - test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ - test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \ - test1216 test1217 test1218 test1219 \ -diff --git a/tests/data/test1152 b/tests/data/test1152 -new file mode 100644 -index 0000000..aa8c0a7 ---- /dev/null -+++ b/tests/data/test1152 -@@ -0,0 +1,61 @@ -+<testcase> -+<info> -+<keywords> -+FTP -+PASV -+LIST -+</keywords> -+</info> -+# -+# Server-side -+<reply> -+<servercmd> -+REPLY PWD 257 "just one -+</servercmd> -+ -+# When doing LIST, we get the default list output hard-coded in the test -+# FTP server -+<data mode="text"> -+total 20 -+drwxr-xr-x 8 98 98 512 Oct 22 13:06 . -+drwxr-xr-x 8 98 98 512 Oct 22 13:06 .. -+drwxr-xr-x 2 98 98 512 May 2 1996 curl-releases -+-r--r--r-- 1 0 1 35 Jul 16 1996 README -+lrwxrwxrwx 1 0 1 7 Dec 9 1999 bin -> usr/bin -+dr-xr-xr-x 2 0 1 512 Oct 1 1997 dev -+drwxrwxrwx 2 98 98 512 May 29 16:04 download.html -+dr-xr-xr-x 2 0 1 512 Nov 30 1995 etc -+drwxrwxrwx 2 98 1 512 Oct 30 14:33 pub -+dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr -+</data> -+</reply> -+ -+# -+# Client-side -+<client> -+<server> -+ftp -+</server> -+ <name> -+FTP with uneven quote in PWD response -+ </name> -+ <command> -+ftp://%HOSTIP:%FTPPORT/test-1152/ -+</command> -+</client> -+ -+# -+# Verify data after the test has been "shot" -+<verify> -+<protocol> -+USER anonymous -+PASS ftp@example.com -+PWD -+CWD test-1152 -+EPSV -+TYPE A -+LIST -+QUIT -+</protocol> -+</verify> -+</testcase> --- -2.11.0 - diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/configure_ac.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/configure_ac.patch deleted file mode 100644 index b8bd304d7..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl/configure_ac.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Pending - ---- a/configure.ac -+++ b/configure.ac -@@ -281,7 +281,7 @@ dnl ************************************ - - CURL_CHECK_COMPILER - CURL_SET_COMPILER_BASIC_OPTS --CURL_SET_COMPILER_DEBUG_OPTS -+dnl CURL_SET_COMPILER_DEBUG_OPTS - CURL_SET_COMPILER_OPTIMIZE_OPTS - CURL_SET_COMPILER_WARNING_OPTS - diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/reproducible-mkhelp.patch b/import-layers/yocto-poky/meta/recipes-support/curl/curl/reproducible-mkhelp.patch deleted file mode 100644 index 268bbebf0..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl/reproducible-mkhelp.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1fe92fd3dd64c7228f6ff41e3fc16c4f2392471a Mon Sep 17 00:00:00 2001 -From: Juro Bystricky <juro.bystricky@intel.com> -Date: Fri, 27 Oct 2017 08:28:25 -0700 -Subject: mkhelp.pl: support reproducible build - -Do not generate line with the current date, such as: - -* Generation time: Tue Oct-24 18:01:41 2017 - -This will improve reproducibility. The generated string is only -part of a comment, so there should be no adverse consequences. - -Upstream-Status: Submitted [ https://github.com/curl/curl/pull/2026 ] - -Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> - -diff --git a/src/mkhelp.pl b/src/mkhelp.pl -index 270daa2..757f024 100755 ---- a/src/mkhelp.pl -+++ b/src/mkhelp.pl -@@ -102,11 +102,9 @@ while(<READ>) { - } - close(READ); - --$now = localtime; - print <<HEAD - /* - * NEVER EVER edit this manually, fix the mkhelp.pl script instead! -- * Generation time: $now - */ - #ifdef USE_MANUAL - #include "tool_hugehelp.h" diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.54.1.bb b/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.60.0.bb index 58f05316f..fe04fa63c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.54.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.60.0.bb @@ -7,23 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e66 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ - file://CVE-2017-1000099.patch \ - file://CVE-2017-1000100.patch \ - file://CVE-2017-1000101.patch \ - file://CVE-2017-1000254.patch \ " -SRC_URI_append_class-target = " \ - file://reproducible-mkhelp.patch \ -" - -# curl likes to set -g0 in CFLAGS, so we stop it -# from mucking around with debug options -# -SRC_URI += " file://configure_ac.patch" - -SRC_URI[md5sum] = "6b6eb722f512e7a24855ff084f54fe55" -SRC_URI[sha256sum] = "fdfc4df2d001ee0c44ec071186e770046249263c491fcae48df0e1a3ca8f25a0" +SRC_URI[md5sum] = "bd2aabf78ded6a9aec8a54532fd6b5d7" +SRC_URI[sha256sum] = "897dfb2204bd99be328279f88f55b7c61592216b0542fcbe995c60aa92871e9b" CVE_PRODUCT = "libcurl" inherit autotools pkgconfig binconfig multilib_header @@ -39,10 +26,12 @@ PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," PACKAGECONFIG[imap] = "--enable-imap,--disable-imap," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap," PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps," -PACKAGECONFIG[libidn] = "--with-libidn,--without-libidn,libidn" +PACKAGECONFIG[libidn] = "--with-libidn2,--without-libidn2,libidn2" PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" +PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy," PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" @@ -54,8 +43,6 @@ PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" EXTRA_OECONF = " \ --enable-crypto-auth \ @@ -64,10 +51,6 @@ EXTRA_OECONF = " \ --without-libpsl \ " -do_install_append() { - oe_multilib_header curl/curlbuild.h -} - do_install_append_class-target() { # cleanup buildpaths from curl-config sed -i \ diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db_5.3.28.bb b/import-layers/yocto-poky/meta/recipes-support/db/db_5.3.28.bb index fb4befbaf..093ee4490 100644 --- a/import-layers/yocto-poky/meta/recipes-support/db/db_5.3.28.bb +++ b/import-layers/yocto-poky/meta/recipes-support/db/db_5.3.28.bb @@ -12,9 +12,11 @@ SECTION = "libs" SUMMARY = "Berkeley Database v5" HOMEPAGE = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" LICENSE = "Sleepycat" -VIRTUAL_NAME ?= "virtual/db" RCONFLICTS_${PN} = "db3" +CVE_PRODUCT = "oracle_berkeley_db" +CVE_VERSION = "11.2.${PV}" + PR = "r1" PE = "1" @@ -37,15 +39,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ed1158e31437f4f87cdd4ab2b8613955" inherit autotools -# Put virtual/db in any appropriate provider of a -# relational database, use it as a dependency in -# place of a specific db and use: -# -# PREFERRED_PROVIDER_virtual/db -# -# to select the correct db in the build (distro) .conf -PROVIDES += "${VIRTUAL_NAME}" - # The executables go in a separate package - typically there # is no need to install these unless doing real database # management on the system. diff --git a/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb b/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.4.bb index 1857d4bf3..300e6f131 100644 --- a/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.4.bb @@ -3,13 +3,15 @@ SECTION = "base" LICENSE = "GPLv2 & SMAIL_GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f" -SRC_URI = "http://snapshot.debian.org/archive/debian/20170402T211732Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" +SRC_URI = "http://snapshot.debian.org/archive/debian/20180129T164727Z/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] = "ee5fcecaab071bd0c93e8a0cee65d6c4" -SRC_URI[sha256sum] = "06446cd4c0d309fd31a0682c5c2f07f7613fb867f769414b9cc51f155ad73172" +SRC_URI[md5sum] = "a6dcd496b4f79b3c452c3a74c2d3f89c" +SRC_URI[sha256sum] = "c061ab99aea61f892043b7624b021ab5b193e9c6bbfd474da0fbcdd506be1eb2" + +S = "${WORKDIR}/${BPN}" inherit autotools update-alternatives diff --git a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.13.bb b/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.14.1.bb index 4bbe147df..54e5696e4 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.13.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.14.1.bb @@ -10,8 +10,8 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://ptest.patch \ " -SRC_URI[md5sum] = "8929dcda2a8de3fd2367bdbf66769376" -SRC_URI[sha256sum] = "9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253" +SRC_URI[md5sum] = "c2ddcb3897efa0f57484af2bd4f4f848" +SRC_URI[sha256sum] = "cdceff00ffe014495bed3aed71c7910aa88bf29379f795abc0f46d4ee5f8bc5f" inherit autotools gettext texinfo lib_package ptest diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch index 665367658..1e47924cc 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch @@ -18,13 +18,13 @@ Upstream-Status: Inappropriate[OE-Specific] configure.ac | 11 ----------- 1 file changed, 11 deletions(-) -diff --git a/configure.ac b/configure.ac -index 857ea3b..359e919 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -607,15 +607,6 @@ case $host in - GMP_INCLUDE_MPN(arm/arm-defs.m4) - CALLING_CONVENTIONS_OBJS='arm32call.lo arm32check.lo' +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" - # This is needed for clang, which is not content with flags like -mfpu=neon - # alone. @@ -38,7 +38,7 @@ index 857ea3b..359e919 100644 # FIXME: We make mandatory compiler options optional here. We should # either enforce them, or organise to strip paths as the corresponding # options fail. -@@ -686,8 +677,6 @@ case $host in +@@ -746,8 +737,6 @@ case $host in ;; *) path="arm" @@ -47,6 +47,3 @@ index 857ea3b..359e919 100644 ;; esac ;; --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch index 564d12d42..3935589f8 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch @@ -1,10 +1,10 @@ Upstream-Status: Pending -Index: gmp-5.0.3/longlong.h +Index: gmp-6.1.2/longlong.h =================================================================== ---- gmp-5.0.3.orig/longlong.h -+++ gmp-5.0.3/longlong.h -@@ -994,8 +994,10 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ( +--- 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 { \ @@ -14,5 +14,5 @@ Index: gmp-5.0.3/longlong.h + __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ + (count) = __cbtmp; \ } while (0) - #endif /* x86_64 */ + #endif /* __amd64__ */ diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch index 74904a253..6b089cf39 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch @@ -1,15 +1,15 @@ Upstream-Status: Pending -Index: gmp-4.2.4/Makefile.am +Index: gmp-6.1.2/Makefile.am =================================================================== ---- gmp-4.2.4.orig/Makefile.am 2008-09-10 19:31:27.000000000 +0000 -+++ gmp-4.2.4/Makefile.am 2009-07-06 20:19:19.000000000 +0000 -@@ -106,7 +106,7 @@ - # but anyone knowledgable enough to be playing with exec_prefix will be able +--- gmp-6.1.2.orig/Makefile.am ++++ gmp-6.1.2/Makefile.am +@@ -130,7 +130,7 @@ EXTRA_DIST += gmpxx.h + # but anyone knowledgeable enough to be playing with exec_prefix will be able # to address that. # -includeexecdir = $(exec_prefix)/include +includeexecdir = $(includedir) include_HEADERS = $(GMPXX_HEADERS_OPTION) - nodist_includeexec_HEADERS = gmp.h $(MPBSD_HEADERS_OPTION) - lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION) + nodist_includeexec_HEADERS = gmp.h + lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch new file mode 100644 index 000000000..3e3a64df2 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -0,0 +1,30 @@ +From 0b97148c3aad0993a9aeb088596fa63a2fec5328 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 + gpg-agent socket in the filesystem + +This should avoid clashes with the host gpg-agent observed on autobuilders. + +Upstream-Status: Inappropriate [oe-core specific, and only for -native] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 382ef1d..0570d7c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1818,7 +1818,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", + + AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) + +-AC_DEFINE_UNQUOTED(GPG_AGENT_SOCK_NAME, "S.gpg-agent", ++AC_DEFINE_UNQUOTED(GPG_AGENT_SOCK_NAME, "S.gpg-agent.yocto-native", + [The name of the agent socket]) + AC_DEFINE_UNQUOTED(GPG_AGENT_EXTRA_SOCK_NAME, "S.gpg-agent.extra", + [The name of the agent socket for remote access]) +-- +2.15.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.2.0.bb b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb index 0176dddad..d3f1a8f4c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.2.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb @@ -15,9 +15,11 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0003-dirmngr-uses-libgpg-error.patch \ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ " +SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch" -SRC_URI[md5sum] = "789f16949fae2d003d387f49e9da4b74" -SRC_URI[sha256sum] = "d4514a0be0f7a1ff263193330019eb4b53c82f0f5e230af3c14df371271a45e6" + +SRC_URI[md5sum] = "709e5af5bba84d251c520222e720972f" +SRC_URI[sha256sum] = "401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ @@ -44,3 +46,5 @@ do_install_append() { PACKAGECONFIG ??= "gnutls" PACKAGECONFIG[gnutls] = "--enable-gnutls, --disable-gnutls, gnutls" PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" + +BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc index 29b5dd6ae..7bcb9133a 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc @@ -21,7 +21,7 @@ SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc -PACKAGECONFIG ??= "libidn zlib" +PACKAGECONFIG ??= "libidn" # You must also have CONFIG_SECCOMP enabled in the kernel for # seccomp to work. @@ -32,7 +32,6 @@ PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn" PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" EXTRA_OECONF = " \ --enable-doc \ diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch index f0b7ca2ec..b6e7bc965 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch @@ -14,19 +14,16 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 6907b21..7c70d9e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -948,7 +948,7 @@ YEAR=`date +%Y` +Index: gnutls-3.5.16/configure.ac +=================================================================== +--- gnutls-3.5.16.orig/configure.ac ++++ gnutls-3.5.16/configure.ac +@@ -955,7 +955,7 @@ YEAR=`date +%Y` AC_SUBST([YEAR], $YEAR) for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do - nam=$(basename $i|sed 's/.bak//g') + nam=$(basename $i|sed 's/\.bak$//') if test "$create_libopts_links" = "yes";then + rm -f "src/$nam.stamp" rm -f "src/$nam" - AC_CONFIG_LINKS([src/$nam:$i]) --- -2.11.0 - diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch deleted file mode 100644 index ae141a5bc..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 18081068a97c00015aabc5fa321664951458ea0d Mon Sep 17 00:00:00 2001 -From: Fan Xin <fan.xin@jp.fujitsu.com> -Date: Fri, 9 Jun 2017 15:20:31 +0900 -Subject: [PATCH] From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17 - 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Tue, 26 May - 2015 21:41:24 -0700 Subject: [PATCH] use pkg-config to locate zlib - -AC_LIB_HAVE_LINKFLAGS can sometimes find host libs and is therefore not -robust when cross-compiling. Remove it for zlib and use PKG_CHECK_MODULES -instead. - -Removing AC_LIB_HAVE_LINKFLAGS for zlib also removes the --with-libz-prefix -configure option. If zlib support is enabled, then failure to find zlib via -pkg-config is now treated as a fatal error. - -Change based on ChromeOS gnutls 2.12.23 cross-compile fixes patch: - - https://chromium-review.googlesource.com/#/c/271661/ - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> - -Rebase on gnutls 3.5.13 - -Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> ---- - configure.ac | 25 +++++++++---------------- - 1 file changed, 9 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c65268e..f6a18aa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -735,28 +735,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib], - AC_MSG_CHECKING([whether to include zlib compression support]) - if test x$ac_zlib != xno; then - AC_MSG_RESULT(yes) -- AC_LIB_HAVE_LINKFLAGS(z,, [#include <zlib.h>], [compress (0, 0, 0, 0);]) -- if test x$ac_cv_libz != xyes; then -- AC_MSG_WARN( --*** --*** ZLIB was not found. You will not be able to use ZLIB compression.) -- fi - else - AC_MSG_RESULT(no) - fi - --PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n) -- - if test x$ac_zlib != xno; then -- if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then -- if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then -- GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" -- else -- GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" -- fi -- LIBZ_PC="" -+ PKG_CHECK_MODULES(ZLIB, zlib) -+ HAVE_LIBZ=yes -+ AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled]) -+ AC_SUBST(HAVE_LIBZ) -+ LTLIBZ=$ZLIB_LIBS -+ AC_SUBST(LTLIBZ) -+ if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then -+ GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" - else -- LIBZ_PC=$LIBZ -+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" - fi - fi - AC_SUBST(LIBZ_PC) --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.13.bb b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.13.bb deleted file mode 100644 index 35d7d09c8..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.13.bb +++ /dev/null @@ -1,10 +0,0 @@ -require gnutls.inc - -SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \ - file://use-pkg-config-to-locate-zlib.patch \ - file://arm_eabi.patch \ - " -SRC_URI[md5sum] = "4fd41ad86572933c2379b4cc321a0959" -SRC_URI[sha256sum] = "79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096" - -BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb new file mode 100644 index 000000000..7624a203d --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb @@ -0,0 +1,9 @@ +require gnutls.inc + +SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \ + file://arm_eabi.patch \ + " +SRC_URI[md5sum] = "4b65ae3ffef59f3eeed51a6166ff12b3" +SRC_URI[sha256sum] = "20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed" + +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch deleted file mode 100644 index be843808a..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d8d805e1f2e6799bb2dff4871a8598dc83088a39 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@redhat.com> -Date: Thu, 22 Jun 2017 16:31:37 +0200 -Subject: [PATCH] _asn1_check_identifier: safer access to values read - -Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com> - -http://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=commit;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39 -Upstream-Status: Backport - -CVE: CVE-2017-10790 - -Signed-off-by: Yue Tao <Yue.Tao@windriver.com> -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - lib/parser_aux.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/lib/parser_aux.c b/lib/parser_aux.c -index 976ab38..786ea64 100644 ---- a/lib/parser_aux.c -+++ b/lib/parser_aux.c -@@ -955,7 +955,7 @@ _asn1_check_identifier (asn1_node node) - if (p2 == NULL) - { - if (p->value) -- _asn1_strcpy (_asn1_identifierMissing, p->value); -+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p->value); - else - _asn1_strcpy (_asn1_identifierMissing, "(null)"); - return ASN1_IDENTIFIER_NOT_FOUND; -@@ -968,9 +968,15 @@ _asn1_check_identifier (asn1_node node) - if (p2 && (type_field (p2->type) == ASN1_ETYPE_DEFAULT)) - { - _asn1_str_cpy (name2, sizeof (name2), node->name); -- _asn1_str_cat (name2, sizeof (name2), "."); -- _asn1_str_cat (name2, sizeof (name2), (char *) p2->value); -- _asn1_strcpy (_asn1_identifierMissing, p2->value); -+ if (p2->value) -+ { -+ _asn1_str_cat (name2, sizeof (name2), "."); -+ _asn1_str_cat (name2, sizeof (name2), (char *) p2->value); -+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p2->value); -+ } -+ else -+ _asn1_strcpy (_asn1_identifierMissing, "(null)"); -+ - p2 = asn1_find_node (node, name2); - if (!p2 || (type_field (p2->type) != ASN1_ETYPE_OBJECT_ID) || - !(p2->type & CONST_ASSIGN)) -@@ -990,7 +996,8 @@ _asn1_check_identifier (asn1_node node) - _asn1_str_cpy (name2, sizeof (name2), node->name); - _asn1_str_cat (name2, sizeof (name2), "."); - _asn1_str_cat (name2, sizeof (name2), (char *) p2->value); -- _asn1_strcpy (_asn1_identifierMissing, p2->value); -+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p2->value); -+ - p2 = asn1_find_node (node, name2); - if (!p2 || (type_field (p2->type) != ASN1_ETYPE_OBJECT_ID) - || !(p2->type & CONST_ASSIGN)) --- -1.7.9.5 - diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.12.bb b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.13.bb index 7a7571ad3..2d223861c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.12.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.13.bb @@ -11,13 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 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 \ - file://CVE-2017-10790.patch \ " DEPENDS = "bison-native" -SRC_URI[md5sum] = "5c724bd1f73aaf4a311833e1cd297b21" -SRC_URI[sha256sum] = "6753da2e621257f33f5b051cc114d417e5206a0818fe0b1ecfd6153f70934753" +SRC_URI[md5sum] = "ce2ba4d3088119b48e7531a703669c52" +SRC_URI[sha256sum] = "7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca" inherit autotools texinfo binconfig lib_package gtk-doc diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 14a43eeee..f1997e15a 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,7 +1,7 @@ -From 8ae149035c97d27cd2c624704d1651806c53577e Mon Sep 17 00:00:00 2001 +From 265faf8fe0acaca2043a248a4df02b0868ffa6de Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Wed, 16 Aug 2017 02:00:08 -0400 -Subject: [PATCH 1/5] pkgconfig +Subject: [PATCH 1/4] pkgconfig Update gpgme to use pkgconfig instead of -config files since its simpler and less error prone when cross compiling. @@ -25,10 +25,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> create mode 100644 src/gpgme.pc.in diff --git a/configure.ac b/configure.ac -index 0dac6ce..6a9e507 100644 +index 6ea4bcd..2a0d528 100644 --- a/configure.ac +++ b/configure.ac -@@ -866,6 +866,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -887,6 +887,7 @@ AC_CONFIG_FILES(Makefile src/Makefile src/versioninfo.rc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) @@ -299,5 +299,5 @@ index 0000000..b69539f +Requires: libassuan gpg-error \ No newline at end of file -- -2.8.1 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch index f1f8c911f..d20271e31 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch @@ -1,29 +1,28 @@ -From fb165c9bd96aca8c9ee3e4509c9b6e35d238ad2e Mon Sep 17 00:00:00 2001 -From: Mark Hatle <mark.hatle@windriver.com> -Date: Wed, 16 Aug 2017 02:02:47 -0400 -Subject: [PATCH 2/5] gpgme/lang/python: gpg-error-config should not be used. +From 30f7a694cc4568ecb24f77c83a6123ed3f4075fa Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 31 Jan 2018 10:44:19 +0800 +Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used -gpg-error-config was modified by OE to always return an error. So we want -to find an alternative way to retrieve whatever it is we need. It turns -out that the system is just trying to find the path to the gpg-error.h, which -we can pull in from the STAGING_INC environment. +gpg-error-config was modified by OE to always return an error. +So we want to find an alternative way to retrieve whatever it +is we need. Upstream-Status: Inappropriate [changes are specific to OE] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Rebase to 1.9.0 +Rework to 1.10.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - lang/python/setup.py.in | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) + lang/python/setup.py.in | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in -index bf4efa3..7c34487 100755 +index f9dda20..9f5d61f 100755 --- a/lang/python/setup.py.in +++ b/lang/python/setup.py.in -@@ -24,7 +24,6 @@ import glob +@@ -26,7 +26,6 @@ import shutil import subprocess # Out-of-tree build of the gpg bindings. @@ -31,35 +30,22 @@ index bf4efa3..7c34487 100755 gpgme_config_flags = ["--thread=pthread"] gpgme_config = ["gpgme-config"] + gpgme_config_flags gpgme_h = "" -@@ -52,13 +51,6 @@ else: - devnull = open(os.devnull, "w") +@@ -174,14 +173,7 @@ class BuildExtFirstHack(build): - try: -- subprocess.check_call(gpg_error_config + ['--version'], -- stdout=devnull) --except: -- sys.exit("Could not find gpg-error-config. " + -- "Please install the libgpg-error development package.") -- --try: - subprocess.check_call(gpgme_config + ['--version'], - stdout=devnull) - except: -@@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and minor >= 7)): - if not gpgme_h: - gpgme_h = os.path.join(getconfig("prefix")[0], "include", "gpgme.h") - --gpg_error_prefix = getconfig("prefix", config=gpg_error_config)[0] --gpg_error_h = os.path.join(gpg_error_prefix, "include", "gpg-error.h") -+gpg_error_h = os.path.join(os.getenv('STAGING_INCDIR'), "gpg-error.h") - if not os.path.exists(gpg_error_h): -- gpg_error_h = \ -- glob.glob(os.path.join(gpg_error_prefix, "include", -- "*", "gpg-error.h"))[0] -+ sys.exit("gpg_error_h not found: %s" % gpg_error_h) + def _generate_errors_i(self): - print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h)) +- try: +- subprocess.check_call(gpg_error_config + ['--version'], +- stdout=devnull) +- except: +- sys.exit("Could not find gpg-error-config. " + +- "Please install the libgpg-error development package.") +- +- 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()) + filter_re = re.compile(r'GPG_ERR_[^ ]* =') + rewrite_re = re.compile(r' *(.*) = .*') -- -2.8.1 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch index d38331171..7c9cccc0e 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch @@ -1,7 +1,7 @@ -From 62332eec752dd790f4dd071dfb0dbe86be377203 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 16 Aug 2017 02:05:34 -0400 -Subject: [PATCH 3/5] Correctly install python modules +From 93aae34ee70b8d50b31a19a65d6ac8290cb148ae 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 2/4] Correctly install python modules Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> @@ -9,22 +9,25 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Rebase to 1.9.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Rebase to 1.10.0 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- lang/python/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index d91ead9..67f7cdc 100644 +index 8d74cbd..ce4f0a5 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -106,6 +106,7 @@ install-exec-local: - cd python$${VERSION}-gpg ; \ - $$PYTHON setup.py install \ - --prefix $(DESTDIR)$(prefix) \ +@@ -91,6 +91,7 @@ install-exec-local: + --build-base="$$(basename "$${PYTHON}")-gpg" \ + install \ + --prefix "$(DESTDIR)$(prefix)" \ + --install-lib=$(DESTDIR)${pythondir} \ - --record files.txt \ --verbose ; \ - cat files.txt >> ../install_files.txt ; \ + done + -- -2.8.1 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch index 93071030f..d2b039dac 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch @@ -1,7 +1,7 @@ -From ccbf028eea8815d3b16d6c34b527253a6b108ec3 Mon Sep 17 00:00:00 2001 +From 32ecc3f058307060e40af86127cd226248a73c41 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/5] python import +Subject: [PATCH 3/4] python import Don't check for output on stderr to know if an import worked, host inputrc and sysroot readline can cause warnings on stderr. @@ -30,5 +30,5 @@ index b990d5b..318b089 100644 else AC_MSG_RESULT([no]) -- -2.8.1 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch index 7a6cc7b84..963ae874c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch @@ -1,7 +1,7 @@ -From 064ae4441e2c11329748a18157988f9e953f9752 Mon Sep 17 00:00:00 2001 +From 6dcedc4dd055af902719b1a1cb10daa935a27f58 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/5] gpgme-config: skip all /lib* or /usr/lib* directories in +Subject: [PATCH 4/4] gpgme-config: skip all /lib* or /usr/lib* directories in output The logic was not working in multilib setups which use other @@ -27,5 +27,5 @@ index a4d152e..8342865 100644 ;; -L*|-l*) -- -2.8.1 +1.8.3.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch new file mode 100644 index 000000000..8cc8983e2 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch @@ -0,0 +1,37 @@ +From 180a5669e4a13a550b1b0dcef1689b6c0470fe54 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] fix build path issue + +Get the "--root" directory supplied to the "install" command, +and use it as a prefix to strip off the purported filename +encoded in bytecode files. + +Since --root added, we need to tweak --prefix and --install-lib +to use relative path. + +Upstream-Status: Submitted [gnupg-devel@gnupg.org] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + lang/python/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am +index ce4f0a5..5a468f1 100644 +--- a/lang/python/Makefile.am ++++ b/lang/python/Makefile.am +@@ -90,8 +90,9 @@ install-exec-local: + build \ + --build-base="$$(basename "$${PYTHON}")-gpg" \ + install \ +- --prefix "$(DESTDIR)$(prefix)" \ +- --install-lib=$(DESTDIR)${pythondir} \ ++ --root=${DESTDIR} \ ++ --prefix "$(prefix)" \ ++ --install-lib=${pythondir} \ + --verbose ; \ + done + +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch new file mode 100644 index 000000000..ce3745cca --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch @@ -0,0 +1,78 @@ +From f47e8c6f9e461803468a64581d3640d873352eaa 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] 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 608c376..fad7467 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -536,6 +536,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 8d74cbd..43b5d1e 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 +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.9.0.bb b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.10.0.bb index 065c34663..f015f3ad7 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.9.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.10.0.bb @@ -16,10 +16,12 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ 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 \ " -SRC_URI[md5sum] = "1e00bb8ef04d1d05d5a0f19e143854c3" -SRC_URI[sha256sum] = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb" +SRC_URI[md5sum] = "78b1533c593478982ee2fc548260c563" +SRC_URI[sha256sum] = "1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693" DEPENDS = "libgpg-error libassuan" RDEPENDS_${PN}-cpp += "libstdc++" @@ -49,7 +51,14 @@ LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" -EXTRA_OECONF += '--enable-languages="${LANGUAGES}"' +EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ + --disable-gpgconf-test \ + --disable-gpg-test \ + --disable-gpgsm-test \ + --disable-g13-test \ + --disable-lang-qt-test \ + --disable-lang-python-test \ +' inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu.inc b/import-layers/yocto-poky/meta/recipes-support/icu/icu.inc index a1ef9ec8b..983118cd6 100644 --- a/import-layers/yocto-poky/meta/recipes-support/icu/icu.inc +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu.inc @@ -17,6 +17,8 @@ STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" BINCONFIG = "${bindir}/icu-config" +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + inherit autotools pkgconfig binconfig # ICU needs the native build directory as an argument to its --with-cross-build option when @@ -26,6 +28,8 @@ EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" EXTRA_OECONF_class-native = "" EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" # 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 @@ -34,6 +38,15 @@ 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 + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" do_install_append_class-native() { mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config @@ -44,6 +57,23 @@ do_install_append_class-native() { cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} } +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" FILES_${PN}-dev += "${libdir}/${BPN}/" diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch b/import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch index add0d765b..f0c49e197 100644 --- a/import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch @@ -1,31 +1,34 @@ -From c4254fd8ff1888ca285e3242b812010357ce2b3e Mon Sep 17 00:00:00 2001 +From d6b57c1b4eb9a24d9d95342a961c93946539c93b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 24 Jun 2017 22:52:40 -0700 -Subject: [PATCH] i18n: Drop include <xlocale.h> +Subject: [PATCH 3/4] i18n: Drop include <xlocale.h> glibc 2.26 drops this header -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> - i18n/digitlst.cpp | 6 +----- +--- + source/i18n/digitlst.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -Index: source/i18n/digitlst.cpp -=================================================================== ---- source.orig/i18n/digitlst.cpp -+++ source/i18n/digitlst.cpp -@@ -61,11 +61,7 @@ +diff --git a/source/i18n/digitlst.cpp b/source/i18n/digitlst.cpp +index 8e86fa7..0bdbb2c 100644 +--- a/i18n/digitlst.cpp ++++ b/i18n/digitlst.cpp +@@ -62,11 +62,7 @@ #endif #if U_USE_STRTOD_L --# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN --# include <locale.h> --# else +-# if U_HAVE_XLOCALE_H -# include <xlocale.h> +-# else +-# include <locale.h> -# endif +# include <locale.h> #endif // *************************************************************************** +-- +2.14.2 + diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/CVE-2017-14952.patch b/import-layers/yocto-poky/meta/recipes-support/icu/icu/CVE-2017-14952.patch deleted file mode 100644 index f759efc43..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/icu/icu/CVE-2017-14952.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fc83cd832725d3968011f118637b9f5d212e8717 Mon Sep 17 00:00:00 2001 -From: Ovidiu Panait <ovidiu.panait@windriver.com> -Date: Fri, 10 Nov 2017 16:51:25 +0200 -Subject: [PATCH] Removed redundant UVector entry clean up function call. - -Upstream-Status: Backport -CVE: CVE-2017-14952 - -Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> ---- - i18n/zonemeta.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/i18n/zonemeta.cpp b/i18n/zonemeta.cpp -index 84a9657..e163b00 100644 ---- a/i18n/zonemeta.cpp -+++ b/i18n/zonemeta.cpp -@@ -690,7 +690,6 @@ ZoneMeta::createMetazoneMappings(const UnicodeString &tzid) { - mzMappings = new UVector(deleteOlsonToMetaMappingEntry, NULL, status); - if (U_FAILURE(status)) { - delete mzMappings; -- deleteOlsonToMetaMappingEntry(entry); - uprv_free(entry); - break; - } --- -2.10.2 - diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/fix-install-manx.patch b/import-layers/yocto-poky/meta/recipes-support/icu/icu/fix-install-manx.patch index ec63f50c4..8186fb412 100644 --- a/import-layers/yocto-poky/meta/recipes-support/icu/icu/fix-install-manx.patch +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu/fix-install-manx.patch @@ -1,3 +1,8 @@ +From 3063a9211669bee673840ee81f81d30699b9b702 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 + 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 parallel. For example, install-manx can fail if the two install processes race @@ -9,12 +14,15 @@ in the install command. Upstream-Status: Pending Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + source/Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index 9db6c52..3441afa 100644 +diff --git a/source/Makefile.in b/source/Makefile.in +index c1db15b..4948deb 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -71,7 +71,7 @@ EXTRA_DATA = +@@ -73,7 +73,7 @@ EXTRA_DATA = ## List of phony targets .PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \ @@ -23,7 +31,7 @@ index 9db6c52..3441afa 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 \ -@@ -82,10 +82,10 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist +@@ -84,9 +84,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist ## List of standard targets all: all-local all-recursive @@ -31,13 +39,11 @@ index 9db6c52..3441afa 100644 +install: install-recursive clean: clean-recursive-with-twist clean-local -distclean : distclean-recursive distclean-local --dist: dist-recursive dist-local +distclean : distclean-recursive -+dist: dist-recursive + dist: dist-recursive check: all check-recursive check-recursive: all - xcheck: all xcheck-recursive -@@ -352,7 +352,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h +@@ -350,7 +350,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h install-manx: $(MANX_FILES) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) @@ -46,3 +52,6 @@ index 9db6c52..3441afa 100644 config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in cd $(top_builddir) \ +-- +2.14.2 + diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu_59.1.bb b/import-layers/yocto-poky/meta/recipes-support/icu/icu_60.2.bb index 9fb1be81c..585a92bc4 100644 --- a/import-layers/yocto-poky/meta/recipes-support/icu/icu_59.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu_60.2.bb @@ -1,6 +1,6 @@ require icu.inc -LIC_FILES_CHKSUM = "file://../LICENSE;md5=fe9e1f2c500466d8f18df2cd068e4b74" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=675f2d069434d8a1e4e6b0dcf4379226" def icu_download_version(d): pvsplit = d.getVar('PV').split('.') @@ -17,14 +17,13 @@ SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ file://0001-i18n-Drop-include-xlocale.h.patch \ - file://CVE-2017-14952.patch \ " SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "54923fa9fab5b2b83f235fb72523de37" -SRC_URI[sha256sum] = "7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe" +SRC_URI[md5sum] = "43861b127744b3c0b9d7f386f4b9fa40" +SRC_URI[sha256sum] = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" diff --git a/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.75.bb b/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.77.bb index 4f3d53c17..bd613ac57 100644 --- a/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.75.bb +++ b/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.77.bb @@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz" -SRC_URI[md5sum] = "9ba173b69d4360003414f23837597a92" -SRC_URI[sha256sum] = "7335e0301cd77cd4ee019bf5d3709aa79309d49dd66e85ba350caf67e00b00cd" +SRC_URI[md5sum] = "9d0d06cfb4634428b300845edcd7140a" +SRC_URI[sha256sum] = "21cd73a4c6f95d9474ebfcffd4e065223857720f24858e564f4409b19f7f0d90" # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which # are inhibited by allarch diff --git a/import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch b/import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch index b6ccdda6a..525b07620 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch @@ -6,32 +6,15 @@ Upstream-Status: Denied Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Constantin Musca <constantinx.musca@intel.com> -Index: libassuan-2.1.2/Makefile.am -=================================================================== ---- libassuan-2.1.2.orig/Makefile.am -+++ libassuan-2.1.2/Makefile.am -@@ -24,10 +24,13 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gz - # (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 \ - 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 - - SUBDIRS = m4 src doc tests - -Index: libassuan-2.1.2/libassuan.pc.in +forward ported to 2.4.4 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +Index: libassuan-2.4.4/libassuan.pc.in =================================================================== --- /dev/null -+++ libassuan-2.1.2/libassuan.pc.in -@@ -0,0 +1,14 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ ++++ libassuan-2.4.4/libassuan.pc.in +@@ -0,0 +1,13 @@ ++prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +api_version=@LIBASSUAN_CONFIG_API_VERSION@ @@ -44,24 +27,42 @@ Index: libassuan-2.1.2/libassuan.pc.in +Libs: -L${libdir} -lassuan +Libs.private: -lgpg-error +Cflags: -I${includedir} -Index: libassuan-2.1.2/configure.ac +Index: libassuan-2.4.4/Makefile.am =================================================================== ---- libassuan-2.1.2.orig/configure.ac -+++ libassuan-2.1.2/configure.ac -@@ -439,7 +439,7 @@ AC_CONFIG_FILES([doc/Makefile]) +--- 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 - echo " -Index: libassuan-2.1.2/src/libassuan.m4 +Index: libassuan-2.4.4/src/libassuan.m4 =================================================================== ---- libassuan-2.1.2.orig/src/libassuan.m4 -+++ libassuan-2.1.2/src/libassuan.m4 -@@ -15,18 +15,6 @@ dnl Returns ok set to yes or no. +--- a/src/libassuan.m4 ++++ b/src/libassuan.m4 +@@ -16,18 +16,6 @@ dnl Returns ok set to yes or no. dnl AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -80,7 +81,7 @@ Index: libassuan-2.1.2/src/libassuan.m4 tmp=ifelse([$1], ,1:0.9.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then -@@ -37,51 +25,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -38,51 +26,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], min_libassuan_version="$tmp" fi @@ -105,7 +106,7 @@ Index: libassuan-2.1.2/src/libassuan.m4 - - if test "$major" -gt "$req_major"; then - ok=yes -- else +- else - if test "$major" -eq "$req_major"; then - if test "$minor" -gt "$req_minor"; then - ok=yes @@ -134,7 +135,7 @@ Index: libassuan-2.1.2/src/libassuan.m4 if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([LIBASSUAN API version]) if test "$req_libassuan_api" -eq "$tmp" ; then -@@ -96,7 +45,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -97,7 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], if test $ok = yes; then if test x"$host" != x ; then @@ -143,7 +144,7 @@ Index: libassuan-2.1.2/src/libassuan.m4 if test x"$libassuan_config_host" != xnone ; then if test x"$libassuan_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -137,12 +86,8 @@ dnl +@@ -138,12 +87,8 @@ dnl AC_DEFUN([AM_PATH_LIBASSUAN], [ _AM_PATH_LIBASSUAN_COMMON($1) if test $ok = yes; then diff --git a/import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan_2.4.3.bb b/import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan_2.5.1.bb index 926c279f9..34d5f1642 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan_2.4.3.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan_2.5.1.bb @@ -7,17 +7,18 @@ LICENSE_${PN} = "LGPLv2.1+" LICENSE_${PN}-doc = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/assuan.c;endline=20;md5=0f465544183405055ec179869fc5b5ba \ - file://src/assuan-defs.h;endline=20;md5=20cd55535260ca1779edae5c7b80b21e" + file://src/assuan.c;endline=20;md5=ab92143a5a2adabd06d7994d1467ea5c\ + file://src/assuan-defs.h;endline=20;md5=15d950c83e82978e35b35e790d7e4d39" DEPENDS = "libgpg-error" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \ - file://libassuan-add-pkgconfig-support.patch" + file://libassuan-add-pkgconfig-support.patch \ + " -SRC_URI[md5sum] = "8e01a7c72d3e5d154481230668e6eb5a" -SRC_URI[sha256sum] = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71" +SRC_URI[md5sum] = "4354b7ae296894f232ada226a062d7d7" +SRC_URI[sha256sum] = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449" BINCONFIG = "${bindir}/libassuan-config" diff --git a/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch b/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch deleted file mode 100644 index c05107594..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 4b005ee56898309e8afba9b3c48cf94f0f5f78e4 Mon Sep 17 00:00:00 2001 -From: Marek Vasut <marex@denx.de> -Date: Tue, 15 Mar 2016 10:09:26 +0300 -Subject: [PATCH] Add initial nios2 architecture support - -* src/Makefile.am (nobase_private_HEADERS): Add nios2.h. -* src/atomic_ops.h: Include nios2.h if __nios2__. -* src/atomic_ops/sysdeps/gcc/nios2.h: New file. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Backport [ https://github.com/ivmai/libatomic_ops.git 4b005ee56898309e8afba9b3c48cf94f0f5f78e4 ] ---- - src/Makefile.am | 1 + - src/atomic_ops.h | 3 +++ - src/atomic_ops/sysdeps/gcc/nios2.h | 17 +++++++++++++++++ - 3 files changed, 21 insertions(+) - create mode 100644 src/atomic_ops/sysdeps/gcc/nios2.h - -diff --git a/src/Makefile.am b/src/Makefile.am -index fc09b27..d463427 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -79,6 +79,7 @@ nobase_private_HEADERS = atomic_ops/ao_version.h \ - atomic_ops/sysdeps/gcc/ia64.h \ - atomic_ops/sysdeps/gcc/m68k.h \ - atomic_ops/sysdeps/gcc/mips.h \ -+ atomic_ops/sysdeps/gcc/nios2.h \ - atomic_ops/sysdeps/gcc/powerpc.h \ - atomic_ops/sysdeps/gcc/s390.h \ - atomic_ops/sysdeps/gcc/sh.h \ -diff --git a/src/atomic_ops.h b/src/atomic_ops.h -index 33fe00e..ec02ba4 100644 ---- a/src/atomic_ops.h -+++ b/src/atomic_ops.h -@@ -262,6 +262,9 @@ - # if defined(__m68k__) - # include "atomic_ops/sysdeps/gcc/m68k.h" - # endif /* __m68k__ */ -+# if defined(__nios2__) -+# include "atomic_ops/sysdeps/gcc/nios2.h" -+# endif /* __nios2__ */ - # if defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) \ - || defined(__powerpc64__) || defined(__ppc64__) - # include "atomic_ops/sysdeps/gcc/powerpc.h" -diff --git a/src/atomic_ops/sysdeps/gcc/nios2.h b/src/atomic_ops/sysdeps/gcc/nios2.h -new file mode 100644 -index 0000000..f402cbb ---- /dev/null -+++ b/src/atomic_ops/sysdeps/gcc/nios2.h -@@ -0,0 +1,17 @@ -+/* -+ * Copyright (C) 2016 Marek Vasut <marex@denx.de> -+ * -+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED -+ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. -+ * -+ * Permission is hereby granted to use or copy this program -+ * for any purpose, provided the above notices are retained on all copies. -+ * Permission to modify the code and to distribute modified code is granted, -+ * provided the above notices are retained, and a notice that the code was -+ * modified is included with the above copyright notice. -+ */ -+ -+#include "../test_and_set_t_is_ao_t.h" -+#include "generic.h" -+ -+#define AO_T_IS_INT --- -2.7.0 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.0.bb b/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb index 4463d86c8..f7b416352 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \ " PV .= "+git${SRCPV}" +SRCBRANCH ?= "release-7_6" -SRCREV = "73c60c5ef1ed370111549ee5aab6d4020ba70ed4" -SRC_URI = "git://github.com/ivmai/libatomic_ops" +SRCREV = "5ae4b4aeea2baf13752d07e3038c47f70f06dcac" +SRC_URI = "git://github.com/ivmai/libatomic_ops;branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch index e97e30e84..54617b506 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch @@ -4,6 +4,7 @@ Date: Sun, 6 Nov 2016 09:39:31 -0800 Subject: [PATCH 1/3] Replace __BEGIN_DECLS and __END_DECLS Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- Upstream-Status: Pending @@ -13,14 +14,14 @@ Upstream-Status: Pending include/bsd/nlist.h | 10 ++++++++-- include/bsd/readpassphrase.h | 10 ++++++++-- include/bsd/stdio.h | 10 ++++++++-- - include/bsd/stdlib.h | 10 ++++++++-- - include/bsd/string.h | 10 ++++++++-- + include/bsd/stdlib.h | 12 +++++++++--- + include/bsd/string.h | 12 +++++++++--- include/bsd/stringlist.h | 10 ++++++++-- include/bsd/unistd.h | 10 ++++++++-- include/bsd/vis.h | 10 ++++++++-- include/bsd/wchar.h | 10 ++++++++-- src/hash/sha512.h | 10 ++++++++-- - 13 files changed, 104 insertions(+), 26 deletions(-) + 13 files changed, 106 insertions(+), 28 deletions(-) diff --git a/include/bsd/err.h b/include/bsd/err.h index 12fd051..43dfc32 100644 @@ -50,7 +51,7 @@ index 12fd051..43dfc32 100644 #endif diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h -index ebb6160..28b919d 100644 +index 45b3b15..9c936e5 100644 --- a/include/bsd/libutil.h +++ b/include/bsd/libutil.h @@ -53,7 +53,10 @@ struct pidfh { @@ -78,7 +79,7 @@ index ebb6160..28b919d 100644 /* humanize_number(3) */ #define HN_DECIMAL 0x01 diff --git a/include/bsd/md5.h b/include/bsd/md5.h -index 9a75fad..3531fd6 100644 +index 5f3ae46..5d80e5c 100644 --- a/include/bsd/md5.h +++ b/include/bsd/md5.h @@ -30,7 +30,10 @@ typedef struct MD5Context { @@ -103,14 +104,14 @@ index 9a75fad..3531fd6 100644 +#endif +/* __END_DECLS */ - #endif /* _MD5_H_ */ + #endif /* LIBBSD_MD5_H */ diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h -index 2730237..0389ab7 100644 +index cb297e8..e63bbbd 100644 --- a/include/bsd/nlist.h +++ b/include/bsd/nlist.h -@@ -30,8 +30,14 @@ - #include <sys/cdefs.h> - #include <a.out.h> +@@ -88,8 +88,14 @@ struct nlist { + + #define N_FORMAT "%08x" /* namelist value format; XXX */ -__BEGIN_DECLS +/* __BEGIN_DECLS */ @@ -126,7 +127,7 @@ index 2730237..0389ab7 100644 #endif diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h -index e1dacc3..76e0d33 100644 +index 14744b8..fa73361 100644 --- a/include/bsd/readpassphrase.h +++ b/include/bsd/readpassphrase.h @@ -34,8 +34,14 @@ @@ -145,13 +146,13 @@ index e1dacc3..76e0d33 100644 +#endif +/* __END_DECLS */ - #endif /* !_READPASSPHRASE_H_ */ + #endif /* !LIBBSD_READPASSPHRASE_H */ diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h -index 7697425..b5b3efd 100644 +index 4b69983..18645b7 100644 --- a/include/bsd/stdio.h +++ b/include/bsd/stdio.h -@@ -41,7 +41,10 @@ - #include <sys/cdefs.h> +@@ -45,7 +45,10 @@ + #endif #include <sys/types.h> -__BEGIN_DECLS @@ -162,7 +163,7 @@ index 7697425..b5b3efd 100644 const char *fmtcheck(const char *, const char *); /* XXX: The function requires cooperation from the system libc to store the -@@ -69,7 +72,10 @@ FILE *funopen(const void *cookie, +@@ -73,7 +76,10 @@ FILE *funopen(const void *cookie, #define fwopen(cookie, fn) funopen(cookie, NULL, fn, NULL, NULL) int fpurge(FILE *fp); @@ -175,7 +176,7 @@ index 7697425..b5b3efd 100644 #endif #endif diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h -index 0604cad..b9f0515 100644 +index ebc9638..c4b54b6 100644 --- a/include/bsd/stdlib.h +++ b/include/bsd/stdlib.h @@ -46,7 +46,10 @@ @@ -189,8 +190,17 @@ index 0604cad..b9f0515 100644 +#endif uint32_t arc4random(void); void arc4random_stir(void); - void arc4random_addrandom(u_char *dat, int datlen); -@@ -73,6 +76,9 @@ long long strtonum(const char *nptr, long long minval, long long maxval, + void arc4random_addrandom(unsigned char *dat, int datlen); +@@ -67,7 +70,7 @@ int sradixsort(const unsigned char **base, int nmemb, + const unsigned char *table, unsigned endbyte); + + void *reallocf(void *ptr, size_t size); +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) ++#if defined(_GNU_SOURCE) && defined(__GLIBC__) + void *reallocarray(void *ptr, size_t nmemb, size_t size); + #endif + +@@ -75,6 +78,9 @@ long long strtonum(const char *nptr, long long minval, long long maxval, const char **errstr); char *getbsize(int *headerlenp, long *blocksizep); @@ -202,10 +212,10 @@ index 0604cad..b9f0515 100644 #endif diff --git a/include/bsd/string.h b/include/bsd/string.h -index ee2f953..fbf8c54 100644 +index 6798bf6..fa1193f 100644 --- a/include/bsd/string.h +++ b/include/bsd/string.h -@@ -36,13 +36,19 @@ +@@ -36,15 +36,21 @@ #include <sys/cdefs.h> #include <sys/types.h> @@ -219,7 +229,10 @@ index ee2f953..fbf8c54 100644 char *strnstr(const char *str, const char *find, size_t str_len); void strmode(mode_t mode, char *str); +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) ++#if defined(_GNU_SOURCE) && defined(__GLIBC__) void explicit_bzero(void *buf, size_t len); + #endif -__END_DECLS +#ifdef __cplusplus +} @@ -228,7 +241,7 @@ index ee2f953..fbf8c54 100644 #endif diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h -index e3c42e9..40d0a52 100644 +index ff30cac..4600f6b 100644 --- a/include/bsd/stringlist.h +++ b/include/bsd/stringlist.h @@ -43,12 +43,18 @@ typedef struct _stringlist { @@ -251,7 +264,7 @@ index e3c42e9..40d0a52 100644 +#endif +/* __END_DECLS */ - #endif /* _STRINGLIST_H */ + #endif /* LIBBSD_STRINGLIST_H */ diff --git a/include/bsd/unistd.h b/include/bsd/unistd.h index 1f9c5f8..5b2f4c7 100644 --- a/include/bsd/unistd.h @@ -280,7 +293,7 @@ index 1f9c5f8..5b2f4c7 100644 #endif diff --git a/include/bsd/vis.h b/include/bsd/vis.h -index 835d2d6..63c951e 100644 +index 970dfdd..621d3c6 100644 --- a/include/bsd/vis.h +++ b/include/bsd/vis.h @@ -74,7 +74,10 @@ @@ -305,7 +318,7 @@ index 835d2d6..63c951e 100644 +#endif +/* __END_DECLS */ - #endif /* !_VIS_H_ */ + #endif /* !LIBBSD_VIS_H */ diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h index 33a500e..aa70742 100644 --- a/include/bsd/wchar.h @@ -359,5 +372,5 @@ index 4f368a1..27ddc24 100644 #endif /* !_SHA512_H_ */ -- -2.10.2 +1.9.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.6.bb b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.7.bb index 182543fd4..552a85c4d 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.6.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.7.bb @@ -42,8 +42,8 @@ SRC_URI_append_libc-musl = " \ file://0002-Remove-funopen.patch \ " -SRC_URI[md5sum] = "4ab7bec639af17d0aacb50222b479110" -SRC_URI[sha256sum] = "467fbf9df1f49af11f7f686691057c8c0a7613ae5a870577bef9155de39f9687" +SRC_URI[md5sum] = "d9e6980fbfe44f94fd92b89a33cce67d" +SRC_URI[sha256sum] = "f548f10e5af5a08b1e22889ce84315b1ebe41505b015c9596bad03fd13a12b31" inherit autotools pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-support/libcheck/libcheck_0.10.0.bb b/import-layers/yocto-poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb index 9d34198a9..e646d4396 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libcheck/libcheck_0.10.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb @@ -5,11 +5,10 @@ SECTION = "devel" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" -SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz \ - " - -SRC_URI[md5sum] = "53c5e5c77d090e103a17f3ed7fd7d8b8" -SRC_URI[sha256sum] = "f5f50766aa6f8fe5a2df752666ca01a950add45079aa06416b83765b1cf71052" +SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz" +SRC_URI[md5sum] = "31b17c6075820a434119592941186f70" +SRC_URI[sha256sum] = "464201098bee00e90f5c4bdfa94a5d3ead8d641f9025b560a27755a83b824234" +UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" S = "${WORKDIR}/check-${PV}" diff --git a/import-layers/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb b/import-layers/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb index b0af75919..d86ddd646 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ SECTION = "x11/utils" DEPENDS = "glib-2.0 libxml2 zlib" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" EXTRA_OECONF += "--enable-Bsymbolic=auto" BINCONFIG = "${bindir}/croco-0.6-config" -inherit autotools pkgconfig gnomebase gtk-doc binconfig-disabled +inherit gnomebase gtk-doc binconfig-disabled SRC_URI[archive.md5sum] = "bc0984fce078ba2ce29f9500c6b9ddce" SRC_URI[archive.sha256sum] = "ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860" diff --git a/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.7.bb b/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.8.bb index f740da206..c1380144b 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.7.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.8.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" -SRC_URI[md5sum] = "4f1cfaee8d75ea3fbbfeb99a98730952" -SRC_URI[sha256sum] = "a1e59e37a2f0d397ffd7e83b73af0e638db83b8dd08902ef0f651a21cc1dd422" +SRC_URI[md5sum] = "c25a8c3939e4ad59a5e9e5e1e354832d" +SRC_URI[sha256sum] = "6083d81e46609da8ba80cb826c02d9080764a6dec33c8267ccb7e158833d4c6d" inherit autotools pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch b/import-layers/yocto-poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch new file mode 100644 index 000000000..36d08204f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch @@ -0,0 +1,48 @@ +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/import-layers/yocto-poky/meta/recipes-support/libevent/libevent_2.1.8.bb b/import-layers/yocto-poky/meta/recipes-support/libevent/libevent_2.1.8.bb index 1270d627f..83ce4644c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libevent/libevent_2.1.8.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libevent/libevent_2.1.8.bb @@ -9,6 +9,7 @@ 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 \ " diff --git a/import-layers/yocto-poky/meta/recipes-support/libffi/libffi/not-win32.patch b/import-layers/yocto-poky/meta/recipes-support/libffi/libffi/not-win32.patch index 1e90125ed..80c40a474 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libffi/libffi/not-win32.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libffi/libffi/not-win32.patch @@ -11,12 +11,16 @@ As this block is generally pointless, disable it. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@intel.com> ---- a/configure.ac~ 2014-11-12 11:56:51.000000000 +0000 -+++ b/configure.ac 2016-02-04 14:02:53.765710532 +0000 -@@ -593,5 +593,5 @@ +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, + # 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
\ No newline at end of file + test x"$with_cross_host" != x"no"; then + toolexecdir="${exec_prefix}"/'$(target_alias)' diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb index 0134572f1..c0fd83ef3 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb @@ -5,7 +5,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007" SECTION = "x11/libs" -DEPENDS = "glib-2.0 intltool-native gettext-native" +DEPENDS = "glib-2.0-native glib-2.0 intltool-native" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ @@ -18,6 +18,6 @@ S = "${WORKDIR}/libfm-${PV}" EXTRA_OECONF = "--with-extra-only --with-gtk=no" -inherit autotools pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc gettext do_configure[dirs] =+ "${S}/m4" diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch new file mode 100644 index 000000000..40e53291e --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch @@ -0,0 +1,76 @@ +From ed4ca8c0b17ff5d3c768b92409c1787e3f3f1841 Mon Sep 17 00:00:00 2001 +From: Andriy Grytsenko <andrej@rep.kiev.ua> +Date: Sun, 26 Nov 2017 22:30:15 +0200 +Subject: [PATCH 2/2] Enclose text in <programlisting> into <![CDATA[ + +New gtk-doc fails on tag-like data in it. +See https://bugs.freedesktop.org/show_bug.cgi?id=101585 +That is definitely bug of gtk-doc but let workaround it. + +Upstream-Status: Backport [https://git.lxde.org/gitweb/?p=lxde/libfm.git;a=commit;h=b072ee0400432d72fdf86ba9fed74a7e0ec11ec1] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/base/fm-module.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/base/fm-module.c b/src/base/fm-module.c +index d364b2d..2e8c978 100644 +--- a/src/base/fm-module.c ++++ b/src/base/fm-module.c +@@ -44,7 +44,7 @@ + * of that type should include: + * <example id="example-fm-dummy-h"> + * <title>Sample of fm-dummy.h</title> +- * <programlisting> ++ * <programlisting><![CDATA[ + * #include <libfm/fm.h> + * + * #define FM_MODULE_dummy_VERSION 1 +@@ -54,7 +54,7 @@ + * } FmDummyInit; + * + * extern FmDummyInit fm_module_init_dummy; +- * </programlisting> ++ * ]]></programlisting> + * </example> + * The FM_MODULE_dummy_VERSION is a number which should be increased each + * time something in FmDummyInit structure is changed. The FmDummyInit +@@ -65,7 +65,7 @@ + * module handling in your code: + * <example id="example-fm-dummy-widget-c"> + * <title>Sample of fm-dummy-widget.c</title> +- * <programlisting> ++ * <programlisting><![CDATA[ + * #include "fm-dummy.h" + * + * FM_MODULE_DEFINE_TYPE(dummy, FmDummyInit, 1) +@@ -87,7 +87,7 @@ + * result = module->get_new("test sample"); + * return result; + * } +- * </programlisting> ++ * ]]></programlisting> + * </example> + * + * Third thing application should do is to register module type on the +@@ -108,7 +108,7 @@ + * interface (see the fm-dummy.h header example above): + * <example id="example-fm-dummy-test-c"> + * <title>Sample of module dummy/test</title> +- * <programlisting> ++ * <programlisting><![CDATA[ + * #include "fm-dummy.h" + * + * FM_DEFINE_MODULE(dummy, test) +@@ -121,7 +121,7 @@ + * FmDummyInit fm_module_init_dummy = { + * fm_dummy_test_get_new; + * }; +- * </programlisting> ++ * ]]></programlisting> + * </example> + * The fm_module_init_dummy should be exactly the same structure that is + * defined in the header file above. +-- +2.15.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb index 1ddddfdc9..596408353 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb @@ -9,22 +9,36 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b \ SECTION = "x11/libs" -DEPENDS = "glib-2.0 pango gtk+3 menu-cache intltool-native libexif libfm-extra gettext-native" +DEPENDS = "glib-2.0 glib-2.0-native pango gtk+3 menu-cache intltool-native libexif libfm-extra" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ - file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch" + file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch \ + file://0001-Enclose-text-in-programlisting-into-CDATA.patch \ + " SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" -inherit autotools pkgconfig gtk-doc distro_features_check +inherit autotools pkgconfig gtk-doc gettext distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OECONF = "--with-gtk=3" do_configure[dirs] =+ "${S}/m4" +PACKAGES =+ "libfm-gtk" PACKAGES += "${PN}-mime" +FILES_libfm-gtk = " \ + ${libdir}/libfm-gtk*so.* \ + ${libdir}/libfm/modules/gtk* \ + ${bindir}/libfm-pref-apps \ + ${bindir}/lxshortcut \ + ${datadir}/applications/libfm-pref-apps.desktop \ + ${datadir}/applications/lxshortcut.desktop \ + ${datadir}/libfm/images/folder.png \ + ${datadir}/libfm/images/unknown.png \ + ${datadir}/libfm/ui/*.ui \ +" FILES_${PN}-mime = "${datadir}/mime/" do_install_append () { diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0005-ecc-Add-input-validation-for-X25519.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0005-ecc-Add-input-validation-for-X25519.patch deleted file mode 100644 index 66fdd740b..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0005-ecc-Add-input-validation-for-X25519.patch +++ /dev/null @@ -1,158 +0,0 @@ -From ef570e3d2773c12126e7d3fcdc4db9ef80a5e214 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Fri, 25 Aug 2017 18:13:28 +0900 -Subject: [PATCH] ecc: Add input validation for X25519. - -* cipher/ecc.c (ecc_decrypt_raw): Add input validation. -* mpi/ec.c (ec_p_init): Use scratch buffer for bad points. -(_gcry_mpi_ec_bad_point): New. - --- - -Following is the paper describing the attack: - - May the Fourth Be With You: A Microarchitectural Side Channel Attack - on Real-World Applications of Curve25519 - by Daniel Genkin, Luke Valenta, and Yuval Yarom - -In the current implementation, we do output checking and it results an -error for those bad points. However, when attacked, the computation -will done with leak of private key, even it will results errors. To -mitigate leak, we added input validation. - -Note that we only list bad points with MSB=0. By X25519, MSB is -always cleared. - -In future, we should implement constant-time field computation. Then, -this input validation could be removed, if performance is important -and we are sure for no leak. - -CVE-id: CVE-2017-0379 -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> - -Upstream-Status: Backport -CVE: CVE-2017-0379 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - cipher/ecc.c | 17 +++++++++++++++-- - mpi/ec.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- - src/mpi.h | 1 + - 3 files changed, 64 insertions(+), 5 deletions(-) - -diff --git a/cipher/ecc.c b/cipher/ecc.c -index e25bf09..4e3e5b1 100644 ---- a/cipher/ecc.c -+++ b/cipher/ecc.c -@@ -1628,9 +1628,22 @@ ecc_decrypt_raw (gcry_sexp_t *r_plain, gcry_sexp_t s_data, gcry_sexp_t keyparms) - if (DBG_CIPHER) - log_printpnt ("ecc_decrypt kG", &kG, NULL); - -- if (!(flags & PUBKEY_FLAG_DJB_TWEAK) -+ if ((flags & PUBKEY_FLAG_DJB_TWEAK)) -+ { - /* For X25519, by its definition, validation should not be done. */ -- && !_gcry_mpi_ec_curve_point (&kG, ec)) -+ /* (Instead, we do output check.) -+ * -+ * However, to mitigate secret key leak from our implementation, -+ * we also do input validation here. For constant-time -+ * implementation, we can remove this input validation. -+ */ -+ if (_gcry_mpi_ec_bad_point (&kG, ec)) -+ { -+ rc = GPG_ERR_INV_DATA; -+ goto leave; -+ } -+ } -+ else if (!_gcry_mpi_ec_curve_point (&kG, ec)) - { - rc = GPG_ERR_INV_DATA; - goto leave; -diff --git a/mpi/ec.c b/mpi/ec.c -index a0f7357..4c16603 100644 ---- a/mpi/ec.c -+++ b/mpi/ec.c -@@ -396,6 +396,29 @@ ec_get_two_inv_p (mpi_ec_t ec) - } - - -+static const char *curve25519_bad_points[] = { -+ "0x0000000000000000000000000000000000000000000000000000000000000000", -+ "0x0000000000000000000000000000000000000000000000000000000000000001", -+ "0x00b8495f16056286fdb1329ceb8d09da6ac49ff1fae35616aeb8413b7c7aebe0", -+ "0x57119fd0dd4e22d8868e1c58c45c44045bef839c55b1d0b1248c50a3bc959c5f", -+ "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffec", -+ "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffed", -+ "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffee", -+ NULL -+}; -+ -+static gcry_mpi_t -+scanval (const char *string) -+{ -+ gpg_err_code_t rc; -+ gcry_mpi_t val; -+ -+ rc = _gcry_mpi_scan (&val, GCRYMPI_FMT_HEX, string, 0, NULL); -+ if (rc) -+ log_fatal ("scanning ECC parameter failed: %s\n", gpg_strerror (rc)); -+ return val; -+} -+ - - /* This function initialized a context for elliptic curve based on the - field GF(p). P is the prime specifying this field, A is the first -@@ -434,9 +457,17 @@ ec_p_init (mpi_ec_t ctx, enum gcry_mpi_ec_models model, - - _gcry_mpi_ec_get_reset (ctx); - -- /* Allocate scratch variables. */ -- for (i=0; i< DIM(ctx->t.scratch); i++) -- ctx->t.scratch[i] = mpi_alloc_like (ctx->p); -+ if (model == MPI_EC_MONTGOMERY) -+ { -+ for (i=0; i< DIM(ctx->t.scratch) && curve25519_bad_points[i]; i++) -+ ctx->t.scratch[i] = scanval (curve25519_bad_points[i]); -+ } -+ else -+ { -+ /* Allocate scratch variables. */ -+ for (i=0; i< DIM(ctx->t.scratch); i++) -+ ctx->t.scratch[i] = mpi_alloc_like (ctx->p); -+ } - - /* Prepare for fast reduction. */ - /* FIXME: need a test for NIST values. However it does not gain us -@@ -1572,3 +1603,17 @@ _gcry_mpi_ec_curve_point (gcry_mpi_point_t point, mpi_ec_t ctx) - - return res; - } -+ -+ -+int -+_gcry_mpi_ec_bad_point (gcry_mpi_point_t point, mpi_ec_t ctx) -+{ -+ int i; -+ gcry_mpi_t x_bad; -+ -+ for (i = 0; (x_bad = ctx->t.scratch[i]); i++) -+ if (!mpi_cmp (point->x, x_bad)) -+ return 1; -+ -+ return 0; -+} -diff --git a/src/mpi.h b/src/mpi.h -index b5385b5..aeba7f8 100644 ---- a/src/mpi.h -+++ b/src/mpi.h -@@ -296,6 +296,7 @@ void _gcry_mpi_ec_mul_point (mpi_point_t result, - gcry_mpi_t scalar, mpi_point_t point, - mpi_ec_t ctx); - int _gcry_mpi_ec_curve_point (gcry_mpi_point_t point, mpi_ec_t ctx); -+int _gcry_mpi_ec_bad_point (gcry_mpi_point_t point, mpi_ec_t ctx); - - gcry_mpi_t _gcry_mpi_ec_ec2os (gcry_mpi_point_t point, mpi_ec_t ectx); - --- -1.8.3.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch deleted file mode 100644 index 65b9fd41e..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 4a7aa30ae9f3ce798dd886c2f2d4164c43027748 Mon Sep 17 00:00:00 2001 -From: Jussi Kivilinna <jussi.kivilinna@iki.fi> -Date: Sat, 29 Jul 2017 14:34:23 +0300 -Subject: [PATCH] Fix building AArch32 CE implementations when target is ARMv6 - arch - -* cipher/cipher-gcm-armv8-aarch32-ce.S: Select ARMv8 architecure. -* cipher/rijndael-armv8-aarch32-ce.S: Ditto. -* cipher/sha1-armv8-aarch32-ce.S: Ditto. -* cipher/sha256-armv8-aarch32-ce.S: Ditto. -* configure.ac (gcry_cv_gcc_inline_asm_aarch32_crypto): Ditto. --- - -Raspbian distribution defaults to ARMv6 architecture thus 'rbit' -instruction is not available with default compiler flags. Patch -adds explicit architecture selection for ARMv8 to enable 'rbit' -usage with ARMv8/AArch32-CE assembly implementations of SHA, -GHASH and AES. - -Reported-by: Chris Horry <zerbey@gmail.com> -Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> - -Signed-off-by: Paul Barker <pbarker@toganlabs.com> -Upstream-Status: Backport - ---- - cipher/cipher-gcm-armv8-aarch32-ce.S | 1 + - cipher/rijndael-armv8-aarch32-ce.S | 1 + - cipher/sha1-armv8-aarch32-ce.S | 1 + - cipher/sha256-armv8-aarch32-ce.S | 1 + - configure.ac | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/cipher/cipher-gcm-armv8-aarch32-ce.S b/cipher/cipher-gcm-armv8-aarch32-ce.S -index b61a7871..1de66a16 100644 ---- a/cipher/cipher-gcm-armv8-aarch32-ce.S -+++ b/cipher/cipher-gcm-armv8-aarch32-ce.S -@@ -24,6 +24,7 @@ - defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO) - - .syntax unified -+.arch armv8-a - .fpu crypto-neon-fp-armv8 - .arm - -diff --git a/cipher/rijndael-armv8-aarch32-ce.S b/cipher/rijndael-armv8-aarch32-ce.S -index f375f673..5c8fa3c0 100644 ---- a/cipher/rijndael-armv8-aarch32-ce.S -+++ b/cipher/rijndael-armv8-aarch32-ce.S -@@ -24,6 +24,7 @@ - defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO) - - .syntax unified -+.arch armv8-a - .fpu crypto-neon-fp-armv8 - .arm - -diff --git a/cipher/sha1-armv8-aarch32-ce.S b/cipher/sha1-armv8-aarch32-ce.S -index b0bc5ffe..bf2b233b 100644 ---- a/cipher/sha1-armv8-aarch32-ce.S -+++ b/cipher/sha1-armv8-aarch32-ce.S -@@ -24,6 +24,7 @@ - defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO) && defined(USE_SHA1) - - .syntax unified -+.arch armv8-a - .fpu crypto-neon-fp-armv8 - .arm - -diff --git a/cipher/sha256-armv8-aarch32-ce.S b/cipher/sha256-armv8-aarch32-ce.S -index 2041a237..2b17ab1b 100644 ---- a/cipher/sha256-armv8-aarch32-ce.S -+++ b/cipher/sha256-armv8-aarch32-ce.S -@@ -24,6 +24,7 @@ - defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO) && defined(USE_SHA256) - - .syntax unified -+.arch armv8-a - .fpu crypto-neon-fp-armv8 - .arm - -diff --git a/configure.ac b/configure.ac -index 27faa7f4..66e7cd67 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1619,6 +1619,7 @@ AC_CACHE_CHECK([whether GCC inline assembler supports AArch32 Crypto Extension i - AC_COMPILE_IFELSE([AC_LANG_SOURCE( - [[__asm__( - ".syntax unified\n\t" -+ ".arch armv8-a\n\t" - ".arm\n\t" - ".fpu crypto-neon-fp-armv8\n\t" - --- -2.11.0 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.2.bb index 02982f03c..b36e653a8 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.2.bb @@ -15,16 +15,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ DEPENDS = "libgpg-error" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" -SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \ +SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.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://0005-ecc-Add-input-validation-for-X25519.patch \ - file://0006-Fix-building-AArch32-CE-implementations-when-target-.patch \ " -SRC_URI[md5sum] = "110ce4352f9ea6f560bdc6c5644ae93c" -SRC_URI[sha256sum] = "f6e470b7f2d3a703e8747f05a8c19d9e10e26ebf2d5f3d71ff75a40f504e12ee" +SRC_URI[md5sum] = "cfb0b5c79eab07686b6898160a407139" +SRC_URI[sha256sum] = "c8064cae7558144b13ef0eb87093412380efa16c4ee30ad12ecb54886a524c07" BINCONFIG = "${bindir}/libgcrypt-config" diff --git a/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb b/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb index b2e2d507c..b74f079f5 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb @@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a2 BINCONFIG = "${bindir}/gpg-error-config" -inherit autotools binconfig-disabled pkgconfig gettext +inherit autotools binconfig-disabled pkgconfig gettext multilib_header CPPFLAGS += "-P" do_compile_prepend() { TARGET_FILE=linux-gnu @@ -53,6 +53,7 @@ do_compile_prepend() { do_install_append() { # we don't have common lisp in OE rm -rf "${D}${datadir}/common-lisp/" + oe_multilib_header gpg-error.h gpgrt.h } FILES_${PN}-dev += "${bindir}/gpg-error" diff --git a/import-layers/yocto-poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch b/import-layers/yocto-poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch index c5c0cb076..b50f50e70 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch @@ -14,11 +14,11 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d5aad80..5cc9863 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -91,8 +91,7 @@ if(SHARED_ONLY) +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() @@ -26,8 +26,5 @@ index d5aad80..5cc9863 100644 -find_package(Perl REQUIRED) +set(PERL_EXECUTABLE perl) - # MSVC specific definitions - if(WIN32) --- -2.1.4 - + # Ensure finding 64bit libs when using 64-bit compilers + if(CMAKE_CL_64) diff --git a/import-layers/yocto-poky/meta/recipes-support/libical/libical_2.0.0.bb b/import-layers/yocto-poky/meta/recipes-support/libical/libical_2.0.0.bb index d4fe868eb..dcc21cc16 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libical/libical_2.0.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libical/libical_2.0.0.bb @@ -17,5 +17,3 @@ SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf2 UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" inherit cmake pkgconfig - -FILES_${PN}-dev += "${libdir}/cmake/*" diff --git a/import-layers/yocto-poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/import-layers/yocto-poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch index d28dfd9eb..5afe6de92 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch @@ -6,13 +6,13 @@ They think pkgconfig adds no portability and maintaining them is not worthwhile. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> -Index: libksba-1.3.0/Makefile.am +Index: libksba-1.3.5/Makefile.am =================================================================== ---- libksba-1.3.0.orig/Makefile.am 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/Makefile.am 2014-05-13 21:39:22.462385646 +0000 -@@ -21,6 +21,9 @@ +--- libksba-1.3.5.orig/Makefile.am ++++ libksba-1.3.5/Makefile.am +@@ -20,6 +20,9 @@ + ACLOCAL_AMFLAGS = -I m4 -I gl/m4 - AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip +pkgconfigdir = ${libdir}/pkgconfig +pkgconfig_DATA = ksba.pc @@ -20,11 +20,11 @@ Index: libksba-1.3.0/Makefile.am # (A suitable gitlog-to-changelog script can be found in GnuPG master.) GITLOG_TO_CHANGELOG=gitlog-to-changelog -Index: libksba-1.3.0/configure.ac +Index: libksba-1.3.5/configure.ac =================================================================== ---- libksba-1.3.0.orig/configure.ac 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/configure.ac 2014-05-13 21:39:22.462385646 +0000 -@@ -400,6 +400,7 @@ +--- libksba-1.3.5.orig/configure.ac ++++ libksba-1.3.5/configure.ac +@@ -414,6 +414,7 @@ gl/Makefile src/Makefile src/ksba-config src/versioninfo.rc @@ -32,10 +32,10 @@ Index: libksba-1.3.0/configure.ac tests/Makefile doc/Makefile ]) -Index: libksba-1.3.0/ksba.pc.in +Index: libksba-1.3.5/ksba.pc.in =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libksba-1.3.0/ksba.pc.in 2014-05-13 21:39:22.462385646 +0000 +--- /dev/null ++++ libksba-1.3.5/ksba.pc.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -54,11 +54,11 @@ Index: libksba-1.3.0/ksba.pc.in +Libs.private: -L${libdir} -lgpg-error +Cflags: -I${includedir} + -Index: libksba-1.3.0/src/ksba.m4 +Index: libksba-1.3.5/src/ksba.m4 =================================================================== ---- libksba-1.3.0.orig/src/ksba.m4 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/src/ksba.m4 2014-05-13 21:49:03.650382696 +0000 -@@ -22,18 +22,7 @@ +--- libksba-1.3.5.orig/src/ksba.m4 ++++ libksba-1.3.5/src/ksba.m4 +@@ -22,18 +22,7 @@ dnl with a changed API. dnl AC_DEFUN([AM_PATH_KSBA], [AC_REQUIRE([AC_CANONICAL_HOST]) @@ -77,7 +77,7 @@ Index: libksba-1.3.0/src/ksba.m4 tmp=ifelse([$1], ,1:1.0.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -43,48 +32,13 @@ +@@ -43,48 +32,13 @@ AC_DEFUN([AM_PATH_KSBA], min_ksba_version="$tmp" fi @@ -129,7 +129,7 @@ Index: libksba-1.3.0/src/ksba.m4 if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([KSBA API version]) if test "$req_ksba_api" -eq "$tmp" ; then -@@ -97,10 +51,8 @@ +@@ -97,10 +51,8 @@ AC_DEFUN([AM_PATH_KSBA], fi fi if test $ok = yes; then @@ -141,7 +141,7 @@ Index: libksba-1.3.0/src/ksba.m4 if test x"$libksba_config_host" != xnone ; then if test x"$libksba_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -114,8 +66,6 @@ +@@ -114,8 +66,6 @@ AC_DEFUN([AM_PATH_KSBA], fi fi else diff --git a/import-layers/yocto-poky/meta/recipes-support/libksba/libksba_1.3.5.bb b/import-layers/yocto-poky/meta/recipes-support/libksba/libksba_1.3.5.bb index 36b667056..a7ea53fed 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libksba/libksba_1.3.5.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libksba/libksba_1.3.5.bb @@ -24,3 +24,5 @@ do_configure_prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/gpg-error.m4 } + +BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-support/libmpc/libmpc_1.0.3.bb b/import-layers/yocto-poky/meta/recipes-support/libmpc/libmpc_1.1.0.bb index 58813244e..2d25d388f 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libmpc/libmpc_1.0.3.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libmpc/libmpc_1.1.0.bb @@ -5,10 +5,10 @@ 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[md5sum] = "d6a1d5f8ddea3abd2cc3e98f58352d26" -SRC_URI[sha256sum] = "617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3" +SRC_URI[md5sum] = "4125404e41e482ec68282a2e687f6c73" +SRC_URI[sha256sum] = "6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e" -UPSTREAM_CHECK_URI = "http://www.multiprecision.org/index.php?prog=mpc&page=download" +UPSTREAM_CHECK_URI = "http://www.multiprecision.org/mpc/download.html" S = "${WORKDIR}/mpc-${PV}" BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch new file mode 100644 index 000000000..b20a29962 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch @@ -0,0 +1,38 @@ +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/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch deleted file mode 100644 index 79aa0bdf1..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -libnl has progressed to 0.3.2 and there does not appear to be any -"make -j" issues with this build after my limited testing on that -newer version so we can assume this issue is fixed upstream - -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> - -Index: libnl-3.2.25/lib/Makefile.am -=================================================================== ---- libnl-3.2.25.orig/lib/Makefile.am -+++ libnl-3.2.25/lib/Makefile.am -@@ -46,9 +46,12 @@ CLEANFILES = \ - - # Hack to avoid using ylwrap. It does not function correctly in combination - # with --header-file= -+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h -+route/pktloc_grammar.h: route/pktloc_grammar.c - route/pktloc_grammar.c: route/pktloc_grammar.l - $(AM_V_GEN) $(MKDIR_P) route; $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ - -+route/pktloc_syntax.h: route/pktloc_syntax.c - route/pktloc_syntax.c: route/pktloc_syntax.y - $(AM_V_GEN) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^ - -@@ -102,7 +105,9 @@ BUILT_SOURCES = \ - route/cls/ematch_grammar.c \ - route/cls/ematch_syntax.c \ - route/pktloc_grammar.c \ -- route/pktloc_syntax.c -+ route/pktloc_syntax.c \ -+ route/pktloc_syntax.h \ -+ route/pktloc_grammar.h - - EXTRA_DIST = \ - route/pktloc_grammar.l \ diff --git a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl_3.2.29.bb b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl_3.4.0.bb index 7d4839ba5..90dc644be 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl_3.2.29.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl_3.4.0.bb @@ -10,13 +10,14 @@ 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-pktloc_syntax_h-race.patch \ file://fix-pc-file.patch \ + file://0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch \ " + UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" -SRC_URI[md5sum] = "a8ba62a5c4f883f4e493a46d1f3733fe" -SRC_URI[sha256sum] = "0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922" +SRC_URI[md5sum] = "8f71910c03db363b41e2ea62057a4311" +SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf" inherit autotools pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-7186.patch b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-7186.patch deleted file mode 100644 index bfa3bfeec..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-7186.patch +++ /dev/null @@ -1,96 +0,0 @@ -libpcre2-10.23: Fix CVE-2017-7186 - -A fuzz on libpcre1 through the pcretest utility revealed an invalid read in the -library. For who is interested in a detailed description of the bug, will -follow a feedback from upstream: - -This was a genuine bug in the 32-bit library. Thanks for finding it. The crash -was caused by trying to find a Unicode property for a code value greater than -0x10ffff, the Unicode maximum, when running in non-UTF mode (where character -values can be up to 0xffffffff). - -The complete ASan output: - -# pcretest -32 -d $FILE -==14788==ERROR: AddressSanitizer: SEGV on unknown address 0x7f1bbffed4df (pc 0x7f1bbee3fe6b bp 0x7fff8b50d8c0 sp 0x7fff8b50d3a0 T0) -==14788==The signal is caused by a READ memory access. - #0 0x7f1bbee3fe6a in match /tmp/portage/dev-libs/libpcre-8.40/work/pcre-8.40/pcre_exec.c:5473:18 - #1 0x7f1bbee09226 in pcre32_exec /tmp/portage/dev-libs/libpcre-8.40/work/pcre-8.40/pcre_exec.c:6936:8 - #2 0x527d6c in main /tmp/portage/dev-libs/libpcre-8.40/work/pcre-8.40/pcretest.c:5218:9 - #3 0x7f1bbddd678f in __libc_start_main /tmp/portage/sys-libs/glibc-2.23-r3/work/glibc-2.23/csu/../csu/libc-start.c:289 - #4 0x41b438 in _init (/usr/bin/pcretest+0x41b438) - -AddressSanitizer can not provide additional info. -SUMMARY: AddressSanitizer: SEGV /tmp/portage/dev-libs/libpcre-8.40/work/pcre-8.40/pcre_exec.c:5473:18 in match -==14788==ABORTING - -Upstream-Status: Backport [https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date \ - https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_internal.h?view=patch&r1=600&r2=670&sortby=date] -CVE: CVE-2017-7186 - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - ---- trunk/src/pcre2_ucd.c 2015/07/17 15:44:51 316 -+++ trunk/src/pcre2_ucd.c 2017/02/24 18:25:32 670 -@@ -41,6 +41,20 @@ - - const char *PRIV(unicode_version) = "8.0.0"; - -+/* If the 32-bit library is run in non-32-bit mode, character values -+greater than 0x10ffff may be encountered. For these we set up a -+special record. */ -+ -+#if PCRE2_CODE_UNIT_WIDTH == 32 -+const ucd_record PRIV(dummy_ucd_record)[] = {{ -+ ucp_Common, /* script */ -+ ucp_Cn, /* type unassigned */ -+ ucp_gbOther, /* grapheme break property */ -+ 0, /* case set */ -+ 0, /* other case */ -+ }}; -+#endif -+ - /* When recompiling tables with a new Unicode version, please check the - types in this structure definition from pcre2_internal.h (the actual - field names will be different): ---- trunk/src/pcre2_internal.h 2016/11/19 12:46:24 600 -+++ trunk/src/pcre2_internal.h 2017/02/24 18:25:32 670 -@@ -1774,10 +1774,17 @@ - /* UCD access macros */ - - #define UCD_BLOCK_SIZE 128 --#define GET_UCD(ch) (PRIV(ucd_records) + \ -+#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ - PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ - UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) - -+#if PCRE2_CODE_UNIT_WIDTH == 32 -+#define GET_UCD(ch) ((ch > MAX_UTF_CODE_POINT)? \ -+ PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) -+#else -+#define GET_UCD(ch) REAL_GET_UCD(ch) -+#endif -+ - #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype - #define UCD_SCRIPT(ch) GET_UCD(ch)->script - #define UCD_CATEGORY(ch) PRIV(ucp_gentype)[UCD_CHARTYPE(ch)] -@@ -1834,6 +1841,9 @@ - #define _pcre2_default_compile_context PCRE2_SUFFIX(_pcre2_default_compile_context_) - #define _pcre2_default_match_context PCRE2_SUFFIX(_pcre2_default_match_context_) - #define _pcre2_default_tables PCRE2_SUFFIX(_pcre2_default_tables_) -+#if PCRE2_CODE_UNIT_WIDTH == 32 -+#define _pcre2_dummy_ucd_record PCRE2_SUFFIX(_pcre2_dummy_ucd_record_) -+#endif - #define _pcre2_hspace_list PCRE2_SUFFIX(_pcre2_hspace_list_) - #define _pcre2_vspace_list PCRE2_SUFFIX(_pcre2_vspace_list_) - #define _pcre2_ucd_caseless_sets PCRE2_SUFFIX(_pcre2_ucd_caseless_sets_) -@@ -1858,6 +1868,9 @@ - extern const uint32_t PRIV(vspace_list)[]; - extern const uint32_t PRIV(ucd_caseless_sets)[]; - extern const ucd_record PRIV(ucd_records)[]; -+#if PCRE2_CODE_UNIT_WIDTH == 32 -+extern const ucd_record PRIV(dummy_ucd_record)[]; -+#endif - extern const uint8_t PRIV(ucd_stage1)[]; - extern const uint16_t PRIV(ucd_stage2)[]; - extern const uint32_t PRIV(ucp_gbtable)[]; diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-8786.patch b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-8786.patch deleted file mode 100644 index eafafc1f6..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/libpcre2-CVE-2017-8786.patch +++ /dev/null @@ -1,93 +0,0 @@ -libpcre2-10.23: Fix CVE-2017-8786 - -The pcre2test.c in PCRE2 10.23 allows remote attackers to cause a denial of -service (heap-based buffer overflow) or possibly have unspecified other impact -via a crafted regular expression. - -Upstream-Status: Backport [https://vcs.pcre.org/pcre2/code/trunk/src/pcre2test.c?r1=692&r2=697&view=patch] -CVE: CVE-2017-8786 - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - ---- trunk/src/pcre2test.c 2017/03/21 16:18:54 692 -+++ trunk/src/pcre2test.c 2017/03/21 18:36:13 697 -@@ -1017,9 +1017,9 @@ - if (test_mode == PCRE8_MODE) \ - r = pcre2_get_error_message_8(a,G(b,8),G(G(b,8),_size)); \ - else if (test_mode == PCRE16_MODE) \ -- r = pcre2_get_error_message_16(a,G(b,16),G(G(b,16),_size)); \ -+ r = pcre2_get_error_message_16(a,G(b,16),G(G(b,16),_size/2)); \ - else \ -- r = pcre2_get_error_message_32(a,G(b,32),G(G(b,32),_size)) -+ r = pcre2_get_error_message_32(a,G(b,32),G(G(b,32),_size/4)) - - #define PCRE2_GET_OVECTOR_COUNT(a,b) \ - if (test_mode == PCRE8_MODE) \ -@@ -1399,6 +1399,9 @@ - - /* ----- Common macros for two-mode cases ----- */ - -+#define BYTEONE (BITONE/8) -+#define BYTETWO (BITTWO/8) -+ - #define CASTFLD(t,a,b) \ - ((test_mode == G(G(PCRE,BITONE),_MODE))? (t)(G(a,BITONE)->b) : \ - (t)(G(a,BITTWO)->b)) -@@ -1481,9 +1484,9 @@ - - #define PCRE2_GET_ERROR_MESSAGE(r,a,b) \ - if (test_mode == G(G(PCRE,BITONE),_MODE)) \ -- r = G(pcre2_get_error_message_,BITONE)(a,G(b,BITONE),G(G(b,BITONE),_size)); \ -+ r = G(pcre2_get_error_message_,BITONE)(a,G(b,BITONE),G(G(b,BITONE),_size/BYTEONE)); \ - else \ -- r = G(pcre2_get_error_message_,BITTWO)(a,G(b,BITTWO),G(G(b,BITTWO),_size)) -+ r = G(pcre2_get_error_message_,BITTWO)(a,G(b,BITTWO),G(G(b,BITTWO),_size/BYTETWO)) - - #define PCRE2_GET_OVECTOR_COUNT(a,b) \ - if (test_mode == G(G(PCRE,BITONE),_MODE)) \ -@@ -1904,7 +1907,7 @@ - #define PCRE2_DFA_MATCH(a,b,c,d,e,f,g,h,i,j) \ - a = pcre2_dfa_match_16(G(b,16),(PCRE2_SPTR16)c,d,e,f,G(g,16),h,i,j) - #define PCRE2_GET_ERROR_MESSAGE(r,a,b) \ -- r = pcre2_get_error_message_16(a,G(b,16),G(G(b,16),_size)) -+ r = pcre2_get_error_message_16(a,G(b,16),G(G(b,16),_size/2)) - #define PCRE2_GET_OVECTOR_COUNT(a,b) a = pcre2_get_ovector_count_16(G(b,16)) - #define PCRE2_GET_STARTCHAR(a,b) a = pcre2_get_startchar_16(G(b,16)) - #define PCRE2_JIT_COMPILE(r,a,b) r = pcre2_jit_compile_16(G(a,16),b) -@@ -2000,7 +2003,7 @@ - #define PCRE2_DFA_MATCH(a,b,c,d,e,f,g,h,i,j) \ - a = pcre2_dfa_match_32(G(b,32),(PCRE2_SPTR32)c,d,e,f,G(g,32),h,i,j) - #define PCRE2_GET_ERROR_MESSAGE(r,a,b) \ -- r = pcre2_get_error_message_32(a,G(b,32),G(G(b,32),_size)) -+ r = pcre2_get_error_message_32(a,G(b,32),G(G(b,32),_size/4)) - #define PCRE2_GET_OVECTOR_COUNT(a,b) a = pcre2_get_ovector_count_32(G(b,32)) - #define PCRE2_GET_STARTCHAR(a,b) a = pcre2_get_startchar_32(G(b,32)) - #define PCRE2_JIT_COMPILE(r,a,b) r = pcre2_jit_compile_32(G(a,32),b) -@@ -2889,7 +2892,7 @@ - { - if (pbuffer32 != NULL) free(pbuffer32); - pbuffer32_size = 4*len + 4; -- if (pbuffer32_size < 256) pbuffer32_size = 256; -+ if (pbuffer32_size < 512) pbuffer32_size = 512; - pbuffer32 = (uint32_t *)malloc(pbuffer32_size); - if (pbuffer32 == NULL) - { -@@ -7600,7 +7603,8 @@ - int errcode; - char *endptr; - --/* Ensure the relevant non-8-bit buffer is available. */ -+/* Ensure the relevant non-8-bit buffer is available. Ensure that it is at -+least 128 code units, because it is used for retrieving error messages. */ - - #ifdef SUPPORT_PCRE2_16 - if (test_mode == PCRE16_MODE) -@@ -7620,7 +7624,7 @@ - #ifdef SUPPORT_PCRE2_32 - if (test_mode == PCRE32_MODE) - { -- pbuffer32_size = 256; -+ pbuffer32_size = 512; - pbuffer32 = (uint32_t *)malloc(pbuffer32_size); - if (pbuffer32 == NULL) - { diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch index 9516caf51..871cdfcb7 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch @@ -9,11 +9,11 @@ Upstream-Status: Pending Signed-off-by: Robert Yang <liezhi.yang@windriver.com> -diff --git a/Makefile.am b/Makefile.am -index 38f1d41..2bde083 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -298,9 +298,21 @@ bin_SCRIPTS = pcre2-config +Index: pcre2-10.30/Makefile.am +=================================================================== +--- pcre2-10.30.orig/Makefile.am ++++ pcre2-10.30/Makefile.am +@@ -325,9 +325,21 @@ bin_SCRIPTS = pcre2-config ## to copy a distributed set of tables that are defined for ASCII code. In this ## case, dftables is not needed. @@ -35,13 +35,13 @@ index 38f1d41..2bde083 100644 src/pcre2_chartables.c: dftables$(EXEEXT) rm -f $@ ./dftables$(EXEEXT) $@ -diff --git a/configure.ac b/configure.ac -index d7c57aa..d6eb0aa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -59,6 +59,23 @@ then - fi - fi +Index: pcre2-10.30/configure.ac +=================================================================== +--- pcre2-10.30.orig/configure.ac ++++ pcre2-10.30/configure.ac +@@ -60,6 +60,23 @@ fi + # This is a new thing required to stop a warning from automake 1.12 + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +if test x"$cross_compiling" = xyes; then + CC_FOR_BUILD="${CC_FOR_BUILD-gcc}" diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.23.bb b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.30.bb index ca2b028e1..46c2d630e 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.23.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.30.bb @@ -8,16 +8,14 @@ SUMMARY = "Perl Compatible Regular Expressions version 2" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=3de34df49e1fe3c3b59a08dff214488b" +LIC_FILES_CHKSUM = "file://LICENCE;md5=12d55e15a0c6da5c645ba40382bd3293" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ file://pcre-cross.patch \ - file://libpcre2-CVE-2017-8786.patch \ - file://libpcre2-CVE-2017-7186.patch \ " -SRC_URI[md5sum] = "b2cd00ca7e24049040099b0a46bb3649" -SRC_URI[sha256sum] = "dfc79b918771f02d33968bd34a749ad7487fa1014aeb787fad29dd392b78c56e" +SRC_URI[md5sum] = "d3adf4b130eed854a530390f00020a65" +SRC_URI[sha256sum] = "90bd41c605d30e3745771eb81928d779f158081a51b2f314bbcc1f73de5773db" CVE_PRODUCT = "pcre2" @@ -35,8 +33,9 @@ EXTRA_OECONF = "\ --enable-rebuild-chartables \ --with-link-size=2 \ --with-match-limit=10000000 \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ " - # 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}/src" @@ -45,13 +44,15 @@ CXXFLAGS_append_powerpc = " -lstdc++" export CCLD_FOR_BUILD ="${BUILD_CCLD}" -PACKAGES =+ "pcre2grep pcre2grep-doc pcre2test pcre2test-doc" +PACKAGES =+ "libpcre2-16 libpcre2-32 pcre2grep pcre2grep-doc pcre2test pcre2test-doc" SUMMARY_pcre2grep = "grep utility that uses perl 5 compatible regexes" SUMMARY_pcre2grep-doc = "grep utility that uses perl 5 compatible regexes - docs" SUMMARY_pcre2test = "program for testing Perl-comatible regular expressions" SUMMARY_pcre2test-doc = "program for testing Perl-comatible regular expressions - docs" +FILES_libpcre2-16 = "${libdir}/libpcre2-16.so.*" +FILES_libpcre2-32 = "${libdir}/libpcre2-32.so.*" FILES_pcre2grep = "${bindir}/pcre2grep" FILES_pcre2grep-doc = "${mandir}/man1/pcre2grep.1" FILES_pcre2test = "${bindir}/pcre2test" diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.41.bb b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.41.bb index 0eaed1808..0187c08f5 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.41.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.41.bb @@ -80,4 +80,8 @@ do_install_ptest() { for i in RunTest RunGrepTest test-driver; \ do cp ${S}/$i $t; \ done + # Skip the fr_FR locale test. If the locale fr_FR is found, it is tested. + # If not found, the test is skipped. The test program assumes fr_FR is non-UTF-8 + # 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 } diff --git a/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.14.bb b/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb index 4c39f52ff..991c9d832 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.14.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb @@ -9,8 +9,8 @@ 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[md5sum] = "e7514f78f5432210e17a01b6b618dde2" -SRC_URI[sha256sum] = "e25d046850346a505c0617646f1e68b660092efadf665548a89c280900262ea6" +SRC_URI[md5sum] = "f6b1d2a1e17a99cd3debaae6d04ab152" +SRC_URI[sha256sum] = "654db464120c9534654590b6683c7fa3887b3dad0ca1c4cd412af24fbfca6d4f" UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases" UPSTREAM_CHECK_REGEX = "libproxy-(?P<pver>.*)\.tar" @@ -34,4 +34,3 @@ EXTRA_OECMAKE += " \ SECURITY_PIE_CFLAGS_remove = "-fPIE -pie" FILES_${PN} += "${libdir}/${BPN}/${PV}/modules" -FILES_${PN}-dev += "${datadir}/cmake" diff --git a/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb b/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.60.3.bb index c9f95e538..e2e7ff4aa 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.58.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.60.3.bb @@ -11,8 +11,8 @@ 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] = "eb33adb459c2283efc5c7d09ccdbbcfc" -SRC_URI[sha256sum] = "442300ca1b1bf8a3bbf2f788203287ff862542d4fc048f19a92a068a27d17b72" +SRC_URI[md5sum] = "4cf8937d161d3dd71a65f1684e317824" +SRC_URI[sha256sum] = "1b0dc762f23abe4e0d29b77370e539fd35f31d8e8e0318d6ddccff395be68a22" S = "${WORKDIR}/libsoup-${PV}" diff --git a/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch b/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch index d4489165b..9e8ce2270 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch @@ -1,6 +1,6 @@ -From 8d99a368615656a835f5502326afd31cec2cebfe Mon Sep 17 00:00:00 2001 +From 30562065ba9e4c238e76100b5f9f0c5add0e635b Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> -Date: Mon, 16 Sep 2013 18:16:12 +0800 +Date: Tue, 5 Dec 2017 09:30:36 +0200 Subject: [PATCH] remove the test to convert euc-jp Remove the test "Test against HP-UX 11.11 bug: @@ -13,28 +13,44 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- - gnulib-m4/iconv.m4 | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) +--- + gnulib-m4/iconv.m4 | 23 ----------------------- + 1 file changed, 23 deletions(-) -Index: libunistring-0.9.4/gnulib-m4/iconv.m4 -=================================================================== ---- libunistring-0.9.4.orig/gnulib-m4/iconv.m4 2014-11-03 17:41:29.755011917 +0000 -+++ libunistring-0.9.4/gnulib-m4/iconv.m4 2014-11-03 17:43:03.795014480 +0000 -@@ -159,17 +159,6 @@ +diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 +index b33ecd0..73b6aa1 100644 +--- a/gnulib-m4/iconv.m4 ++++ b/gnulib-m4/iconv.m4 +@@ -165,29 +165,6 @@ AC_DEFUN([AM_ICONV_LINK], } } #endif - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ -- if (/* Try standardized names. */ -- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) -- /* Try IRIX, OSF/1 names. */ -- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) -- /* Try AIX names. */ -- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) -- /* Try HP-UX names. */ -- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) -- result |= 16; +- { +- /* Try standardized names. */ +- iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); +- /* Try IRIX, OSF/1 names. */ +- iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); +- /* Try AIX names. */ +- iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); +- /* Try HP-UX names. */ +- iconv_t cd4 = iconv_open ("utf8", "eucJP"); +- if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) +- && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) +- result |= 16; +- if (cd1 != (iconv_t)(-1)) +- iconv_close (cd1); +- if (cd2 != (iconv_t)(-1)) +- iconv_close (cd2); +- if (cd3 != (iconv_t)(-1)) +- iconv_close (cd3); +- if (cd4 != (iconv_t)(-1)) +- iconv_close (cd4); +- } return result; - }]])], - [am_cv_func_iconv_works=yes], + ]])], + [am_cv_func_iconv_works=yes], , +-- +2.4.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.7.bb b/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.9.bb index f77a210b1..ab7cba522 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.7.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.9.bb @@ -16,15 +16,15 @@ SECTION = "devel" LICENSE = "LGPLv3+ | GPLv2" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://README;beginline=45;endline=65;md5=08287d16ba8d839faed8d2dc14d7d6a5 \ - file://doc/libunistring.texi;md5=b86c9fd7acaac623017239640631912c \ + file://doc/libunistring.texi;md5=efb80a3799a60f95feaf80661d4f204c \ " SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ " -SRC_URI[md5sum] = "8e663454aa372181ee8e46edaa3ba4c8" -SRC_URI[sha256sum] = "9ce081cbee1951b55597b30e7030bda9d7b2f034ef901a135ff3a020be5a41e5" +SRC_URI[md5sum] = "4f689e37e4c3bd67de5786aa51d98b13" +SRC_URI[sha256sum] = "f5e90c08f9e5427ca3a2c0c53f19aa38b25c500913510ad25afef86448bea84a" inherit autotools texinfo BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch index 0dff2c86d..c8faca472 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch @@ -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(-) -diff --git a/acinclude.m4 b/acinclude.m4 -index 497f7c2..9c15af1 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 +Index: libunwind-1.2.1/acinclude.m4 +=================================================================== +--- libunwind-1.2.1.orig/acinclude.m4 ++++ libunwind-1.2.1/acinclude.m4 @@ -22,11 +22,5 @@ fi]) AC_DEFUN([CHECK_ATOMIC_OPS], [dnl Check whether the system has the atomic_ops package installed. @@ -45,18 +45,15 @@ index 497f7c2..9c15af1 100644 -# AC_CHECK_LIB(atomic_ops, main) + AC_CHECK_LIB(atomic_ops, main) ]) -diff --git a/include/libunwind_i.h b/include/libunwind_i.h -index 23f615e..deabdfd 100644 ---- a/include/libunwind_i.h -+++ b/include/libunwind_i.h -@@ -95,6 +95,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - (pthread_mutex_unlock != NULL ? pthread_mutex_unlock (l) : 0) +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 + (pthread_mutex_unlock != NULL ? pthread_mutex_unlock (l) : 0) #ifdef HAVE_ATOMIC_OPS_H +# define AO_REQUIRE_CAS # include <atomic_ops.h> static inline int cmpxchg_ptr (void *addr, void *old, void *new) --- -1.9.2 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/fix-mips.patch b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/fix-mips.patch deleted file mode 100644 index 002223793..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/fix-mips.patch +++ /dev/null @@ -1,134 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 5f354cb7b9c84dae006f0ebd8ad7a78d7e2aad0c Mon Sep 17 00:00:00 2001 -From: Dave Watson <davejwatson@fb.com> -Date: Wed, 25 Jan 2017 16:18:02 -0800 -Subject: [PATCH] mips/tilegx: Add missing unwind_i.h header file - -reported-by: John Knight <John.Knight@belkin.com> ---- - src/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 5d874755..7de4c425 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -280,7 +280,7 @@ libunwind_hppa_la_SOURCES_hppa = $(libunwind_la_SOURCES_hppa_common) \ - hppa/Gresume.c hppa/Gstep.c - - # The list of files that go info libunwind and libunwind-mips: --noinst_HEADERS += mips/init.h mips/offsets.h -+noinst_HEADERS += mips/init.h mips/offsets.h mips/unwind_i.h - libunwind_la_SOURCES_mips_common = $(libunwind_la_SOURCES_common) \ - mips/is_fpreg.c mips/regname.c - -@@ -299,7 +299,7 @@ libunwind_mips_la_SOURCES_mips = $(libunwind_la_SOURCES_mips_common) \ - mips/Gis_signal_frame.c mips/Gregs.c mips/Gresume.c mips/Gstep.c - - # The list of files that go info libunwind and libunwind-tilegx: --noinst_HEADERS += tilegx/init.h tilegx/offsets.h -+noinst_HEADERS += tilegx/init.h tilegx/offsets.h tilegx/unwind_i.h - libunwind_la_SOURCES_tilegx_common = $(libunwind_la_SOURCES_common) \ - tilegx/is_fpreg.c tilegx/regname.c - -diff --git a/src/mips/unwind_i.h b/src/mips/unwind_i.h -new file mode 100644 -index 0000000..3382dcf ---- /dev/null -+++ b/src/mips/unwind_i.h -@@ -0,0 +1,43 @@ -+/* libunwind - a platform-independent unwind library -+ Copyright (C) 2008 CodeSourcery -+ -+This file is part of libunwind. -+ -+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 unwind_i_h -+#define unwind_i_h -+ -+#include <stdint.h> -+ -+#include <libunwind-mips.h> -+ -+#include "libunwind_i.h" -+ -+#define mips_lock UNW_OBJ(lock) -+#define mips_local_resume UNW_OBJ(local_resume) -+#define mips_local_addr_space_init UNW_OBJ(local_addr_space_init) -+ -+extern int mips_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, -+ void *arg); -+ -+extern void mips_local_addr_space_init (void); -+ -+#endif /* unwind_i_h */ -diff --git a/src/tilegx/unwind_i.h b/src/tilegx/unwind_i.h -new file mode 100644 -index 0000000..aac7be3 ---- /dev/null -+++ b/src/tilegx/unwind_i.h -@@ -0,0 +1,44 @@ -+/* libunwind - a platform-independent unwind library -+ Copyright (C) 2008 CodeSourcery -+ -+This file is part of libunwind. -+ -+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 unwind_i_h -+#define unwind_i_h -+ -+#include <memory.h> -+#include <stdint.h> -+ -+#include <libunwind-tilegx.h> -+ -+#include "libunwind_i.h" -+ -+#define tilegx_local_resume UNW_OBJ(local_resume) -+#define tilegx_local_addr_space_init UNW_OBJ(local_addr_space_init) -+ -+extern int tilegx_local_resume (unw_addr_space_t as, -+ unw_cursor_t *cursor, -+ void *arg); -+ -+extern void tilegx_local_addr_space_init (void); -+ -+#endif /* unwind_i_h */ diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_1.2.bb b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb index c6312f24f..37a762486 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_1.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb @@ -1,7 +1,7 @@ require libunwind.inc -SRC_URI[md5sum] = "eefcb5d7f78fdc8f1ed172a26ea4202f" -SRC_URI[sha256sum] = "1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992" +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 \ @@ -11,7 +11,6 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV 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://fix-mips.patch \ " SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" diff --git a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.10.0.bb b/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb index 4ecb20b75..459c04a7a 100644 --- a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.10.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb @@ -10,8 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \ SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ " -SRC_URI[md5sum] = "69dab85b6929c378338b9504adc6aea7" -SRC_URI[sha256sum] = "7cb58a7ba5151198087f025dc8d19d8918e9c6d56772f039696c111d9aad3190" +SRC_URI[md5sum] = "281a2f92fdc39c40ad6b76f6631fdbd7" +SRC_URI[sha256sum] = "9c09220be4435dc27fcd22d291707b94b97f159e0c442fbcd60c168f8f79eb06" S = "${WORKDIR}/userspace-rcu-${PV}" inherit autotools + +CPPFLAGS_append_riscv64 = " -pthread -D_REENTRANT" diff --git a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/0001-Check-for-integer-overflow-in-xsltAddTextString.patch b/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/0001-Check-for-integer-overflow-in-xsltAddTextString.patch deleted file mode 100644 index 57aaacc58..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/0001-Check-for-integer-overflow-in-xsltAddTextString.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 08ab2774b870de1c7b5a48693df75e8154addae5 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <wellnhofer@aevum.de> -Date: Thu, 12 Jan 2017 15:39:52 +0100 -Subject: [PATCH] Check for integer overflow in xsltAddTextString - -Limit buffer size in xsltAddTextString to INT_MAX. The issue can be -exploited to trigger an out of bounds write on 64-bit systems. - -Originally reported to Chromium: - -https://crbug.com/676623 - -CVE: CVE-2017-5029 -Upstream-Status: Backport - -Signed-off-by: Fan Xin <fan.xin@jp.fujitus.com> - ---- - libxslt/transform.c | 25 ++++++++++++++++++++++--- - libxslt/xsltInternals.h | 4 ++-- - 2 files changed, 24 insertions(+), 5 deletions(-) - -diff --git a/libxslt/transform.c b/libxslt/transform.c -index 519133f..02bff34 100644 ---- a/libxslt/transform.c -+++ b/libxslt/transform.c -@@ -813,13 +813,32 @@ xsltAddTextString(xsltTransformContextPtr ctxt, xmlNodePtr target, - return(target); - - if (ctxt->lasttext == target->content) { -+ int minSize; - -- if (ctxt->lasttuse + len >= ctxt->lasttsize) { -+ /* Check for integer overflow accounting for NUL terminator. */ -+ if (len >= INT_MAX - ctxt->lasttuse) { -+ xsltTransformError(ctxt, NULL, target, -+ "xsltCopyText: text allocation failed\n"); -+ return(NULL); -+ } -+ minSize = ctxt->lasttuse + len + 1; -+ -+ if (ctxt->lasttsize < minSize) { - xmlChar *newbuf; - int size; -+ int extra; -+ -+ /* Double buffer size but increase by at least 100 bytes. */ -+ extra = minSize < 100 ? 100 : minSize; -+ -+ /* Check for integer overflow. */ -+ if (extra > INT_MAX - ctxt->lasttsize) { -+ size = INT_MAX; -+ } -+ else { -+ size = ctxt->lasttsize + extra; -+ } - -- size = ctxt->lasttsize + len + 100; -- size *= 2; - newbuf = (xmlChar *) xmlRealloc(target->content,size); - if (newbuf == NULL) { - xsltTransformError(ctxt, NULL, target, -diff --git a/libxslt/xsltInternals.h b/libxslt/xsltInternals.h -index 060b178..5ad1771 100644 ---- a/libxslt/xsltInternals.h -+++ b/libxslt/xsltInternals.h -@@ -1754,8 +1754,8 @@ struct _xsltTransformContext { - * Speed optimization when coalescing text nodes - */ - const xmlChar *lasttext; /* last text node content */ -- unsigned int lasttsize; /* last text node size */ -- unsigned int lasttuse; /* last text node use */ -+ int lasttsize; /* last text node size */ -+ int lasttuse; /* last text node use */ - /* - * Per Context Debugging - */ --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/0001-Link-libraries-with-libm.patch b/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/0001-Link-libraries-with-libm.patch deleted file mode 100644 index 16ffeba10..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/0001-Link-libraries-with-libm.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 487e2f7e35dad3deec7978ce4478a3d4ea5070e7 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Fri, 10 Feb 2017 14:26:59 +0200 -Subject: [PATCH] Link libraries with libm - -Otherwise linking the resulting libraries to a binary (e.g. xsltproc) -fails when using gold linker: -| ../libxslt/.libs/libxslt.so: error: undefined reference to 'fmod' -| ../libxslt/.libs/libxslt.so: error: undefined reference to 'pow' -| ../libexslt/.libs/libexslt.so: error: undefined reference to 'floor' -| collect2: error: ld returned 1 exit status - -Upstream-Status: Submitted [mailing list, Feb 10 2017] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - libexslt/Makefile.am | 2 +- - libxslt/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am -index 1cf5138..5449524 100644 ---- a/libexslt/Makefile.am -+++ b/libexslt/Makefile.am -@@ -27,7 +27,7 @@ libexslt_la_SOURCES = \ - libexslt.h \ - dynamic.c - --libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) -+libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(M_LIBS) - libexslt_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBEXSLT_VERSION_INFO) - - man_MANS = libexslt.3 -diff --git a/libxslt/Makefile.am b/libxslt/Makefile.am -index d9fed68..9d44c3d 100644 ---- a/libxslt/Makefile.am -+++ b/libxslt/Makefile.am -@@ -62,7 +62,7 @@ else - LIBXSLT_VERSION_SCRIPT = - endif - --libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) -+libxslt_la_LIBADD = $(LIBXML_LIBS) $(M_LIBS) $(EXTRA_LIBS) - libxslt_la_LDFLAGS = \ - $(WIN32_EXTRA_LDFLAGS) \ - $(LIBXSLT_VERSION_SCRIPT) \ --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch b/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch deleted file mode 100644 index 71867067b..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch +++ /dev/null @@ -1,130 +0,0 @@ -From ed71ac9548a2bb6ecd2dc5ad880c604975f872b0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 2 Jun 2016 14:20:04 +0300 -Subject: [PATCH] Use pkg-config to find gcrypt and libxml2. - -Upstream-Status: Pending [libxml2 is upstreamable] - -RP 2014/5/22 - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.in | 70 +++++++++++------------------------------------------------- - 1 file changed, 12 insertions(+), 58 deletions(-) - -diff --git a/configure.in b/configure.in -index 8bdf45a..0b2b312 100644 ---- a/configure.in -+++ b/configure.in -@@ -377,6 +377,8 @@ AC_SUBST(pythondir) - AC_SUBST(PYTHON_SUBDIR) - AC_SUBST(PYTHON_LIBS) - -+PKG_PROG_PKG_CONFIG -+ - AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)]) - WITH_CRYPTO=0 - CRYPTO_TESTDIR= -@@ -394,27 +396,14 @@ case $host in - CRYPTO_TESTDIR=crypto - ;; - *) -- AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) -- if test "$LIBGCRYPT_CONFIG" != "no" ; then -- LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version` -- if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42") -- then -- LIBGCRYPT_CFLAGS="" -- LIBGCRYPT_LIBS="" -- echo 'gcrypt library version < 1.1.42 - Crypto extensions will not be available.' -- else -- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags` -- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs` -- AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.]) -- echo 'Crypto extensions will be available.' -+ PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= 1.1.42], [ -+ AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.]) -+ echo 'Crypto extensions will be available.' - WITH_CRYPTO=1 - CRYPTO_TESTDIR=crypto -- fi -- else -- LIBGCRYPT_CFLAGS="" -- LIBGCRYPT_LIBS="" -- echo 'Crypto extensions will not be available. Install libgcrypt and reconfigure to make available.' -- fi -+ ], [ -+ echo 'Crypto extensions will not be available. Install libgcrypt >= 1.1.42 and reconfigure to make available.' -+ ]) - esac - fi - AC_SUBST(WITH_CRYPTO) -@@ -476,24 +465,8 @@ dnl original work - Mathieu Lacage 30/03/2000 - dnl some tweaking - David Härdeman 30/10/2001 - dnl - --LIBXML_CONFIG_PREFIX="" - LIBXML_SRC="" - --AC_ARG_WITH(libxml-prefix, -- [ --with-libxml-prefix=[PFX] Specify location of libxml config], -- LIBXML_CONFIG_PREFIX=$withval --) -- --AC_ARG_WITH(libxml-include-prefix, -- [ --with-libxml-include-prefix=[PFX] Specify location of libxml headers], -- LIBXML_CFLAGS="-I$withval" --) -- --AC_ARG_WITH(libxml-libs-prefix, -- [ --with-libxml-libs-prefix=[PFX] Specify location of libxml libs], -- LIBXML_LIBS="-L$withval" --) -- - AC_ARG_WITH(libxml-src, - [ --with-libxml-src=[DIR] For libxml thats not installed yet (sets all three above)], - LIBXML_SRC="$withval" -@@ -556,28 +529,9 @@ then - fi - fi - --dnl --dnl make sure xml2-config is executable, --dnl test version and init our variables --dnl -- --if ${XML_CONFIG} --libs print > /dev/null 2>&1 --then -- XMLVERS=`$XML_CONFIG --version` -- if test VERSION_TO_NUMBER(echo $XMLVERS) -ge VERSION_TO_NUMBER(echo $LIBXML_REQUIRED_VERSION) -- then -- AC_MSG_RESULT($XMLVERS found) -- else -- AC_MSG_ERROR(Version $XMLVERS found. You need at least libxml2 $LIBXML_REQUIRED_VERSION for this version of libxslt) -- fi -- LIBXML_LIBS="$LIBXML_LIBS `$XML_CONFIG --libs`" -- if test "x$LIBXML_SRC" = "x"; then -- LIBXML_CFLAGS="$LIBXML_CFLAGS `$XML_CONFIG --cflags`" -- fi --else -- AC_MSG_ERROR([Could not find libxml2 anywhere, check ftp://xmlsoft.org/.]) --fi -- -+PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= $LIBXML_REQUIRED_VERSION],, -+ [AC_MSG_ERROR([Could not find libxml-2.0 >= $LIBXML_REQUIRED_VERSION anywhere, check ftp://xmlsoft.org/.])] -+) - - AC_SUBST(CFLAGS) - AC_SUBST(CPPFLAGS) -@@ -602,7 +556,7 @@ fi - - if test "$with_plugins" = "yes" ; then - AC_MSG_CHECKING([libxml2 module support]) -- WITH_MODULES="`$XML_CONFIG --modules`" -+ WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0`" - if test "${WITH_MODULES}" = "1"; then - AC_MSG_RESULT(yes) - else --- -2.8.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch b/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch deleted file mode 100644 index 16a801010..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: libxslt-1.1.27/libexslt.pc.in -=================================================================== ---- libxslt-1.1.27.orig/libexslt.pc.in -+++ libxslt-1.1.27/libexslt.pc.in -@@ -8,5 +8,5 @@ Name: libexslt - Version: @LIBEXSLT_VERSION@ - Description: EXSLT Extension library - Requires: libxml-2.0 --Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@ -+Libs: -lexslt @EXSLT_LIBDIR@ @EXSLT_LIBS@ - Cflags: @EXSLT_INCLUDEDIR@ -Index: libxslt-1.1.27/libxslt.pc.in -=================================================================== ---- libxslt-1.1.27.orig/libxslt.pc.in -+++ libxslt-1.1.27/libxslt.pc.in -@@ -8,5 +8,5 @@ Name: libxslt - Version: @VERSION@ - Description: XSLT library version 2. - Requires: libxml-2.0 --Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@ -+Libs: -lxslt @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@ - Cflags: @XSLT_INCLUDEDIR@ diff --git a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.29.bb b/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb index 5b11bc228..6a03f7769 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.29.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb @@ -8,15 +8,9 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458" SECTION = "libs" DEPENDS = "libxml2" -SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz \ - file://pkgconfig_fix.patch \ - file://0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch \ - file://0001-Link-libraries-with-libm.patch \ - file://0001-Check-for-integer-overflow-in-xsltAddTextString.patch \ - " - -SRC_URI[md5sum] = "a129d3c44c022de3b9dcf6d6f288d72e" -SRC_URI[sha256sum] = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce" +SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz" +SRC_URI[md5sum] = "1fc72f98e98bf4443f1651165f3aa146" +SRC_URI[sha256sum] = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460" UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar" @@ -28,7 +22,7 @@ inherit autotools pkgconfig binconfig-disabled lib_package # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header do_configure_prepend () { - sed -i -e 's/ansidecl.h//' ${S}/configure.in + sed -i -e 's/ansidecl.h//' ${S}/configure.ac # The timestamps in the 1.1.28 tarball are messed up causing this file to # appear out of date. Touch it so that we don't try to regenerate it. diff --git a/import-layers/yocto-poky/meta/recipes-support/lzo/lzo/acinclude.m4 b/import-layers/yocto-poky/meta/recipes-support/lzo/lzo/acinclude.m4 deleted file mode 100644 index c4d2ccd5b..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/lzo/lzo/acinclude.m4 +++ /dev/null @@ -1,358 +0,0 @@ - -AC_DEFUN([mfx_ACC_CHECK_ENDIAN], [ -AC_C_BIGENDIAN([AC_DEFINE(ACC_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(ACC_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])]) -])# - -AC_DEFUN([mfx_ACC_CHECK_HEADERS], [ -AC_HEADER_TIME -AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h limits.h malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h strings.h time.h unistd.h utime.h sys/stat.h sys/time.h sys/types.h sys/wait.h]) -])# - -AC_DEFUN([mfx_ACC_CHECK_FUNCS], [ -AC_CHECK_FUNCS(access alloca atexit atoi atol chmod chown ctime difftime fstat gettimeofday gmtime localtime longjmp lstat memcmp memcpy memmove memset mktime qsort raise setjmp signal snprintf strcasecmp strchr strdup strerror strftime stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf) -])# - - -AC_DEFUN([mfx_ACC_CHECK_SIZEOF], [ -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) - -AC_CHECK_SIZEOF(long long) -AC_CHECK_SIZEOF(__int16) -AC_CHECK_SIZEOF(__int32) -AC_CHECK_SIZEOF(__int64) - -AC_CHECK_SIZEOF(void *) -AC_CHECK_SIZEOF(size_t) -AC_CHECK_SIZEOF(ptrdiff_t) -])# - - -# /*********************************************************************** -# // Check for ACC_conformance -# ************************************************************************/ - -AC_DEFUN([mfx_ACC_ACCCHK], [ -mfx_tmp=$1 -mfx_save_CPPFLAGS=$CPPFLAGS -dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here -test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS" - -AC_MSG_CHECKING([whether your compiler passes the ACC conformance test]) - -AC_LANG_CONFTEST([AC_LANG_PROGRAM( -[[#define ACC_CONFIG_NO_HEADER 1 -#include "acc/acc.h" -#include "acc/acc_incd.h" -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr) -#include "acc/acc_chk.ch" -#undef ACCCHK_ASSERT -static void test_acc_compile_time_assert(void) { -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr) -#include "acc/acc_chk.ch" -#undef ACCCHK_ASSERT -} -#undef NDEBUG -#include <assert.h> -static int test_acc_run_time_assert(int r) { -#define ACCCHK_ASSERT(expr) assert(expr); -#include "acc/acc_chk.ch" -#undef ACCCHK_ASSERT -return r; -} -]], [[ -test_acc_compile_time_assert(); -if (test_acc_run_time_assert(1) != 1) return 1; -]] -)]) - -mfx_tmp=FAILED -_AC_COMPILE_IFELSE([], [mfx_tmp=yes]) -rm -f conftest.$ac_ext conftest.$ac_objext - -CPPFLAGS=$mfx_save_CPPFLAGS - -AC_MSG_RESULT([$mfx_tmp]) -case x$mfx_tmp in - xpassed | xyes) ;; - *) - AC_MSG_NOTICE([]) - AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ]) - AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending]) - AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.]) - AC_MSG_NOTICE([Thanks for your support.]) - AC_MSG_NOTICE([]) - AC_MSG_ERROR([ACC conformance test failed. Stop.]) -dnl AS_EXIT - ;; -esac -])# mfx_ACC_ACCCHK - - -# /*********************************************************************** -# // Check for ACC_conformance -# ************************************************************************/ - -AC_DEFUN([mfx_MINIACC_ACCCHK], [ -mfx_tmp=$1 -mfx_save_CPPFLAGS=$CPPFLAGS -dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here -test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS" - -AC_MSG_CHECKING([whether your compiler passes the ACC conformance test]) - -AC_LANG_CONFTEST([AC_LANG_PROGRAM( -[[#define ACC_CONFIG_NO_HEADER 1 -#define ACC_WANT_ACC_INCD_H 1 -#include $2 - -#define ACC_WANT_ACC_CHK_CH 1 -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr) -#include $2 - -#define ACC_WANT_ACC_CHK_CH 1 -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr) -static void test_acc_compile_time_assert(void) { -#include $2 -} - -#undef NDEBUG -#include <assert.h> -#define ACC_WANT_ACC_CHK_CH 1 -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) assert(expr); -static int test_acc_run_time_assert(int r) { -#include $2 -return r; -} -]], [[ -test_acc_compile_time_assert(); -if (test_acc_run_time_assert(1) != 1) return 1; -]] -)]) - -mfx_tmp=FAILED -_AC_COMPILE_IFELSE([], [mfx_tmp=yes]) -rm -f conftest.$ac_ext conftest.$ac_objext - -CPPFLAGS=$mfx_save_CPPFLAGS - -AC_MSG_RESULT([$mfx_tmp]) -case x$mfx_tmp in - xpassed | xyes) ;; - *) - AC_MSG_NOTICE([]) - AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ]) - AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending]) - AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.]) - AC_MSG_NOTICE([Thanks for your support.]) - AC_MSG_NOTICE([]) - AC_MSG_ERROR([ACC conformance test failed. Stop.]) -dnl AS_EXIT - ;; -esac -])# mfx_MINIACC_ACCCHK - - - -# serial 1 - -AC_DEFUN([mfx_PROG_CPPFLAGS], [ -AC_MSG_CHECKING([whether the C preprocessor needs special flags]) - -AC_LANG_CONFTEST([AC_LANG_PROGRAM( -[[#include <limits.h> -#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul) -# include "your C preprocessor is broken 1" -#elif (0xffffu == 0xfffffffful) -# include "your C preprocessor is broken 2" -#elif (32767 >= ULONG_MAX) || (65535u >= ULONG_MAX) -# include "your C preprocessor is broken 3" -#endif -]], [[ ]] -)]) - -mfx_save_CPPFLAGS=$CPPFLAGS -mfx_tmp=ERROR -for mfx_arg in "" -no-cpp-precomp -do - CPPFLAGS="$mfx_arg $mfx_save_CPPFLAGS" - _AC_COMPILE_IFELSE([], -[mfx_tmp=$mfx_arg -break]) -done -CPPFLAGS=$mfx_save_CPPFLAGS -rm -f conftest.$ac_ext conftest.$ac_objext -case x$mfx_tmp in - x) - AC_MSG_RESULT([none needed]) ;; - xERROR) - AC_MSG_RESULT([ERROR]) - AC_MSG_ERROR([your C preprocessor is broken - for details see config.log]) - ;; - *) - AC_MSG_RESULT([$mfx_tmp]) - CPPFLAGS="$mfx_tmp $CPPFLAGS" - ;; -esac -])# mfx_PROG_CPPFLAGS - - - -# serial 3 - -AC_DEFUN([mfx_CHECK_HEADER_SANE_LIMITS_H], [ -AC_CACHE_CHECK([whether limits.h is sane], -mfx_cv_header_sane_limits_h, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <limits.h> -#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul) -# if defined(__APPLE__) && defined(__GNUC__) -# error "your preprocessor is broken - use compiler option -no-cpp-precomp" -# else -# include "your preprocessor is broken" -# endif -#endif -#define MFX_0xffff 0xffff -#define MFX_0xffffffffL 4294967295ul -#if !defined(CHAR_BIT) || (CHAR_BIT != 8) -# include "error CHAR_BIT" -#endif -#if !defined(UCHAR_MAX) -# include "error UCHAR_MAX 1" -#endif -#if !defined(USHRT_MAX) -# include "error USHRT_MAX 1" -#endif -#if !defined(UINT_MAX) -# include "error UINT_MAX 1" -#endif -#if !defined(ULONG_MAX) -# include "error ULONG_MAX 1" -#endif -#if !defined(SHRT_MAX) -# include "error SHRT_MAX 1" -#endif -#if !defined(INT_MAX) -# include "error INT_MAX 1" -#endif -#if !defined(LONG_MAX) -# include "error LONG_MAX 1" -#endif -#if (UCHAR_MAX < 1) -# include "error UCHAR_MAX 2" -#endif -#if (USHRT_MAX < 1) -# include "error USHRT_MAX 2" -#endif -#if (UINT_MAX < 1) -# include "error UINT_MAX 2" -#endif -#if (ULONG_MAX < 1) -# include "error ULONG_MAX 2" -#endif -#if (UCHAR_MAX < 0xff) -# include "error UCHAR_MAX 3" -#endif -#if (USHRT_MAX < MFX_0xffff) -# include "error USHRT_MAX 3" -#endif -#if (UINT_MAX < MFX_0xffff) -# include "error UINT_MAX 3" -#endif -#if (ULONG_MAX < MFX_0xffffffffL) -# include "error ULONG_MAX 3" -#endif -#if (USHRT_MAX > UINT_MAX) -# include "error USHRT_MAX vs UINT_MAX" -#endif -#if (UINT_MAX > ULONG_MAX) -# include "error UINT_MAX vs ULONG_MAX" -#endif -]], [[ -#if (USHRT_MAX == MFX_0xffff) -{ typedef char a_short2a[1 - 2 * !(sizeof(short) == 2)]; } -#elif (USHRT_MAX >= MFX_0xffff) -{ typedef char a_short2b[1 - 2 * !(sizeof(short) > 2)]; } -#endif -#if (UINT_MAX == MFX_0xffff) -{ typedef char a_int2a[1 - 2 * !(sizeof(int) == 2)]; } -#elif (UINT_MAX >= MFX_0xffff) -{ typedef char a_int2b[1 - 2 * !(sizeof(int) > 2)]; } -#endif -#if (ULONG_MAX == MFX_0xffff) -{ typedef char a_long2a[1 - 2 * !(sizeof(long) == 2)]; } -#elif (ULONG_MAX >= MFX_0xffff) -{ typedef char a_long2b[1 - 2 * !(sizeof(long) > 2)]; } -#endif -#if (USHRT_MAX == MFX_0xffffffffL) -{ typedef char a_short4a[1 - 2 * !(sizeof(short) == 4)]; } -#elif (USHRT_MAX >= MFX_0xffffffffL) -{ typedef char a_short4b[1 - 2 * !(sizeof(short) > 4)]; } -#endif -#if (UINT_MAX == MFX_0xffffffffL) -{ typedef char a_int4a[1 - 2 * !(sizeof(int) == 4)]; } -#elif (UINT_MAX >= MFX_0xffffffffL) -{ typedef char a_int4b[1 - 2 * !(sizeof(int) > 4)]; } -#endif -#if (ULONG_MAX == MFX_0xffffffffL) -{ typedef char a_long4a[1 - 2 * !(sizeof(long) == 4)]; } -#elif (ULONG_MAX >= MFX_0xffffffffL) -{ typedef char a_long4b[1 - 2 * !(sizeof(long) > 4)]; } -#endif -]])], -[mfx_cv_header_sane_limits_h=yes], -[mfx_cv_header_sane_limits_h=no])]) -]) - -# /*********************************************************************** -# // standard -# ************************************************************************/ - -AC_DEFUN([mfx_LZO_CHECK_ENDIAN], [ -AC_C_BIGENDIAN([AC_DEFINE(LZO_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(LZO_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])]) -])# - - -# /*********************************************************************** -# // -# ************************************************************************/ - -dnl more types which are not yet covered by ACC - -AC_DEFUN([mfx_CHECK_SIZEOF], [ -AC_CHECK_SIZEOF(__int32) -AC_CHECK_SIZEOF(intmax_t) -AC_CHECK_SIZEOF(uintmax_t) -AC_CHECK_SIZEOF(intptr_t) -AC_CHECK_SIZEOF(uintptr_t) - -AC_CHECK_SIZEOF(float) -AC_CHECK_SIZEOF(double) -AC_CHECK_SIZEOF(long double) - -AC_CHECK_SIZEOF(dev_t) -AC_CHECK_SIZEOF(fpos_t) -AC_CHECK_SIZEOF(mode_t) -AC_CHECK_SIZEOF(off_t) -AC_CHECK_SIZEOF(ssize_t) -AC_CHECK_SIZEOF(time_t) -])# - - - -AC_DEFUN([mfx_CHECK_LIB_WINMM], [ -if test "X$GCC" = Xyes; then -case $host_os in -cygwin* | mingw* | pw32*) - test "X$LIBS" != "X" && LIBS="$LIBS " - LIBS="${LIBS}-lwinmm" ;; -*) - ;; -esac -fi -])# - diff --git a/import-layers/yocto-poky/meta/recipes-support/lzo/lzo_2.10.bb b/import-layers/yocto-poky/meta/recipes-support/lzo/lzo_2.10.bb index 490d2307a..8eefec3cc 100644 --- a/import-layers/yocto-poky/meta/recipes-support/lzo/lzo_2.10.bb +++ b/import-layers/yocto-poky/meta/recipes-support/lzo/lzo_2.10.bb @@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ file://0001-Use-memcpy-instead-of-reinventing-it.patch \ file://0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch \ - file://acinclude.m4 \ file://run-ptest \ " @@ -19,10 +18,6 @@ inherit autotools ptest EXTRA_OECONF = "--enable-shared" -do_configure_prepend () { - cp ${WORKDIR}/acinclude.m4 ${S}/ -} - do_install_ptest() { t=${D}${PTEST_PATH} cp ${S}/util/check.sh $t diff --git a/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr.inc b/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr.inc deleted file mode 100644 index 7f3f9175d..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr.inc +++ /dev/null @@ -1,6 +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 diff --git a/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb b/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb index 2d59c4a1b..a78c0bd48 100644 --- a/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb +++ b/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb @@ -1,6 +1,10 @@ -require mpfr.inc +SUMMARY = "C library for multiple-precision floating-point computations with exact rounding" +HOMEPAGE = "http://www.mpfr.org/" +LICENSE = "LGPLv3+" +SECTION = "devel" + +inherit autotools texinfo -LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" DEPENDS = "gmp" @@ -13,6 +17,4 @@ SRC_URI[sha256sum] = "015fde82b3979fbe5f83501986d328331ba8ddf008c1ff3da3c238f49c UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/" -S = "${WORKDIR}/mpfr-${PV}" - BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/neon/neon/pkgconfig.patch b/import-layers/yocto-poky/meta/recipes-support/neon/neon/pkgconfig.patch deleted file mode 100644 index 239dba8e2..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/neon/neon/pkgconfig.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - neon.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- neon-0.30.1.orig/neon.pc.in -+++ neon-0.30.1/neon.pc.in -@@ -7,5 +7,5 @@ Name: neon - Description: HTTP/WebDAV client library - Version: @NEON_VERSION@ - Libs: -L${libdir} -lneon @NEON_PC_LIBS@ --Libs.private: @NEON_LIBS@ -+Libs.private: -L${libdir} -lz -lgcrypt -lgpg-error -lexpat -lgnutls - Cflags: -I${includedir}/neon @NEON_CFLAGS@ diff --git a/import-layers/yocto-poky/meta/recipes-support/neon/neon_0.30.2.bb b/import-layers/yocto-poky/meta/recipes-support/neon/neon_0.30.2.bb deleted file mode 100644 index 5792c56f3..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/neon/neon_0.30.2.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "An HTTP and WebDAV client library with a C interface" -HOMEPAGE = "http://www.webdav.org/neon/" -SECTION = "libs" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ - file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037" - -SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ - file://pkgconfig.patch \ - " - -SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41" -SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca" - -inherit autotools binconfig-disabled lib_package pkgconfig - -# Enable gnutls or openssl, not both -PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib" -PACKAGECONFIG_class-native = "expat gnutls webdav zlib" - -PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" -PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" -PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" -PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" -PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" -PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" - -EXTRA_OECONF += "--enable-shared" - -do_compile_append() { - oe_runmake -C test -} - -BINCONFIG = "${bindir}/neon-config" - -BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch b/import-layers/yocto-poky/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch deleted file mode 100644 index 23da77792..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 46edf01cc98db9f9feec984897836dfdd26bdc8d Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Wed, 12 Aug 2015 23:27:27 +0300 -Subject: [PATCH] Add target to only build tests (not run them) - -Not sending upstream as this is only a start of a solution to -installable tests: It's useful for us already as is. - -Upstream-Status: Inappropriate [not a complete solution] - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - Makefile.in | 3 +++ - testsuite/Makefile.in | 2 ++ - 2 files changed, 5 insertions(+) - -diff --git a/Makefile.in b/Makefile.in -index 08efb7d..7909342 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-clean tags: - echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done - $(MAKE) $@-here - -+buildtest: -+ echo "Making $@ in testsuite" ; (cd testsuite && $(MAKE) $@) -+ - check-here: - true - -diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in -index 6bc1907..bb65bf0 100644 ---- a/testsuite/Makefile.in -+++ b/testsuite/Makefile.in -@@ -116,6 +116,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \ - # data. - VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes - -+buildtest: $(TS_ALL) -+ - # The PATH update is for locating dlls on w*ndows. - check: $(TS_ALL) - LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \ --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch new file mode 100644 index 000000000..c007060ee --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch @@ -0,0 +1,38 @@ +Add target to only build tests (not run them) + +Not sending upstream as this is only a start of a solution to +installable tests: It's useful for us already as is. + +Upstream-Status: Inappropriate [not a complete solution] + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Refactored for 3.4 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +Index: nettle-3.4/Makefile.in +=================================================================== +--- nettle-3.4.orig/Makefile.in ++++ nettle-3.4/Makefile.in +@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-c + echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done + $(MAKE) $@-here + ++buildtest: ++ echo "Making $@ in testsuite" ; (cd testsuite && $(MAKE) $@) ++ + check-here: + true + +Index: nettle-3.4/testsuite/Makefile.in +=================================================================== +--- nettle-3.4.orig/testsuite/Makefile.in ++++ nettle-3.4/testsuite/Makefile.in +@@ -131,6 +131,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$ + # data. + VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes + ++buildtest: $(TS_ALL) ++ + # The PATH update is for windows dlls, DYLD_LIBRARY_PATH is for OSX. + check: $(TS_ALL) + LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" DYLD_LIBRARY_PATH=../.lib \ diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.3/check-header-files-of-openssl-only-if-enable_.patch b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch index e7216bac2..d5f266681 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.3/check-header-files-of-openssl-only-if-enable_.patch +++ b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch @@ -10,29 +10,27 @@ building for nettle. Upstream-Status: Pending Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> ---- - configure.ac | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) -diff --git a/configure.ac b/configure.ac -index 4ead52c..982760f 100644 ---- a/configure.ac -+++ b/configure.ac +refactored for 3.4. pending not in as of 3.4 + +Signed-off-by: Armin Kuster <akuster@mvista.com> + +Index: nettle-3.4/configure.ac +=================================================================== +--- nettle-3.4.orig/configure.ac ++++ nettle-3.4/configure.ac @@ -185,9 +185,11 @@ AC_HEADER_TIME AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(size_t) --AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],, +-AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],, -[enable_openssl=no - break]) +if test "x$enable_openssl" = "xyes"; then -+ AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],, ++ AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],, + [enable_openssl=no -+ break]) ++ break]) +fi + # For use by the testsuite AC_CHECK_HEADERS([valgrind/memcheck.h]) - --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch index c4f0b7ea1..c4f0b7ea1 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch +++ b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/files/run-ptest b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/run-ptest index b90bed66d..b90bed66d 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nettle/files/run-ptest +++ b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/run-ptest diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.3.bb b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.3.bb deleted file mode 100644 index 39516781b..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -require nettle.inc - -LICENSE = "LGPLv3+ | GPLv2+" - -LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \ - file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e" - -SRC_URI += "\ - file://check-header-files-of-openssl-only-if-enable_.patch \ - " - -SRC_URI_append_class-target = "\ - file://dlopen-test.patch \ - " - -SRC_URI[md5sum] = "10f969f78a463704ae73529978148dbe" -SRC_URI[sha256sum] = "46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e" diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle.inc b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.4.bb index af51fb6c7..7a3cc654c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle.inc +++ b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.4.bb @@ -1,25 +1,35 @@ SUMMARY = "A low level cryptographic library" HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/" SECTION = "libs" +LICENSE = "LGPLv3+ | GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \ + file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e" DEPENDS += "gmp" -SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz \ +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://Add-target-to-only-build-tests-not-run-them.patch \ file://run-ptest \ + file://check-header-files-of-openssl-only-if-enable_.patch \ " +SRC_URI_append_class-target = "\ + file://dlopen-test.patch \ + " + +SRC_URI[md5sum] = "dc0f13028264992f58e67b4e8915f53d" +SRC_URI[sha256sum] = "ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94" + UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" inherit autotools ptest -EXTRA_OECONF = "--disable-openssl" +EXTRA_AUTORECONF += "--exclude=aclocal" -do_configure_prepend() { - if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then - cp ${S}/aclocal.m4 ${S}/acinclude.m4 - fi -} +EXTRA_OECONF = "--disable-openssl" do_compile_ptest() { oe_runmake buildtest diff --git a/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.5.bb b/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.5.bb index 54de70c5c..e7db6ae1b 100644 --- a/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.5.bb +++ b/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.5.bb @@ -19,3 +19,5 @@ inherit autotools binconfig-disabled FILES_${PN} = "${libdir}/libnpth.so.*" FILES_${PN}-dev += "${bindir}/npth-config" + +BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/0001-include-stdint.h-for-SSIZE_MAX-and-SIZE_MAX-definiti.patch b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/0001-include-stdint.h-for-SSIZE_MAX-and-SIZE_MAX-definiti.patch deleted file mode 100644 index b3bdd8e08..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/0001-include-stdint.h-for-SSIZE_MAX-and-SIZE_MAX-definiti.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f7551ec58e2f0a892295e0c2a650083101e12c54 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 20 May 2017 13:24:26 -0700 -Subject: [PATCH] include stdint.h for SSIZE_MAX and SIZE_MAX definitions - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - pr/tests/prfz.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/pr/tests/prfz.c b/pr/tests/prfz.c -index 0c5a432..9c17590 100644 ---- a/pr/tests/prfz.c -+++ b/pr/tests/prfz.c -@@ -10,7 +10,9 @@ - #include <sys/types.h> - #include <limits.h> - #include <string.h> -- -+#ifdef XP_UNIX -+#include <stdint.h> -+#endif - int - main(int argc, char **argv) - { --- -2.13.0 - diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch index c2b7258e5..f12acc854 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch @@ -49,4 +49,4 @@ Index: nspr/configure.in - PR_MD_ASFILES=os_Linux_ppc.s fi ;; - m68k) + esac diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch index a7e7853de..ecc6d3187 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch @@ -11,12 +11,12 @@ in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-sp Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Upstream-Status: Pending -Index: nspr-4.8.9/mozilla/nsprpub/pr/tests/Makefile.in +Index: nspr/pr/tests/Makefile.in =================================================================== ---- nsprpub.orig/pr/tests/Makefile.in 2012-02-11 00:01:10.476220505 +0200 -+++ nsprpub/pr/tests/Makefile.in 2012-02-10 23:57:40.000000000 +0200 -@@ -379,7 +379,7 @@ - endif +--- 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) diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.16.bb b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.19.bb index 78ef994ff..de2c87131 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.16.bb +++ b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.19.bb @@ -10,7 +10,6 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz file://fix-build-on-x86_64.patch \ file://remove-srcdir-from-configure-in.patch \ file://0002-Add-nios2-support.patch \ - file://0001-include-stdint.h-for-SSIZE_MAX-and-SIZE_MAX-definiti.patch \ file://0001-md-Fix-build-with-musl.patch \ file://nspr.pc.in \ " @@ -23,8 +22,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" -SRC_URI[md5sum] = "42fd8963a4b394f62d43ba604f03fab7" -SRC_URI[sha256sum] = "9b3102d97665504aeee73363c11a21c062ad67a2522242368b7f019f96a53cd1" +SRC_URI[md5sum] = "e1d27282ad6286b69d6b9fd07201d3dd" +SRC_URI[sha256sum] = "2ed95917fa2277910d1d1cf36030607dccc0ba522bba08e2af13c113dcd8f729" CVE_PRODUCT = "netscape_portable_runtime" diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch b/import-layers/yocto-poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch new file mode 100644 index 000000000..bc10f3385 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch @@ -0,0 +1,119 @@ +From 6f7d7be9997ba6727a5ad7c3800df9051160dc12 Mon Sep 17 00:00:00 2001 +From: Martin Thomson <martin.thomson@gmail.com> +Date: Tue, 13 Feb 2018 12:30:58 +1100 +Subject: [PATCH] Bug 1437734 - Use snprintf in sign.c, r=ttaubert + +--HG-- +extra : rebase_source : 97921ece71ff86b18d32b891591608290eed4d83 +--- +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [https://github.com/nss-dev/nss/commit/0a9078b3cde97add7c825c9d13467a8401ad0c88#diff-b42512151dc137537091f823f7701804.patch] + + nss/cmd/signtool/sign.c | 58 ++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 48 insertions(+), 10 deletions(-) + +diff --git a/nss/cmd/signtool/sign.c b/nss/cmd/signtool/sign.c +index 6e776069a..6f8e43946 100644 +--- a/nss/cmd/signtool/sign.c ++++ b/nss/cmd/signtool/sign.c +@@ -43,6 +43,7 @@ SignArchive(char *tree, char *keyName, char *zip_file, int javascript, + int status; + char tempfn[FNSIZE], fullfn[FNSIZE]; + int keyType = rsaKey; ++ int count; + + metafile = meta_file; + optimize = _optimize; +@@ -81,9 +82,18 @@ SignArchive(char *tree, char *keyName, char *zip_file, int javascript, + } + + /* rsa/dsa to zip */ +- sprintf(tempfn, "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" +- : "rsa")); +- sprintf(fullfn, "%s/%s", tree, tempfn); ++ count = snprintf(tempfn, sizeof(tempfn), "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" : "rsa")); ++ if (count >= sizeof(tempfn)) { ++ PR_fprintf(errorFD, "unable to write key metadata\n"); ++ errorCount++; ++ exit(ERRX); ++ } ++ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); ++ if (count >= sizeof(fullfn)) { ++ PR_fprintf(errorFD, "unable to write key metadata\n"); ++ errorCount++; ++ exit(ERRX); ++ } + JzipAdd(fullfn, tempfn, zipfile, compression_level); + + /* Loop through all files & subdirectories, add to archive */ +@@ -93,20 +103,44 @@ SignArchive(char *tree, char *keyName, char *zip_file, int javascript, + } + /* mf to zip */ + strcpy(tempfn, "META-INF/manifest.mf"); +- sprintf(fullfn, "%s/%s", tree, tempfn); ++ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); ++ if (count >= sizeof(fullfn)) { ++ PR_fprintf(errorFD, "unable to write manifest\n"); ++ errorCount++; ++ exit(ERRX); ++ } + JzipAdd(fullfn, tempfn, zipfile, compression_level); + + /* sf to zip */ +- sprintf(tempfn, "META-INF/%s.sf", base); +- sprintf(fullfn, "%s/%s", tree, tempfn); ++ count = snprintf(tempfn, sizeof(tempfn), "META-INF/%s.sf", base); ++ if (count >= sizeof(tempfn)) { ++ PR_fprintf(errorFD, "unable to write sf metadata\n"); ++ errorCount++; ++ exit(ERRX); ++ } ++ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); ++ if (count >= sizeof(fullfn)) { ++ PR_fprintf(errorFD, "unable to write sf metadata\n"); ++ errorCount++; ++ exit(ERRX); ++ } + JzipAdd(fullfn, tempfn, zipfile, compression_level); + + /* Add the rsa/dsa file to the zip archive normally */ + if (!xpi_arc) { + /* rsa/dsa to zip */ +- sprintf(tempfn, "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" +- : "rsa")); +- sprintf(fullfn, "%s/%s", tree, tempfn); ++ count = snprintf(tempfn, sizeof(tempfn), "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" : "rsa")); ++ if (count >= sizeof(tempfn)) { ++ PR_fprintf(errorFD, "unable to write key metadata\n"); ++ errorCount++; ++ exit(ERRX); ++ } ++ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); ++ if (count >= sizeof(fullfn)) { ++ PR_fprintf(errorFD, "unable to write key metadata\n"); ++ errorCount++; ++ exit(ERRX); ++ } + JzipAdd(fullfn, tempfn, zipfile, compression_level); + } + +@@ -408,6 +442,7 @@ static int + manifesto_xpi_fn(char *relpath, char *basedir, char *reldir, char *filename, void *arg) + { + char fullname[FNSIZE]; ++ int count; + + if (verbosity >= 0) { + PR_fprintf(outputFD, "--> %s\n", relpath); +@@ -421,7 +456,10 @@ manifesto_xpi_fn(char *relpath, char *basedir, char *reldir, char *filename, voi + if (!PL_HashTableLookup(extensions, ext)) + return 0; + } +- sprintf(fullname, "%s/%s", basedir, relpath); ++ count = snprintf(fullname, sizeof(fullname), "%s/%s", basedir, relpath); ++ if (count >= sizeof(fullname)) { ++ return 1; ++ } + JzipAdd(fullname, relpath, zipfile, compression_level); + + return 0; diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch b/import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch new file mode 100644 index 000000000..8276f89e8 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# User Daiki Ueno <dueno@redhat.com> +# Date 1516710574 -3600 +# Tue Jan 23 13:29:34 2018 +0100 +# Node ID 27f27ce21c2c6ff5a47fa9e17c438b000366c9c9 +# Parent be1dca5ac80541d3b81a8da9d42854d8b1cceefb +Build Hacl_Poly1305_64.o on aarch64 even with make + +Upstream-Status: Backport +https://bug1432455.bmoattachments.org/attachment.cgi?id=8944691 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +Index: nss-3.35/nss/lib/freebl/Makefile +=================================================================== +--- nss-3.35.orig/nss/lib/freebl/Makefile ++++ nss-3.35/nss/lib/freebl/Makefile +@@ -533,7 +533,12 @@ ifndef NSS_DISABLE_CHACHAPOLY + EXTRA_SRCS += chacha20_vec.c + endif + else +- EXTRA_SRCS += poly1305.c ++ ifeq ($(CPU_ARCH),aarch64) ++ EXTRA_SRCS += Hacl_Poly1305_64.c ++ else ++ EXTRA_SRCS += poly1305.c ++ endif ++ + EXTRA_SRCS += chacha20.c + VERIFIED_SRCS += Hacl_Chacha20.c + endif # x86_64 diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.31.1.bb b/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.35.bb index 2bb9bdb0c..84f1916f3 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.31.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.35.bb @@ -26,10 +26,12 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://disable-Wvarargs-with-clang.patch \ file://pqg.c-ULL_addend.patch \ file://Fix-compilation-for-X32.patch \ + file://nss-build-hacl-poly1305-aarch64.patch \ + file://0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch \ " -SRC_URI[md5sum] = "ebb44f1394250d2cf6ec3c2e3d71fa20" -SRC_URI[sha256sum] = "933439214dc03ee60e86d1419c19e1568998b0776dde987f41fa70ced6cd08dc" +SRC_URI[md5sum] = "9467ec9e65c5aeb3254a50250490f5f7" +SRC_URI[sha256sum] = "f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" diff --git a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.0.0/gpg-error_pkconf.patch b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch index 431edb035..431edb035 100644 --- a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.0.0/gpg-error_pkconf.patch +++ b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch diff --git a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.0.0/libassuan_pkgconf.patch b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.1.0/libassuan_pkgconf.patch index 11d564f35..11d564f35 100644 --- a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.0.0/libassuan_pkgconf.patch +++ b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.1.0/libassuan_pkgconf.patch diff --git a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry_1.0.0.bb b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb index 319acd3b4..1eaa261f7 100644 --- a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry_1.0.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb @@ -18,8 +18,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://gpg-error_pkconf.patch \ " -SRC_URI[md5sum] = "4a3fad8b31f9b4c5526c8837495015dc" -SRC_URI[sha256sum] = "1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a" +SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" +SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" EXTRA_OECONF = "--disable-rpath --disable-dependency-tracking \ --disable-pinentry-qt5 \ @@ -34,3 +34,5 @@ PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ gli #To use libsecret, add meta-gnome PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" + +BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.bb b/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.1.bb index 71c1dabee..e5b71c0f0 100644 --- a/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.1.bb @@ -7,8 +7,8 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "8a93832dad621535e90aa8e1fb74ae5ba743fc3e" -PV = "2.1+git${SRCPV}" +SRCREV = "16413d71cc06b02a6d859c35a017cc49b88283f7" +PV = "2.1.1+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch new file mode 100644 index 000000000..8aa13bf8b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch @@ -0,0 +1,98 @@ +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/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb index 4a66bed64..b3c9fd974 100644 --- a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb +++ b/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb @@ -7,6 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/${BP}.tar.gz \ 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 \ diff --git a/import-layers/yocto-poky/meta/recipes-support/serf/serf/norpath.patch b/import-layers/yocto-poky/meta/recipes-support/serf/serf/norpath.patch index 380f5d00d..c392444f7 100644 --- a/import-layers/yocto-poky/meta/recipes-support/serf/serf/norpath.patch +++ b/import-layers/yocto-poky/meta/recipes-support/serf/serf/norpath.patch @@ -5,11 +5,11 @@ Upstream-Status: Inappropriate RP 2014/7/17 -Index: serf-1.3.6/SConstruct +Index: serf-1.3.9/SConstruct =================================================================== ---- serf-1.3.6.orig/SConstruct 2014-07-17 19:57:57.724389150 +0000 -+++ serf-1.3.6/SConstruct 2014-07-17 20:04:21.784399616 +0000 -@@ -218,8 +218,7 @@ +--- serf-1.3.9.orig/SConstruct ++++ serf-1.3.9/SConstruct +@@ -224,8 +224,7 @@ if sys.platform != 'win32': else: LIBNAMESTATIC = 'serf-${MAJOR}' @@ -17,9 +17,9 @@ Index: serf-1.3.6/SConstruct - PDB='${TARGET.filebase}.pdb') +env.Append(PDB='${TARGET.filebase}.pdb') - #for i in env: - # print(str(env[i])) -@@ -371,12 +370,6 @@ + if sys.platform == 'darwin': + # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) +@@ -385,12 +384,6 @@ if gssapi and CALLOUT_OKAY: if sys.platform == 'win32': env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) @@ -32,8 +32,8 @@ Index: serf-1.3.6/SConstruct # Set up the construction of serf-*.pc pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,), env.File('build/serf.pc.in'), -@@ -446,7 +439,6 @@ - ENV={'PATH' : os.environ['PATH']})) +@@ -461,7 +454,6 @@ else: + TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ] # Find the (dynamic) library in this directory -tenv.Replace(RPATH=thisdir) diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch index 3c9f1ea43..262ff7562 100644 --- a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch +++ b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch @@ -8,16 +8,18 @@ Upstream-Status: Pending Signed-off-by: Joe Slater <jslater@windriver.com> ---- a/Makefile.am -+++ b/Makefile.am -@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status - @INTLTOOL_XML_RULE@ - @INTLTOOL_DESKTOP_RULE@ +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 - $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime" + $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime" endif diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch index 84c4d0373..fea34a55a 100644 --- a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch +++ b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch @@ -11,17 +11,17 @@ RP 10/10/2011 Upstream-Status: Pending Signed-off-by: Constantin Musca <constantinx.musca@intel.com> -Index: shared-mime-info-1.0/Makefile.am +Index: shared-mime-info-1.9/Makefile.am =================================================================== ---- shared-mime-info-1.0.orig/Makefile.am -+++ shared-mime-info-1.0/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 -@@ -72,8 +70,7 @@ uninstall-hook: +@@ -81,8 +79,7 @@ endif all: $(defaultmakedeps) @@ -29,5 +29,5 @@ Index: shared-mime-info-1.0/Makefile.am - $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot +create-pot: po - check: create-pot freedesktop.org.xml update-mime-database check-translations - if test -e $(top_builddir)/freedesktop.org.xml; then \ + local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT) + if CROSS_COMPILING diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.8.bb b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.8.bb deleted file mode 100644 index 849d99903..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.8.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] = "f6dcadce764605552fc956563efa058c" -SRC_URI[sha256sum] = "2af55ef1a0319805b74ab40d331a3962c905477d76c086f49e34dc96363589e9" diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.9.bb b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.9.bb new file mode 100644 index 000000000..f9b273edc --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.9.bb @@ -0,0 +1,7 @@ +require shared-mime-info.inc + +SRC_URI += "file://parallelmake.patch \ + file://install-data-hook.patch" + +SRC_URI[md5sum] = "45103889b91242850aa47f09325e798b" +SRC_URI[sha256sum] = "5c0133ec4e228e41bdf52f726d271a2d821499c2ab97afd3aa3d6cf43efcdc83" diff --git a/import-layers/yocto-poky/meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch b/import-layers/yocto-poky/meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch deleted file mode 100644 index aac428c82..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/sqlite/files/sqlite3-fix-CVE-2017-13685.patch +++ /dev/null @@ -1,57 +0,0 @@ -Fix CVE-2017-13685 - -The dump_callback function in SQLite 3.20.0 allows remote attackers to -cause a denial of service (EXC_BAD_ACCESS and application crash) via a -crafted file. - -References: -https://sqlite.org/src/info/02f0f4c54f2819b3 -http://www.mail-archive.com/sqlite-users%40mailinglists.sqlite.org/msg105314.html - -Upstream-Status: Backport [https://sqlite.org/src/info/cf0d3715caac9149] - -CVE: CVE-2017-13685 - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> - -Index: src/shell.c -================================================================== ---- src/shell.c -+++ src/shell.c -@@ -2657,10 +2657,11 @@ - int *aiType /* Column types */ - ){ - int i; - ShellState *p = (ShellState*)pArg; - -+ if( azArg==0 ) return 0; - switch( p->cMode ){ - case MODE_Line: { - int w = 5; - if( azArg==0 ) break; - for(i=0; i<nArg; i++){ -@@ -3007,10 +3008,11 @@ - */ - static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){ - ShellText *p = (ShellText*)pArg; - int i; - UNUSED_PARAMETER(az); -+ if( azArg==0 ) return 0; - if( p->n ) appendText(p, "|", 0); - for(i=0; i<nArg; i++){ - if( i ) appendText(p, ",", 0); - if( azArg[i] ) appendText(p, azArg[i], 0); - } -@@ -3888,11 +3890,11 @@ - const char *zType; - const char *zSql; - ShellState *p = (ShellState *)pArg; - - UNUSED_PARAMETER(azNotUsed); -- if( nArg!=3 ) return 1; -+ if( nArg!=3 || azArg==0 ) return 0; - zTable = azArg[0]; - zType = azArg[1]; - zSql = azArg[2]; - - if( strcmp(zTable, "sqlite_sequence")==0 ){ diff --git a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.20.0.bb b/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.20.0.bb deleted file mode 100644 index e50825833..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.20.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require sqlite3.inc - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" - -SRC_URI = "\ - http://www.sqlite.org/2017/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - file://sqlite3-fix-CVE-2017-13685.patch \ - " -SRC_URI[md5sum] = "e262a28b73cc330e7e83520c8ce14e4d" -SRC_URI[sha256sum] = "3814c6f629ff93968b2b37a70497cfe98b366bf587a2261a56a5f750af6ae6a0" diff --git a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb b/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb new file mode 100644 index 000000000..ef88659e9 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb @@ -0,0 +1,10 @@ +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 \ + " +SRC_URI[md5sum] = "96b5648d542e8afa6ab7ffb8db8ddc3d" +SRC_URI[sha256sum] = "2824ab1238b706bc66127320afbdffb096361130e23291f26928a027b885c612" diff --git a/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.48.3.bb b/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.50.2.bb index 47208417b..8b9ee33ec 100644 --- a/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.48.3.bb +++ b/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.50.2.bb @@ -11,8 +11,8 @@ inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject 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] = "b300675ac5f269aa6eb48fe89a0d726d" -SRC_URI[archive.sha256sum] = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3" +SRC_URI[archive.md5sum] = "1912cfd1d9cdd30cebeb908507acadc5" +SRC_URI[archive.sha256sum] = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
