diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-support')
167 files changed, 2351 insertions, 3820 deletions
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/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch new file mode 100644 index 000000000..12371428f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch @@ -0,0 +1,76 @@ +From f26e8b88d2c90ed7eb9d4e276412b0923c23d10f Mon Sep 17 00:00:00 2001 +From: Dengke Du <dengke.du@windriver.com> +Date: Wed, 14 Dec 2016 18:13:08 +0800 +Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross + compiling + +In configure.in, it contains the following: + + APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8) + +the macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4, +it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross +compiling enable. + +So it was hardcoded for cross compiling, we should detect it dynamic based on +the sysroot's glibc. We change it to the following: + + AC_CHECK_SIZEOF(off_t) + +The same for the following hardcoded types for cross compiling: + + pid_t 8 + ssize_t 8 + size_t 8 + off_t 8 + +Change the above correspondingly. + +Signed-off-by: Dengke Du <dengke.du@windriver.com> +--- + configure.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index 9d57ae6..5b19940 100644 +--- a/configure.in ++++ b/configure.in +@@ -1681,7 +1681,7 @@ else + socklen_t_value="int" + fi + +-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8) ++AC_CHECK_SIZEOF(pid_t) + + if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then + pid_t_fmt='#define APR_PID_T_FMT "hd"' +@@ -1750,7 +1750,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"]) + +-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8) ++AC_CHECK_SIZEOF(ssize_t) + + AC_MSG_CHECKING([which format to use for apr_ssize_t]) + if test -n "$ssize_t_fmt"; then +@@ -1767,7 +1767,7 @@ fi + + ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" + +-APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8) ++AC_CHECK_SIZEOF(size_t) + + AC_MSG_CHECKING([which format to use for apr_size_t]) + if test -n "$size_t_fmt"; then +@@ -1784,7 +1784,7 @@ fi + + size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" + +-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8) ++AC_CHECK_SIZEOF(off_t) + + if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then + # Enable LFS +-- +2.7.4 + 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/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch new file mode 100644 index 000000000..7d0dddc53 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch @@ -0,0 +1,50 @@ +From 94d1ca0266a0f9c0446f1299b54f752e87b8a695 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 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_init' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_settype' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_destroy' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutex_trylock' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_attr_setstacksize' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_create' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_join' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_detach' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_sigmask' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_once' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_create' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_getspecific' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_delete' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_setspecific' +| collect2: error: ld returned 1 exit status +| Makefile:114: recipe for target 'globalmutexchild' failed +| make[1]: *** [globalmutexchild] Error 1 +| make[1]: Leaving directory '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/apr/1.5.2-r0/apr-1.5.2/test' + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + configure.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.in b/configure.in +index 5b19940..cdf4d58 100644 +--- a/configure.in ++++ b/configure.in +@@ -766,6 +766,7 @@ else + APR_PTHREADS_CHECK_RESTORE ] ) + fi + if test "$pthreadh" = "1"; then ++ APR_ADDTO(LIBS,[-lpthread]) + APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS + APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG + APR_CHECK_PTHREAD_RECURSIVE_MUTEX +-- +2.9.3 + diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb b/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb index 302c93504..992b561fb 100644 --- a/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb @@ -17,6 +17,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ 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 \ " SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa" @@ -38,7 +40,7 @@ CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sct # x86_64-linux-libtool: error: specify a tag with '--tag' CCACHE = "" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," do_configure_prepend() { diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.20.1.bb b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.22.0.bb index d4120b604..58edb6e1b 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.20.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.22.0.bb @@ -5,10 +5,10 @@ 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] = "23309b6f8e1623871ace6347fb734dce" -SRC_URI[sha256sum] = "2358a794e918e8f47ce0c7370eee8fc8a6207ff1afe976ec9ff547a03277bf8e" +SRC_URI[md5sum] = "aa62aed21b8e03dc44ab81ae49d893ca" +SRC_URI[sha256sum] = "e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1" -DEPENDS = "dbus glib-2.0 atk at-spi2-core" +DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core" inherit autotools pkgconfig distro_features_check upstream-version-is-even diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.20.2.bb b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.22.0.bb index 199243adf..272849e34 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.20.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.22.0.bb @@ -9,8 +9,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-build-Add-with-systemduserunitdir.patch \ " -SRC_URI[md5sum] = "f6f6303da2e72317f881703f40bf0c62" -SRC_URI[sha256sum] = "88a4de9d43139f13cca531b47b901bc1b56e0ab06ba899126644abd4ac16a143" +SRC_URI[md5sum] = "3da5fe62a653e49dad1c47f9a46fee56" +SRC_URI[sha256sum] = "415ea3af21318308798e098be8b3a17b2f0cf2fe16cecde5ad840cf4e0f2c80a" DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native" diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.20.0.bb b/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.22.0.bb index 0422354e0..bc80f9535 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.20.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.22.0.bb @@ -12,8 +12,8 @@ DEPENDS = "glib-2.0" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "5187b0972f4d3905f285540b31395e20" -SRC_URI[archive.sha256sum] = "493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0" +SRC_URI[archive.md5sum] = "c7f2adcf75e4058727174cde970e9129" +SRC_URI[archive.sha256sum] = "d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6" BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl.inc b/import-layers/yocto-poky/meta/recipes-support/attr/acl.inc deleted file mode 100644 index 37a0218cb..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/attr/acl.inc +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Utilities for managing POSIX Access Control Lists" -HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" -SECTION = "libs" - -LICENSE = "LGPLv2.1+ & GPLv2+" -LICENSE_${PN} = "GPLv2+" -LICENSE_lib${BPN} = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ - file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764" - -DEPENDS = "attr" -SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \ - file://run-ptest \ - file://acl-fix-the-order-of-expected-output-of-getfacl.patch \ - file://test-fix-insufficient-quoting-of.patch \ - file://test-fixups-on-SELinux-machines-for-root-testcases.patch \ - file://test-fix-directory-permissions.patch \ -" - -require ea-acl.inc - -# avoid RPATH hardcode to staging dir -do_configure_append() { - sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\', - ${S}/config.status -} - -# libdir should point to .la -do_install_append() { - sed -i ${D}${libdir}/libacl.la -e \ - s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', -} - -inherit ptest - -do_install_ptest() { - tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) - mkdir ${D}${PTEST_PATH}/include - cp ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/ -} - -RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow" diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch b/import-layers/yocto-poky/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch new file mode 100644 index 000000000..4c7cba3b8 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch @@ -0,0 +1,51 @@ +From d82457ce5ca7455e336da5e244d95f90e52aaef8 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 18 Apr 2017 01:17:26 -0700 +Subject: [PATCH] Makefile: libacl should depend on include + +Fixed race issue: + In file included from acl_copy_entry.c:22:0: + libacl.h:19:21: fatal error: sys/acl.h: No such file or directory + #include <sys/acl.h> + +[snip] + + compilation terminated. + acl_get_file.c:27:24: fatal error: acl/libacl.h: No such file or directory + #include <acl/libacl.h> + ^ + +The acl.h is in "include" directory, and include/Makefile creates +symlink "sys" and "acl" poinst to current dirctory: +$ ls include/ -l +acl -> . +sys -> . + +So if "libacl" target runs before "include", the error would happen +since no "acl" or "sys" directory. + +Let libacl depend on include can fix the problem. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index dce32d3..8a79379 100644 +--- a/Makefile ++++ b/Makefile +@@ -48,7 +48,7 @@ else + endif + + # tool/lib dependencies +-libacl: libmisc ++libacl: include libmisc + getfacl setfacl chacl: libacl + + ifeq ($(HAVE_BUILDDEFS), yes) +-- +2.10.2 + diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/add-missing-configure.ac.patch b/import-layers/yocto-poky/meta/recipes-support/attr/acl/add-missing-configure.ac.patch deleted file mode 100644 index eb6979fa3..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/attr/acl/add-missing-configure.ac.patch +++ /dev/null @@ -1,59 +0,0 @@ -Upstream-Status: Backport [configure.ac is missing from tarball] - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: acl-2.2.52/configure.ac -=================================================================== ---- /dev/null -+++ acl-2.2.52/configure.ac -@@ -0,0 +1,50 @@ -+ -+# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de> -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see <http://www.gnu.org/licenses/>. -+# -+AC_INIT(include/acl.h) -+AC_CONFIG_AUX_DIR([.]) -+AC_CONFIG_MACRO_DIR([m4]) -+AC_CONFIG_HEADER(include/config.h) -+AC_PREFIX_DEFAULT(/usr) -+ -+AC_PROG_LIBTOOL -+ -+AC_ARG_ENABLE(shared, -+[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, -+ enable_shared=yes) -+AC_SUBST(enable_shared) -+ -+AC_ARG_ENABLE(gettext, -+[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, -+ enable_gettext=yes) -+AC_SUBST(enable_gettext) -+ -+AC_ARG_ENABLE(lib64, -+[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],, -+ enable_lib64=no) -+AC_SUBST(enable_lib64) -+ -+AC_PACKAGE_GLOBALS(acl) -+AC_PACKAGE_UTILITIES(acl) -+AC_PACKAGE_NEED_ATTR_XATTR_H -+AC_PACKAGE_NEED_ATTR_ERROR_H -+AC_MULTILIB($enable_lib64) -+AC_PACKAGE_NEED_GETXATTR_LIBATTR -+AC_MANUAL_FORMAT -+ -+AC_FUNC_GCC_VISIBILITY -+ -+AC_OUTPUT(include/builddefs) diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/configure.ac b/import-layers/yocto-poky/meta/recipes-support/attr/acl/configure.ac new file mode 100644 index 000000000..7af2e8d88 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/attr/acl/configure.ac @@ -0,0 +1,49 @@ +# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +AC_INIT(include/acl.h) +AC_CONFIG_AUX_DIR([.]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_HEADER(include/config.h) +AC_PREFIX_DEFAULT(/usr) + +AC_PROG_LIBTOOL + +AC_ARG_ENABLE(shared, +[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, + enable_shared=yes) +AC_SUBST(enable_shared) + +AC_ARG_ENABLE(gettext, +[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, + enable_gettext=yes) +AC_SUBST(enable_gettext) + +AC_ARG_ENABLE(lib64, +[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],, + enable_lib64=no) +AC_SUBST(enable_lib64) + +AC_PACKAGE_GLOBALS(acl) +AC_PACKAGE_UTILITIES(acl) +AC_PACKAGE_NEED_ATTR_XATTR_H +AC_PACKAGE_NEED_ATTR_ERROR_H +AC_MULTILIB($enable_lib64) +AC_PACKAGE_NEED_GETXATTR_LIBATTR +AC_MANUAL_FORMAT + +AC_FUNC_GCC_VISIBILITY + +AC_OUTPUT(include/builddefs) diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb b/import-layers/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb index ecdbdb6b7..306c7b5cd 100644 --- a/import-layers/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb +++ b/import-layers/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb @@ -1,9 +1,50 @@ -require acl.inc +SUMMARY = "Utilities for managing POSIX Access Control Lists" +HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" +SECTION = "libs" -SRC_URI += "file://add-missing-configure.ac.patch" +LICENSE = "LGPLv2.1+ & GPLv2+" +LICENSE_${PN} = "GPLv2+" +LICENSE_lib${BPN} = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ + file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764" + +DEPENDS = "attr" + +SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \ + file://configure.ac;subdir=${S} \ + file://run-ptest \ + file://acl-fix-the-order-of-expected-output-of-getfacl.patch \ + file://test-fix-insufficient-quoting-of.patch \ + file://test-fixups-on-SELinux-machines-for-root-testcases.patch \ + file://test-fix-directory-permissions.patch \ + file://Makefile-libacl-should-depend-on-include.patch \ +" SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda" SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23" +require ea-acl.inc + +# avoid RPATH hardcode to staging dir +do_configure_append() { + sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\', + ${S}/config.status +} + +# libdir should point to .la +do_install_append() { + sed -i ${D}${libdir}/libacl.la -e \ + s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', +} + +inherit ptest + +do_install_ptest() { + tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) + mkdir ${D}${PTEST_PATH}/include + cp ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/ +} + +RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow" BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/files/attr-Missing-configure.ac.patch b/import-layers/yocto-poky/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch index 20fcc3cee..20fcc3cee 100644 --- a/import-layers/yocto-poky/meta/recipes-support/attr/files/attr-Missing-configure.ac.patch +++ b/import-layers/yocto-poky/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/files/dont-use-decl-macros.patch b/import-layers/yocto-poky/meta/recipes-support/attr/attr/dont-use-decl-macros.patch index 9d4b8929e..9d4b8929e 100644 --- a/import-layers/yocto-poky/meta/recipes-support/attr/files/dont-use-decl-macros.patch +++ b/import-layers/yocto-poky/meta/recipes-support/attr/attr/dont-use-decl-macros.patch 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 b3ca65e68..c587b3cac 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 @@ -2,6 +2,8 @@ SRC_URI += "file://relative-libdir.patch;striplevel=0 \ " +# This patch should be applied after '(attr\|acl)-Missing-configure.ac.patch' +SRC_URI_append = " file://0001-Added-configure-option-to-enable-disable-static-libr.patch" inherit autotools-brokensep gettext @@ -10,7 +12,7 @@ inherit autotools-brokensep gettext EXTRA_AUTORECONF += "--exclude=autoheader" EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root" EXTRA_OECONF_append_class-native = " --enable-gettext=no" -EXTRA_OECONF_append_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 'no')]}" +EXTRA_OECONF_append_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS') == 'no')]}" EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}" @@ -22,8 +24,8 @@ do_install_append_class-native () { if test "${libdir}" = "${base_libdir}" ; then return fi - librelpath=${@os.path.relpath(d.getVar('libdir',True), d.getVar('base_libdir', True))} - baselibrelpath=${@os.path.relpath(d.getVar('base_libdir',True), d.getVar('libdir', True))} + librelpath=${@os.path.relpath(d.getVar('libdir'), d.getVar('base_libdir'))} + baselibrelpath=${@os.path.relpath(d.getVar('base_libdir'), d.getVar('libdir'))} # Remove bad symlinks & create the correct symlinks if test -L ${D}${libdir}/lib${BPN}.so ; then @@ -46,5 +48,5 @@ FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}" BBCLASSEXTEND = "native" # Only append ldflags for target recipe and if USE_NLS is enabled -LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS', True) == 'yes')]}" -EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 'no')]}" +LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS') == 'yes')]}" +EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS') == 'no')]}" diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch b/import-layers/yocto-poky/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch new file mode 100644 index 000000000..1c1159f2c --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch @@ -0,0 +1,70 @@ +From 01256c61ba126449c46dd4ab5d5e145488b981fa Mon Sep 17 00:00:00 2001 +From: Amarnath Valluri <amarnath.valluri@intel.com> +Date: Mon, 23 Jan 2017 13:25:13 +0200 +Subject: [PATCH] Added configure option to enable/disable static library + +Create static library archive only in case of --enable-static. + +Upstream-Status: Pending + +Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> +--- + configure.ac | 6 ++++++ + include/builddefs.in | 1 + + include/buildmacros | 3 +++ + 3 files changed, 10 insertions(+) + +diff --git a/configure.ac b/configure.ac +index b966d0e..e48268b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,6 +26,12 @@ AC_ARG_ENABLE(shared, + enable_shared=yes) + AC_SUBST(enable_shared) + ++AC_ARG_ENABLE(static, ++[ --enable-static=[yes/no] Enable use of static libraries [default=yes]],, ++ enable_static=yes) ++AC_SUBST(enable_static) ++ ++ + AC_ARG_ENABLE(gettext, + [ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, + enable_gettext=yes) +diff --git a/include/builddefs.in b/include/builddefs.in +index d9931db..3b3dbd2 100644 +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -71,6 +71,7 @@ RPMBUILD = @rpmbuild@ + RPM_VERSION = @rpm_version@ + + ENABLE_SHARED = @enable_shared@ ++ENABLE_STATIC = @enable_static@ + ENABLE_GETTEXT = @enable_gettext@ + + HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@ +diff --git a/include/buildmacros b/include/buildmacros +index 39fa7e2..b0f25c5 100644 +--- a/include/buildmacros ++++ b/include/buildmacros +@@ -80,6 +80,7 @@ endif + # /usr/lib. + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB_DEV = \ ++ set -x; \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ + ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ + ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ +@@ -88,7 +89,9 @@ INSTALL_LTLIB_DEV = \ + ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ + if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ + rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ ++ if test "$(ENABLE_STATIC)" = "yes" ; then \ + ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ ++ fi ;\ + ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ + rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ + ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.4.bb b/import-layers/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.5.bb index 42719f143..dd22857a7 100644 --- a/import-layers/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.4.bb +++ b/import-layers/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.5.bb @@ -9,8 +9,8 @@ SECTION = "console/utils" SRC_URI = "https://github.com/scop/bash-completion/releases/download/${PV}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "1ea94864fb2b2446fbbdf82f10bd25df" -SRC_URI[sha256sum] = "c0f76b5202fec9ef8ffba82f5605025ca003f27cfd7a85115f838ba5136890f6" +SRC_URI[md5sum] = "15300010bd4034de12c3fc4f171692e3" +SRC_URI[sha256sum] = "b0b9540c65532825eca030f1241731383f89b2b65e80f3492c5dd2f0438c95cf" UPSTREAM_CHECK_REGEX = "bash-completion-(?P<pver>(?!2008).+)\.tar" UPSTREAM_CHECK_URI = "https://github.com/scop/bash-completion/releases" diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.61.0.bb b/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.63.0.bb index 32646d707..46013f343 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.61.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.63.0.bb @@ -1,4 +1,4 @@ -include boost-${PV}.inc +require boost-${PV}.inc SUMMARY = "Portable Boost.Jam build tool for boost" SECTION = "devel" diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.61.0.inc b/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.63.0.inc index cd9d8a495..b540a8992 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.61.0.inc +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.63.0.inc @@ -7,13 +7,18 @@ HOMEPAGE = "http://www.boost.org/" LICENSE = "BSL-1.0 & MIT & Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -BOOST_VER = "${@"_".join(d.getVar("PV", True).split("."))}" -BOOST_MAJ = "${@"_".join(d.getVar("PV", True).split(".")[0:2])}" +BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" +BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" -SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "6095876341956f65f9d35939ccea1a9f" -SRC_URI[sha256sum] = "a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640" +SRC_URI[md5sum] = "1c837ecd990bb022d07e7aab32b09847" +SRC_URI[sha256sum] = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0" + +UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" +UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" + +PR = "r1" S = "${WORKDIR}/${BOOST_P}" 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 1966d3d80..4ff70e399 100644 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost.inc +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost.inc @@ -42,16 +42,15 @@ PACKAGECONFIG ??= "locale" PACKAGECONFIG[locale] = ",,icu" PACKAGECONFIG[graph_parallel] = ",,,boost-mpi mpich" PACKAGECONFIG[mpi] = ",,mpich" -PACKAGECONFIG[python] = ",,python python3" +PACKAGECONFIG[python] = ",,python3" BOOST_LIBS += "\ - ${@bb.utils.contains('PACKAGECONFIG', 'locale', 'locale', '', d)} \ + ${@bb.utils.filter('PACKAGECONFIG', 'locale python', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'graph_parallel', 'graph_parallel mpi', \ - bb.utils.contains('PACKAGECONFIG', 'mpi', 'mpi', '', d), d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python python3', '', d)} \ + bb.utils.filter('PACKAGECONFIG', 'mpi', d), d)} \ " -inherit python-dir +inherit python3-dir PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" # Make a package for each library, plus -dev @@ -59,25 +58,17 @@ PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" python __anonymous () { packages = [] extras = [] - for lib in d.getVar('BOOST_LIBS', True).split( ): - # BJAM does not know '--with-python3' (only --with-python) - if lib != "python3": - extras.append("--with-%s" % lib) + for lib in d.getVar('BOOST_LIBS').split(): + extras.append("--with-%s" % lib) pkg = "boost-%s" % lib.replace("_", "-") packages.append(pkg) - if lib == "python": - # special: python*.so matches python3.so !! - if not d.getVar("FILES_%s" % pkg, True): - d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s.so.*" % lib) - else: - if not d.getVar("FILES_%s" % pkg, True): - d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib) + if not d.getVar("FILES_%s" % pkg): + d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib) d.setVar("BOOST_PACKAGES", " ".join(packages)) d.setVar("BJAM_EXTRA", " ".join(extras)) } # Override the contents of specific packages -FILES_${PN}-graph = "${libdir}/libboost_graph.so.*" FILES_${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" FILES_${PN}-locale = "${libdir}/libboost_locale.so.*" FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" @@ -88,15 +79,15 @@ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev ${PN}-staticdev" -FILES_${PN} = "" FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so" FILES_${PN}-staticdev = "${libdir}/libboost_*.a" # "boost" is a metapackage which pulls in all boost librabries PACKAGES += "${PN}" +FILES_${PN} = "" +ALLOW_EMPTY_${PN} = "1" RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" RRECOMMENDS_${PN}_class-native = "" -ALLOW_EMPTY_${PN} = "1" # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works TARGET_CC_ARCH += "${LDFLAGS}" @@ -145,7 +136,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', True) + 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 @@ -177,34 +168,42 @@ BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ # Native compilation of bzip2 isn't working BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1' +# Adjust the build for x32 +BJAM_OPTS_append_linux-gnux32 = " abi=x32 address-model=64" + do_configure() { cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. rm -f ${WORKDIR}/user-config.jam echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${WORKDIR}/user-config.jam - echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${WORKDIR}/user-config.jam - echo "using python : 3.5 : : ${STAGING_INCDIR}/python3.5m ;" >> ${WORKDIR}/user-config.jam + + # If we want Python then we need to tell Boost *exactly* where to find it + if ${@bb.utils.contains('BOOST_LIBS', 'python', 'true', 'false', d)}; then + echo "using python : ${PYTHON_BASEVERSION} : ${STAGING_DIR_HOST}${bindir}/python3 : ${STAGING_DIR_HOST}${includedir}/${PYTHON_DIR}${PYTHON_ABI} : ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR} ;" >> ${WORKDIR}/user-config.jam + fi if ${@bb.utils.contains('BOOST_LIBS', 'mpi', 'true', 'false', d)}; then echo "using mpi : : <find-shared-library>mpi ;" >> ${WORKDIR}/user-config.jam fi - CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT} - sed -i '/^using python/d' ${S}/project-config.jam + CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc + + # Boost can't be trusted to find Python on it's own, so remove any mention + # of it from the boost configuration + sed -i '/using python/d' ${S}/project-config.jam } do_compile() { - set -ex rm -rf ${S}/${TARGET_SYS} bjam ${BJAM_OPTS} --prefix=${prefix} \ --exec-prefix=${exec_prefix} \ --libdir=${libdir} \ - --includedir=${includedir} + --includedir=${includedir} \ + --debug-configuration } do_install() { - set -ex bjam ${BJAM_OPTS} \ --libdir=${D}${libdir} \ --includedir=${D}${includedir} \ diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch new file mode 100644 index 000000000..169906344 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch @@ -0,0 +1,100 @@ +From 8845a786598f1d9e83aa1b7d2966b0d1eb765ba0 Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Tue, 13 Dec 2016 10:14:31 -0700 +Subject: [PATCH 1/3] Apply boost-1.62.0-no-forced-flags.patch + +Upstream-Status: Inappropriate +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +--- + libs/log/build/Jamfile.v2 | 4 ++-- + libs/log/config/x86-ext/Jamfile.jam | 16 ++++++++-------- + libs/log/src/dump_avx2.cpp | 4 ++++ + libs/log/src/dump_ssse3.cpp | 4 ++++ + 4 files changed, 18 insertions(+), 10 deletions(-) + +diff --git a/libs/log/build/Jamfile.v2 b/libs/log/build/Jamfile.v2 +index 4abbdbc..b3016fc 100644 +--- a/libs/log/build/Jamfile.v2 ++++ b/libs/log/build/Jamfile.v2 +@@ -373,7 +373,7 @@ rule avx2-targets-cond ( properties * ) + } + else if <toolset>clang in $(properties) + { +- result = <cxxflags>"-mavx -mavx2" ; ++ result = <cxxflags> ; + } + else if <toolset>intel in $(properties) + { +@@ -383,7 +383,7 @@ rule avx2-targets-cond ( properties * ) + } + else + { +- result = <cxxflags>"-xCORE-AVX2 -fabi-version=0" ; ++ result = <cxxflags>"-fabi-version=0" ; + } + } + else if <toolset>msvc in $(properties) +diff --git a/libs/log/config/x86-ext/Jamfile.jam b/libs/log/config/x86-ext/Jamfile.jam +index 0e9695a..dcc394d 100644 +--- a/libs/log/config/x86-ext/Jamfile.jam ++++ b/libs/log/config/x86-ext/Jamfile.jam +@@ -15,19 +15,19 @@ project /boost/log/x86-extensions + + obj ssse3 : ssse3.cpp + : +- <toolset>gcc:<cxxflags>"-msse -msse2 -msse3 -mssse3" +- <toolset>clang:<cxxflags>"-msse -msse2 -msse3 -mssse3" +- <toolset>intel-linux:<cxxflags>"-xSSSE3" +- <toolset>intel-darwin:<cxxflags>"-xSSSE3" ++ <toolset>gcc:<cxxflags> ++ <toolset>clang:<cxxflags> ++ <toolset>intel-linux:<cxxflags> ++ <toolset>intel-darwin:<cxxflags> + <toolset>intel-win:<cxxflags>"/QxSSSE3" + ; + + obj avx2 : avx2.cpp + : +- <toolset>gcc:<cxxflags>"-mavx -mavx2 -fabi-version=0" +- <toolset>clang:<cxxflags>"-mavx -mavx2" +- <toolset>intel-linux:<cxxflags>"-xCORE-AVX2 -fabi-version=0" +- <toolset>intel-darwin:<cxxflags>"-xCORE-AVX2 -fabi-version=0" ++ <toolset>gcc:<cxxflags>"-fabi-version=0" ++ <toolset>clang:<cxxflags> ++ <toolset>intel-linux:<cxxflags>"-fabi-version=0" ++ <toolset>intel-darwin:<cxxflags>"-fabi-version=0" + <toolset>intel-win:<cxxflags>"/arch:CORE-AVX2" + <toolset>msvc:<cxxflags>"/arch:AVX" + ; +diff --git a/libs/log/src/dump_avx2.cpp b/libs/log/src/dump_avx2.cpp +index 4ab1250..610fc6d 100644 +--- a/libs/log/src/dump_avx2.cpp ++++ b/libs/log/src/dump_avx2.cpp +@@ -22,6 +22,10 @@ + #include <boost/cstdint.hpp> + #include <boost/log/detail/header.hpp> + ++#if !defined(__AVX2__) ++#error "AVX2 Unsupported!" ++#endif ++ + #if defined(__x86_64) || defined(__x86_64__) || \ + defined(__amd64__) || defined(__amd64) || \ + defined(_M_X64) +diff --git a/libs/log/src/dump_ssse3.cpp b/libs/log/src/dump_ssse3.cpp +index 1325b49..60d4112 100644 +--- a/libs/log/src/dump_ssse3.cpp ++++ b/libs/log/src/dump_ssse3.cpp +@@ -22,6 +22,10 @@ + #include <boost/cstdint.hpp> + #include <boost/log/detail/header.hpp> + ++#if !defined(__SSSE3__) ++#error "SSSE3 Unsupported!" ++#endif ++ + #if defined(__x86_64) || defined(__x86_64__) || \ + defined(__amd64__) || defined(__amd64) || \ + defined(_M_X64) +-- +2.8.0 diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch new file mode 100644 index 000000000..bafd5ce00 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch @@ -0,0 +1,29 @@ +From 9ab0914207e6d0e6b75ce12147c54b96478feb64 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 21 Feb 2017 12:50:35 +0200 +Subject: [PATCH] When using soft-float, on ARM we should not expect the FE_* + symbols + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + boost/test/execution_monitor.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/boost/test/execution_monitor.hpp b/boost/test/execution_monitor.hpp +index f53348a..86252d7 100644 +--- a/boost/test/execution_monitor.hpp ++++ b/boost/test/execution_monitor.hpp +@@ -498,7 +498,7 @@ enum masks { + + BOOST_FPE_ALL = MCW_EM, + +-#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) /* *** */ ++#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) || defined(__ARM_PCS) /* *** */ + BOOST_FPE_ALL = BOOST_FPE_OFF, + + #else /* *** */ +-- +2.11.0 + 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 new file mode 100644 index 000000000..e9c7e4c55 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch @@ -0,0 +1,97 @@ +From c0e785f8da2caa6617052b1c7b347e0dffb1520d 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 + +Upstream-Status: Inappropriate +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +--- + tools/build/src/tools/gcc.jam | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam +index 0f346a5..942f141 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) ; + } + + 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 diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch deleted file mode 100644 index 569c98733..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 5c349a1c391c9ce171a1c80f5164fae764f27dba Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com> -Date: Wed, 24 Aug 2016 20:58:59 +0100 -Subject: [PATCH 2/4] boost/test/execution_monitor.hpp: fix mips soft float -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gcc.compile.c++ <builddir>/boost/bin.v2/libs/test/build/gcc-4.3.1/release/threading-multi/execution_monitor.o - - "mipsel-poky-linux-musl-g++" "-mel" "-mabi=32" "-msoft-float" "-march=mips32r2" "-mips16" "-minterlink-compressed" "-mtune=24kec" "-mdsp" "-Wl,-O1" "-Wl,--as-needed" "-fstack-protector-strong" "-Wl,-z,relro,-z,now" "--sysroot=<sysroot>" -ftemplate-depth-128 -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=<srcdir>=/usr/src/debug/boost/1.61.0-r0 -fdebug-prefix-map=<sysroot_host>= -fdebug-prefix-map=<sysroot>= -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -fvisibility-inlines-hidden -O3 -finline-functions -Wno-inline -Wall -pedantic -pthread -fPIC -Wno-variadic-macros -DBOOST_ALL_NO_LIB=1 -DBOOST_CHRONO_DYN_LINK=1 -DBOOST_SYSTEM_DYN_LINK=1 -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_TEST_DYN_LINK=1 -DBOOST_TIMER_DYN_LINK=1 -DNDEBUG -I"." -c -o "<builddir>/boost/bin.v2/libs/test/build/gcc-4.3.1/release/threading-multi/execution_monitor.o" "libs/test/src/execution_monitor.cpp" - -In file included from ./boost/test/impl/execution_monitor.ipp:31:0, - from libs/test/src/execution_monitor.cpp:16: -./boost/test/execution_monitor.hpp:491:27: error: 'FE_DIVBYZERO' was not declared in this scope - BOOST_FPE_DIVBYZERO = FE_DIVBYZERO, - ^~~~~~~~~~~~ -./boost/test/execution_monitor.hpp:492:27: error: 'FE_INEXACT' was not declared in this scope - BOOST_FPE_INEXACT = FE_INEXACT, - ^~~~~~~~~~ -./boost/test/execution_monitor.hpp:493:27: error: 'FE_INVALID' was not declared in this scope - BOOST_FPE_INVALID = FE_INVALID, - ^~~~~~~~~~ -./boost/test/execution_monitor.hpp:494:27: error: 'FE_OVERFLOW' was not declared in this scope - BOOST_FPE_OVERFLOW = FE_OVERFLOW, - ^~~~~~~~~~~ -./boost/test/execution_monitor.hpp:495:27: error: 'FE_UNDERFLOW' was not declared in this scope - BOOST_FPE_UNDERFLOW = FE_UNDERFLOW, - ^~~~~~~~~~~~ - -The reason is that some (notably FPU-less) architectures, -including mips*-nf, don't define/implement some of the -floating point constants, even though fenv.h is -available. - -The key point is: - A fully standards conforming fenv.h does not have to - define any FE_* macros, and if it does define them, - then it defines macros only for the FP exceptions it - actually supports. - -So correct usage requires a triple check: -1) Check BOOST_NO_FENV_H to see if the header is supported. -2) Include the header and then check FE_ALL_EXCEPT to see - if any FP exceptions are supported. -3) Before using the individual FE_* macros, you need to - check for their existence too as not all may be - supported. - -https://svn.boost.org/trac/boost/ticket/11756 - -Other projects have similar issues, e.g. pixman, and -apply similar work-arounds: - https://lists.freedesktop.org/archives/pixman/2014-February/003172.html - -Architectures are notably also allowed to define FE_ALL_EXCEPT to 0! -Keeping this in mind, and knowing that the compiler will eliminate -code that can't be executed, we can change BOOST_FPE_ALL to be 0 for -the case of compiling using Clang and/or fenv.h being unavailable -as well, which allows simplification of the #ifdef's in -execution_monitor.ipp a bit. - -Signed-off-by: André Draszik <adraszik@tycoint.com> ---- -Upstream-Status: Submitted https://svn.boost.org/trac/boost/ticket/11756 - boost/test/execution_monitor.hpp | 26 +++++++++++++++++++++++++- - boost/test/impl/execution_monitor.ipp | 10 ++++++++-- - 2 files changed, 33 insertions(+), 3 deletions(-) - -diff --git a/boost/test/execution_monitor.hpp b/boost/test/execution_monitor.hpp -index 0eee497..44fe59d 100644 ---- a/boost/test/execution_monitor.hpp -+++ b/boost/test/execution_monitor.hpp -@@ -486,15 +486,39 @@ enum masks { - BOOST_FPE_ALL = MCW_EM, - #elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) \ - || defined(__ARM_PCS) -- BOOST_FPE_ALL = 1, -+ BOOST_FPE_ALL = 0, - #else -+#if defined(FE_DIVBYZERO) - BOOST_FPE_DIVBYZERO = FE_DIVBYZERO, -+#else -+ BOOST_FPE_DIVBYZERO = 0, -+#endif -+#if defined(FE_INEXACT) - BOOST_FPE_INEXACT = FE_INEXACT, -+#else -+ BOOST_FPE_INEXACT = 0, -+#endif -+#if defined(FE_INVALID) - BOOST_FPE_INVALID = FE_INVALID, -+#else -+ BOOST_FPE_INVALID = 0, -+#endif -+#if defined(FE_OVERFLOW) - BOOST_FPE_OVERFLOW = FE_OVERFLOW, -+#else -+ BOOST_FPE_OVERFLOW = 0, -+#endif -+#if defined(FE_UNDERFLOW) - BOOST_FPE_UNDERFLOW = FE_UNDERFLOW, -+#else -+ BOOST_FPE_UNDERFLOW = 0, -+#endif - -+#if defined(FE_ALL_EXCEPT) - BOOST_FPE_ALL = FE_ALL_EXCEPT, -+#else -+ BOOST_FPE_ALL = 0, -+#endif - #endif - BOOST_FPE_INV = BOOST_FPE_ALL+1 - }; -diff --git a/boost/test/impl/execution_monitor.ipp b/boost/test/impl/execution_monitor.ipp -index f7fc8ea..d1088b9 100644 ---- a/boost/test/impl/execution_monitor.ipp -+++ b/boost/test/impl/execution_monitor.ipp -@@ -1381,7 +1381,10 @@ enable( unsigned mask ) - #endif - - return ~old_cw & BOOST_FPE_ALL; --#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) -+#elif defined(__GLIBC__) && defined(__USE_GNU) -+ if (BOOST_FPE_ALL == 0) -+ /* Not Implemented */ -+ return 0; - feclearexcept(BOOST_FPE_ALL); - int res = feenableexcept( mask ); - return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; -@@ -1418,7 +1421,10 @@ disable( unsigned mask ) - #endif - - return ~old_cw & BOOST_FPE_ALL; --#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) -+#elif defined(__GLIBC__) && defined(__USE_GNU) -+ if (BOOST_FPE_ALL == 0) -+ /* Not Implemented */ -+ return BOOST_FPE_INV; - feclearexcept(BOOST_FPE_ALL); - int res = fedisableexcept( mask ); - return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; --- -2.9.3 - 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 new file mode 100644 index 000000000..6bb25f885 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch @@ -0,0 +1,143 @@ +From 7c49525812567f1219706c4ed330b3bd2cc8e94a 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 + 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(-) + +diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam +index 942f141..d062c20 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 + : + <architecture>$(architecture)/<instruction-set>$(instruction-set) + : $(values) ; + } +- +- +-# Set architecture/instruction-set options. +-# +-# x86 and compatible +-# The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. +-# Use i686 instead for 32-bit. +-toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ; +-cpu-flags gcc OPTIONS : x86 : native : -march=native ; +-cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ; +-cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ; +-cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ; +-cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ; +-cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ; +-cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ; +-cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ; +-cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ; +-cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ; +-cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ; +-cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ; +-cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ; +-cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ; +-cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ; +-cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ; +-cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ; +-cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ; +-cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ; +-cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ; +-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 : k6 : -march=k6 ; +-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; +-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; +-cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ; +-cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ; +-cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ; +-cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ; +-cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ; +-## +-cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ; +-cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ; +-cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ; +-cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ; +-cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ; +-cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ; +-cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ; +-cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ; +-cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ; +-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 : btver1 : -march=btver1 ; +-cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; +-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 ; +-cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; +-## +-cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; +-# Sparc +-cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ; +-cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ; +-cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ; +-cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ; +-cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ; +-cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ; +-cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ; +-cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ; +-cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ; +-cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ; +-cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ; +-cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ; +-cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ; +-cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ; +-# RS/6000 & PowerPC +-cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ; +-cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ; +-cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ; +-cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ; +-cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ; +-cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ; +-cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ; +-cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ; +-cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ; +-cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ; +-cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ; +-cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ; +-cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ; +-cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ; +-cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ; +-cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ; +-cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ; +-cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ; +-cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ; +-cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ; +-cpu-flags gcc OPTIONS : power : power : -mcpu=power ; +-cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ; +-cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ; +-cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ; +-cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ; +-cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ; +-cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ; +-cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ; +-cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ; +-cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ; +-cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ; +-cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; +-# AIX variant of RS/6000 & PowerPC +-toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; +-- +2.8.0 diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch deleted file mode 100644 index 2b48d0d5d..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 4f19d72ca94418431e068cfd4ffb96ed9b289f6c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com> -Date: Wed, 24 Aug 2016 17:34:59 +0100 -Subject: [PATCH 3/4] smart_ptr: mips assembly doesn't compile in mips16e mode -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gcc.compile.c++ <builddir>/boost/bin.v2/libs/date_time/build/gcc-4.3.1/release/threading-multi/gregorian/greg_month.o - - "mipsel-poky-linux-musl-g++" "-mel" "-mabi=32" "-msoft-float" "-march=mips32r2" "-mips16" "-minterlink-compressed" "-mtune=24kec" "-mdsp" "-Wl,-O1" "-Wl,--as-needed" "-fstack-protector-strong" "-Wl,-z,relro,-z,now" "--sysroot=<sysroot>" -ftemplate-depth-128 -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=<srcdir>=/usr/src/debug/boost/1.61.0-r0 -fdebug-prefix-map=<sysroot_host>= -fdebug-prefix-map=<sysroot>= -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -fvisibility-inlines-hidden -O3 -finline-functions -Wno-inline -Wall -pthread -fPIC -DBOOST_ALL_DYN_LINK=1 -DBOOST_ALL_NO_LIB=1 -DDATE_TIME_INLINE -DNDEBUG -I"." -c -o "<builddir>/boost/bin.v2/libs/date_time/build/gcc-4.3.1/release/threading-multi/gregorian/greg_month.o" "libs/date_time/src/gregorian/greg_month.cpp" - -{standard input}: Assembler messages: -{standard input}:17603: Warning: the `dsp' extension requires MIPS32 revision 2 or greater -{standard input}:17604: Error: unrecognized opcode `ll $3,4($16)' -{standard input}:17606: Error: unrecognized opcode `sc $2,4($16)' -{standard input}:17734: Error: unrecognized opcode `ll $3,8($16)' -{standard input}:17736: Error: unrecognized opcode `sc $2,8($16)' -{standard input}:18084: Error: unrecognized opcode `ll $3,4($4)' -{standard input}:18086: Error: unrecognized opcode `sc $2,4($4)' -{standard input}:18318: Error: unrecognized opcode `ll $3,8($4)' -{standard input}:18320: Error: unrecognized opcode `sc $2,8($4)' -{standard input}:19921: Error: unrecognized opcode `ll $3,4($2)' -{standard input}:19923: Error: unrecognized opcode `sc $3,4($2)' -{standard input}:20199: Error: unrecognized opcode `ll $4,4($16)' -{standard input}:20201: Error: unrecognized opcode `sc $2,4($16)' -{standard input}:23392: Error: unrecognized opcode `ll $4,8($16)' -{standard input}:23394: Error: unrecognized opcode `sc $2,8($16)' -...failed updating 1 target... - -boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp -contains hand-written MIPS assembly, which is not compatible -with the MIPS16e instruction set. - -By not using this file in MIPS16e mode, we fallback to using -g++ 4.1+ __sync intrinsics (__sync_fetch_and_add() and -__sync_val_compare_and_swap()) which are working fine. - -Signed-off-by: André Draszik <adraszik@tycoint.com> ---- -Upstream-Status: Backport https://svn.boost.org/trac/boost/ticket/12418 - boost/smart_ptr/detail/sp_counted_base.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/boost/smart_ptr/detail/sp_counted_base.hpp b/boost/smart_ptr/detail/sp_counted_base.hpp -index 0addf07..0995ca8 100644 ---- a/boost/smart_ptr/detail/sp_counted_base.hpp -+++ b/boost/smart_ptr/detail/sp_counted_base.hpp -@@ -65,7 +65,7 @@ - #elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) ) && !defined(__PATHSCALE__) && !defined( _AIX ) - # include <boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp> - --#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) && !defined(__PATHSCALE__) -+#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) && !defined(__PATHSCALE__) && !defined( __mips16 ) - # include <boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp> - - #elif defined( BOOST_SP_HAS_SYNC ) --- -2.9.3 - diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/consider-hardfp.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/consider-hardfp.patch deleted file mode 100644 index 66808a69d..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost/consider-hardfp.patch +++ /dev/null @@ -1,19 +0,0 @@ -When using soft-float, on ARM we should not expect the FE_* symbols - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: boost_1_60_0/boost/test/execution_monitor.hpp -=================================================================== ---- boost_1_60_0.orig/boost/test/execution_monitor.hpp -+++ boost_1_60_0/boost/test/execution_monitor.hpp -@@ -484,7 +484,8 @@ enum masks { - BOOST_FPE_UNDERFLOW = EM_UNDERFLOW|EM_DENORMAL, - - BOOST_FPE_ALL = MCW_EM, --#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) -+#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) \ -+ || defined(__ARM_PCS) - BOOST_FPE_ALL = 1, - #else - BOOST_FPE_DIVBYZERO = FE_DIVBYZERO, diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/py3.patch b/import-layers/yocto-poky/meta/recipes-support/boost/boost/py3.patch new file mode 100644 index 000000000..2b1ff1865 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost/py3.patch @@ -0,0 +1,269 @@ +Backport fixes from upstream (as of boost super-module commit 0d52b9) to improve +the building of the Boost Python module with Python 3. + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/build/Jamfile b/build/Jamfile +index 313fdab..f14dc11 100644 +--- a/libs/python/build/Jamfile ++++ b/libs/python/build/Jamfile +@@ -6,6 +6,7 @@ import os ; + import indirect ; + import modules ; + import feature ; ++import property ; + + import python ; + +@@ -30,21 +31,8 @@ else + ; + } + +-rule find-py3-version +-{ +- local versions = [ feature.values python ] ; +- local py3ver ; +- for local v in $(versions) +- { +- if $(v) >= 3.0 +- { +- py3ver = $(v) ; +- } +- } +- return $(py3ver) ; +-} +- +-py3-version = [ find-py3-version ] ; ++py2-version = [ py-version 2 ] ; ++py3-version = [ py-version 3 ] ; + + project boost/python + : source-location ../src +@@ -52,11 +40,17 @@ project boost/python + + rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } + rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } ++local rule eq ( a : b ) { if $(a) = $(b) { return 1 ; } } + +-rule lib_boost_python ( is-py3 ? ) +-{ ++lib_boost_python(2) = boost_python ; ++lib_boost_python(3) = boost_python3 ; + +- lib [ cond $(is-py3) : boost_python3 : boost_python ] ++lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ; ++lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ; ++ ++rule lib_boost_python ( version ) ++{ ++ lib $(lib_boost_python($(version))) + : # sources + numeric.cpp + list.cpp +@@ -112,11 +106,13 @@ rule lib_boost_python ( is-py3 ? ) + <dependency>config-warning + + <python-debugging>on:<define>BOOST_DEBUG_PYTHON +- [ cond $(is-py3) : <python>$(py3-version) ] ++ <python>$(version) + + -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag + <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag + ++ <conditional>@python.require-py ++ + : # default build + <link>shared + : # usage requirements +@@ -125,51 +121,68 @@ rule lib_boost_python ( is-py3 ? ) + ; + } + +-rule lib_boost_numpy ( is-py3 ? ) ++lib_boost_numpy(2) = boost_numpy ; ++lib_boost_numpy(3) = boost_numpy3 ; ++ ++lib_boost_numpy($(py2-version)) = $(lib_boost_python(2)) ; ++lib_boost_numpy($(py3-version)) = $(lib_boost_python(3)) ; ++ ++rule lib_boost_numpy ( version ) + { + numpy-include = [ python.numpy-include ] ; +- lib [ cond $(is-py3) : boost_numpy3 : boost_numpy ] ++ lib $(lib_boost_numpy($(version))) + : # sources + numpy/dtype.cpp + numpy/matrix.cpp + numpy/ndarray.cpp +- numpy/numpy.cpp +- numpy/scalars.cpp +- numpy/ufunc.cpp ++ numpy/numpy.cpp ++ numpy/scalars.cpp ++ numpy/ufunc.cpp + : # requirements ++ <link>static:<define>BOOST_NUMPY_STATIC_LIB ++ <define>BOOST_NUMPY_SOURCE + [ cond [ python.numpy ] : <library>/python//python_for_extensions ] + [ unless [ python.numpy ] : <build>no ] +- <include>$(numpy-include) +- <library>boost_python ++ <include>$(numpy-include) ++ <library>$(lib_boost_python($(version))) + <python-debugging>on:<define>BOOST_DEBUG_PYTHON +- [ cond $(is-py3) : <python>$(py3-version) ] ++ <python>$(version) + + -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag + <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag + ++ <conditional>@python.require-py ++ + : # default build + <link>shared + : # usage requirements ++ <link>static:<define>BOOST_NUMPY_STATIC_LIB + <python-debugging>on:<define>BOOST_DEBUG_PYTHON + ; + } + +-libraries = boost_python ; +-libraries3 = boost_python3 ; +-if [ python.numpy ] +-{ +- libraries += boost_numpy ; +- libraries3 += boost_numpy3 ; +-} +- +-lib_boost_python ; +-lib_boost_numpy ; ++libraries = ; + +-if $(py3-version) ++for local N in 2 3 + { +- lib_boost_python yes ; +- lib_boost_numpy yes ; +- libraries += $(libraries3) ; ++ if $(py$(N)-version) ++ { ++ lib_boost_python $(py$(N)-version) ; ++ libraries += $(lib_boost_python($(py$(N)-version))) ; ++ } ++ else ++ { ++ alias $(lib_boost_python($(N))) ; ++ } ++ if $(py$(N)-version) && [ python.numpy ] ++ { ++ lib_boost_numpy $(py$(N)-version) ; ++ libraries += $(lib_boost_numpy($(py$(N)-version))) ; ++ } ++ else ++ { ++ alias $(lib_boost_numpy($(N))) ; ++ } + } + + boost-install $(libraries) ; +diff --git a/src/tools/python.jam b/src/tools/python.jam +index cc13385..bf300b8 100644 +--- a/tools/build/src/tools/python.jam ++++ b/tools/build/src/tools/python.jam +@@ -34,6 +34,7 @@ import path ; + import feature ; + import set ; + import builtin ; ++import property-set ; + + + # Make this module a project. +@@ -60,6 +61,10 @@ lib rt ; + # installed in the development system's default paths. + feature.feature pythonpath : : free optional path ; + ++# The best configured version of Python 2 and 3. ++py2-version = ; ++py3-version = ; ++ + # Initializes the Python toolset. Note that all parameters are optional. + # + # - version -- the version of Python to use. Should be in Major.Minor format, +@@ -861,6 +866,11 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : + if ! $(version) in [ feature.values python ] + { + feature.extend python : $(version) ; ++ py$(major-minor[1])-version ?= $(version) ; ++ if $(py$(major-minor[1])-version) < $(version) ++ { ++ py$(major-minor[1])-version = $(version) ; ++ } + } + target-requirements += <python>$(version:E=default) ; + } +@@ -916,6 +926,9 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : + } + } + ++ # In case we added duplicate requirements from what the user specified. ++ target-requirements = [ sequence.unique $(target-requirements) ] ; ++ + # Global, but conditional, requirements to give access to the interpreter + # for general utilities, like other toolsets, that run Python scripts. + toolset.add-requirements +@@ -934,19 +947,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : + toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ; + } + +- # We also set a default requirement that assigns the first python configured +- # for a particular target OS as the default. This makes it so that we can +- # select a python interpreter with only knowledge of the target OS. And hence +- # can configure different Pythons based on the target OS only. +- local toolset-requirements = [ toolset.requirements ] ; +- local toolset-target-os-requirements +- = [ property.evaluate-conditionals-in-context +- [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ; +- if ! <python> in $(toolset-target-os-requirements:G) +- { +- toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ; +- } +- + # Register the right suffix for extensions. + register-extension-suffix $(extension-suffix) : $(target-requirements) ; + +@@ -1038,6 +1038,22 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : + : $(usage-requirements) + ; + } ++ ++} ++ ++# Conditional rule specification that will prevent building of a target ++# if there is no matching python configuration available with the given ++# required properties. ++rule require-py ( properties * ) ++{ ++ local py-ext-target = [ $(.project).find python_for_extensions ] ; ++ local property-set = [ property-set.create $(properties) ] ; ++ property-set = [ $(property-set).expand ] ; ++ local py-ext-alternative = [ $(py-ext-target).select-alternatives $(property-set) ] ; ++ if ! $(py-ext-alternative) ++ { ++ return <build>no ; ++ } + } + + +@@ -1298,5 +1314,11 @@ rule numpy-test ( name : sources * : requirements * ) + : $(name) ] ; + } + ++rule py-version ( n ) ++{ ++ return $(py$(n)-version) ; ++} ++ + IMPORT $(__name__) : bpl-test : : bpl-test ; + IMPORT $(__name__) : numpy-test : : numpy-test ; ++IMPORT $(__name__) : py-version : : py-version ; diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.61.0.bb b/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.61.0.bb deleted file mode 100644 index 40e3870a3..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.61.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -include boost-${PV}.inc -include boost.inc - -SRC_URI += "\ - file://arm-intrinsics.patch \ - file://consider-hardfp.patch \ - file://boost-CVE-2012-2677.patch \ - file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \ - file://0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch \ - file://0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch \ - file://0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.patch \ - file://boost-math-disable-pch-for-gcc.patch \ -" diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.63.0.bb b/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.63.0.bb new file mode 100644 index 000000000..1107686bc --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.63.0.bb @@ -0,0 +1,15 @@ +require boost-${PV}.inc +require boost.inc + +SRC_URI += "\ + file://arm-intrinsics.patch \ + file://0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch \ + file://boost-CVE-2012-2677.patch \ + file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \ + file://0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.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://py3.patch \ +" diff --git a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb b/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20161130.bb index 1bea0676b..c282ace26 100644 --- a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb +++ b/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20161130.bb @@ -8,11 +8,13 @@ LICENSE = "GPL-2.0+ & MPL-2.0" LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7358b9541ccf3029e9705ed8de57968" # This is needed to ensure we can run the postinst at image creation time -DEPENDS = "ca-certificates-native" +DEPENDS = "" DEPENDS_class-native = "openssl-native" -DEPENDS_class-nativesdk = "ca-certificates-native openssl-native" +DEPENDS_class-nativesdk = "openssl-native" +# Need c_rehash from openssl and run-parts from debianutils +PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" -SRCREV = "f54715702c5c0581c9461f78fd84e2c8d2ec243c" +SRCREV = "61b70a1007dc269d56881a0d480fc841daacc77c" SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ file://0002-update-ca-certificates-use-SYSROOT.patch \ @@ -62,7 +64,7 @@ do_install_append_class-target () { } pkg_postinst_${PN} () { - SYSROOT="$D" update-ca-certificates + SYSROOT="$D" $D${sbindir}/update-ca-certificates } CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf" @@ -70,7 +72,7 @@ CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf" # Postinsts don't seem to be run for nativesdk packages when populating SDKs. CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" do_install_append_class-nativesdk () { - SYSROOT="${D}${SDKPATHNATIVE}" update-ca-certificates + SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates } do_install_append_class-native () { @@ -79,4 +81,4 @@ do_install_append_class-native () { RDEPENDS_${PN} += "openssl" -BBCLASSEXTEND += "native nativesdk" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb index ceac0fe31..80d48bf84 100644 --- a/import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb @@ -23,8 +23,7 @@ SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf9751464 S = "${WORKDIR}/ConsoleKit-${PV}" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" PACKAGECONFIG[policykit] = "--with-polkit,--without-polkit,polkit" diff --git a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/createrepo-dbpath.patch b/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/createrepo-dbpath.patch deleted file mode 100644 index 72755981a..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/createrepo-dbpath.patch +++ /dev/null @@ -1,61 +0,0 @@ -createrepo: Implement --dbpath command line option - ---dbpath option allows to specify path to the directory -with rpm database. By default createrepo uses or creates -rpm database in /var/lib/rpm/ - -Upstream-Status: Pending - -Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> - ---- createrepo-0.4.11.orig/genpkgmetadata.py 2015-03-30 22:18:19.904000000 +0300 -+++ createrepo-0.4.11/genpkgmetadata.py 2015-03-30 22:28:49.208000000 +0300 -@@ -65,6 +65,7 @@ - -p, --pretty = output xml files in pretty format. - --update = update existing metadata (if present) - -d, --database = generate the sqlite databases. -+ --dbpath <dir> = specify path to rpm db directory. - """) - - sys.exit(retval) -@@ -72,10 +73,13 @@ - class MetaDataGenerator: - def __init__(self, cmds): - self.cmds = cmds -- self.ts = rpm.TransactionSet() - self.pkgcount = 0 - self.files = [] - -+ if self.cmds['dbpath']: -+ rpm.addMacro("_dbpath", self.cmds['dbpath']) -+ self.ts = rpm.TransactionSet() -+ - def _os_path_walk(self, top, func, arg): - """Directory tree walk with callback function. - copy of os.path.walk, fixes the link/stating problem -@@ -435,6 +439,7 @@ - cmds['dir-pattern-match'] = ['.*bin\/.*', '^\/etc\/.*'] - cmds['skip-symlinks'] = False - cmds['pkglist'] = [] -+ cmds['dbpath'] = None - - try: - gopts, argsleft = getopt.getopt(args, 'phqVvndg:s:x:u:c:o:CSi:', ['help', 'exclude=', -@@ -442,7 +447,7 @@ - 'baseurl=', 'groupfile=', 'checksum=', - 'version', 'pretty', 'split', 'outputdir=', - 'noepoch', 'checkts', 'database', 'update', -- 'skip-symlinks', 'pkglist=']) -+ 'skip-symlinks', 'pkglist=', 'dbpath=']) - except getopt.error, e: - errorprint(_('Options Error: %s.') % e) - usage() -@@ -516,6 +521,8 @@ - cmds['skip-symlinks'] = True - elif arg in ['-i', '--pkglist']: - cmds['pkglist'] = a -+ elif arg == '--dbpath': -+ cmds['dbpath'] = os.path.realpath(a) - - except ValueError, e: - errorprint(_('Options Error: %s') % e) diff --git a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch b/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch deleted file mode 100644 index bc7200d07..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch +++ /dev/null @@ -1,22 +0,0 @@ -dumpMetadata.py: Fix for RPM5 - 5.4.9 integration - -RPM5 no longer has a switch to disable signature validation. (Due to security -validation concerns.) - -Upstream-Status: Inappropriate [other] - createrepo does not support RPM5 upstream - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> - -diff -u createrepo-0.4.11.orig/dumpMetadata.py createrepo-0.4.11/dumpMetadata.py ---- createrepo-0.4.11.orig/dumpMetadata.py 2012-06-05 10:12:55.687964222 -0500 -+++ createrepo-0.4.11/dumpMetadata.py 2012-06-05 10:40:08.154060600 -0500 -@@ -92,7 +92,7 @@ - fdno = package # let's assume this is an fdno and go with it :) - except OSError: - raise MDError, "Error opening file" -- ts.setVSFlags((rpm._RPMVSF_NOSIGNATURES|rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD)) -+ ts.setVSFlags((rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD)) - try: - hdr = ts.hdrFromFdno(fdno) - except rpm.error: diff --git a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/dumpMetadata-disable-signature-validation.patch b/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/dumpMetadata-disable-signature-validation.patch deleted file mode 100644 index 905531f84..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/dumpMetadata-disable-signature-validation.patch +++ /dev/null @@ -1,31 +0,0 @@ -dumpMetadata: disable signature validation - -Makes it possible to work on RPM repositories that contain signed packages -without the need of importing the public part of the signing key into the RPM -database. - -Upstream-Status: Pending - -Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> ---- - dumpMetadata.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/dumpMetadata.py b/dumpMetadata.py -index e40e8ac..ca6a82d 100644 ---- a/dumpMetadata.py -+++ b/dumpMetadata.py -@@ -92,7 +92,9 @@ def returnHdr(ts, package): - fdno = package # let's assume this is an fdno and go with it :) - except OSError: - raise MDError, "Error opening file" -- ts.setVSFlags((rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD)) -+ ts.setVSFlags((rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD| -+ rpm.RPMVSF_NODSA|rpm.RPMVSF_NORSA| -+ rpm.RPMVSF_NODSAHEADER|rpm.RPMVSF_NORSAHEADER)) - try: - hdr = ts.hdrFromFdno(fdno) - except rpm.error: --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/fix-native-install.patch b/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/fix-native-install.patch deleted file mode 100644 index d8202a4f7..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/fix-native-install.patch +++ /dev/null @@ -1,163 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Date: Jan 31, 2011 - -There are two fixes: - 1. -native needs to customize prefix - 2. needs to change python reference in binaries - -Signed-off-by: Qing He <qing.he@intel.com> - -diff --git a/Makefile b/Makefile -index b2d1a32..3c3639f 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,22 +3,22 @@ VERSION = 0.4.11 - SHELL = /bin/sh - top_srcdir = . - srcdir = . --prefix = /usr --exec_prefix = ${prefix} -- --bindir = ${exec_prefix}/bin --sbindir = ${exec_prefix}/sbin --libexecdir = ${exec_prefix}/libexec --datadir = ${prefix}/share --sysconfdir = ${prefix}/etc --sharedstatedir = ${prefix}/com --localstatedir = ${prefix}/var --libdir = ${exec_prefix}/lib --infodir = ${prefix}/info -+prefix ?= /usr -+exec_prefix ?= ${prefix} -+ -+bindir ?= ${exec_prefix}/bin -+sbindir ?= ${exec_prefix}/sbin -+libexecdir ?= ${exec_prefix}/libexec -+datadir ?= ${prefix}/share -+sysconfdir ?= ${prefix}/etc -+sharedstatedir ?= ${prefix}/com -+localstatedir ?= ${prefix}/var -+libdir ?= ${exec_prefix}/lib -+infodir ?= ${prefix}/info - docdir = --includedir = ${prefix}/include -+includedir ?= ${prefix}/include - oldincludedir = /usr/include --mandir = ${prefix}/share/man -+mandir ?= ${prefix}/share/man - - pkgdatadir = $(datadir)/$(PACKAGE) - pkglibdir = $(libdir)/$(PACKAGE) -diff --git a/bin/Makefile b/bin/Makefile -index 52c1f50..e30610e 100644 ---- a/bin/Makefile -+++ b/bin/Makefile -@@ -1,22 +1,22 @@ - SHELL = /bin/sh - top_srcdir = .. - srcdir = ../bin --prefix = /usr --exec_prefix = ${prefix} -- --bindir = ${exec_prefix}/bin --sbindir = ${exec_prefix}/sbin --libexecdir = ${exec_prefix}/libexec --datadir = ${prefix}/share --sysconfdir = ${prefix}/etc --sharedstatedir = ${prefix}/com --localstatedir = ${prefix}/var --libdir = ${exec_prefix}/lib --infodir = ${prefix}/info -+prefix ?= /usr -+exec_prefix ?= ${prefix} -+ -+bindir ?= ${exec_prefix}/bin -+sbindir ?= ${exec_prefix}/sbin -+libexecdir ?= ${exec_prefix}/libexec -+datadir ?= ${prefix}/share -+sysconfdir ?= ${prefix}/etc -+sharedstatedir ?= ${prefix}/com -+localstatedir ?= ${prefix}/var -+libdir ?= ${exec_prefix}/lib -+infodir ?= ${prefix}/info - docdir = --includedir = ${prefix}/include -+includedir ?= ${prefix}/include - oldincludedir = /usr/include --mandir = ${prefix}/man -+mandir ?= ${prefix}/man - - pkgdatadir = $(datadir)/$(PACKAGE) - pkglibdir = $(libdir)/$(PACKAGE) -@@ -40,8 +40,11 @@ all: $(srcdir)/$(PACKAGE) - - - install: all installdirs -- $(INSTALL_BIN) $(srcdir)/$(PACKAGE) $(DESTDIR)$(bindir)/$(PACKAGE) -- $(INSTALL_BIN) $(srcdir)/modifyrepo $(DESTDIR)$(bindir)/modifyrepo -+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/$(PACKAGE) > $(srcdir)/$(PACKAGE).tmp -+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/modifyrepo > $(srcdir)/modifyrepo.tmp -+ $(INSTALL_BIN) $(srcdir)/$(PACKAGE).tmp $(DESTDIR)$(bindir)/$(PACKAGE) -+ $(INSTALL_BIN) $(srcdir)/modifyrepo.tmp $(DESTDIR)$(bindir)/modifyrepo -+ rm -f $(srcdir)/$(PACKAGE).tmp $(srcdir)/modifyrepo.tmp - - - uninstall: -diff --git a/bin/createrepo b/bin/createrepo -index b0de515..eaacb39 100755 ---- a/bin/createrepo -+++ b/bin/createrepo -@@ -1,2 +1,2 @@ - #!/bin/sh --exec /usr/share/createrepo/genpkgmetadata.py "$@" -+exec @DATADIR@/createrepo/genpkgmetadata.py "$@" -diff --git a/bin/modifyrepo b/bin/modifyrepo -index c9732d8..6f7c1d4 100755 ---- a/bin/modifyrepo -+++ b/bin/modifyrepo -@@ -1,2 +1,2 @@ - #!/bin/sh --exec /usr/share/createrepo/modifyrepo.py "$@" -+exec @DATADIR@/createrepo/modifyrepo.py "$@" -diff --git a/docs/Makefile b/docs/Makefile -index 0a41179..e128c85 100644 ---- a/docs/Makefile -+++ b/docs/Makefile -@@ -1,22 +1,22 @@ - SHELL = /bin/sh - top_srcdir = .. - srcdir = ../docs --prefix = /usr --exec_prefix = ${prefix} -- --bindir = ${exec_prefix}/bin --sbindir = ${exec_prefix}/sbin --libexecdir = ${exec_prefix}/libexec --datadir = ${prefix}/share --sysconfdir = ${prefix}/etc --sharedstatedir = ${prefix}/com --localstatedir = ${prefix}/var --libdir = ${exec_prefix}/lib --infodir = ${prefix}/info -+prefix ?= /usr -+exec_prefix ?= ${prefix} -+ -+bindir ?= ${exec_prefix}/bin -+sbindir ?= ${exec_prefix}/sbin -+libexecdir ?= ${exec_prefix}/libexec -+datadir ?= ${prefix}/share -+sysconfdir ?= ${prefix}/etc -+sharedstatedir ?= ${prefix}/com -+localstatedir ?= ${prefix}/var -+libdir ?= ${exec_prefix}/lib -+infodir ?= ${prefix}/info - docdir = --includedir = ${prefix}/include -+includedir ?= ${prefix}/include - oldincludedir = /usr/include --mandir = ${datadir}/man -+mandir ?= ${datadir}/man - - pkgdatadir = $(datadir)/$(PACKAGE) - pkglibdir = $(libdir)/$(PACKAGE) diff --git a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/fixstat.patch b/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/fixstat.patch deleted file mode 100644 index d34eb56a8..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/fixstat.patch +++ /dev/null @@ -1,19 +0,0 @@ -When reading the mtime from disk, the system can get a floating point -value. Convert this to an int for comparision purposes, else some -packages always get reindexed as the value in the index is an int. -RP 2016/3/2 -Upstream-Status: Pending - -Index: createrepo-0.4.11/readMetadata.py -=================================================================== ---- createrepo-0.4.11.orig/readMetadata.py -+++ createrepo-0.4.11/readMetadata.py -@@ -126,7 +126,7 @@ class MetadataIndex(object): - if self.opts.get('verbose'): - print _("Size (%i -> %i) changed for file %s") % (size,st.st_size,filepath) - return -- if st.st_mtime != mtime: -+ if int(st.st_mtime) != mtime: - if self.opts.get('verbose'): - print _("Modification time changed for %s") % filepath - return diff --git a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch b/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch deleted file mode 100644 index 80205a150..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/python-scripts-should-use-interpreter-from-env.patch +++ /dev/null @@ -1,47 +0,0 @@ -Author: Andrei Gherzan <andrei@gherzan.ro> - -Python interpreter should be use from PATH - native python - and not the one from -host. - -Upstream-Status: Inappropriate [configuration] - -Index: createrepo-0.4.11/genpkgmetadata.py -=================================================================== ---- createrepo-0.4.11.orig/genpkgmetadata.py 2012-04-10 17:14:05.278649384 +0300 -+++ createrepo-0.4.11/genpkgmetadata.py 2012-04-10 17:14:22.290648886 +0300 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -t -+#! /usr/bin/env python - # primary functions and glue for generating the repository metadata - # - -Index: createrepo-0.4.11/modifyrepo.py -=================================================================== ---- createrepo-0.4.11.orig/modifyrepo.py 2012-04-10 17:14:09.106649272 +0300 -+++ createrepo-0.4.11/modifyrepo.py 2012-04-10 17:14:27.818648725 +0300 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#! /usr/bin/env python - # $Id$ - # - # This tools is used to insert arbitrary metadata into an RPM repository. -Index: createrepo-0.4.11/dumpMetadata.py -=================================================================== ---- createrepo-0.4.11.orig/dumpMetadata.py 2012-04-10 17:19:23.874640068 +0300 -+++ createrepo-0.4.11/dumpMetadata.py 2012-04-10 17:19:34.502639756 +0300 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -t -+#! /usr/bin/env python - # base classes and functions for dumping out package Metadata - # - # This program is free software; you can redistribute it and/or modify -Index: createrepo-0.4.11/readMetadata.py -=================================================================== ---- createrepo-0.4.11.orig/readMetadata.py 2012-04-10 17:19:19.626640193 +0300 -+++ createrepo-0.4.11/readMetadata.py 2012-04-10 17:19:40.198639590 +0300 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -t -+#! /usr/bin/env python - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by diff --git a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/recommends.patch b/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/recommends.patch deleted file mode 100644 index dc5de2b5b..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/recommends.patch +++ /dev/null @@ -1,71 +0,0 @@ -createrepo: implement recommends support - -Record against the corresponding requires entry in the output metadata -if a dependency relationship is marked with the RPMSENSE_MISSINGOK flag -(indicating it is a recommendation, rather than a hard dependency). - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - -diff --git a/dumpMetadata.py b/dumpMetadata.py -index 70bb2d8..e40e8ac 100644 ---- a/dumpMetadata.py -+++ b/dumpMetadata.py -@@ -319,6 +319,23 @@ class RpmMetaData: - reqs.append(0) - return reqs - -+ def _checkMissingOk(self, flags): -+ reqs=[] -+ if flags is None: -+ return reqs -+ -+ if type(flags) is not types.ListType: -+ flags = [flags] -+ for flag in flags: -+ newflag = flag -+ if flag is not None: -+ newflag = flag & rpm.RPMSENSE_MISSINGOK -+ if newflag: -+ reqs.append(1) -+ else: -+ reqs.append(0) -+ return reqs -+ - - def _correctVersion(self, vers): - returnvers = [] -@@ -537,9 +554,10 @@ class RpmMetaData: - tmpflags = self.hdr[rpm.RPMTAG_REQUIREFLAGS] - flags = self._correctFlags(tmpflags) - prereq = self._checkPreReq(tmpflags) -+ missingok = self._checkMissingOk(tmpflags) - ver = self._correctVersion(self.hdr[rpm.RPMTAG_REQUIREVERSION]) - if names is not None: -- lst = zip(names, flags, ver, prereq) -+ lst = zip(names, flags, ver, prereq, missingok) - return self._uniq(lst) - - def obsoletesList(self): -@@ -692,7 +710,7 @@ def generateXML(doc, node, formatns, rpmObj, sumtype): - depsList = rpmObj.depsList() - if len(depsList) > 0: - rpconode = format.newChild(formatns, 'requires', None) -- for (name, flags, (e,v,r), prereq) in depsList: -+ for (name, flags, (e,v,r), prereq, missingok) in depsList: - entry = rpconode.newChild(formatns, 'entry', None) - entry.newProp('name', name) - if flags != 0: -@@ -711,6 +729,8 @@ def generateXML(doc, node, formatns, rpmObj, sumtype): - entry.newProp('rel', str(r)) - if prereq == 1: - entry.newProp('pre', str(prereq)) -+ if missingok: -+ entry.newProp('missingok', '1') - - for file in rpmObj.usefulFiles(): - files = format.newChild(None, 'file', None) --- -1.7.9.5 - diff --git a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/rpm-createsolvedb.py b/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/rpm-createsolvedb.py deleted file mode 100755 index a5b61bade..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo/rpm-createsolvedb.py +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env python -# -# This script generates a solution database for a directory containing rpm packages -# but tries to be efficient about this, only doing so when the packages have changed -# in some way. -# -# It is assumed something already went through and removed all the solvedb.done stamp files -# in advance. -# -# First argument - the rpm binary to use -# Subsequent arguments - paths to process solution databases for -# - -import sys, os -import hashlib -import stat -import subprocess - -if len(sys.argv) < 1: - print("Error, rpm command not specified") - sys.exit(1) - -if len(sys.argv) < 2: - print("Error, no paths specified") - sys.exit(1) - -paths = sys.argv[2:] - -for path in paths: - if os.path.exists(path + "/solvedb.done"): - continue - data = "" - manifest = [] - for root, dirs, files in os.walk(path): - for file in files: - f = os.path.join(root, file) - if f.startswith(path + "/" + "solvedb"): - continue - data = data + str(os.stat(f)[stat.ST_MTIME]) - manifest.append(f) - checksum = hashlib.md5(data).hexdigest() - - if os.path.exists(path + "/solvedb.checksum") and open(path + "/solvedb.checksum", "r").read() == checksum: - open(path + "/solvedb.done", "w") - continue - - if os.path.exists(path + "/solvedb"): - subprocess.call("rm -rf %s" % (path + "/solvedb"), shell=True) - os.mkdir(path + "/solvedb") - m = open(path + "/solvedb/manifest", "w") - m.write("# Dynamically generated solve manifest\n") - for f in manifest: - m.write(f + "\n") - m.close() - - cmd = sys.argv[1] + ' -i --replacepkgs --replacefiles --oldpackage -D "_dbpath ' + path + '/solvedb" --justdb \ - --noaid --nodeps --noorder --noscripts --notriggers --noparentdirs --nolinktos --stats \ - --ignoresize --nosignature --nodigest -D "__dbi_txn create nofsync" \ - ' + path + '/solvedb/manifest' - subprocess.call(cmd, shell=True) - - open(path + "/solvedb.checksum", "w").write(checksum) - open(path + "/solvedb.done", "w") - diff --git a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo_0.4.11.bb deleted file mode 100644 index 2a3231b3a..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/createrepo/createrepo_0.4.11.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Creates metadata indexes for RPM package repositories" -HOMEPAGE = "http://createrepo.baseurl.org/" - -RECIPE_NO_UPDATE_REASON = "Versions after 0.9.* use YUM, so we hold at 0.4.11" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" - -DEPENDS_class-native += "libxml2-native rpm-native" -RDEPENDS_${PN}_class-target = "libxml2-python" - -PR = "r9" - -SRC_URI = "http://createrepo.baseurl.org/download/${BP}.tar.gz \ - file://fix-native-install.patch \ - file://python-scripts-should-use-interpreter-from-env.patch \ - file://createrepo-rpm549.patch \ - file://recommends.patch \ - file://createrepo-dbpath.patch \ - file://dumpMetadata-disable-signature-validation.patch \ - file://rpm-createsolvedb.py \ - file://fixstat.patch \ - " - -SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2" -SRC_URI[sha256sum] = "a73ae11a0dcde8bde36d900bc3f7f8f1083ba752c70a5c61b72d1e1e7608f21b" - -BBCLASSEXTEND = "native" - -do_install () { - oe_runmake -e 'DESTDIR=${D}' install - install -m 0755 ${WORKDIR}/rpm-createsolvedb.py ${D}${bindir}/ -} - -# Wrap the python script since the native python is -# ${bindir}/python-native/python, and the "#! /usr/bin/env python" can't -# find it since it is not in PATH. -do_install_append_class-native () { - # Not all the python scripts should be wrapped since some of - # them are modules (be imported). - for i in ${D}${datadir}/createrepo/genpkgmetadata.py \ - ${D}${datadir}/createrepo/modifyrepo.py \ - ${D}${bindir}/rpm-createsolvedb.py ; do - sed -i -e 's|^#!.*/usr/bin/env python|#! /usr/bin/env nativepython|' $i - done - - create_wrapper ${D}/${bindir}/createrepo \ - RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \ - RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \ - RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale -} 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 new file mode 100644 index 000000000..508df8c7d --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000100.patch @@ -0,0 +1,50 @@ +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-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 + +CVE: CVE-2017-1000100 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + lib/tftp.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +Index: curl-7.53.1/lib/tftp.c +=================================================================== +--- curl-7.53.1.orig/lib/tftp.c ++++ curl-7.53.1/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 +@@ -490,6 +490,11 @@ static CURLcode tftp_send_first(tftp_sta + 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'); 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 new file mode 100644 index 000000000..9eef5e2a2 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/curl/curl/CVE-2017-1000101.patch @@ -0,0 +1,92 @@ +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-2017-1000101 + +Bug: https://curl.haxx.se/docs/adv_20170809A.html +Reported-by: Brian Carpenter + +Upstream-Status: Backport +CVE: CVE-2017-1000101 +Signed-off-by: Armin Kuster <akuster@mvista.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 + +Index: curl-7.53.1/src/tool_urlglob.c +=================================================================== +--- curl-7.53.1.orig/src/tool_urlglob.c ++++ curl-7.53.1/src/tool_urlglob.c +@@ -269,7 +269,10 @@ static CURLcode glob_range(URLGlob *glob + } + 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); +Index: curl-7.53.1/tests/data/Makefile.inc +=================================================================== +--- curl-7.53.1.orig/tests/data/Makefile.inc ++++ curl-7.53.1/tests/data/Makefile.inc +@@ -131,6 +131,7 @@ test1244 test1245 test1246 test1247 test + test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \ + \ + test1280 test1281 test1282 test1283 test1284 test1285 test1286 \ ++test1289 \ + \ + test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \ + test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \ +Index: curl-7.53.1/tests/data/test1289 +=================================================================== +--- /dev/null ++++ curl-7.53.1/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> diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.50.1.bb b/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.53.1.bb index 653fa2e7a..c3e1f898a 100644 --- a/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.50.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.53.1.bb @@ -12,17 +12,20 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ # 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 += " file://configure_ac.patch \ + file://CVE-2017-1000100.patch \ + file://CVE-2017-1000101.patch \ + " -SRC_URI[md5sum] = "015f6a0217ca6f2c5442ca406476920b" -SRC_URI[sha256sum] = "3c12c5f54ccaa1d40abc65d672107dcc75d3e1fcb38c267484334280096e5156" +SRC_URI[md5sum] = "fb1f03a142236840c1a77c035fa4c542" +SRC_URI[sha256sum] = "1c7207c06d75e9136a944a2e0528337ce76f15b9ec9ae4bb30d703b59bf530e8" CVE_PRODUCT = "libcurl" inherit autotools pkgconfig binconfig multilib_header -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls proxy zlib" -PACKAGECONFIG_class-native = "ipv6 proxy ssl zlib" -PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl zlib" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls proxy threaded-resolver zlib" +PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver zlib" +PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver zlib" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" @@ -42,6 +45,7 @@ PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp," PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl" 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" diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch b/import-layers/yocto-poky/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch new file mode 100644 index 000000000..571708e03 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch @@ -0,0 +1,45 @@ +From 29621d637e30982489693f2e207ce6a1790e3337 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 22 Mar 2017 15:32:26 +0000 +Subject: [PATCH] atomic: Rename local __atomic_compare_exchange to avoid clash + with builtins + +Helps building with clang + +Fixes + +../db-5.3.28/src/dbinc/atomic.h:179:19: error: definition of builtin function '__atomic_compare_exchange' +static inline int __atomic_compare_exchange( + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/dbinc/atomic.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h +index 6a858f7..1b49de5 100644 +--- a/src/dbinc/atomic.h ++++ b/src/dbinc/atomic.h +@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; + #define atomic_inc(env, p) __atomic_inc(p) + #define atomic_dec(env, p) __atomic_dec(p) + #define atomic_compare_exchange(env, p, o, n) \ +- __atomic_compare_exchange((p), (o), (n)) ++ __db_atomic_compare_exchange((p), (o), (n)) + static inline int __atomic_inc(db_atomic_t *p) + { + int temp; +@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * which configure could be changed to use. + */ +-static inline int __atomic_compare_exchange( ++static inline int __db_atomic_compare_exchange( + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) + { + atomic_value_t was; +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch b/import-layers/yocto-poky/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch deleted file mode 100644 index 68a213136..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2902dda6e3f7b2cd5796a96af20deece610e2eb9 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Mon, 16 Nov 2015 22:20:49 -0800 -Subject: [PATCH] build_unix/Makefile: let libdb-6.0.la depend os_map.lo - -Fixed parallel issue: -libtool: link: `os_map.lo' is not a valid libtool object -Makefile:867: recipe for target 'libdb-6.0.la' failed - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - dist/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: db-6.0.30/dist/Makefile.in -=================================================================== ---- db-6.0.30.orig/dist/Makefile.in -+++ db-6.0.30/dist/Makefile.in -@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS) - $(LN) -s $(libdb_version) $(libdb) - - # Shared C library. --$(libso_target): $(C_OBJS) bt_rec@o@ -+$(libso_target): $(C_OBJS) bt_rec@o@ os_map@o@ - $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \ - $(LIBCSO_LIBS) - $(RM) $(libdb) diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch b/import-layers/yocto-poky/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch deleted file mode 100644 index 868040834..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c640ff9340f358a00835816d0fea03d27a7be978 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Tue, 31 Mar 2015 00:56:44 -0700 -Subject: [PATCH] Makefile: let libso_target depend on bt_rec - -Fixed parallel issue: -libtool: link: `bt_rec.lo' is not a valid libtool object -Makefile:867: recipe for target 'libdb-6.0.la' failed -make: *** [libdb-6.0.la] Error 1 - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: db-6.0.30/dist/Makefile.in -=================================================================== ---- db-6.0.30.orig/dist/Makefile.in -+++ db-6.0.30/dist/Makefile.in -@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS) - $(LN) -s $(libdb_version) $(libdb) - - # Shared C library. --$(libso_target): $(C_OBJS) -+$(libso_target): $(C_OBJS) bt_rec@o@ - $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \ - $(LIBCSO_LIBS) - $(RM) $(libdb) 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 0b51a1d44..26065bbb0 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 @@ -16,10 +16,12 @@ VIRTUAL_NAME ?= "virtual/db" RCONFLICTS_${PN} = "db3" PR = "r1" +PE = "1" SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" SRC_URI += "file://arm-thumb-mutex_db5.patch \ file://fix-parallel-build.patch \ + file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \ " SRC_URI[md5sum] = "b99454564d5b4479750567031d66fe24" @@ -27,7 +29,7 @@ SRC_URI[sha256sum] = "e0a992d740709892e81f9d93f06daf305cf73fb81b545afe7247804317 LIC_FILES_CHKSUM = "file://LICENSE;md5=ed1158e31437f4f87cdd4ab2b8613955" -inherit autotools +inherit autotools multilib_header # Put virtual/db in any appropriate provider of a # relational database, use it as a dependency in @@ -95,6 +97,8 @@ do_install_append() { ln -s db51/db.h ${D}/${includedir}/db.h ln -s db51/db_cxx.h ${D}/${includedir}/db_cxx.h + oe_multilib_header db51/db.h + # The docs end up in /usr/docs - not right. if test -d "${D}/${prefix}/docs" then diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db_6.0.35.bb b/import-layers/yocto-poky/meta/recipes-support/db/db_6.0.35.bb deleted file mode 100644 index 0f69cab76..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/db/db_6.0.35.bb +++ /dev/null @@ -1,113 +0,0 @@ -# Version 6 of the Berkeley DB from Oracle (formerly Sleepycat) -# -# At present this package only installs the DB code -# itself (shared libraries, .a in the dev package), -# documentation and headers. -# -# The headers have the same names as those as v3 -# of the DB, only one version can be used *for dev* -# at once - DB3 and DB6 can both be installed on the -# same system at the same time if really necessary. -SECTION = "libs" -SUMMARY = "Berkeley Database v6" -HOMEPAGE = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -LICENSE = "AGPL-3.0" -VIRTUAL_NAME ?= "virtual/db" -RCONFLICTS_${PN} = "db3" - -PR = "r1" - -# Note, when upgraded to 6.1.x, a patch in RPM will need to be removed to activate db 6.1 support. -SRC_URI = "http://distfiles.gentoo.org/distfiles/db-${PV}.tar.gz \ - file://arm-thumb-mutex_db5.patch \ - file://fix-parallel-build.patch \ - file://Makefile-let-libso_target-depend-on-bt_rec.patch \ - file://Makefile-let-libdb-6.0.la-depend-os_map.l.patch \ - " - -SRC_URI[md5sum] = "c65a4d3e930a116abaaf69edfc697f25" -SRC_URI[sha256sum] = "24421affa8ae436fe427ae4f5f2d1634da83d3d55a5ad6354a98eeedb825de55" - -# Exclude NC versions which lack AES encryption -UPSTREAM_CHECK_REGEX = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar" -UPSTREAM_CHECK_URI = "http://www.oracle.com/technetwork/products/berkeleydb/downloads/index-082944.html" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490" - -# 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}" - -inherit autotools - -# The executables go in a separate package - typically there -# is no need to install these unless doing real database -# management on the system. -inherit lib_package - -PACKAGES =+ "${PN}-cxx" -FILES_${PN}-cxx = "${libdir}/*cxx*so" - -# The dev package has the .so link (as in db3) and the .a's - -# it is therefore incompatible (cannot be installed at the -# same time) as the db3 package -# sort out the .so since they do version prior to the .so -SOLIBS = "-6*.so" -FILES_SOLIBSDEV = "${libdir}/libdb.so ${libdir}/libdb_cxx.so" - -#configuration - set in local.conf to override -# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) -DB6_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql" - -EXTRA_OECONF = "${DB6_CONFIG} --enable-shared --enable-cxx --with-sysroot" - -# Cancel the site stuff - it's set for db3 and destroys the configure. -CONFIG_SITE = "" - -AUTOTOOLS_SCRIPT_PATH = "${S}/dist" - -do_configure() { - cd ${B} - gnu-configize --force ${AUTOTOOLS_SCRIPT_PATH} - oe_runconf -} - -EXTRA_OEMAKE_append_class-target = " LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" -EXTRA_OEMAKE += "STRIP=true" - -do_compile_prepend() { - # Stop libtool adding RPATHs - sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' ${B}/libtool -} - -do_install_append() { - mkdir -p ${D}/${includedir}/db60 - mv ${D}/${includedir}/db.h ${D}/${includedir}/db60/. - mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db60/. - ln -s db60/db.h ${D}/${includedir}/db.h - ln -s db60/db_cxx.h ${D}/${includedir}/db_cxx.h - - # The docs end up in /usr/docs - not right. - if test -d "${D}/${prefix}/docs" - then - mkdir -p "${D}/${datadir}" - test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}" - mv "${D}/${prefix}/docs" "${D}/${docdir}" - fi - - chown -R root:root ${D} -} - -# libdb isn't versioned in the typical manner (libdb-6.0.so is the full library -# name) so skip these checks. -INSANE_SKIP_${PN} = "dev-so" -INSANE_SKIP_${PN}-cxx = "dev-so" - -BBCLASSEXTEND = "native nativesdk" - -RECIPE_NO_UPDATE_REASON = "latest db does not work with RPM-5.x due to changes in locking semantics" diff --git a/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.bb b/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.1.bb index d969fd3c9..12c63ee1e 100644 --- a/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.bb +++ b/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.1.bb @@ -3,13 +3,14 @@ SECTION = "base" LICENSE = "GPLv2 & SMAIL_GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f" -SRC_URI = "http://snapshot.debian.org/archive/debian/20160629T224408Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" +SRC_URI = "http://snapshot.debian.org/archive/debian/20161118T033019Z/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] = "66a37e5ff17be431319bd0b43e9a46b5" -SRC_URI[sha256sum] = "afa95bbe6b6fd3ef3c0c838b2d7232f09fabeff593ca4b5583cffa6748567ee2" + +SRC_URI[md5sum] = "44083fc66164746880dffd30d62d054b" +SRC_URI[sha256sum] = "2c395c0bdcfe89de30828b1d25cc5549ded5225a6d3625fbcb2cc0881ef5f026" inherit autotools update-alternatives @@ -33,12 +34,15 @@ PACKAGES =+ "${PN}-run-parts" FILES_${PN}-run-parts = "${base_bindir}/run-parts.debianutils" RDEPENDS_${PN} += "${PN}-run-parts" - +RDEPENDS_${PN}_class-native = "" ALTERNATIVE_PRIORITY="30" ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which" ALTERNATIVE_${PN}-run-parts = "run-parts" +ALTERNATIVE_${PN}-doc = "which.1" +ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1" + ALTERNATIVE_LINK_NAME[add-shell]="${sbindir}/add-shell" ALTERNATIVE_LINK_NAME[installkernel]="${sbindir}/installkernel" ALTERNATIVE_LINK_NAME[remove-shell]="${sbindir}/remove-shell" @@ -46,3 +50,5 @@ ALTERNATIVE_LINK_NAME[run-parts]="${base_bindir}/run-parts" ALTERNATIVE_LINK_NAME[savelog]="${bindir}/savelog" ALTERNATIVE_LINK_NAME[tempfile]="${base_bindir}/tempfile" ALTERNATIVE_LINK_NAME[which]="${bindir}/which" + +BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch b/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch deleted file mode 100644 index d3cb43b9b..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ -Obey LDFLAGS - -Signed-off-by: Christopher Larson <chris_larson@mentor.com> -Upstream-Status: Inappropriate [old version] - ---- gdbm-1.8.3.orig/Makefile.in -+++ gdbm-1.8.3/Makefile.in -@@ -156,12 +156,12 @@ install-compat: - - libgdbm.la: $(LOBJS) gdbm.h - rm -f libgdbm.la -- $(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm.la -rpath $(libdir) \ - -version-info $(SHLIB_VER) $(LOBJS) - - libgdbm_compat.la: $(C_LOBJS) gdbm.h - rm -f libgdbm_compat.la -- $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm_compat.la -rpath $(libdir) \ - -version-info $(SHLIB_VER) $(C_LOBJS) - - gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 diff --git a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch b/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch deleted file mode 100644 index 0f9d04f4a..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Pending - ---- gdbm-1.8.3/Makefile.in.orig 2006-02-16 15:17:25.000000000 +0000 -+++ gdbm-1.8.3/Makefile.in 2006-02-16 15:18:08.000000000 +0000 -@@ -131,7 +131,7 @@ - $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir) $(DESTDIR)$(man3dir) \ - $(DESTDIR)$(infodir) -- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la -+ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la - $(INSTALL_DATA) gdbm.h \ - $(DESTDIR)$(includedir)/gdbm.h - $(INSTALL_DATA) $(srcdir)/gdbm.3 \ -@@ -142,7 +142,7 @@ - install-compat: - $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir) -- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ -+ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \ - $(DESTDIR)$(libdir)/libgdbm_compat.la - $(INSTALL_DATA) $(srcdir)/dbm.h \ - $(DESTDIR)$(includedir)/dbm.h diff --git a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch b/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch deleted file mode 100644 index 369145c41..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch +++ /dev/null @@ -1,60 +0,0 @@ -Upstream-Status: Pending - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- gdbm-1.8.3/Makefile.in~makefile -+++ gdbm-1.8.3/Makefile.in -@@ -22,6 +22,7 @@ - TEXI2DVI = texi2dvi - - DEFS = -+DESTDIR = - - # Where the system [n]dbm routines are... - LIBS = @LIBS@ -lc -@@ -127,26 +128,26 @@ - progs: $(PROGS) - - install: libgdbm.la gdbm.h gdbm.info -- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ -- $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ -- $(INSTALL_ROOT)$(infodir) -- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ -- $(INSTALL_ROOT)$(includedir)/gdbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ -- $(INSTALL_ROOT)$(man3dir)/gdbm.3 -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ -- $(INSTALL_ROOT)$(infodir)/gdbm.info -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ -+ $(DESTDIR)$(includedir) $(DESTDIR)$(man3dir) \ -+ $(DESTDIR)$(infodir) -+ $(LIBTOOL) $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la -+ $(INSTALL_DATA) gdbm.h \ -+ $(DESTDIR)$(includedir)/gdbm.h -+ $(INSTALL_DATA) $(srcdir)/gdbm.3 \ -+ $(DESTDIR)$(man3dir)/gdbm.3 -+ $(INSTALL_DATA) $(srcdir)/gdbm.info \ -+ $(DESTDIR)$(infodir)/gdbm.info - - install-compat: -- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ -- $(INSTALL_ROOT)$(includedir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ -+ $(DESTDIR)$(includedir) - $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ -- $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ -- $(INSTALL_ROOT)$(includedir)/dbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ -- $(INSTALL_ROOT)$(includedir)/ndbm.h -+ $(DESTDIR)$(libdir)/libgdbm_compat.la -+ $(INSTALL_DATA) $(srcdir)/dbm.h \ -+ $(DESTDIR)$(includedir)/dbm.h -+ $(INSTALL_DATA) $(srcdir)/ndbm.h \ -+ $(DESTDIR)$(includedir)/ndbm.h - - #libgdbm.a: $(OBJS) gdbm.h - # rm -f libgdbm.a diff --git a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.8.3.bb b/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.8.3.bb deleted file mode 100644 index b253dc144..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.8.3.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Key/value database library with extensible hashing" -HOMEPAGE = "http://www.gnu.org/software/gdbm/" -SECTION = "libs" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d8e20eece214df8ef953ed5857862150" - -PR = "r4" - -SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ - file://makefile.patch \ - file://libtool-mode.patch \ - file://ldflags.patch" - -SRC_URI[md5sum] = "1d1b1d5c0245b1c00aff92da751e9aa1" -SRC_URI[sha256sum] = "cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9" - -inherit autotools texinfo - -BBCLASSEXTEND = "native nativesdk" - -do_install_append () { - oe_runmake install-compat DESTDIR=${D} - install -d ${D}${includedir}/gdbm - install -m 0644 ${S}/dbm.h ${D}${includedir}/ - install -m 0644 ${S}/ndbm.h ${D}${includedir}/ - # Create a symlink to ndbm.h and gdbm.h in include/gdbm to let other packages to find - # these headers - ln -sf ../ndbm.h ${D}/${includedir}/gdbm/ndbm.h - ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h -} diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/Use-__gnu_inline__-attribute.patch b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/Use-__gnu_inline__-attribute.patch deleted file mode 100644 index 627d71aba..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/Use-__gnu_inline__-attribute.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3cb33502bafd04b8ad4ca3454fab16d5ff313297 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Tue, 22 Sep 2015 13:16:23 +0300 -Subject: [PATCH] Use __gnu_inline__ attribute - -gcc5 uses C11 inline rules. This means the old "extern inline" -semantics are not available without a special attribute. - -See: https://gcc.gnu.org/gcc-5/porting_to.html - -Upstream-Status: Inappropriate [Fixed in current versions] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - gmp-h.in | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gmp-h.in b/gmp-h.in -index eed6fe4..361dd1d 100644 ---- a/gmp-h.in -+++ b/gmp-h.in -@@ -419,8 +419,11 @@ typedef __mpq_struct *mpq_ptr; - /* gcc has __inline__ in all modes, including strict ansi. Give a prototype - for an inline too, so as to correctly specify "dllimport" on windows, in - case the function is called rather than inlined. */ -+ -+/* Use __gnu_inline__ attribute: later gcc uses different "extern inline" -+ behaviour */ - #ifdef __GNUC__ --#define __GMP_EXTERN_INLINE extern __inline__ -+#define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__)) - #define __GMP_INLINE_PROTOTYPES 1 - #endif - --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch deleted file mode 100644 index 6da0be9ca..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d50686de0406a88ef9112f5252103f799982e84a Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Thu, 4 Feb 2016 14:00:00 -0800 -Subject: [PATCH] avoid h asm constraint for MIPS - -The h asm constrain (to extract the high part of a multiplication -result) has not been recognised since gcc 4.4: - - https://gcc.gnu.org/gcc-4.4/changes.html - -Drop the MIPS umul_ppmm() implementations which rely on "=h" and fall -back to the older implementations (which use explicit mfhi and mflo -instructions to move the high and low parts of the multiplication -result into their destinations). - -Upstream-Status: Inappropriate [upstream has a different solution] - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> ---- - longlong.h | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/longlong.h b/longlong.h -index b53fbee..0193abb 100644 ---- a/longlong.h -+++ b/longlong.h -@@ -1011,27 +1011,17 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ((UWtype *, UWtype, UWtype, UWtype)); - #endif /* __m88000__ */ - - #if defined (__mips) && W_TYPE_SIZE == 32 --#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 --#define umul_ppmm(w1, w0, u, v) \ -- __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) --#else - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1" \ - : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) --#endif - #define UMUL_TIME 10 - #define UDIV_TIME 100 - #endif /* __mips */ - - #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 --#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 --#define umul_ppmm(w1, w0, u, v) \ -- __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) --#else - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1" \ - : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) --#endif - #define UMUL_TIME 20 - #define UDIV_TIME 140 - #endif /* __mips */ --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch deleted file mode 100644 index 26fd8ef8b..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch +++ /dev/null @@ -1,56 +0,0 @@ -automake 1.12 has depricated automatic de-ANSI-fication support - -this patch avoids these kinds of errors: - -| configure.in:2240: error: automatic de-ANSI-fication support has been removed -| Makefile.am:28: error: automatic de-ANSI-fication support has been removed - -Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> -2012/05/02 - - -This patch was removed in f181c6ce8b3 when gmp 4.2.1 was mistakenly -dropped. - -Upstream is not interested in patches for ancient versions. - -Upstream-Status: Inappropriate -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> - - -Index: gmp-4.2.1/configure.in -=================================================================== ---- gmp-4.2.1.orig/configure.in -+++ gmp-4.2.1/configure.in -@@ -67,7 +67,7 @@ dnl - dnl Note that there's a copy of these options in the top-level Makefile.am, - dnl so update there too if changing anything. - dnl --AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr]) -+AM_INIT_AUTOMAKE([1.8 gnu no-dependencies]) - AM_CONFIG_HEADER(config.h:config.in) - AM_MAINTAINER_MODE - -@@ -2022,9 +2022,6 @@ fi - echo " MPN_PATH=\"$path\"" - - --# Automake ansi2knr support. --AM_C_PROTOTYPES -- - GMP_PROG_AR - GMP_PROG_NM - -Index: gmp-4.2.1/Makefile.am -=================================================================== ---- gmp-4.2.1.orig/Makefile.am -+++ gmp-4.2.1/Makefile.am -@@ -27,7 +27,7 @@ - # Makefiles in subdirectories, but here we must omit it so automake gives - # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr". - # --AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr -+AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies - - - # Libtool -version-info for libgmp.la and libmp.la. See "Versioning" in the diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.1/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch index 325ffe491..325ffe491 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.1/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.1/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..665367658 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.1/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 diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.1/amd64.patch b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch index 564d12d42..564d12d42 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.1/amd64.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.1/use-includedir.patch b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch index 74904a253..74904a253 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.1/use-includedir.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_4.2.1.bb b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_4.2.1.bb deleted file mode 100644 index 5e8ee29f3..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_4.2.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -require gmp.inc - -LICENSE = "LGPLv2.1+ & GPLv2+" -LICENSE_${PN} = "LGPLv2.1+" - -LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \ - file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ - file://gmp-h.in;beginline=6;endline=21;md5=e056f74a12c3277d730dbcfb85d2ca34" - -SRC_URI = "https://gmplib.org/download/${BPN}/archive/${BP}.tar.bz2 \ - file://Use-__gnu_inline__-attribute.patch \ - file://gmp_fix_for_automake-1.12.patch \ - file://avoid-h-asm-constraint-for-MIPS.patch \ -" - -SRC_URI[md5sum] = "091c56e0e1cca6b09b17b69d47ef18e3" -SRC_URI[sha256sum] = "d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941" diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_6.1.1.bb b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_6.1.2.bb index 614d21ab7..5e6507558 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_6.1.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_6.1.2.bb @@ -14,9 +14,8 @@ SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \ " - -SRC_URI[md5sum] = "4c175f86e11eb32d8bf9872ca3a8e11d" -SRC_URI[sha256sum] = "a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6" +SRC_URI[md5sum] = "8ddbb26dc3bd4e2302984debba1406a5" +SRC_URI[sha256sum] = "5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2" acpaths = "" diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4242.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4242.patch deleted file mode 100644 index f0667741c..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4242.patch +++ /dev/null @@ -1,63 +0,0 @@ -From e2202ff2b704623efc6277fb5256e4e15bac5676 Mon Sep 17 00:00:00 2001 -From: Werner Koch <wk@gnupg.org> -Date: Thu, 25 Jul 2013 11:17:52 +0200 -Subject: [PATCH] Mitigate a flush+reload cache attack on RSA secret - exponents. - -commit e2202ff2b704623efc6277fb5256e4e15bac5676 from -git://git.gnupg.org/libgcrypt.git - -* mpi/mpi-pow.c (gcry_mpi_powm): Always perfrom the mpi_mul for -exponents in secure memory. - -Upstream-Status: Backport -CVE: CVE-2013-4242 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> --- - -The attack is published as http://eprint.iacr.org/2013/448 : - -Flush+Reload: a High Resolution, Low Noise, L3 Cache Side-Channel -Attack by Yuval Yarom and Katrina Falkner. 18 July 2013. - - Flush+Reload is a cache side-channel attack that monitors access to - data in shared pages. In this paper we demonstrate how to use the - attack to extract private encryption keys from GnuPG. The high - resolution and low noise of the Flush+Reload attack enables a spy - program to recover over 98% of the bits of the private key in a - single decryption or signing round. Unlike previous attacks, the - attack targets the last level L3 cache. Consequently, the spy - program and the victim do not need to share the execution core of - the CPU. The attack is not limited to a traditional OS and can be - used in a virtualised environment, where it can attack programs - executing in a different VM. - -Index: gnupg-1.4.7/mpi/mpi-pow.c -=================================================================== ---- gnupg-1.4.7.orig/mpi/mpi-pow.c -+++ gnupg-1.4.7/mpi/mpi-pow.c -@@ -212,7 +212,13 @@ mpi_powm( MPI res, MPI base, MPI exponen - tp = rp; rp = xp; xp = tp; - rsize = xsize; - -- if( (mpi_limb_signed_t)e < 0 ) { -+ /* To mitigate the Yarom/Falkner flush+reload cache -+ * side-channel attack on the RSA secret exponent, we do -+ * the multiplication regardless of the value of the -+ * high-bit of E. But to avoid this performance penalty -+ * we do it only if the exponent has been stored in secure -+ * memory and we can thus assume it is a secret exponent. */ -+ if (esec || (mpi_limb_signed_t)e < 0) { - /*mpihelp_mul( xp, rp, rsize, bp, bsize );*/ - if( bsize < KARATSUBA_THRESHOLD ) { - mpihelp_mul( xp, rp, rsize, bp, bsize ); -@@ -227,6 +233,8 @@ mpi_powm( MPI res, MPI base, MPI exponen - mpihelp_divrem(xp + msize, 0, xp, xsize, mp, msize); - xsize = msize; - } -+ } -+ if ( (mpi_limb_signed_t)e < 0 ) { - - tp = rp; rp = xp; xp = tp; - rsize = xsize; diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4351.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4351.patch deleted file mode 100644 index b50a32f40..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4351.patch +++ /dev/null @@ -1,45 +0,0 @@ -Upstream-Status: Backport -CVE: CVE-2013-4351 - -Index: gnupg-1.4.7/g10/getkey.c -=================================================================== ---- gnupg-1.4.7.orig/g10/getkey.c 2007-03-05 16:54:41.000000000 +0800 -+++ gnupg-1.4.7/g10/getkey.c 2013-11-28 14:41:59.640212240 +0800 -@@ -1454,7 +1454,11 @@ - - if(flags) - key_usage |= PUBKEY_USAGE_UNKNOWN; -+ if (!key_usage) -+ key_usage |= PUBKEY_USAGE_NONE; - } -+ else if (p) -+ key_usage |= PUBKEY_USAGE_NONE; - - /* We set PUBKEY_USAGE_UNKNOWN to indicate that this key has a - capability that we do not handle. This serves to distinguish -Index: gnupg-1.4.7/g10/keygen.c -=================================================================== ---- gnupg-1.4.7.orig/g10/keygen.c 2007-02-05 00:27:40.000000000 +0800 -+++ gnupg-1.4.7/g10/keygen.c 2013-11-28 14:43:05.016670092 +0800 -@@ -209,9 +209,6 @@ - if (use & PUBKEY_USAGE_AUTH) - buf[0] |= 0x20; - -- if (!buf[0]) -- return; -- - build_sig_subpkt (sig, SIGSUBPKT_KEY_FLAGS, buf, 1); - } - -Index: gnupg-1.4.7/include/cipher.h -=================================================================== ---- gnupg-1.4.7.orig/include/cipher.h 2006-04-21 20:39:49.000000000 +0800 -+++ gnupg-1.4.7/include/cipher.h 2013-11-28 14:49:24.159322744 +0800 -@@ -52,6 +52,7 @@ - #define PUBKEY_USAGE_CERT 4 /* key is also good to certify other keys*/ - #define PUBKEY_USAGE_AUTH 8 /* key is good for authentication */ - #define PUBKEY_USAGE_UNKNOWN 128 /* key has an unknown usage bit */ -+#define PUBKEY_USAGE_NONE 256 /* No usage given. */ - - #define DIGEST_ALGO_MD5 1 - #define DIGEST_ALGO_SHA1 2 diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4576.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4576.patch deleted file mode 100644 index 5dcde1f9c..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4576.patch +++ /dev/null @@ -1,154 +0,0 @@ -Upstream-Status: Backport -CVE: CVE-2013-4576 - -Index: gnupg-1.4.7/cipher/dsa.c -=================================================================== ---- gnupg-1.4.7.orig/cipher/dsa.c 2006-12-12 02:27:21.000000000 +0800 -+++ gnupg-1.4.7/cipher/dsa.c 2014-01-23 11:30:17.300915919 +0800 -@@ -287,6 +287,8 @@ - MPI kinv; - MPI tmp; - -+ mpi_normalize (hash); -+ - /* select a random k with 0 < k < q */ - k = gen_k( skey->q ); - -Index: gnupg-1.4.7/cipher/elgamal.c -=================================================================== ---- gnupg-1.4.7.orig/cipher/elgamal.c 2006-12-12 03:08:05.000000000 +0800 -+++ gnupg-1.4.7/cipher/elgamal.c 2014-01-23 11:30:17.300915919 +0800 -@@ -376,6 +376,9 @@ - { - MPI t1 = mpi_alloc_secure( mpi_get_nlimbs( skey->p ) ); - -+ mpi_normalize (a); -+ mpi_normalize (b); -+ - /* output = b/(a^x) mod p */ - mpi_powm( t1, a, skey->x, skey->p ); - mpi_invm( t1, t1, skey->p ); -Index: gnupg-1.4.7/cipher/random.c -=================================================================== ---- gnupg-1.4.7.orig/cipher/random.c 2006-11-03 18:09:39.000000000 +0800 -+++ gnupg-1.4.7/cipher/random.c 2014-01-23 11:31:53.993495462 +0800 -@@ -273,6 +273,18 @@ - } - - -+/* Randomize the MPI */ -+void -+randomize_mpi (MPI mpi, size_t nbits, int level) -+{ -+ unsigned char *buffer; -+ -+ buffer = get_random_bits (nbits, level, mpi_is_secure (mpi)); -+ mpi_set_buffer (mpi, buffer, (nbits+7)/8, 0); -+ xfree (buffer); -+} -+ -+ - int - random_is_faked() - { -Index: gnupg-1.4.7/cipher/random.h -=================================================================== ---- gnupg-1.4.7.orig/cipher/random.h 2006-02-09 19:29:29.000000000 +0800 -+++ gnupg-1.4.7/cipher/random.h 2014-01-23 11:30:17.300915919 +0800 -@@ -32,6 +32,7 @@ - int random_is_faked(void); - void random_disable_locking (void); - void randomize_buffer( byte *buffer, size_t length, int level ); -+void randomize_mpi (MPI mpi, size_t nbits, int level); - byte *get_random_bits( size_t nbits, int level, int secure ); - void fast_random_poll( void ); - -Index: gnupg-1.4.7/cipher/rsa.c -=================================================================== ---- gnupg-1.4.7.orig/cipher/rsa.c 2006-12-12 03:09:00.000000000 +0800 -+++ gnupg-1.4.7/cipher/rsa.c 2014-01-23 11:35:04.330639125 +0800 -@@ -301,9 +301,26 @@ - #if 0 - mpi_powm( output, input, skey->d, skey->n ); - #else -- MPI m1 = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); -- MPI m2 = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); -- MPI h = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); -+ int nlimbs = mpi_get_nlimbs (skey->n)+1; -+ MPI m1 = mpi_alloc_secure (nlimbs); -+ MPI m2 = mpi_alloc_secure (nlimbs); -+ MPI h = mpi_alloc_secure (nlimbs); -+# if 1 -+ MPI bdata= mpi_alloc_secure (nlimbs); -+ MPI r = mpi_alloc_secure (nlimbs); -+# endif -+ -+ /* Remove superfluous leading zeroes from INPUT. */ -+ mpi_normalize (input); -+ -+# if 1 -+ /* Blind: bdata = (data * r^e) mod n */ -+ randomize_mpi (r, mpi_get_nbits (skey->n), 0); -+ mpi_fdiv_r (r, r, skey->n); -+ mpi_powm (bdata, r, skey->e, skey->n); -+ mpi_mulm (bdata, bdata, input, skey->n); -+ input = bdata; -+# endif - - /* m1 = c ^ (d mod (p-1)) mod p */ - mpi_sub_ui( h, skey->p, 1 ); -@@ -321,8 +338,15 @@ - /* m = m2 + h * p */ - mpi_mul ( h, h, skey->p ); - mpi_add ( output, m1, h ); -- /* ready */ -- -+ -+# if 1 -+ mpi_free (bdata); -+ /* Unblind: output = (output * r^(-1)) mod n */ -+ mpi_invm (r, r, skey->n); -+ mpi_mulm (output, output, r, skey->n); -+ mpi_free (r); -+# endif -+ - mpi_free ( h ); - mpi_free ( m1 ); - mpi_free ( m2 ); -@@ -397,6 +421,7 @@ - rsa_decrypt( int algo, MPI *result, MPI *data, MPI *skey ) - { - RSA_secret_key sk; -+ MPI input; - - if( algo != 1 && algo != 2 ) - return G10ERR_PUBKEY_ALGO; -@@ -407,8 +432,14 @@ - sk.p = skey[3]; - sk.q = skey[4]; - sk.u = skey[5]; -- *result = mpi_alloc_secure( mpi_get_nlimbs( sk.n ) ); -- secret( *result, data[0], &sk ); -+ -+ /* Mitigates side-channel attacks (CVE-2013-4576). */ -+ input = mpi_alloc (0); -+ mpi_normalize (data[0]); -+ mpi_fdiv_r (input, data[0], sk.n); -+ *result = mpi_alloc_secure (mpi_get_nlimbs (sk.n)); -+ secret (*result, input, &sk); -+ mpi_free (input); - return 0; - } - -Index: gnupg-1.4.7/g10/gpgv.c -=================================================================== ---- gnupg-1.4.7.orig/g10/gpgv.c 2006-12-13 19:25:04.000000000 +0800 -+++ gnupg-1.4.7/g10/gpgv.c 2014-01-23 11:30:17.300915919 +0800 -@@ -390,6 +390,7 @@ - void random_dump_stats(void) {} - int quick_random_gen( int onoff ) { return -1;} - void randomize_buffer( byte *buffer, size_t length, int level ) {} -+void randomize_mpi (MPI mpi, size_t nbits, int level) {} - int random_is_faked() { return -1;} - byte *get_random_bits( size_t nbits, int level, int secure ) { return NULL;} - void set_random_seed_file( const char *name ) {} diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/GnuPG1-CVE-2012-6085.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/GnuPG1-CVE-2012-6085.patch deleted file mode 100644 index 362717636..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/GnuPG1-CVE-2012-6085.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit f0b33b6fb8e0586e9584a7a409dcc31263776a67 -Author: Werner Koch <wk@gnupg.org> -Date: Thu Dec 20 09:43:41 2012 +0100 - - gpg: Import only packets which are allowed in a keyblock. - - * g10/import.c (valid_keyblock_packet): New. - (read_block): Store only valid packets. - -- - - A corrupted key, which for example included a mangled public key - encrypted packet, used to corrupt the keyring. This change skips all - packets which are not allowed in a keyblock. - - GnuPG-bug-id: 1455 - - (cherry-picked from commit f795a0d59e197455f8723c300eebf59e09853efa) - -Upstream-Status: Backport -CVE: CVE-2012-6085 - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -diff --git a/g10/import.c b/g10/import.c -index bfe02eb..a57b32e 100644 ---- a/g10/import.c -+++ b/g10/import.c -@@ -384,6 +384,27 @@ import_print_stats (void *hd) - } - - -+/* Return true if PKTTYPE is valid in a keyblock. */ -+static int -+valid_keyblock_packet (int pkttype) -+{ -+ switch (pkttype) -+ { -+ case PKT_PUBLIC_KEY: -+ case PKT_PUBLIC_SUBKEY: -+ case PKT_SECRET_KEY: -+ case PKT_SECRET_SUBKEY: -+ case PKT_SIGNATURE: -+ case PKT_USER_ID: -+ case PKT_ATTRIBUTE: -+ case PKT_RING_TRUST: -+ return 1; -+ default: -+ return 0; -+ } -+} -+ -+ - /**************** - * Read the next keyblock from stream A. - * PENDING_PKT should be initialzed to NULL -@@ -461,7 +482,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root ) - } - in_cert = 1; - default: -- if( in_cert ) { -+ if (in_cert && valid_keyblock_packet (pkt->pkttype)) { - if( !root ) - root = new_kbnode( pkt ); - else diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch deleted file mode 100644 index e005ac658..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch +++ /dev/null @@ -1,17 +0,0 @@ - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: gnupg-1.4.7/configure.ac -=================================================================== ---- gnupg-1.4.7.orig/configure.ac -+++ gnupg-1.4.7/configure.ac -@@ -827,7 +827,6 @@ else - AC_SUBST(USE_NLS) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(BUILD_INCLUDED_LIBINTL) -- AM_PO_SUBDIRS - fi - - if test "$try_extensions" = yes || test x"$card_support" = xyes ; then diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/curl_typeof_fix_backport.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/curl_typeof_fix_backport.patch deleted file mode 100644 index e5fb24aa6..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/curl_typeof_fix_backport.patch +++ /dev/null @@ -1,27 +0,0 @@ - -This has been discussed in a couple of different bug reported -upstream: - -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=486250 -http://bugs.sourcemage.org/show_bug.cgi?id=14446 - -Fix: -http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html - -Upstream-Status: Backport [Debian] - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: gnupg-1.4.7/keyserver/gpgkeys_curl.c -=================================================================== ---- gnupg-1.4.7.orig/keyserver/gpgkeys_curl.c -+++ gnupg-1.4.7/keyserver/gpgkeys_curl.c -@@ -286,7 +286,7 @@ main(int argc,char *argv[]) - curl_easy_setopt(curl,CURLOPT_VERBOSE,1); - } - -- curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert); -+ curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(long)opt->flags.check_cert); - curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file); - - if(proxy) diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch deleted file mode 100644 index 2855cab24..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch +++ /dev/null @@ -1,19 +0,0 @@ -Orignal Patch came from OpenWrt via OE-Classic -https://dev.openwrt.org/browser/packages/utils/gnupg/patches/001-mips_gcc4.4 -which is no longer a valid revision! - -Upstream-Status: Inappropriate [configuration] - - ---- gnupg/mpi/longlong.h~ 2006-02-14 10:09:55.000000000 +0000 -+++ gnupg/mpi/longlong.h 2008-10-27 13:11:09.000000000 +0000 -@@ -181,7 +181,7 @@ - /*************************************** - ************** ARM ****************** - ***************************************/ --#if defined (__arm__) && W_TYPE_SIZE == 32 -+#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__) - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ - __asm__ ("adds %1, %4, %5\n" \ - "adc %0, %2, %3" \ - diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch deleted file mode 100644 index 9a03b2b70..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch +++ /dev/null @@ -1,50 +0,0 @@ - -From Openembedded-Classic - - gnupg-1.4.10: Readd the ARM Thumb patch as debian has no thumb support - - -Upstream-Status: Inappropriate [embedded-specific] - -Index: gnupg-1.4.10/mpi/longlong.h -=================================================================== ---- gnupg-1.4.10.orig/mpi/longlong.h 2008-12-11 17:39:43.000000000 +0100 -+++ gnupg-1.4.10/mpi/longlong.h 2010-03-27 14:27:53.000000000 +0100 -@@ -706,18 +706,35 @@ - #endif /* __m88110__ */ - #endif /* __m88000__ */ - -+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ -+#if defined (__GNUC__) && defined (__GNUC_MINOR__) -+#define __GNUC_PREREQ(maj, min) \ -+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -+#else -+#define __GNUC_PREREQ(maj, min) 0 -+#endif -+ - /*************************************** - ************** MIPS ***************** - ***************************************/ - #if defined (__mips__) && W_TYPE_SIZE == 32 --#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 -+#if __GNUC_PREREQ (4,4) -+#define umul_ppmm(w1, w0, u, v) \ -+ do { \ -+ UDItype __ll = (UDItype)(u) * (v); \ -+ w1 = __ll >> 32; \ -+ w0 = __ll; \ -+ } while (0) -+#endif -+#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7) - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("multu %2,%3" \ - : "=l" ((USItype)(w0)), \ - "=h" ((USItype)(w1)) \ - : "d" ((USItype)(u)), \ - "d" ((USItype)(v))) --#else -+#endif -+#if !defined (umul_ppmm) - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("multu %2,%3 \n" \ - "mflo %0 \n" \ diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_1.4.7.bb b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_1.4.7.bb deleted file mode 100644 index 6ccffd54c..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_1.4.7.bb +++ /dev/null @@ -1,104 +0,0 @@ -SUMMARY = "GNU Privacy Guard - encryption and signing tools" -HOMEPAGE = "http://www.gnupg.org/" -DEPENDS = "zlib bzip2 readline" -SECTION = "console/utils" - -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" - -PR = "r9" - -SRC_URI = "${GNUPG_MIRROR}/gnupg/gnupg-${PV}.tar.bz2 \ - file://long-long-thumb.patch \ - file://configure.patch \ - file://mips_gcc4.4.patch \ - file://GnuPG1-CVE-2012-6085.patch \ - file://curl_typeof_fix_backport.patch \ - file://CVE-2013-4351.patch \ - file://CVE-2013-4576.patch \ - file://CVE-2013-4242.patch \ - " - -SRC_URI[md5sum] = "b06a141cca5cd1a55bbdd25ab833303c" -SRC_URI[sha256sum] = "69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d" - -inherit autotools gettext texinfo - -# --with-egd-socket=NAME use NAME for the EGD socket -# --with-photo-viewer=FIXED_VIEWER set a fixed photo ID viewer -# --with-included-zlib use the zlib code included here -# --with-capabilities use linux capabilities default=no -# --with-mailprog=NAME use "NAME -t" for mail transport -# --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -# --without-libiconv-prefix don't search for libiconv in includedir and libdir -# --with-included-gettext use the GNU gettext library included here -# --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib -# --without-libintl-prefix don't search for libintl in includedir and libdir -# --without-readline do not support fancy command line editing -# --with-included-regex use the included GNU regex library -# --with-zlib=DIR use libz in DIR -# --with-bzip2=DIR look for bzip2 in DIR -# --enable-static-rnd=egd|unix|linux|auto -# --disable-dev-random disable the use of dev random -# --disable-asm do not use assembler modules -# --enable-m-guard enable memory guard facility -# --enable-selinux-support -# enable SELinux support -# --disable-card-support disable OpenPGP card support -# --disable-gnupg-iconv disable the new iconv code -# --enable-backsigs enable the experimental backsigs code -# --enable-minimal build the smallest gpg binary possible -# --disable-rsa disable the RSA public key algorithm -# --disable-idea disable the IDEA cipher -# --disable-cast5 disable the CAST5 cipher -# --disable-blowfish disable the BLOWFISH cipher -# --disable-aes disable the AES, AES192, and AES256 ciphers -# --disable-twofish disable the TWOFISH cipher -# --disable-sha256 disable the SHA-256 digest -# --disable-sha512 disable the SHA-384 and SHA-512 digests -# --disable-bzip2 disable the BZIP2 compression algorithm -# --disable-exec disable all external program execution -# --disable-photo-viewers disable photo ID viewers -# --disable-keyserver-helpers disable all external keyserver support -# --disable-ldap disable LDAP keyserver interface -# --disable-hkp disable HKP keyserver interface -# --disable-http disable HTTP key fetching interface -# --disable-finger disable Finger key fetching interface -# --disable-mailto disable email keyserver interface -# --disable-keyserver-path disable the exec-path option for keyserver helpers -# --enable-key-cache=SIZE Set key cache to SIZE (default 4096) -# --disable-largefile omit support for large files -# --disable-dns-srv disable the use of DNS SRV in HKP and HTTP -# --disable-nls do not use Native Language Support -# --disable-regex do not handle regular expressions in trust sigs - -EXTRA_OECONF = "--disable-ldap \ - --with-zlib=${STAGING_LIBDIR}/.. \ - --with-bzip2=${STAGING_LIBDIR}/.. \ - --disable-selinux-support \ - --with-readline=${STAGING_LIBDIR}/.. \ - ac_cv_sys_symbol_underscore=no \ - " - -# Force gcc's traditional handling of inline to avoid issues with gcc 5 -CFLAGS += "-fgnu89-inline" - -do_install () { - autotools_do_install - install -d ${D}${docdir}/${BPN} - mv ${D}${datadir}/${BPN}/* ${D}/${docdir}/${BPN}/ || : - mv ${D}${prefix}/doc/* ${D}/${docdir}/${BPN}/ || : -} - -# split out gpgv from main package -RDEPENDS_${PN} = "gpgv" -PACKAGES =+ "gpgv" -FILES_gpgv = "${bindir}/gpgv" - -# Exclude debug files from the main packages -FILES_${PN} = "${bindir}/* ${datadir}/${BPN} ${libexecdir}/${BPN}/*" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[curl] = "--with-libcurl=${STAGING_LIBDIR},--without-libcurl,curl" -PACKAGECONFIG[libusb] = "--with-libusb=${STAGING_LIBDIR},--without-libusb,libusb-compat" diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.14.bb b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.18.bb index 5ea9b962e..a0611aa00 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.14.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.18.bb @@ -1,8 +1,8 @@ SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)" HOMEPAGE = "http://www.gnupg.org/" LICENSE = "GPLv3 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ - file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" +LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \ + file://COPYING.LIB;md5=a2b6bf2cb38ee52619e60f30a1fc7257" DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt" @@ -16,8 +16,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://autogen.sh-fix-find-version-for-beta-checking.patch \ " -SRC_URI[md5sum] = "46cf0a42ffad6c2615cafd633580b2de" -SRC_URI[sha256sum] = "9450dee9693b6a12bf0c374dae77b66c30f69ff8f35fc9266ab8dd76998eba42" +SRC_URI[md5sum] = "c67f908b0b35c7ebc62144f362757e1e" +SRC_URI[sha256sum] = "d04c6fab7e5562ce4b915b22020e34d4c1a256847690cf149842264fc7cef994" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ 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 51b9d2b19..1ecad1f99 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc @@ -12,10 +12,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" -DEPENDS = "nettle gmp virtual/libiconv" +DEPENDS = "nettle gmp virtual/libiconv libunistring" DEPENDS_append_libc-musl = " argp-standalone" -SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" @@ -23,6 +23,11 @@ inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc PACKAGECONFIG ??= "libidn zlib" +# You must also have CONFIG_SECCOMP enabled in the kernel for +# seccomp to work. +# +PACKAGECONFIG[seccomp] = "ac_cv_libseccomp=yes,ac_cv_libseccomp=no,libseccomp" + 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" @@ -37,6 +42,7 @@ EXTRA_OECONF = " \ --enable-local-libopts \ --enable-openssl-compatibility \ --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ + --without-libunistring-prefix \ " LDFLAGS_append_libc-musl = " -largp" diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch deleted file mode 100644 index d7dd7cf69..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2651b08477f42dd7a05ea7d6df410fb2c46de4fb Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Wed, 31 Aug 2016 11:04:06 +0300 -Subject: [PATCH] Use correct include dir with minitasn -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows compiling certtool-cfg without libtasn headers. - -Upstream-Status: Submitted [https://gitlab.com/gnutls/gnutls/merge_requests/54] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - src/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 182f3a5..cf65388 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -146,6 +146,7 @@ libcmd_cli_debug_la_SOURCES = cli-debug-args.def cli-debug-args.c cli-debug-args - COMMON_LIBS = $(LIBOPTS) $(LTLIBINTL) - if ENABLE_MINITASN1 - COMMON_LIBS += ../lib/minitasn1/libminitasn1.la ../gl/libgnu.la -+AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1 - else - COMMON_LIBS += $(LIBTASN1_LIBS) - endif --- -2.9.3 - 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 c5b95eb5b..f0b7ca2ec 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 @@ -1,6 +1,6 @@ -From 67c638c7e209554d9b19627e9402a20fdabead21 Mon Sep 17 00:00:00 2001 +From eaab55bb6d48643163eebbc9ca575a9ca2a8e03f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 4 Dec 2015 13:19:28 +0200 +Date: Tue, 21 Feb 2017 17:10:07 +0200 Subject: [PATCH] configure.ac: fix sed command The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors @@ -15,18 +15,18 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index e634236..dc9e6a8 100644 +index 6907b21..7c70d9e 100644 --- a/configure.ac +++ b/configure.ac -@@ -549,7 +549,7 @@ if test "$enable_tools" != "no" || test "$enable_doc" != "no"; then - dnl replace libopts-generated files with distributed backups, if present - missing_baks= - for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do -- nam=`echo $i|sed 's/.bak//g'` -+ nam=`echo $i|sed 's/\.bak$//'` - if test -f $i;then - cp -f $i $nam - else +@@ -948,7 +948,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" + AC_CONFIG_LINKS([src/$nam:$i]) -- -2.6.2 +2.11.0 diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/CVE-2016-7444.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/CVE-2016-7444.patch deleted file mode 100644 index 215be5a8e..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/CVE-2016-7444.patch +++ /dev/null @@ -1,35 +0,0 @@ -CVE: CVE-2016-7444 -Upstream-Status: Backport -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> - -Upstream commit follows: - - -From 964632f37dfdfb914ebc5e49db4fa29af35b1de9 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@gnutls.org> -Date: Sat, 27 Aug 2016 17:00:22 +0200 -Subject: [PATCH] ocsp: corrected the comparison of the serial size in OCSP response - -Previously the OCSP certificate check wouldn't verify the serial length -and could succeed in cases it shouldn't. - -Reported by Stefan Buehler. ---- - lib/x509/ocsp.c | 1 + - 1 file changed, 1 insertion(+), 0 deletions(-) - -diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c -index 92db9b6..8181f2e 100644 ---- a/lib/x509/ocsp.c -+++ b/lib/x509/ocsp.c -@@ -1318,6 +1318,7 @@ gnutls_ocsp_resp_check_crt(gnutls_ocsp_resp_t resp, - gnutls_assert(); - goto cleanup; - } -+ cserial.size = t; - - if (rserial.size != cserial.size - || memcmp(cserial.data, rserial.data, rserial.size) != 0) { --- -libgit2 0.24.0 - diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch new file mode 100644 index 000000000..34c8985c1 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch @@ -0,0 +1,19 @@ +Certain syscall's are not availabe for arm-eabi, so we eliminate +reference to them. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <jslater@windriver.com> + +--- a/tests/seccomp.c ++++ b/tests/seccomp.c +@@ -49,7 +49,9 @@ int disable_system_calls(void) + } + + ADD_SYSCALL(nanosleep, 0); ++#if ! defined(__ARM_EABI__) + ADD_SYSCALL(time, 0); ++#endif + ADD_SYSCALL(getpid, 0); + ADD_SYSCALL(gettimeofday, 0); + #if defined(HAVE_CLOCK_GETTIME) diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch index 5e452c52e..96b023a46 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch @@ -1,7 +1,7 @@ -From ae3370788ed3447bba16969d9eb1bf1b9631e1b7 Mon Sep 17 00:00:00 2001 +From 81b0f04c14f673b99778d2e7d8e85461e0bf2018 Mon Sep 17 00:00:00 2001 From: Valentin Popa <valentin.popa@intel.com> Date: Fri, 25 Apr 2014 13:58:55 +0300 -Subject: [PATCH] Correct rpl_gettimeofday signature +Subject: [PATCH 1/3] Correct rpl_gettimeofday signature Currently we fail on uclibc like below @@ -29,12 +29,13 @@ eglibc otherwise we will have same issue there too Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending + --- gl/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h -index 84a17c9..6ceadc3 100644 +index 5a8caf3..2dc5718 100644 --- a/gl/sys_time.in.h +++ b/gl/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval @@ -61,7 +62,7 @@ index 84a17c9..6ceadc3 100644 + (struct timeval *__restrict, void *__restrict)); # endif _GL_CXXALIASWARN (gettimeofday); - #elif defined GNULIB_POSIXCHECK + # if defined __cplusplus && defined GNULIB_NAMESPACE -- -1.9.1 +2.10.2 diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.3.bb b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.3.bb deleted file mode 100644 index b2dbb0712..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -require gnutls.inc - -SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ - file://0001-configure.ac-fix-sed-command.patch \ - file://use-pkg-config-to-locate-zlib.patch \ - file://0001-Use-correct-include-dir-with-minitasn.patch \ - file://CVE-2016-7444.patch \ - " -SRC_URI[md5sum] = "6c2c7f40ddf52933ee3ca474cb8cb63c" -SRC_URI[sha256sum] = "92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef" - -# x86 .text relocations should be fixed from 3.5.5 onwards -INSANE_SKIP_${PN}_append_x86 = " textrel" diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.9.bb b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.9.bb new file mode 100644 index 000000000..8f84dbbf4 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.5.9.bb @@ -0,0 +1,10 @@ +require gnutls.inc + +SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ + file://0001-configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ + file://arm_eabi.patch \ + " +SRC_URI[md5sum] = "0ab25eb6a1509345dd085bc21a387951" +SRC_URI[sha256sum] = "82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951" + diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch deleted file mode 100644 index ae643946f..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 908e9fa4c1172f09e0e45420a403dc25ed0a466c Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@redhat.com> -Date: Tue, 26 Jul 2016 08:45:33 +0200 -Subject: [PATCH 1/4] configure: don't add -Werror to build flags - ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7a14e04..066f5fe 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -70,8 +70,6 @@ AC_ARG_ENABLE([gcc-warnings], - ) - - if test "$gl_gcc_warnings" = yes; then -- gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) -- - nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings - nw="$nw -Wc++-compat" # We don't care strongly about C++ compilers - nw="$nw -Wtraditional" # Warns on #elif which we use often --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch new file mode 100644 index 000000000..1e52d6abf --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch @@ -0,0 +1,63 @@ +From b17dbb8d3c5605db3a1d82861fcaeef4636d1117 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <maxin.john@intel.com> +Date: Thu, 26 Jan 2017 18:54:48 +0200 +Subject: [PATCH] stdint.m4: reintroduce GNULIB_OVERRIDES_WINT_T check + +Partially revert the gnulib commit: 5a400b3f5a1f5483dbfd75d38bdb7080218a063b +to fix the build error with musl library. + +Upstream-Status: Inappropriate + +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + gl/m4/stdint.m4 | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4 +index 4ac854d..3dc3da1 100644 +--- a/gl/m4/stdint.m4 ++++ b/gl/m4/stdint.m4 +@@ -355,6 +355,32 @@ int32_t i32 = INT32_C (0x7fffffff); + gl_STDINT_TYPE_PROPERTIES + fi + ++ dnl Determine whether gnulib's <wchar.h> or <wctype.h> would, if present, ++ dnl override 'wint_t'. ++ AC_CACHE_CHECK([whether wint_t is too small], ++ [gl_cv_type_wint_t_too_small], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[ ++ /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before ++ <wchar.h>. ++ BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be ++ included before <wchar.h>. */ ++ #if !(defined __GLIBC__ && !defined __UCLIBC__) ++ # include <stddef.h> ++ # include <stdio.h> ++ # include <time.h> ++ #endif ++ #include <wchar.h> ++ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; ++ ]])], ++ [gl_cv_type_wint_t_too_small=no], ++ [gl_cv_type_wint_t_too_small=yes])]) ++ if test $gl_cv_type_wint_t_too_small = yes; then ++ GNULIB_OVERRIDES_WINT_T=1 ++ else ++ GNULIB_OVERRIDES_WINT_T=0 ++ fi ++ + dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. + LIMITS_H=limits.h + AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) +@@ -363,6 +389,7 @@ int32_t i32 = INT32_C (0x7fffffff); + AC_SUBST([HAVE_SYS_BITYPES_H]) + AC_SUBST([HAVE_SYS_INTTYPES_H]) + AC_SUBST([STDINT_H]) ++ AC_SUBST([GNULIB_OVERRIDES_WINT_T]) + AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"]) + ]) + +-- +2.4.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch deleted file mode 100644 index dd364223b..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3542c01618fcde83b29640ea2c60bfd2629ae0b7 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@redhat.com> -Date: Tue, 26 Jul 2016 08:47:49 +0200 -Subject: [PATCH 2/4] ASN.y: corrected compiler warning - ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - lib/ASN1.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ASN1.y b/lib/ASN1.y -index 731415d..6db638f 100644 ---- a/lib/ASN1.y -+++ b/lib/ASN1.y -@@ -621,7 +621,7 @@ _asn1_create_errorDescription (int error, char *error_desc) - case ASN1_NAME_TOO_LONG: - snprintf (error_desc, ASN1_MAX_ERROR_DESCRIPTION_SIZE, - "%s:%u: name too long (more than %u characters)", file_name, -- line_number, ASN1_MAX_NAME_SIZE); -+ line_number, (unsigned)ASN1_MAX_NAME_SIZE); - break; - case ASN1_IDENTIFIER_NOT_FOUND: - snprintf (error_desc, ASN1_MAX_ERROR_DESCRIPTION_SIZE, --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch deleted file mode 100644 index 24201437b..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch +++ /dev/null @@ -1,73 +0,0 @@ -From c8903aa27dc9de1d9efeed9d1f7894f1019548f7 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@redhat.com> -Date: Tue, 26 Jul 2016 08:49:15 +0200 -Subject: [PATCH 3/4] parser_aux: corrected potential null pointer dereferences - ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - lib/parser_aux.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lib/parser_aux.c b/lib/parser_aux.c -index 2285b20..12ee16f 100644 ---- a/lib/parser_aux.c -+++ b/lib/parser_aux.c -@@ -637,7 +637,7 @@ _asn1_change_integer_value (asn1_node node) - p = NULL; - break; - } -- if (p->right) -+ if (p && p->right) - { - p = p->right; - break; -@@ -753,7 +753,7 @@ _asn1_expand_object_id (asn1_node node) - - if (move == RIGHT) - { -- if (p->right) -+ if (p && p->right) - p = p->right; - else - move = UP; -@@ -828,7 +828,7 @@ _asn1_expand_object_id (asn1_node node) - - if (move == RIGHT) - { -- if (p->right) -+ if (p && p->right) - p = p->right; - else - move = UP; -@@ -898,7 +898,7 @@ _asn1_type_set_config (asn1_node node) - - if (move == RIGHT) - { -- if (p->right) -+ if (p && p->right) - p = p->right; - else - move = UP; -@@ -1007,7 +1007,7 @@ _asn1_check_identifier (asn1_node node) - p = NULL; - break; - } -- if (p->right) -+ if (p && p->right) - { - p = p->right; - break; -@@ -1067,7 +1067,7 @@ _asn1_set_default_tag (asn1_node node) - p = NULL; - break; - } -- if (p->right) -+ if (p && p->right) - { - p = p->right; - break; --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch deleted file mode 100644 index 7bda0e6f2..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d647bb2fa1bd288a6ac02c18318f3cba2a34c3a0 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@redhat.com> -Date: Tue, 26 Jul 2016 08:50:24 +0200 -Subject: [PATCH 4/4] tools: eliminated compiler warnings - ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - src/asn1Coding.c | 2 +- - src/asn1Decoding.c | 2 +- - src/asn1Parser.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/asn1Coding.c b/src/asn1Coding.c -index d4df593..b516bfe 100644 ---- a/src/asn1Coding.c -+++ b/src/asn1Coding.c -@@ -188,7 +188,7 @@ main (int argc, char *argv[]) - default: - fprintf (stderr, - "asn1Coding: ?? getopt returned character code Ox%x ??\n", -- option_result); -+ (unsigned)option_result); - } - } - -diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c -index 078963e..20f91ac 100644 ---- a/src/asn1Decoding.c -+++ b/src/asn1Decoding.c -@@ -131,7 +131,7 @@ main (int argc, char *argv[]) - default: - fprintf (stderr, - "asn1Decoding: ?? getopt returned character code Ox%x ??\n", -- option_result); -+ (unsigned)option_result); - } - } - -diff --git a/src/asn1Parser.c b/src/asn1Parser.c -index 7a3ae67..475bfc9 100644 ---- a/src/asn1Parser.c -+++ b/src/asn1Parser.c -@@ -139,7 +139,7 @@ main (int argc, char *argv[]) - default: - fprintf (stderr, - "asn1Parser: ?? getopt returned character code Ox%x ??\n", -- option_result); -+ (unsigned)option_result); - } - - } --- -1.9.1 - 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 new file mode 100644 index 000000000..be843808a --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch @@ -0,0 +1,63 @@ +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.9.bb b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.10.bb index b8ff9eaf7..dfc7f12c2 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.9.bb +++ b/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.10.bb @@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ - file://0001-configure-don-t-add-Werror-to-build-flags.patch \ - file://0002-ASN.y-corrected-compiler-warning.patch \ - file://0003-parser_aux-corrected-potential-null-pointer-derefere.patch \ - file://0004-tools-eliminated-compiler-warnings.patch \ + file://0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch \ + file://CVE-2017-10790.patch \ " -SRC_URI[md5sum] = "3018d0f466a32b66dde41bb122e6cab6" -SRC_URI[sha256sum] = "4f6f7a8fd691ac2b8307c8ca365bad711db607d4ad5966f6938a9d2ecd65c920" +DEPENDS = "bison-native" + +SRC_URI[md5sum] = "f4faffdf63969d0e4e6df43b9679e8e5" +SRC_URI[sha256sum] = "681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02" inherit autotools texinfo binconfig lib_package gtk-doc diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch new file mode 100644 index 000000000..42655fbbe --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch @@ -0,0 +1,26 @@ +From 4d714c097e497b63d2e8b22a834c671045e215e9 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 9 Mar 2017 21:34:55 +0200 +Subject: [PATCH] Correctly install python modules + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + lang/python/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am +index e32fd12..5ecf6fb 100644 +--- a/lang/python/Makefile.am ++++ b/lang/python/Makefile.am +@@ -102,6 +102,7 @@ install-exec-local: + for PYTHON in $(PYTHONS); do \ + $$PYTHON setup.py install \ + --prefix $(DESTDIR)$(prefix) \ ++ --install-lib=$(DESTDIR)${pythondir} \ + --record files.txt \ + --verbose ; \ + cat files.txt >> install_files.txt ; \ +-- +2.11.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch new file mode 100644 index 000000000..84d55b968 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch @@ -0,0 +1,31 @@ +From 8c317f6186bd3a9a1c80b4d1e872b3db95934bb6 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] gpgme-config: skip all /lib* or /usr/lib* directories in + output + +The logic was not working in multilib setups which use other +directory names than plain /lib or /usr/lib. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/gpgme-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gpgme-config.in b/src/gpgme-config.in +index a4d152e..8342865 100644 +--- a/src/gpgme-config.in ++++ b/src/gpgme-config.in +@@ -154,7 +154,7 @@ while test $# -gt 0; do + for i in $libs $tmp_l $assuan_libs $gpg_error_libs $tmp_x; do + skip=no + case $i in +- -L/usr/lib|-L/lib) ++ -L/usr/lib*|-L/lib*) + skip=yes + ;; + -L*|-l*) +-- +2.11.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/gpgme.pc b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/gpgme.pc deleted file mode 100644 index 30a4d56d6..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/gpgme.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: gpgme -Description: GNU Privacy Guard Made Easy -Version: 1.4.3 -Requires: -Libs: -L${libdir} -lgpgme -lassuan -lgpg-error -Cflags: -I${includedir} diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/pkgconfig.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/pkgconfig.patch index e2f1f4ffb..341cabfc5 100644 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/pkgconfig.patch +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/pkgconfig.patch @@ -4,37 +4,50 @@ simpler and less error prone when cross compiling. Upstream-Status: Denied [Upstream not interested in pkg-config support] RP 2015/4/17 +Rebase to 1.8.0 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 1 + + src/Makefile.am | 4 +- + src/gpgme-pthread.pc.in | 15 +++++++ + src/gpgme.m4 | 114 ++++-------------------------------------------- + src/gpgme.pc.in | 15 +++++++ + 5 files changed, 42 insertions(+), 107 deletions(-) + create mode 100644 src/gpgme-pthread.pc.in + create mode 100644 src/gpgme.pc.in + diff --git a/configure.ac b/configure.ac -index 298a22b..c778b61 100644 +index 0a67b48..e402dd3 100644 --- a/configure.ac +++ b/configure.ac -@@ -622,6 +622,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -875,6 +875,7 @@ AC_CONFIG_FILES(Makefile src/Makefile src/versioninfo.rc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) +AC_CONFIG_FILES(src/gpgme.pc src/gpgme-pthread.pc) - AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd]) - AC_OUTPUT - + AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile) + AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) + AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in) diff --git a/src/Makefile.am b/src/Makefile.am -index 58922f9..40d0dca 100644 +index ce6f1d4..5f38fee 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -20,11 +20,13 @@ +@@ -19,12 +19,14 @@ + ## Process this file with automake to produce Makefile.in - # Note: moc_kdpipeiodevice should actually be a dependecy below. EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ -- gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp -+ gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp gpgme.pc.in gpgme-pthread.pc.in +- gpgme.h.in versioninfo.rc.in gpgme.def ++ gpgme.h.in versioninfo.rc.in gpgme.def gpgme.pc.in gpgme-pthread.pc.in bin_SCRIPTS = gpgme-config m4datadir = $(datadir)/aclocal m4data_DATA = gpgme.m4 + nodist_include_HEADERS = gpgme.h +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gpgme.pc gpgme-pthread.pc - nodist_include_HEADERS = gpgme.h bin_PROGRAMS = gpgme-tool + diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in new file mode 100644 index 0000000..980a48e @@ -51,9 +64,9 @@ index 0000000..980a48e +host=@GPGME_CONFIG_HOST@ + +Name: gpgme -+Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program (threaded version) ++Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program (deprecated) +Version: @VERSION@ -+Libs: -L${libdir} -lgpgme-pthread -lpthread ++Libs: -L${libdir} -lgpgme -lpthread +Cflags: -I${includedir} +Requires: libassuan gpg-error diff --git a/src/gpgme.m4 b/src/gpgme.m4 @@ -277,3 +290,6 @@ index 0000000..b69539f +Cflags: -I${includedir} +Requires: libassuan gpg-error \ No newline at end of file +-- +2.8.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/python-import.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/python-import.patch new file mode 100644 index 000000000..61b77a1f7 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/python-import.patch @@ -0,0 +1,19 @@ +Don't check for output on stderr to know if an import worked, host inputrc and +sysroot readline can cause warnings on stderr. + +Upstream-Status: Backport (from autoconf-archive 883a2abd) +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 +index b990d5b..318b089 100644 +--- a/m4/ax_python_devel.m4 ++++ b/m4/ax_python_devel.m4 +@@ -137,7 +137,7 @@ variable to configure. See ``configure --help'' for reference. + # + AC_MSG_CHECKING([for the distutils Python package]) + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/python-lang-config.patch b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/python-lang-config.patch new file mode 100644 index 000000000..132e42677 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/python-lang-config.patch @@ -0,0 +1,52 @@ +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. + +Upstream-Status: Inappropriate [changes are specific to OE] + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: gpgme-1.8.0/lang/python/setup.py.in +=================================================================== +--- gpgme-1.8.0.orig/lang/python/setup.py.in ++++ gpgme-1.8.0/lang/python/setup.py.in +@@ -24,7 +24,6 @@ import glob + import subprocess + + # Out-of-tree build of the gpg bindings. +-gpg_error_config = ["gpg-error-config"] + gpgme_config_flags = ["--thread=pthread"] + gpgme_config = ["gpgme-config"] + gpgme_config_flags + gpgme_h = "" +@@ -52,13 +51,6 @@ else: + devnull = open(os.devnull, "w") + + 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 min + 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) + + print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h)) + diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.6.0.bb b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.6.0.bb deleted file mode 100644 index a2d05878b..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.6.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "High-level GnuPG encryption/signing API" -DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management" -HOMEPAGE = "http://www.gnupg.org/gpgme.html" -BUGTRACKER = "https://bugs.g10code.com/gnupg/index" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://src/gpgme.h.in;endline=23;md5=5027eec93a996272a9a0a6a86cf35775 \ - file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" - -UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" -SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ - file://gpgme.pc \ - file://pkgconfig.patch \ - " - -SRC_URI[md5sum] = "60d730d22e8065fd5de309e8b98e304b" -SRC_URI[sha256sum] = "b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d" - -DEPENDS = "libgpg-error libassuan" - -BINCONFIG = "${bindir}/gpgme-config" - -inherit autotools texinfo binconfig-disabled pkgconfig - -PACKAGES =+ "${PN}-pthread" -FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*" -FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" - -CFLAGS_append_libc-musl = " -D__error_t_defined " -do_configure_prepend () { - # Else these could be used in preference to those in aclocal-copy - rm -f ${S}/m4/gpg-error.m4 - rm -f ${S}/m4/libassuan.m4 -} - -do_install_append () { - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${WORKDIR}/gpgme.pc ${D}${libdir}/pkgconfig/ -} diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.8.0.bb b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.8.0.bb new file mode 100644 index 000000000..4ddf6ed99 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.8.0.bb @@ -0,0 +1,76 @@ +SUMMARY = "High-level GnuPG encryption/signing API" +DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management" +HOMEPAGE = "http://www.gnupg.org/gpgme.html" +BUGTRACKER = "https://bugs.g10code.com/gnupg/index" + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ + file://src/gpgme.h.in;endline=23;md5=0f7059665c4b7897f4f4d0cb93aa9f98 \ + file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" + +UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" +SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ + file://pkgconfig.patch \ + file://python-lang-config.patch \ + file://0001-Correctly-install-python-modules.patch \ + file://python-import.patch \ + file://0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ + " + +SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b" +SRC_URI[sha256sum] = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33" + +DEPENDS = "libgpg-error libassuan" +RDEPENDS_${PN}-cpp += "libstdc++" + +RDEPENDS_python2-gpg += "python-unixadmin" +RDEPENDS_python3-gpg += "python3-unixadmin" + +BINCONFIG = "${bindir}/gpgme-config" + +# Note select python2 or python3, but you can't select both at the same time +PACKAGECONFIG ??= "python3" +PACKAGECONFIG[python2] = ",,python swig-native," +PACKAGECONFIG[python3] = ",,python3 swig-native," + +# Default in configure.ac: "cl cpp python qt" +# Supported: "cl cpp python python2 python3 qt" +# python says 'search and find python2 or python3' + +# Building the C++ bindings for native requires a C++ compiler with C++11 +# support. Since these bindings are currently not needed, we can disable them. +DEFAULT_LANGUAGES = "" +DEFAULT_LANGUAGES_class-target = "cpp" +LANGUAGES ?= "${DEFAULT_LANGUAGES}" +LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' python2', '', d)}" +LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d)}" + +PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" +PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" + +EXTRA_OECONF += '--enable-languages="${LANGUAGES}"' + +inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} + +export PKG_CONFIG='pkg-config' + +BBCLASSEXTEND = "native nativesdk" + +PACKAGES =+ "${PN}-cpp" +PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python2-gpg ', '', d)}" +PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-gpg ', '', d)}" + +FILES_${PN}-cpp = "${libdir}/libgpgmepp.so.*" +FILES_python2-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES_python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/* \ + ${libdir}/cmake/* \ +" + +CFLAGS_append_libc-musl = " -D__error_t_defined " +do_configure_prepend () { + # Else these could be used in preference to those in aclocal-copy + rm -f ${S}/m4/gpg-error.m4 + rm -f ${S}/m4/libassuan.m4 +} 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 cc6f222a5..fe48101f2 100644 --- a/import-layers/yocto-poky/meta/recipes-support/icu/icu.inc +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu.inc @@ -9,6 +9,8 @@ LICENSE = "ICU" DEPENDS = "icu-native" DEPENDS_class-native = "" +CVE_PRODUCT = "international_components_for_unicode" + S = "${WORKDIR}/icu/source" SPDX_S = "${WORKDIR}/icu" STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" @@ -26,6 +28,14 @@ EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" EXTRA_OECONF_class-native = "" EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +# strtod_l() is not supported by musl; also xlocale.h is missing +# It is not possible to disable its use via configure switches or env vars +# so monkey patching is needed. +do_configure_prepend_libc-musl () { + sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' ${S}/configure.ac +} + PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" do_install_append_class-native() { mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config @@ -36,15 +46,13 @@ do_install_append_class-native() { cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} } -PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio" +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" FILES_${PN}-dev += "${libdir}/${BPN}/" FILES_libicudata = "${libdir}/libicudata.so.*" FILES_libicuuc = "${libdir}/libicuuc.so.*" FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicule = "${libdir}/libicule.so.*" -FILES_libiculx = "${libdir}/libiculx.so.*" FILES_libicutu = "${libdir}/libicutu.so.*" FILES_libicuio = "${libdir}/libicuio.so.*" 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 new file mode 100644 index 000000000..add0d765b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch @@ -0,0 +1,31 @@ +From c4254fd8ff1888ca285e3242b812010357ce2b3e 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> + +glibc 2.26 drops this header + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + 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 @@ + #endif + + #if U_USE_STRTOD_L +-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN +-# include <locale.h> +-# else +-# include <xlocale.h> +-# endif ++# include <locale.h> + #endif + + // *************************************************************************** diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu_57.1.bb b/import-layers/yocto-poky/meta/recipes-support/icu/icu_58.2.bb index 90c2b8275..47684a6c8 100644 --- a/import-layers/yocto-poky/meta/recipes-support/icu/icu_57.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/icu/icu_58.2.bb @@ -1,9 +1,9 @@ require icu.inc -LIC_FILES_CHKSUM = "file://../LICENSE;md5=787d3b37867445c1cdd6f6167bd0e347" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=1b3b75c1777cd49ad5c6a24cd338cfc9" def icu_download_version(d): - pvsplit = d.getVar('PV', True).split('.') + pvsplit = d.getVar('PV').split('.') return pvsplit[0] + "_" + pvsplit[1] ICU_PV = "${@icu_download_version(d)}" @@ -16,13 +16,14 @@ BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ - " + file://0001-i18n-Drop-include-xlocale.h.patch \ + " SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "976734806026a4ef8bdd17937c8898b9" -SRC_URI[sha256sum] = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581" +SRC_URI[md5sum] = "fac212b32b7ec7ab007a12dff1f3aea1" +SRC_URI[sha256sum] = "2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c" 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.70.bb b/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.74.bb index 7edd8b7bb..c436a1dd2 100644 --- a/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.70.bb +++ b/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.74.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] = "c61f8f02eecf978d3710ff594e43ca7e" -SRC_URI[sha256sum] = "41e2fbaec2ed57e767b94f175d0dcd31b627aeb23b75cd604605a6fb6109d61f" +SRC_URI[md5sum] = "d5448475d087756b78391b8c53c5b83a" +SRC_URI[sha256sum] = "21f4f3cea8fe09f5b53784522303a0e1e7d083964ecaf1c75b1441d4d9ec6aee" # 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_2.4.3.bb b/import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan_2.4.3.bb index 1b3916d73..926c279f9 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.4.3.bb @@ -28,4 +28,4 @@ do_configure_prepend () { rm -f ${S}/m4/*.m4 } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch new file mode 100644 index 000000000..7e3a5b3be --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch @@ -0,0 +1,33 @@ +From b6972f1c29ebf073cbe19a4a669ee093259792a0 Mon Sep 17 00:00:00 2001 +From: Fabio Berton <fabio.berton@ossystems.com.br> +Date: Mon, 30 Jan 2017 12:00:33 -0200 +Subject: [PATCH] src/libbsd-overlay.pc.in: Set Cflags to use -I instead of + -isystem +Organization: O.S. Systems Software LTDA. + +pkg-config currently only handles -I and -L correctly, but misses +-isystem, so we need to do this workaround to fix this issue. + +There's a open bug in: +https://bugzilla.freedesktop.org/show_bug.cgi?id=99516 + +Upstream-Status: Pending + +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> +--- + src/libbsd-overlay.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libbsd-overlay.pc.in b/src/libbsd-overlay.pc.in +index ac8bf89..65dc3ae 100644 +--- a/src/libbsd-overlay.pc.in ++++ b/src/libbsd-overlay.pc.in +@@ -8,4 +8,4 @@ Description: Utility functions from BSD systems (overlay) + Version: @VERSION@ + URL: https://libbsd.freedesktop.org/ + Libs: -L${libdir} -lbsd +-Cflags: -isystem ${includedir}/bsd -DLIBBSD_OVERLAY ++Cflags: -I${includedir}/bsd -DLIBBSD_OVERLAY +-- +2.11.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.3.bb b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.3.bb index fadd7886a..e85ee2153 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.3.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.3.bb @@ -35,6 +35,7 @@ SECTION = "libs" SRC_URI = " \ http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch \ " SRC_URI_append_libc-musl = " \ file://0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch \ diff --git a/import-layers/yocto-poky/meta/recipes-support/libcap/libcap_2.25.bb b/import-layers/yocto-poky/meta/recipes-support/libcap/libcap_2.25.bb index 7ced4be62..0587e77e9 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libcap/libcap_2.25.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libcap/libcap_2.25.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://sites.google.com/site/fullycapable/" LICENSE = "BSD | GPLv2" LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" -DEPENDS = "hostperl-runtime-native" +DEPENDS = "hostperl-runtime-native gperf-native" SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \ file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \ @@ -27,11 +27,9 @@ do_configure() { sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile } -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG_class-native ??= "" -PACKAGECONFIG[attr] = "LIBATTR=yes,LIBATTR=no,attr" PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam" EXTRA_OEMAKE = " \ 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.10.0.bb index c0b459f66..9d34198a9 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.10.0.bb @@ -21,4 +21,4 @@ RREPLACES_${PN} = "check (<= 0.9.5)" RDEPENDS_${PN} += "gawk" RDEPENDS_${PN}_class-native = "" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.2.bb b/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.6.bb index c76e1d79f..2f84554bd 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.6.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] = "96ad6edb5ce5c4428f1b183cc180ff8c" -SRC_URI[sha256sum] = "5ee2163656a61f5703cb5c08a05c9471ffb7b640bfbe2c55194ea50d908f629b" +SRC_URI[md5sum] = "d4ce9f061f8f954bea7adba0cb768a53" +SRC_URI[sha256sum] = "ecec7e9d66b1d3692f10b3b20aa97fb25e874a784c5552a7b1698091fef5a688" inherit autotools pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.4.bb b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb index f20496803..0134572f1 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.4.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb @@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ " -SRC_URI[md5sum] = "74997d75e7e87dc73398746fd373bf52" -SRC_URI[sha256sum] = "7804f6f28cb3d1bc8ffb3151ab7ff0c063b27c5f9b06c682eb903e01cf25502f" +SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" +SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" S = "${WORKDIR}/libfm-${PV}" diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch new file mode 100644 index 000000000..fb91d90cf --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch @@ -0,0 +1,28 @@ +From 23c6e9df611c86a5e97079e1b88c7a18474bf0bc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 16 Dec 2016 16:52:04 +0200 +Subject: [PATCH] Correctly check the stamp file that indicates if we need to + re-build vala code + +Upstream-Status: Pending +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 d043b3d..0e85590 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,7 +42,7 @@ AM_COND_IF(EXTRALIB_ONLY, + [enable_actions=no]) + if test x"$enable_actions" = xyes; then + dnl no vala compiler required when sources are from dist tarball +- if test -f src/actions/libfmactions_la_vala.stamp; then ++ if test -f $srcdir/src/actions/libfmactions_la_vala.stamp; then + AM_PROG_VALAC + else + AM_PROG_VALAC([0.13.0]) +-- +2.10.2 + diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.4.bb b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb index 2218f9cb7..aca59e147 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.4.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb @@ -11,10 +11,11 @@ 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" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ + file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch" -SRC_URI[md5sum] = "74997d75e7e87dc73398746fd373bf52" -SRC_URI[sha256sum] = "7804f6f28cb3d1bc8ffb3151ab7ff0c063b27c5f9b06c682eb903e01cf25502f" +SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" +SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" inherit autotools pkgconfig gtk-doc distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch index f6c4ca76f..0a4dfe677 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch @@ -2,7 +2,7 @@ CVE: CVE-2017-9526 Upstream-Status: Backport Signed-off-by: Ross Burton <ross.burton@intel.com> -From b3cab278eb9c2ceda79f980bc26460d97f260041 Mon Sep 17 00:00:00 2001 +From 4a1768d683f6572ad86d833508c70e6b3dc1efdc Mon Sep 17 00:00:00 2001 From: Jo Van Bulck <jo.vanbulck@cs.kuleuven.be> Date: Thu, 19 Jan 2017 17:00:15 +0100 Subject: [PATCH] ecc: Store EdDSA session key in secure memory. diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2017-7526.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2017-7526.patch index 7180e7af2..384fa964a 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2017-7526.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2017-7526.patch @@ -5,7 +5,7 @@ CVE: CVE-2017-7526 Upstream-Status: Backport Signed-off-by: Ross Burton <ross.burton@intel.com> -From 56bd068335500207dea2cece9cc662bcd9658951 Mon Sep 17 00:00:00 2001 +From 12ee400c39e0ebb5fb819c3926d459c278fc99fd Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka <gniibe@fsij.org> Date: Tue, 4 Apr 2017 17:38:05 +0900 Subject: [PATCH 1/5] mpi: Simplify mpi_powm. @@ -186,7 +186,7 @@ index a780ebd1..7b3dc318 100644 2.11.0 -From 6e237c8c48d257dc315e364791d284c6bf3fa703 Mon Sep 17 00:00:00 2001 +From a4b275c4d5378837e820fdc84f4ada876f9c8ccd Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka <gniibe@fsij.org> Date: Sat, 24 Jun 2017 20:46:20 +0900 Subject: [PATCH 2/5] Same computation for square and multiply. @@ -287,7 +287,7 @@ index 7b3dc318..3cba6903 100644 2.11.0 -From bf059348dafc1b8d29e07b9426d870ead853db84 Mon Sep 17 00:00:00 2001 +From 129c1960e55603ec3f6fd1cd9cd51b22e9a9a7ef Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka <gniibe@fsij.org> Date: Thu, 29 Jun 2017 11:48:44 +0900 Subject: [PATCH 3/5] rsa: Add exponent blinding. @@ -390,7 +390,7 @@ index b6c73741..25e29b5c 100644 2.11.0 -From 09b9df2675a24e679b7944352ad6385e9e68474f Mon Sep 17 00:00:00 2001 +From 8e1a6289b7d11a8bf6c94affa06c9794e7216e26 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka <gniibe@fsij.org> Date: Thu, 29 Jun 2017 12:36:27 +0900 Subject: [PATCH 4/5] rsa: Fix exponent blinding. @@ -422,7 +422,7 @@ index 25e29b5c..33f92ebd 100644 2.11.0 -From 1323fdcf6f2f9fd1da8c5adf396650f15a2a1260 Mon Sep 17 00:00:00 2001 +From 4e5497752172edc444029af645f28cb88ce93906 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka <gniibe@fsij.org> Date: Thu, 29 Jun 2017 12:40:19 +0900 Subject: [PATCH 5/5] rsa: More fix. diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc index 00870e3d2..3403579a7 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc @@ -12,7 +12,7 @@ LICENSE_dumpsexp-dev = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff" -DEPENDS = "libgpg-error libcap" +DEPENDS = "libgpg-error" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \ @@ -28,7 +28,10 @@ BINCONFIG = "${bindir}/libgcrypt-config" inherit autotools texinfo binconfig-disabled pkgconfig -EXTRA_OECONF = "--disable-asm --with-capabilities" +EXTRA_OECONF = "--disable-asm" + +PACKAGECONFIG ??= "capabilities" +PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap" do_configure_prepend () { # Else this could be used in preference to the one in aclocal-copy @@ -48,4 +51,4 @@ FILES_dumpsexp-dev += "${bindir}/dumpsexp" ARM_INSTRUCTION_SET = "arm" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb deleted file mode 100644 index ddd7c5392..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libgcrypt.inc - -SRC_URI[md5sum] = "bb5b00cb70b1215833857fd690080fbb" -SRC_URI[sha256sum] = "c98470cf6a781f2af4bdfda710ad39f0f54b5044e8c43b878d4005737d6c213f" diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb new file mode 100644 index 000000000..da0a1fe7f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb @@ -0,0 +1,4 @@ +require libgcrypt.inc + +SRC_URI[md5sum] = "eac6d11999650e8a1493674c1bdbc7f8" +SRC_URI[sha256sum] = "fc0aec7714d75d812b665bd510d66031b1b2ce8fa855cc2c02238c954ea36982" diff --git a/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.24.bb b/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb index 84a882a0c..090db1b49 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.24.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb @@ -5,7 +5,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index" LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/gpg-error.h.in;endline=23;md5=cf562f60b9dba7df20d6ee3f97ea1d5a \ + file://src/gpg-error.h.in;endline=23;md5=64af9846baaf852793fd3a5af393acbf \ file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc" @@ -15,8 +15,10 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ " -SRC_URI[md5sum] = "feb42198c0aaf3b28eabe8f41a34b983" -SRC_URI[sha256sum] = "9268e1cc487de5e6e4460fca612a06e4f383072ac43ae90603e5e46783d3e540" + +SRC_URI[md5sum] = "97456709dbbcbb69354317ffe3e347cd" +SRC_URI[sha256sum] = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69" +PR = "r1" BINCONFIG = "${bindir}/gpg-error-config" @@ -24,7 +26,10 @@ inherit autotools binconfig-disabled pkgconfig gettext CPPFLAGS += "-P" do_compile_prepend() { TARGET_FILE=linux-gnu - if [ ${TARGET_OS} != "linux" ]; then + if [ ${TARGET_OS} = "mingw32" ]; then + # There are no arch specific syscfg files for mingw32 + TARGET_FILE= + elif [ ${TARGET_OS} != "linux" ]; then TARGET_FILE=${TARGET_OS} fi @@ -33,14 +38,17 @@ do_compile_prepend() { arm) TUPLE=arm-unknown-linux-gnueabi ;; armeb) TUPLE=arm-unknown-linux-gnueabi ;; i586|i686) TUPLE=i686-pc-linux-gnu ;; + mips64*) TUPLE=mips64el-unknown-linux-gnuabi64 ;; mips*el) TUPLE=mipsel-unknown-linux-gnu ;; mips*) TUPLE=mips-unknown-linux-gnu ;; x86_64) TUPLE=x86_64-pc-linux-gnu ;; *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; esac - cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \ - ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h + if [ -n "$TARGET_FILE" ]; then + cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \ + ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h + fi } do_install_append() { @@ -49,5 +57,6 @@ do_install_append() { } FILES_${PN}-dev += "${bindir}/gpg-error" +FILES_${PN}-doc += "${datadir}/libgpg-error/errorref.txt" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch b/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch deleted file mode 100644 index 3cbf549d4..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch +++ /dev/null @@ -1,50 +0,0 @@ -It adds the variables that are needed -for autoconf 2.65 to reconfigure libiconv and defines the m4 macros -directory. Its imported from OE. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: libiconv-1.11.1/configure.ac -=================================================================== ---- libiconv-1.11.1.orig/configure.ac -+++ libiconv-1.11.1/configure.ac -@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR(build-aux) - AM_INIT_AUTOMAKE(libiconv, 1.11) - AC_CONFIG_HEADERS(config.h lib/config.h) - AC_PROG_MAKE_SET -- -+AC_CONFIG_MACRO_DIR([m4]) - dnl checks for basic programs - - AC_PROG_CC -Index: libiconv-1.11.1/libcharset/configure.ac -=================================================================== ---- libiconv-1.11.1.orig/libcharset/configure.ac -+++ libiconv-1.11.1/libcharset/configure.ac -@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library; - dnl write to the Free Software Foundation, Inc., 51 Franklin Street, - dnl Fifth Floor, Boston, MA 02110-1301, USA. - --AC_PREREQ(2.13) -+AC_PREREQ(2.61) -+AC_INIT([libcharset],[1.4] ) -+AC_CONFIG_SRCDIR([lib/localcharset.c]) - --PACKAGE=libcharset --VERSION=1.4 -- --AC_INIT(lib/localcharset.c) - AC_CONFIG_AUX_DIR(build-aux) - AC_CONFIG_HEADER(config.h) - AC_PROG_MAKE_SET --AC_SUBST(PACKAGE) --AC_SUBST(VERSION) -+dnl AC_SUBST(PACKAGE) -+dnl AC_SUBST(VERSION) -+ -+AC_CONFIG_MACRO_DIR([m4]) - - dnl checks for basic programs - diff --git a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch b/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch deleted file mode 100644 index fb07f7366..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch +++ /dev/null @@ -1,26 +0,0 @@ -With libtool generating shared and static version of libraries needs -fPIC flags -without this it will not generate the commands to create shared linked library -Its more enforced by libtool 2.4. I have not checked it with older libtool -libiconv 1.11.x is relatively old release and libtool 2.4 did not exist when it -was released these kind of problem are more likely - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: libiconv-1.11.1/lib/Makefile.in -=================================================================== ---- libiconv-1.11.1.orig/lib/Makefile.in -+++ libiconv-1.11.1/lib/Makefile.in -@@ -70,9 +70,9 @@ preloadable_libiconv.so : preloadable_li - - preloadable_libiconv_linux.so : $(SOURCES) - if test -n "@GCC@"; then \ -- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \ -+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -rpath $(libdir) -o libpreload_iconv.la && cp .libs/libpreload_iconv.so preloadable_libiconv_linux.so; \ - else \ -- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \ -+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -rpath $(libdir) -o libpreload_iconv.la && cp .libs/libpreload_iconv.so preloadable_libiconv_linux.so; \ - fi - - preloadable_libiconv_solaris.so : $(SOURCES) diff --git a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv_1.11.1.bb deleted file mode 100644 index 6ce4b96e3..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv_1.11.1.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Character encoding support library" -DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \ -multiple character encodings, but that support lacks from your system." -HOMEPAGE = "http://www.gnu.org/software/libiconv" -SECTION = "libs" -NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8" -PROVIDES = "virtual/libiconv" - -LICENSE = "LGPLv2.0" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ - file://libcharset/COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://autoconf.patch \ - file://shared_preloadable_libiconv_linux.patch \ - " - -SRC_URI[md5sum] = "d42b97f6ef5dd0ba4469d520ed732fed" -SRC_URI[sha256sum] = "e78c347a1a0cb15f2648519e9799151f4b4a934b61ad9ee7424478efe2b8257f" - -S = "${WORKDIR}/libiconv-${PV}" - -inherit autotools pkgconfig gettext - -python __anonymous() { - if d.getVar("TCLIBC", True) == "glibc": - raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") -} - -EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" - -LEAD_SONAME = "libiconv.so" - -do_configure_prepend () { - rm -f ${S}/m4/libtool.m4 ${S}/m4/ltoptions.m4 ${S}/m4/ltsugar.m4 ${S}/m4/ltversion.m4 ${S}/m4/lt~obsolete.m4 ${S}/libcharset/m4/libtool.m4 ${S}/libcharset/m4/ltoptions.m4 ${S}/libcharset/m4/ltsugar.m4 ${S}/libcharset/m4/ltversion.m4 ${S}/libcharset/m4/lt~obsolete.m4 -} - -do_configure_append () { - # forcibly remove RPATH from libtool - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' *libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=_NO_RPATH_|g' *libtool -} - -do_install_append () { - rm -rf ${D}${libdir}/preloadable_libiconv.so - rm -rf ${D}${libdir}/charset.alias -} diff --git a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv_1.14.bb b/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv_1.14.bb index 1b6fe09bb..9fd5114ac 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv_1.14.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libiconv/libiconv_1.14.bb @@ -23,9 +23,9 @@ S = "${WORKDIR}/libiconv-${PV}" inherit autotools pkgconfig gettext python __anonymous() { - if d.getVar("TARGET_OS", True) != "linux": + if d.getVar("TARGET_OS") != "linux": return - if d.getVar("TCLIBC", True) == "glibc": + if d.getVar("TCLIBC") == "glibc": raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") } diff --git a/import-layers/yocto-poky/meta/recipes-support/libksba/libksba_1.3.4.bb b/import-layers/yocto-poky/meta/recipes-support/libksba/libksba_1.3.5.bb index e68255c67..36b667056 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libksba/libksba_1.3.4.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libksba/libksba_1.3.5.bb @@ -17,8 +17,8 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://ksba-add-pkgconfig-support.patch" -SRC_URI[md5sum] = "2bfc3d69053db7b6983b5627706033f4" -SRC_URI[sha256sum] = "f6c2883cebec5608692d8730843d87f237c0964d923bbe7aa89c05f20558ad4f" +SRC_URI[md5sum] = "8302a3e263a7c630aa7dea7d341f07a2" +SRC_URI[sha256sum] = "41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340" do_configure_prepend () { # Else these could be used in preference to those in aclocal-copy diff --git a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0001-lib-add-utility-function-nl_strerror_l.patch b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0001-lib-add-utility-function-nl_strerror_l.patch deleted file mode 100644 index b734028c7..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0001-lib-add-utility-function-nl_strerror_l.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 683f27fbb68ca2028a7b3468f17164d484df2759 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com> -Date: Thu, 25 Aug 2016 13:14:59 +0100 -Subject: [PATCH 1/3] lib: add utility function nl_strerror_l() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libnl currently uses strerror_r() throughout, but this is -problematic because there is a non-standard GNU version -implemented in glibc, and the standard POSIX version, which -differ in signature. When using glibc, one can choose -between the two versions using feature test macros -_GNU_SOURCE and _POSIX_C_SOURCE. - -Given libnl is built using the former, we always get the -glibc special version, and all code so far has been written -for that non-standard version. - -Other C libraries like musl on the other hand only try -to be posix compliant, and only ever provide the posix -version of strerror_r(), which has a different signature. - -The alternative is to use strerror_l() rather than -strerror_r() http://austingroupbugs.net/view.php?id=655 -- this will avoid the non-confirming versions issue -- strerror_l() is now recommended by POSIX to replace - strerror_r() usage - -So rather than changing all uses of strerror_r() to be in -line with posix, we are going to switch to the recommended -interface strerror_l(). - -Since strerror_l() is slightly more difficuly to use, we -add a little (private) wrapper that we can use from all -current callsites of strerror_r(). - -Signed-off-by: André Draszik <adraszik@tycoint.com> -Reviewed-by: Stephane Ayotte <sayotte@tycoint.com> -Signed-off-by: Thomas Haller <thaller@redhat.com> ---- -Upstream-Status: Backport https://github.com/thom311/libnl/commit/683f27fbb68ca2028a7b3468f17164d484df2759 - include/Makefile.am | 1 + - include/netlink-private/utils.h | 17 +++++++++++++++++ - lib/utils.c | 24 ++++++++++++++++++++++++ - libnl-3.sym | 5 +++++ - 4 files changed, 47 insertions(+) - create mode 100644 include/netlink-private/utils.h - -diff --git a/include/Makefile.am b/include/Makefile.am -index 804e984..f8b977a 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -166,6 +166,7 @@ noinst_HEADERS = \ - netlink-private/socket.h \ - netlink-private/tc.h \ - netlink-private/types.h \ -+ netlink-private/utils.h \ - netlink-private/cache-api.h \ - netlink-private/object-api.h \ - netlink-private/route/link/api.h \ -diff --git a/include/netlink-private/utils.h b/include/netlink-private/utils.h -new file mode 100644 -index 0000000..77aadb3 ---- /dev/null -+++ b/include/netlink-private/utils.h -@@ -0,0 +1,17 @@ -+/* -+ * netlink-private/utils.h Local Utility Functions -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation version 2.1 -+ * of the License. -+ * -+ * Copyright (c) 2003-2012 Thomas Graf <tgraf@suug.ch> -+ */ -+ -+#ifndef NETLINK_UTILS_PRIV_H_ -+#define NETLINK_UTILS_PRIV_H_ -+ -+extern const char * nl_strerror_l(int err); -+ -+#endif -diff --git a/lib/utils.c b/lib/utils.c -index 61c3d95..c1c1b72 100644 ---- a/lib/utils.c -+++ b/lib/utils.c -@@ -25,10 +25,12 @@ - */ - - #include <netlink-private/netlink.h> -+#include <netlink-private/utils.h> - #include <netlink/netlink.h> - #include <netlink/utils.h> - #include <linux/socket.h> - #include <stdlib.h> /* exit() */ -+#include <locale.h> - - /** - * Global variable indicating the desired level of debugging output. -@@ -118,6 +120,28 @@ int __nl_read_num_str_file(const char *path, int (*cb)(long, const char *)) - - return 0; - } -+ -+const char *nl_strerror_l(int err) -+{ -+ int errno_save = errno; -+ locale_t loc = newlocale(LC_MESSAGES_MASK, "", (locale_t)0); -+ const char *buf; -+ -+ if (loc == (locale_t)0) { -+ if (errno == ENOENT) -+ loc = newlocale(LC_MESSAGES_MASK, -+ "POSIX", (locale_t)0); -+ } -+ if (loc != (locale_t)0) { -+ buf = strerror_l(err, loc); -+ freelocale(loc); -+ } else { -+ buf = "newlocale() failed"; -+ } -+ -+ errno = errno_save; -+ return buf; -+} - /** @endcond */ - - /** -diff --git a/libnl-3.sym b/libnl-3.sym -index 4e09bdd..9119e66 100644 ---- a/libnl-3.sym -+++ b/libnl-3.sym -@@ -351,3 +351,8 @@ libnl_3_2_28 { - global: - nl_object_diff64; - } libnl_3_2_27; -+ -+libnl_3_2_29 { -+global: -+ nl_strerror_l; -+} libnl_3_2_28; --- -2.9.3 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0002-lib-switch-to-using-strerror_l-instead-of-strerror_r.patch b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0002-lib-switch-to-using-strerror_l-instead-of-strerror_r.patch deleted file mode 100644 index 6347ec0b9..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0002-lib-switch-to-using-strerror_l-instead-of-strerror_r.patch +++ /dev/null @@ -1,403 +0,0 @@ -From c1948ec29b8dcdc58d2d92700c325abdeab111a6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com> -Date: Thu, 25 Aug 2016 13:15:00 +0100 -Subject: [PATCH 2/3] lib: switch to using strerror_l() instead of strerror_r() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -glibc provides two versions of strerror_r(), which -can be chosen between using feature test macros -_GNU_SOURCE and _POSIX_C_SOURCE. libnl is built using -the former, hence we get the glibc special version, -and all code so far has been written for this. - -Other C libraries like musl on the other hand only try -to be posix compliant, and only ever provide the posix -version of strerror_r(), which has a different signature. - -Uses in libnl hence generally cause printf() of an *int* -with a *string format* specifier for that reason. - -Additionally, strerror_r() has been deprecated: - http://austingroupbugs.net/view.php?id=655 - -Switch to using strerror_l() (via our wrapper just -introduced). - -Signed-off-by: André Draszik <adraszik@tycoint.com> -Reviewed-by: Stephane Ayotte <sayotte@tycoint.com> -Signed-off-by: Thomas Haller <thaller@redhat.com> ---- -Upstream-Status: Backport https://github.com/thom311/libnl/commit/c1948ec29b8dcdc58d2d92700c325abdeab111a6 - lib/cache_mngr.c | 5 ++--- - lib/fib_lookup/lookup.c | 3 ++- - lib/handlers.c | 4 ++-- - lib/msg.c | 4 ++-- - lib/nl.c | 26 +++++++++----------------- - lib/route/route_obj.c | 3 ++- - lib/socket.c | 33 +++++++++++---------------------- - 7 files changed, 30 insertions(+), 48 deletions(-) - -diff --git a/lib/cache_mngr.c b/lib/cache_mngr.c -index b9eb345..1f23eb1 100644 ---- a/lib/cache_mngr.c -+++ b/lib/cache_mngr.c -@@ -33,6 +33,7 @@ - */ - - #include <netlink-private/netlink.h> -+#include <netlink-private/utils.h> - #include <netlink/netlink.h> - #include <netlink/cache.h> - #include <netlink/utils.h> -@@ -392,10 +393,8 @@ int nl_cache_mngr_poll(struct nl_cache_mngr *mngr, int timeout) - ret = poll(&fds, 1, timeout); - NL_DBG(3, "Cache manager %p, poll() returned %d\n", mngr, ret); - if (ret < 0) { -- char buf[64]; -- - NL_DBG(4, "nl_cache_mngr_poll(%p): poll() failed with %d (%s)\n", -- mngr, errno, strerror_r(errno, buf, sizeof(buf))); -+ mngr, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - -diff --git a/lib/fib_lookup/lookup.c b/lib/fib_lookup/lookup.c -index 43b6126..efc862b 100644 ---- a/lib/fib_lookup/lookup.c -+++ b/lib/fib_lookup/lookup.c -@@ -17,6 +17,7 @@ - */ - - #include <netlink-private/netlink.h> -+#include <netlink-private/utils.h> - #include <netlink/netlink.h> - #include <netlink/attr.h> - #include <netlink/utils.h> -@@ -133,7 +134,7 @@ static void result_dump_line(struct nl_object *obj, struct nl_dump_params *p) - nl_rtntype2str(res->fr_type, buf, sizeof(buf))); - nl_dump(p, "scope %s error %s (%d)\n", - rtnl_scope2str(res->fr_scope, buf, sizeof(buf)), -- strerror_r(-res->fr_error, buf, sizeof(buf)), res->fr_error); -+ nl_strerror_l(-res->fr_error), res->fr_error); - } - - static void result_dump_details(struct nl_object *obj, struct nl_dump_params *p) -diff --git a/lib/handlers.c b/lib/handlers.c -index 97a0d9c..4a48b99 100644 ---- a/lib/handlers.c -+++ b/lib/handlers.c -@@ -26,6 +26,7 @@ - */ - - #include <netlink-private/netlink.h> -+#include <netlink-private/utils.h> - #include <netlink/netlink.h> - #include <netlink/utils.h> - #include <netlink/msg.h> -@@ -79,10 +80,9 @@ static int nl_error_handler_verbose(struct sockaddr_nl *who, - struct nlmsgerr *e, void *arg) - { - FILE *ofd = arg ? arg : stderr; -- char buf[256]; - - fprintf(ofd, "-- Error received: %s\n-- Original message: ", -- strerror_r(-e->error, buf, sizeof(buf))); -+ nl_strerror_l(-e->error)); - print_header_content(ofd, &e->msg); - fprintf(ofd, "\n"); - -diff --git a/lib/msg.c b/lib/msg.c -index e8a7e99..9af3f3a 100644 ---- a/lib/msg.c -+++ b/lib/msg.c -@@ -27,6 +27,7 @@ - */ - - #include <netlink-private/netlink.h> -+#include <netlink-private/utils.h> - #include <netlink/netlink.h> - #include <netlink/utils.h> - #include <netlink/cache.h> -@@ -913,11 +914,10 @@ static void dump_error_msg(struct nl_msg *msg, FILE *ofd) - fprintf(ofd, " [ERRORMSG] %zu octets\n", sizeof(*err)); - - if (nlmsg_len(hdr) >= sizeof(*err)) { -- char buf[256]; - struct nl_msg *errmsg; - - fprintf(ofd, " .error = %d \"%s\"\n", err->error, -- strerror_r(-err->error, buf, sizeof(buf))); -+ nl_strerror_l(-err->error)); - fprintf(ofd, " [ORIGINAL MESSAGE] %zu octets\n", sizeof(*hdr)); - - errmsg = nlmsg_inherit(&err->msg); -diff --git a/lib/nl.c b/lib/nl.c -index 123f657..a45c3ea 100644 ---- a/lib/nl.c -+++ b/lib/nl.c -@@ -27,6 +27,7 @@ - - #include <netlink-private/netlink.h> - #include <netlink-private/socket.h> -+#include <netlink-private/utils.h> - #include <netlink/netlink.h> - #include <netlink/utils.h> - #include <netlink/handlers.h> -@@ -105,7 +106,6 @@ int nl_connect(struct nl_sock *sk, int protocol) - int errsv; - socklen_t addrlen; - struct sockaddr_nl local = { 0 }; -- char buf[64]; - int try_bind = 1; - - #ifdef SOCK_CLOEXEC -@@ -119,7 +119,7 @@ int nl_connect(struct nl_sock *sk, int protocol) - if (sk->s_fd < 0) { - errsv = errno; - NL_DBG(4, "nl_connect(%p): socket() failed with %d (%s)\n", sk, errsv, -- strerror_r(errsv, buf, sizeof(buf))); -+ nl_strerror_l(errsv)); - err = -nl_syserr2nlerr(errsv); - goto errout; - } -@@ -158,7 +158,7 @@ int nl_connect(struct nl_sock *sk, int protocol) - _nl_socket_used_ports_set(used_ports, port); - } else { - NL_DBG(4, "nl_connect(%p): bind() for port %u failed with %d (%s)\n", -- sk, (unsigned) port, errsv, strerror_r(errsv, buf, sizeof(buf))); -+ sk, (unsigned) port, errsv, nl_strerror_l(errsv)); - _nl_socket_used_ports_release_all(used_ports); - err = -nl_syserr2nlerr(errsv); - goto errout; -@@ -172,7 +172,7 @@ int nl_connect(struct nl_sock *sk, int protocol) - if (err != 0) { - errsv = errno; - NL_DBG(4, "nl_connect(%p): bind() failed with %d (%s)\n", -- sk, errsv, strerror_r(errsv, buf, sizeof(buf))); -+ sk, errsv, nl_strerror_l(errsv)); - err = -nl_syserr2nlerr(errsv); - goto errout; - } -@@ -183,7 +183,7 @@ int nl_connect(struct nl_sock *sk, int protocol) - &addrlen); - if (err < 0) { - NL_DBG(4, "nl_connect(%p): getsockname() failed with %d (%s)\n", -- sk, errno, strerror_r(errno, buf, sizeof(buf))); -+ sk, errno, nl_strerror_l(errno)); - err = -nl_syserr2nlerr(errno); - goto errout; - } -@@ -280,10 +280,8 @@ int nl_sendto(struct nl_sock *sk, void *buf, size_t size) - ret = sendto(sk->s_fd, buf, size, 0, (struct sockaddr *) - &sk->s_peer, sizeof(sk->s_peer)); - if (ret < 0) { -- char errbuf[64]; -- - NL_DBG(4, "nl_sendto(%p): sendto() failed with %d (%s)\n", -- sk, errno, strerror_r(errno, errbuf, sizeof(errbuf))); -+ sk, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - -@@ -343,10 +341,8 @@ int nl_sendmsg(struct nl_sock *sk, struct nl_msg *msg, struct msghdr *hdr) - - ret = sendmsg(sk->s_fd, hdr, 0); - if (ret < 0) { -- char errbuf[64]; -- - NL_DBG(4, "nl_sendmsg(%p): sendmsg() failed with %d (%s)\n", -- sk, errno, strerror_r(errno, errbuf, sizeof(errbuf))); -+ sk, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - -@@ -706,15 +702,13 @@ retry: - goto abort; - } - if (n < 0) { -- char errbuf[64]; -- - if (errno == EINTR) { - NL_DBG(3, "recvmsg() returned EINTR, retrying\n"); - goto retry; - } - - NL_DBG(4, "nl_sendmsg(%p): nl_recv() failed with %d (%s)\n", -- sk, errno, strerror_r(errno, errbuf, sizeof(errbuf))); -+ sk, errno, nl_strerror_l(errno)); - retval = -nl_syserr2nlerr(errno); - goto abort; - } -@@ -980,10 +974,8 @@ continue_reading: - goto out; - } - } else if (e->error) { -- char buf[64]; -- - NL_DBG(4, "recvmsgs(%p): RTNETLINK responded with %d (%s)\n", -- sk, -e->error, strerror_r(-e->error, buf, sizeof(buf))); -+ sk, -e->error, nl_strerror_l(-e->error)); - - /* Error message reported back from kernel. */ - if (cb->cb_err) { -diff --git a/lib/route/route_obj.c b/lib/route/route_obj.c -index 7347ed2..21b67b1 100644 ---- a/lib/route/route_obj.c -+++ b/lib/route/route_obj.c -@@ -31,6 +31,7 @@ - */ - - #include <netlink-private/netlink.h> -+#include <netlink-private/utils.h> - #include <netlink/netlink.h> - #include <netlink/cache.h> - #include <netlink/utils.h> -@@ -259,7 +260,7 @@ static void route_dump_details(struct nl_object *a, struct nl_dump_params *p) - if ((r->ce_mask & ROUTE_ATTR_CACHEINFO) && r->rt_cacheinfo.rtci_error) { - nl_dump_line(p, " cacheinfo error %d (%s)\n", - r->rt_cacheinfo.rtci_error, -- strerror_r(-r->rt_cacheinfo.rtci_error, buf, sizeof(buf))); -+ nl_strerror_l(-r->rt_cacheinfo.rtci_error)); - } - - if (r->ce_mask & ROUTE_ATTR_METRICS) { -diff --git a/lib/socket.c b/lib/socket.c -index 97b2f69..55153b4 100644 ---- a/lib/socket.c -+++ b/lib/socket.c -@@ -33,6 +33,7 @@ - - #include <netlink-private/netlink.h> - #include <netlink-private/socket.h> -+#include <netlink-private/utils.h> - #include <netlink/netlink.h> - #include <netlink/utils.h> - #include <netlink/handlers.h> -@@ -449,11 +450,9 @@ int nl_socket_add_memberships(struct nl_sock *sk, int group, ...) - err = setsockopt(sk->s_fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, - &group, sizeof(group)); - if (err < 0) { -- char buf[64]; -- - va_end(ap); - NL_DBG(4, "nl_socket_add_memberships(%p): setsockopt() failed with %d (%s)\n", -- sk, errno, strerror_r(errno, buf, sizeof(buf))); -+ sk, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - -@@ -501,11 +500,9 @@ int nl_socket_drop_memberships(struct nl_sock *sk, int group, ...) - err = setsockopt(sk->s_fd, SOL_NETLINK, NETLINK_DROP_MEMBERSHIP, - &group, sizeof(group)); - if (err < 0) { -- char buf[64]; -- - va_end(ap); - NL_DBG(4, "nl_socket_drop_memberships(%p): setsockopt() failed with %d (%s)\n", -- sk, errno, strerror_r(errno, buf, sizeof(buf))); -+ sk, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - -@@ -619,7 +616,6 @@ int nl_socket_set_fd(struct nl_sock *sk, int protocol, int fd) - { - int err = 0; - socklen_t addrlen; -- char buf[64]; - struct sockaddr_nl local = { 0 }; - int so_type = -1, so_protocol = -1; - -@@ -633,7 +629,7 @@ int nl_socket_set_fd(struct nl_sock *sk, int protocol, int fd) - &addrlen); - if (err < 0) { - NL_DBG(4, "nl_socket_set_fd(%p,%d): getsockname() failed with %d (%s)\n", -- sk, fd, errno, strerror_r(errno, buf, sizeof(buf))); -+ sk, fd, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - if (addrlen != sizeof(local)) -@@ -648,7 +644,7 @@ int nl_socket_set_fd(struct nl_sock *sk, int protocol, int fd) - err = getsockopt(fd, SOL_SOCKET, SO_TYPE, &so_type, &addrlen); - if (err < 0) { - NL_DBG(4, "nl_socket_set_fd(%p,%d): getsockopt() for SO_TYPE failed with %d (%s)\n", -- sk, fd, errno, strerror_r(errno, buf, sizeof(buf))); -+ sk, fd, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - if (addrlen != sizeof(so_type)) -@@ -666,7 +662,7 @@ int nl_socket_set_fd(struct nl_sock *sk, int protocol, int fd) - if (errno == ENOPROTOOPT) - goto no_so_protocol; - NL_DBG(4, "nl_socket_set_fd(%p,%d): getsockopt() for SO_PROTOCOL failed with %d (%s)\n", -- sk, fd, errno, strerror_r(errno, buf, sizeof(buf))); -+ sk, fd, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - if (addrlen != sizeof(so_protocol)) -@@ -709,10 +705,8 @@ int nl_socket_set_nonblocking(const struct nl_sock *sk) - return -NLE_BAD_SOCK; - - if (fcntl(sk->s_fd, F_SETFL, O_NONBLOCK) < 0) { -- char buf[64]; -- - NL_DBG(4, "nl_socket_set_nonblocking(%p): fcntl() failed with %d (%s)\n", -- sk, errno, strerror_r(errno, buf, sizeof(buf))); -+ sk, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - -@@ -813,7 +807,6 @@ int nl_socket_modify_err_cb(struct nl_sock *sk, enum nl_cb_kind kind, - int nl_socket_set_buffer_size(struct nl_sock *sk, int rxbuf, int txbuf) - { - int err; -- char buf[64]; - - if (rxbuf <= 0) - rxbuf = 32768; -@@ -828,7 +821,7 @@ int nl_socket_set_buffer_size(struct nl_sock *sk, int rxbuf, int txbuf) - &txbuf, sizeof(txbuf)); - if (err < 0) { - NL_DBG(4, "nl_socket_set_buffer_size(%p): setsockopt() failed with %d (%s)\n", -- sk, errno, strerror_r(errno, buf, sizeof(buf))); -+ sk, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - -@@ -836,7 +829,7 @@ int nl_socket_set_buffer_size(struct nl_sock *sk, int rxbuf, int txbuf) - &rxbuf, sizeof(rxbuf)); - if (err < 0) { - NL_DBG(4, "nl_socket_set_buffer_size(%p): setsockopt() failed with %d (%s)\n", -- sk, errno, strerror_r(errno, buf, sizeof(buf))); -+ sk, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - -@@ -890,10 +883,8 @@ int nl_socket_set_passcred(struct nl_sock *sk, int state) - err = setsockopt(sk->s_fd, SOL_SOCKET, SO_PASSCRED, - &state, sizeof(state)); - if (err < 0) { -- char buf[64]; -- - NL_DBG(4, "nl_socket_set_passcred(%p): setsockopt() failed with %d (%s)\n", -- sk, errno, strerror_r(errno, buf, sizeof(buf))); -+ sk, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - -@@ -922,10 +913,8 @@ int nl_socket_recv_pktinfo(struct nl_sock *sk, int state) - err = setsockopt(sk->s_fd, SOL_NETLINK, NETLINK_PKTINFO, - &state, sizeof(state)); - if (err < 0) { -- char buf[64]; -- - NL_DBG(4, "nl_socket_recv_pktinfo(%p): setsockopt() failed with %d (%s)\n", -- sk, errno, strerror_r(errno, buf, sizeof(buf))); -+ sk, errno, nl_strerror_l(errno)); - return -nl_syserr2nlerr(errno); - } - --- -2.9.3 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0003-src-switch-to-using-strerror_l-instead-of-strerror_r.patch b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0003-src-switch-to-using-strerror_l-instead-of-strerror_r.patch deleted file mode 100644 index a0f5a7809..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0003-src-switch-to-using-strerror_l-instead-of-strerror_r.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 6c2d111177e91184073c44f83d4a6182aaba06d7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com> -Date: Thu, 25 Aug 2016 13:15:01 +0100 -Subject: [PATCH 3/3] src: switch to using strerror_l() instead of strerror_r() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -glibc provides two versions of strerror_r(), which -can be chosen between using feature test macros -_GNU_SOURCE and _POSIX_C_SOURCE. libnl is built using -the former, hence we get the glibc special version, -and all code so far has been written for this. - -Other C libraries like musl on the other hand only try -to be posix compliant, and only ever provide the posix -version of strerror_r(), which has a different signature. - -Uses in libnl hence generally cause printf() of an *int* -with a *string format* specifier for that reason. - -Additionally, strerror_r() has been deprecated: - http://austingroupbugs.net/view.php?id=655 - -Switch to using strerror_l(). - -Signed-off-by: André Draszik <adraszik@tycoint.com> -Reviewed-by: Stephane Ayotte <sayotte@tycoint.com> -Signed-off-by: Thomas Haller <thaller@redhat.com> ---- -Upstream-Status: Backport https://github.com/thom311/libnl/commit/6c2d111177e91184073c44f83d4a6182aaba06d7 - src/lib/utils.c | 20 +++++++++++++++++--- - 1 file changed, 17 insertions(+), 3 deletions(-) - -diff --git a/src/lib/utils.c b/src/lib/utils.c -index 467aaed..5878f27 100644 ---- a/src/lib/utils.c -+++ b/src/lib/utils.c -@@ -22,6 +22,7 @@ - */ - - #include <netlink/cli/utils.h> -+#include <locale.h> - - /** - * Parse a text based 32 bit unsigned integer argument -@@ -70,7 +71,6 @@ void nl_cli_print_version(void) - void nl_cli_fatal(int err, const char *fmt, ...) - { - va_list ap; -- char buf[256]; - - fprintf(stderr, "Error: "); - -@@ -79,8 +79,22 @@ void nl_cli_fatal(int err, const char *fmt, ...) - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, "\n"); -- } else -- fprintf(stderr, "%s\n", strerror_r(err, buf, sizeof(buf))); -+ } else { -+ char *buf; -+ locale_t loc = newlocale(LC_MESSAGES_MASK, "", (locale_t)0); -+ if (loc == (locale_t)0) { -+ if (errno == ENOENT) -+ loc = newlocale(LC_MESSAGES_MASK, -+ "POSIX", (locale_t)0); -+ if (loc == (locale_t)0) -+ buf = "newlocale() failed"; -+ } -+ if (loc != (locale_t)0) -+ buf = strerror_l(err, loc); -+ fprintf(stderr, "%s\n", buf); -+ if (loc != (locale_t)0) -+ freelocale(loc); -+ } - - exit(abs(err)); - } --- -2.9.3 - diff --git a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl_3.2.28.bb b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl_3.2.29.bb index 26982f3ef..7d4839ba5 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl_3.2.28.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libnl/libnl_3.2.29.bb @@ -9,17 +9,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', True).replace('.','_')}/${BP}.tar.gz \ +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-lib-add-utility-function-nl_strerror_l.patch \ - file://0002-lib-switch-to-using-strerror_l-instead-of-strerror_r.patch \ - file://0003-src-switch-to-using-strerror_l-instead-of-strerror_r.patch \ " UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" -SRC_URI[md5sum] = "bab12db1eb94a42129f712a44be91a67" -SRC_URI[sha256sum] = "cd608992c656e8f6e3ab6c1391b162a5a51c49336b9219f7f390e61fc5437c41" +SRC_URI[md5sum] = "a8ba62a5c4f883f4e493a46d1f3733fe" +SRC_URI[sha256sum] = "0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922" inherit autotools pkgconfig 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 new file mode 100644 index 000000000..9516caf51 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch @@ -0,0 +1,65 @@ +Fix for cross compiling + +Fixed: +| ./dftables src/pcre2_chartables.c +| make: ./dftables: Command not found +| make: *** [src/pcre2_chartables.c] Error 127 + +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 + ## to copy a distributed set of tables that are defined for ASCII code. In this + ## case, dftables is not needed. + ++CC_FOR_BUILD = @CC_FOR_BUILD@ ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ ++CCLD_FOR_BUILD = @CCLD_FOR_BUILD@ ++LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ ++ + if WITH_REBUILD_CHARTABLES + noinst_PROGRAMS += dftables + dftables_SOURCES = src/dftables.c ++ ++dftables_LINK = $(CCLD_FOR_BUILD) -o $@ ++dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD) ++ ++src/dftables.o: $(srcdir)/src/dftables.c ++ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/src/dftables.c ++ + 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 + ++if test x"$cross_compiling" = xyes; then ++ CC_FOR_BUILD="${CC_FOR_BUILD-gcc}" ++ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-gcc}" ++ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}" ++ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD}" ++else ++ CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}" ++ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-\$(CCLD)}" ++ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-\$(CFLAGS)}" ++ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD-\$(LDFLAGS)}" ++fi ++AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler]) ++AC_ARG_VAR(CCLD_FOR_BUILD, [build system C linker frontend]) ++AC_ARG_VAR(CFLAGS_FOR_BUILD, [build system C compiler arguments]) ++AC_ARG_VAR(LDFLAGS_FOR_BUILD, [build system C linker frontend arguments]) ++ ++ + # Check for a 64-bit integer type + AC_TYPE_INT64_T + diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.22.bb b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.22.bb new file mode 100644 index 000000000..0cf81c050 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.22.bb @@ -0,0 +1,58 @@ +DESCRIPTION = "There are two major versions of the PCRE library. The \ +newest version is PCRE2, which is a re-working of the original PCRE \ +library to provide an entirely new API. The original, very widely \ +deployed PCRE library's API and feature are stable, future releases \ + will be for bugfixes only. All new future features will be to PCRE2, \ +not the original PCRE 8.x series." +SUMMARY = "Perl Compatible Regular Expressions version 2" +HOMEPAGE = "http://www.pcre.org" +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENCE;md5=ab9633efd38d6f799398df2c248b5aec" + +SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ + file://pcre-cross.patch \ +" + +SRC_URI[md5sum] = "c0c02517938ee2b0d350d53edf450664" +SRC_URI[sha256sum] = "b2b44619f4ac6c50ad74c2865fd56807571392496fae1c9ad7a70993d018f416" + +CVE_PRODUCT = "pcre2" + +S = "${WORKDIR}/pcre2-${PV}" + +PROVIDES += "pcre2" +DEPENDS += "bzip2 zlib" + +BINCONFIG = "${bindir}/pcre2-config" + +inherit autotools binconfig-disabled + +EXTRA_OECONF = "\ + --enable-newline-is-lf \ + --enable-rebuild-chartables \ + --with-link-size=2 \ + --with-match-limit=10000000 \ +" + +# Set LINK_SIZE in BUILD_CFLAGS given that the autotools bbclass use it to +# set CFLAGS_FOR_BUILD, required for the libpcre build. +BUILD_CFLAGS =+ "-DLINK_SIZE=2 -I${B}/src" +CFLAGS += "-D_REENTRANT" +CXXFLAGS_append_powerpc = " -lstdc++" + +export CCLD_FOR_BUILD ="${BUILD_CCLD}" + +PACKAGES =+ "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_pcre2grep = "${bindir}/pcre2grep" +FILES_pcre2grep-doc = "${mandir}/man1/pcre2grep.1" +FILES_pcre2test = "${bindir}/pcre2test" +FILES_pcre2test-doc = "${mandir}/man1/pcre2test.1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.39.bb b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.40.bb index 90dfb3355..8b6ab25e1 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.39.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.40.bb @@ -6,18 +6,18 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=b8221cbf43c5587f90ccf228f1185cc2" - - -SRC_URI = "${SOURCEFORGE_MIRROR}/projects/pcre/files/prce/8.39/pcre-${PV}.tar.bz2 \ +LIC_FILES_CHKSUM = "file://LICENCE;md5=60da32d84d067f53e22071c4ecb4384d" +SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2 \ file://pcre-cross.patch \ file://fix-pcre-name-collision.patch \ file://run-ptest \ file://Makefile \ " -SRC_URI[md5sum] = "e3fca7650a0556a2647821679d81f585" -SRC_URI[sha256sum] = "b858099f82483031ee02092711689e7245586ada49e534a06e678b8ea9549e8b" +SRC_URI[md5sum] = "41a842bf7dcecd6634219336e2167d1d" +SRC_URI[sha256sum] = "00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4" + +CVE_PRODUCT = "pcre" S = "${WORKDIR}/pcre-${PV}" diff --git a/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.13.bb b/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.14.bb index 3940e228d..62a6a13c8 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.13.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.14.bb @@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "glib-2.0" -SRC_URI = "https://github.com/${BPN}/${BPN}/archive/${PV}.tar.gz" +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" +SRC_URI[md5sum] = "e7514f78f5432210e17a01b6b618dde2" +SRC_URI[sha256sum] = "e25d046850346a505c0617646f1e68b660092efadf665548a89c280900262ea6" UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases" - -SRC_URI[md5sum] = "de293bb311f185a2ffa3492700a694c2" -SRC_URI[sha256sum] = "d610bc0ef81a18ba418d759c5f4f87bf7102229a9153fb397d7d490987330ffd" +UPSTREAM_CHECK_REGEX = "libproxy-(?P<pver>.*)\.tar" inherit cmake pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.54.1.bb b/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb index b93a9fde7..a1f294efb 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.54.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb @@ -7,12 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native" -SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" +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] = "73b1fb774de16c29b380f87016f9f9dd" -SRC_URI[sha256sum] = "47b42c232034734d66e5f093025843a5d8cc4b2357c011085a2fd04ef02dd633" +SRC_URI[md5sum] = "465083f74b7bb035959ddb0599313986" +SRC_URI[sha256sum] = "d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5" S = "${WORKDIR}/libsoup-${PV}" diff --git a/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.6.bb b/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.7.bb index bb701227f..f77a210b1 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.6.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.7.bb @@ -13,16 +13,18 @@ DESCRIPTION = "Text files are nowadays usually encoded in Unicode, and may\ HOMEPAGE = "http://www.gnu.org/software/libunistring/" SECTION = "devel" -LICENSE = "GPLv3 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" +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 \ + " 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] = "dfae4ff5583649ed24d8f368f1d0543b" -SRC_URI[sha256sum] = "9625eec2507f4789ebb6fc48ebda98be0e0168979a2f68aa8b680bf8eeabbd47" +SRC_URI[md5sum] = "8e663454aa372181ee8e46edaa3ba4c8" +SRC_URI[sha256sum] = "9ce081cbee1951b55597b30e7030bda9d7b2f034ef901a135ff3a020be5a41e5" inherit autotools texinfo BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind.inc b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind.inc index e4ae8df27..c8ff836e8 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind.inc +++ b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind.inc @@ -9,6 +9,7 @@ inherit autotools PACKAGECONFIG ??= "" PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" +PACKAGECONFIG[latexdocs] = "--enable-documentaiton, --disable-documentation, latex2man-native" EXTRA_OECONF_arm = "--enable-debug-frame" EXTRA_OECONF_aarch64 = "--enable-debug-frame" diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch new file mode 100644 index 000000000..32516464c --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch @@ -0,0 +1,31 @@ +From 506bd37bd580d7382d7c58257dac4b1e502a887c Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Tue, 13 Dec 2016 09:50:34 -0700 +Subject: [PATCH] Fix for X32 + +Apply patch to fix the X32 build from https://github.com/sjnewbury/x32. + +Upstream-Status: Pending +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +--- + src/x86_64/Gos-linux.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/x86_64/Gos-linux.c b/src/x86_64/Gos-linux.c +index 9e1acfc..8169d5a 100644 +--- a/src/x86_64/Gos-linux.c ++++ b/src/x86_64/Gos-linux.c +@@ -143,8 +143,8 @@ x86_64_sigreturn (unw_cursor_t *cursor) + + Debug (8, "resuming at ip=%llx via sigreturn(%p)\n", + (unsigned long long) c->dwarf.ip, sc); +- __asm__ __volatile__ ("mov %0, %%rsp;" +- "mov %1, %%rax;" ++ __asm__ __volatile__ ("mov %q0, %%rsp;" ++ "mov %q1, %%rax;" + "syscall" + :: "r"(sc), "i"(SYS_rt_sigreturn) + : "memory"); +-- +2.8.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_git.bb b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_git.bb index 424943087..b637c5c44 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_git.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_git.bb @@ -11,6 +11,7 @@ SRC_URI = "git://git.sv.gnu.org/libunwind.git \ file://0001-Fix-build-on-mips-musl.patch \ file://0001-add-knobs-to-disable-enable-tests.patch \ file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ + file://libunwind-1.1-x32.patch \ " SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" diff --git a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch b/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch index 690872b4a..6296238b8 100644 --- a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch +++ b/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch @@ -1,4 +1,4 @@ -From add566b913e1b5cd4974a2167157dc08d8245ab0 Mon Sep 17 00:00:00 2001 +From f37c5b56376d9bb506da68bb11d0d7463e6e563b Mon Sep 17 00:00:00 2001 From: Marek Vasut <marex@denx.de> Date: Tue, 9 Feb 2016 01:52:26 +0100 Subject: [PATCH] Support for NIOS2 architecture @@ -9,6 +9,7 @@ trivial too, since the CPU does not support SMP at all. Signed-off-by: Marek Vasut <marex@denx.de> Upstream-Status: Backport [ http://git.lttng.org/?p=userspace-rcu.git;a=commit;h=859050b3088aa3f0cb59d7f51ce24b9a0f18faa5 ] + --- LICENSE | 1 + README.md | 1 + @@ -44,12 +45,12 @@ index f6b290f..6fe9c1e 100644 - ia64 - Sparcv9 32/64 diff --git a/configure.ac b/configure.ac -index 39a7777..71a7d71 100644 +index eebed56..8014e1d 100644 --- a/configure.ac +++ b/configure.ac -@@ -124,6 +124,7 @@ AS_CASE([$host_cpu], +@@ -136,6 +136,7 @@ AS_CASE([$host_cpu], [arm*], [ARCHTYPE="arm"], - [aarch64], [ARCHTYPE="aarch64"], + [aarch64*], [ARCHTYPE="aarch64"], [mips*], [ARCHTYPE="mips"], + [nios2*], [ARCHTYPE="nios2"], [tile*], [ARCHTYPE="tile"], @@ -57,7 +58,7 @@ index 39a7777..71a7d71 100644 [ARCHTYPE="unknown"] diff --git a/urcu/arch/nios2.h b/urcu/arch/nios2.h new file mode 100644 -index 0000000..030d1bc +index 0000000..b4f3e50 --- /dev/null +++ b/urcu/arch/nios2.h @@ -0,0 +1,40 @@ @@ -140,5 +141,5 @@ index 0000000..5b3c303 + +#endif /* _URCU_UATOMIC_ARCH_NIOS2_H */ -- -2.7.0 +2.10.2 diff --git a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu/0002-Support-for-aarch64_be.patch b/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu/0002-Support-for-aarch64_be.patch deleted file mode 100644 index a10ccd7d8..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu/0002-Support-for-aarch64_be.patch +++ /dev/null @@ -1,19 +0,0 @@ -liburcu: add support for aarch64_be - -Upstream-Status: Pending - -Signed-off-by: Tudor Florea <tudor.florea@enea.com> - -diff --git a/configure.ac b/configure.ac -index 8ebfa8b..fe1c55d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -121,7 +121,7 @@ AS_CASE([$host_cpu], - [alpha*], [ARCHTYPE="alpha"], - [ia64], [ARCHTYPE="ia64"], - [arm*], [ARCHTYPE="arm"], -- [aarch64], [ARCHTYPE="aarch64"], -+ [aarch64*], [ARCHTYPE="aarch64"], - [mips*], [ARCHTYPE="mips"], - [nios2*], [ARCHTYPE="nios2"], - [tile*], [ARCHTYPE="tile"], diff --git a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.9.2.bb b/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.9.3.bb index 23fb8c4b4..4486e0abe 100644 --- a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.9.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.9.3.bb @@ -7,14 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \ file://urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=58e50bbd8a2f073bb5500e6554af0d0b" -SRC_URI = " \ - http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ - file://0001-Support-for-NIOS2-architecture.patch \ - file://0002-Support-for-aarch64_be.patch \ - " +SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ + file://0001-Support-for-NIOS2-architecture.patch \ + " -SRC_URI[md5sum] = "49f86e68c1e2f41d303381a271b791d1" -SRC_URI[sha256sum] = "8f7fa313b1e0a3f742cea24ce63a39c0efe63e615a769e2961e55bd2663ecaa3" +SRC_URI[md5sum] = "920970e35a1a2066c8353eabfeab8730" +SRC_URI[sha256sum] = "1bce32e6a6c967fef6d37adaadf33df19878d69673f9ef9d3f2470e0c6ed4006" S = "${WORKDIR}/userspace-rcu-${PV}" CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" diff --git a/import-layers/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.20.bb b/import-layers/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.21.bb index 4cad2d4be..1fefd1475 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.20.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.21.bb @@ -12,8 +12,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ file://no-dll.patch \ " -SRC_URI[md5sum] = "1d4eb194eaaa2bcfbba28102768c7dbf" -SRC_URI[sha256sum] = "cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff" +SRC_URI[md5sum] = "1da9ea3c27b3858fa85c5f4466003e44" +SRC_URI[sha256sum] = "7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b" S = "${WORKDIR}/libusb-${PV}" diff --git a/import-layers/yocto-poky/meta/recipes-support/libyaml/libyaml_0.1.7.bb b/import-layers/yocto-poky/meta/recipes-support/libyaml/libyaml_0.1.7.bb index 5c422ef11..b167f031a 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libyaml/libyaml_0.1.7.bb +++ b/import-layers/yocto-poky/meta/recipes-support/libyaml/libyaml_0.1.7.bb @@ -17,4 +17,4 @@ S = "${WORKDIR}/yaml-${PV}" inherit autotools -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/lz4/lz4.bb b/import-layers/yocto-poky/meta/recipes-support/lz4/lz4.bb index 18e56d04c..03c5a7ab3 100644 --- a/import-layers/yocto-poky/meta/recipes-support/lz4/lz4.bb +++ b/import-layers/yocto-poky/meta/recipes-support/lz4/lz4.bb @@ -18,4 +18,4 @@ do_install() { oe_runmake install } -BBCLASSEXTEND += "native nativesdk" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/lzop/lzop_1.03.bb b/import-layers/yocto-poky/meta/recipes-support/lzop/lzop_1.03.bb index 649e7243e..6f09002f5 100644 --- a/import-layers/yocto-poky/meta/recipes-support/lzop/lzop_1.03.bb +++ b/import-layers/yocto-poky/meta/recipes-support/lzop/lzop_1.03.bb @@ -26,4 +26,4 @@ do_configure_prepend () { install -Dm 0644 ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4 } -BBCLASSEXTEND += "native nativesdk" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.4.bb b/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb index 230a86208..2d59c4a1b 100644 --- a/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.4.bb +++ b/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb @@ -8,8 +8,8 @@ DEPENDS = "gmp" SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz \ file://long-long-thumb.patch \ " -SRC_URI[md5sum] = "064b2c18185038e404a401b830d59be8" -SRC_URI[sha256sum] = "761413b16d749c53e2bfd2b1dfaa3b027b0e793e404b90b5fbaeef60af6517f5" +SRC_URI[md5sum] = "c4ac246cf9795a4491e7766002cd528f" +SRC_URI[sha256sum] = "015fde82b3979fbe5f83501986d328331ba8ddf008c1ff3da3c238f49ca062bc" UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/" diff --git a/import-layers/yocto-poky/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch b/import-layers/yocto-poky/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch deleted file mode 100644 index 459f5e385..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/neon/neon/gnutls_4.3_fixup.patch +++ /dev/null @@ -1,68 +0,0 @@ -replace deprecated GnuTLS functions with newer ones if available - -Upstream-Status: Pending - -Signed-off-by: Armin Kuster <akuster808@gmail.com> - -Index: neon-0.30.1/macros/neon.m4 -=================================================================== ---- neon-0.30.1.orig/macros/neon.m4 -+++ neon-0.30.1/macros/neon.m4 -@@ -987,6 +987,10 @@ gnutls) - gnutls_certificate_get_x509_cas \ - gnutls_x509_crt_sign2]) - -+ # gnutls 4.3 check -+ AC_CHECK_LIB(gnutls, gnutls_global_init) -+ AC_CHECK_FUNCS(gnutls_certificate_set_retrieve_function,,) -+ - # fail if gnutls_x509_crt_sign2 is not found (it was introduced in 1.2.0, which is required) - if test x${ac_cv_func_gnutls_x509_crt_sign2} != xyes; then - AC_MSG_ERROR([GnuTLS version predates gnutls_x509_crt_sign2, newer version required (at least 1.2.0)]) -Index: neon-0.30.1/src/ne_gnutls.c -=================================================================== ---- neon-0.30.1.orig/src/ne_gnutls.c -+++ neon-0.30.1/src/ne_gnutls.c -@@ -553,7 +553,13 @@ dup_error: - static int provide_client_cert(gnutls_session_t session, - const gnutls_datum_t *req_ca_rdn, int nreqs, - const gnutls_pk_algorithm_t *sign_algos, -- int sign_algos_length, gnutls_retr_st *st) -+ int sign_algos_length, -+#if HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION -+ gnutls_retr2_st* st -+#else -+ gnutls_retr_st *st -+#endif -+ ) - { - ne_session *sess = gnutls_session_get_ptr(session); - -@@ -617,8 +623,11 @@ static int provide_client_cert(gnutls_se - #endif - ) { - NE_DEBUG(NE_DBG_SSL, "Supplying client certificate.\n"); -- -+#if HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION -+ st->cert_type = type; -+#else - st->type = type; -+#endif - st->ncerts = 1; - st->cert.x509 = &sess->client_cert->cert.subject; - st->key.x509 = sess->client_cert->pkey; -@@ -649,8 +658,14 @@ ne_ssl_context *ne_ssl_context_create(in - ne_ssl_context *ctx = ne_calloc(sizeof *ctx); - gnutls_certificate_allocate_credentials(&ctx->cred); - if (flags == NE_SSL_CTX_CLIENT) { -+ -+#if HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION -+ gnutls_certificate_set_retrieve_function(ctx->cred, -+ provide_client_cert); -+#else - gnutls_certificate_client_set_retrieve_function(ctx->cred, - provide_client_cert); -+#endif - } - gnutls_certificate_set_verify_flags(ctx->cred, - GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT); diff --git a/import-layers/yocto-poky/meta/recipes-support/neon/neon_0.30.1.bb b/import-layers/yocto-poky/meta/recipes-support/neon/neon_0.30.2.bb index b6cfd5076..5792c56f3 100644 --- a/import-layers/yocto-poky/meta/recipes-support/neon/neon_0.30.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/neon/neon_0.30.2.bb @@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ file://pkgconfig.patch \ - file://gnutls_4.3_fixup.patch" + " -SRC_URI[md5sum] = "231adebe5c2f78fded3e3df6e958878e" -SRC_URI[sha256sum] = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd" +SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41" +SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca" inherit autotools binconfig-disabled lib_package pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch deleted file mode 100644 index a956f426b..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch +++ /dev/null @@ -1,71 +0,0 @@ -Upstream-Status: Backport -https://git.lysator.liu.se/nettle/nettle/commit/c71d2c9d20eeebb985e3872e4550137209e3ce4d - -CVE: CVE-2015-8803 -CVE: CVE-2015-8805 - -Same fix for both. - -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Index: nettle-2.7.1/ecc-256.c -=================================================================== ---- nettle-2.7.1.orig/ecc-256.c -+++ nettle-2.7.1/ecc-256.c -@@ -96,9 +96,19 @@ ecc_256_modp (const struct ecc_curve *ec - q2 += t + (q1 < t); - - assert (q2 < 2); -+ /* -+ n-1 n-2 n-3 n-4 -+ +---+---+---+---+ -+ | u1| u0| u low | -+ +---+---+---+---+ -+ - | q1(2^96-1)| -+ +-------+---+ -+ |q2(2^.)| -+ +-------+ - -- /* We multiply by two low limbs of p, 2^96 - 1, so we could use -- shifts rather than mul. */ -+ We multiply by two low limbs of p, 2^96 - 1, so we could use -+ shifts rather than mul. -+ */ - t = mpn_submul_1 (rp + n - 4, ecc->p, 2, q1); - t += cnd_sub_n (q2, rp + n - 3, ecc->p, 1); - t += (-q2) & 0xffffffff; -@@ -108,7 +118,10 @@ ecc_256_modp (const struct ecc_curve *ec - u0 -= t; - t = (u1 < cy); - u1 -= cy; -- u1 += cnd_add_n (t, rp + n - 4, ecc->p, 3); -+ -+ cy = cnd_add_n (t, rp + n - 4, ecc->p, 2); -+ u0 += cy; -+ u1 += (u0 < cy); - u1 -= (-t) & 0xffffffff; - } - rp[2] = u0; -@@ -195,7 +208,7 @@ ecc_256_modq (const struct ecc_curve *ec - - /* Conditional add of p */ - u1 += t; -- u2 += (t<<32) + (u0 < t); -+ u2 += (t<<32) + (u1 < t); - - t = cnd_add_n (t, rp + n - 4, ecc->q, 2); - u1 += t; -Index: nettle-2.7.1/ChangeLog -=================================================================== ---- nettle-2.7.1.orig/ChangeLog -+++ nettle-2.7.1/ChangeLog -@@ -1,3 +1,9 @@ -+2015-12-10 Niels Möller <nisse@lysator.liu.se> -+ -+ * ecc-256.c (ecc_256_modp): Fixed carry propagation bug. Problem -+ reported by Hanno Böck. -+ (ecc_256_modq): Fixed another carry propagation bug. -+ - 2013-05-28 Niels Möller <nisse@lysator.liu.se> - - * Released nettle-2.7.1. diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch deleted file mode 100644 index 73723a998..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch +++ /dev/null @@ -1,272 +0,0 @@ -Upstream-Status: Backport - https://git.lysator.liu.se/nettle/nettle/commit/fa269b6ad06dd13c901dbd84a12e52b918a09cd7 - -CVE: CVE-2015-8804 -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Index: nettle-2.7.1/ChangeLog -=================================================================== ---- nettle-2.7.1.orig/ChangeLog -+++ nettle-2.7.1/ChangeLog -@@ -1,3 +1,11 @@ -+2015-12-15 Niels Möller <nisse@lysator.liu.se> -+ -+ * x86_64/ecc-384-modp.asm: Fixed carry propagation bug. Problem -+ reported by Hanno Böck. Simplified the folding to always use -+ non-negative carry, the old code attempted to add in a carry which -+ could be either positive or negative, but didn't get that case -+ right. -+ - 2015-12-10 Niels Möller <nisse@lysator.liu.se> - - * ecc-256.c (ecc_256_modp): Fixed carry propagation bug. Problem -Index: nettle-2.7.1/x86_64/ecc-384-modp.asm -=================================================================== ---- nettle-2.7.1.orig/x86_64/ecc-384-modp.asm -+++ nettle-2.7.1/x86_64/ecc-384-modp.asm -@@ -20,7 +20,7 @@ C MA 02111-1301, USA. - .file "ecc-384-modp.asm" - - define(<RP>, <%rsi>) --define(<D4>, <%rax>) -+define(<D5>, <%rax>) - define(<T0>, <%rbx>) - define(<T1>, <%rcx>) - define(<T2>, <%rdx>) -@@ -35,8 +35,8 @@ define(<H4>, <%r13>) - define(<H5>, <%r14>) - define(<C2>, <%r15>) - define(<C0>, H5) C Overlap --define(<D0>, RP) C Overlap --define(<TMP>, H4) C Overlap -+define(<TMP>, RP) C Overlap -+ - - PROLOGUE(nettle_ecc_384_modp) - W64_ENTRY(2, 0) -@@ -48,34 +48,38 @@ PROLOGUE(nettle_ecc_384_modp) - push %r14 - push %r15 - -- C First get top 2 limbs, which need folding twice -+ C First get top 2 limbs, which need folding twice. -+ C B^10 = B^6 + B^4 + 2^32 (B-1)B^4. -+ C We handle the terms as follow: - C -- C H5 H4 -- C -H5 -- C ------ -- C H0 D4 -+ C B^6: Folded immediatly. - C -- C Then shift right, (H1,H0,D4) <-- (H0,D4) << 32 -- C and add -+ C B^4: Delayed, added in in the next folding. - C -- C H5 H4 -- C H1 H0 -- C ---------- -- C C2 H1 H0 -- -- mov 80(RP), D4 -- mov 88(RP), H0 -- mov D4, H4 -- mov H0, H5 -- sub H0, D4 -- sbb $0, H0 -- -- mov D4, T2 -- mov H0, H1 -- shl $32, H0 -- shr $32, T2 -+ C 2^32(B-1) B^4: Low half limb delayed until the next -+ C folding. Top 1.5 limbs subtracted and shifter now, resulting -+ C in 2.5 limbs. The low limb saved in D5, high 1.5 limbs added -+ C in. -+ -+ mov 80(RP), H4 -+ mov 88(RP), H5 -+ C Shift right 32 bits, into H1, H0 -+ mov H4, H0 -+ mov H5, H1 -+ mov H5, D5 - shr $32, H1 -- or T2, H0 -+ shl $32, D5 -+ shr $32, H0 -+ or D5, H0 -+ -+ C H1 H0 -+ C - H1 H0 -+ C -------- -+ C H1 H0 D5 -+ mov H0, D5 -+ neg D5 -+ sbb H1, H0 -+ sbb $0, H1 - - xor C2, C2 - add H4, H0 -@@ -114,118 +118,95 @@ PROLOGUE(nettle_ecc_384_modp) - adc H3, T5 - adc $0, C0 - -- C H3 H2 H1 H0 0 -- C - H4 H3 H2 H1 H0 -- C --------------- -- C H3 H2 H1 H0 D0 -- -- mov XREG(D4), XREG(D4) -- mov H0, D0 -- neg D0 -- sbb H1, H0 -- sbb H2, H1 -- sbb H3, H2 -- sbb H4, H3 -- sbb $0, D4 -- -- C Shift right. High bits are sign, to be added to C0. -- mov D4, TMP -- sar $32, TMP -- shl $32, D4 -- add TMP, C0 -- -+ C Shift left, including low half of H4 - mov H3, TMP -+ shl $32, H4 - shr $32, TMP -- shl $32, H3 -- or TMP, D4 -+ or TMP, H4 - - mov H2, TMP -+ shl $32, H3 - shr $32, TMP -- shl $32, H2 - or TMP, H3 - - mov H1, TMP -+ shl $32, H2 - shr $32, TMP -- shl $32, H1 - or TMP, H2 - - mov H0, TMP -+ shl $32, H1 - shr $32, TMP -- shl $32, H0 - or TMP, H1 - -- mov D0, TMP -- shr $32, TMP -- shl $32, D0 -- or TMP, H0 -+ shl $32, H0 -+ -+ C H4 H3 H2 H1 H0 0 -+ C - H4 H3 H2 H1 H0 -+ C --------------- -+ C H4 H3 H2 H1 H0 TMP - -- add D0, T0 -+ mov H0, TMP -+ neg TMP -+ sbb H1, H0 -+ sbb H2, H1 -+ sbb H3, H2 -+ sbb H4, H3 -+ sbb $0, H4 -+ -+ add TMP, T0 - adc H0, T1 - adc H1, T2 - adc H2, T3 - adc H3, T4 -- adc D4, T5 -+ adc H4, T5 - adc $0, C0 - - C Remains to add in C2 and C0 -- C C0 C0<<32 (-2^32+1)C0 -- C C2 C2<<32 (-2^32+1)C2 -- C where C2 is always positive, while C0 may be -1. -+ C Set H1, H0 = (2^96 - 2^32 + 1) C0 - mov C0, H0 - mov C0, H1 -- mov C0, H2 -- sar $63, C0 C Get sign - shl $32, H1 -- sub H1, H0 C Gives borrow iff C0 > 0 -+ sub H1, H0 - sbb $0, H1 -- add C0, H2 - -+ C Set H3, H2 = (2^96 - 2^32 + 1) C2 -+ mov C2, H2 -+ mov C2, H3 -+ shl $32, H3 -+ sub H3, H2 -+ sbb $0, H3 -+ add C0, H2 C No carry. Could use lea trick -+ -+ xor C0, C0 - add H0, T0 - adc H1, T1 -- adc $0, H2 -- adc $0, C0 -- -- C Set (H1 H0) <-- C2 << 96 - C2 << 32 + 1 -- mov C2, H0 -- mov C2, H1 -- shl $32, H1 -- sub H1, H0 -- sbb $0, H1 -- -- add H2, H0 -- adc C0, H1 -- adc C2, C0 -- mov C0, H2 -- sar $63, C0 -- add H0, T2 -- adc H1, T3 -- adc H2, T4 -- adc C0, T5 -- sbb C0, C0 -+ adc H2, T2 -+ adc H3, T3 -+ adc C2, T4 -+ adc D5, T5 C Value delayed from initial folding -+ adc $0, C0 C Use sbb and switch sign? - - C Final unlikely carry - mov C0, H0 - mov C0, H1 -- mov C0, H2 -- sar $63, C0 - shl $32, H1 - sub H1, H0 - sbb $0, H1 -- add C0, H2 - - pop RP - -- sub H0, T0 -+ add H0, T0 - mov T0, (RP) -- sbb H1, T1 -+ adc H1, T1 - mov T1, 8(RP) -- sbb H2, T2 -+ adc C0, T2 - mov T2, 16(RP) -- sbb C0, T3 -+ adc $0, T3 - mov T3, 24(RP) -- sbb C0, T4 -+ adc $0, T4 - mov T4, 32(RP) -- sbb C0, T5 -+ adc $0, T5 - mov T5, 40(RP) - - pop %r15 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.3/check-header-files-of-openssl-only-if-enable_.patch new file mode 100644 index 000000000..e7216bac2 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.3/check-header-files-of-openssl-only-if-enable_.patch @@ -0,0 +1,38 @@ +From ffee6b5f6204a0210f717968ec6ce514d70acca1 Mon Sep 17 00:00:00 2001 +From: Haiqing Bai <Haiqing.Bai@windriver.com> +Date: Fri, 9 Dec 2016 15:23:17 +0800 +Subject: [PATCH] nettle: check header files of openssl only if + 'enable_openssl=yes'. + +The original configure script checks openssl header files to generate +config.h even if 'enable_openssl' is not set to yes, this made inconsistent +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 +@@ -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],, +-[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],, ++ [enable_openssl=no ++ break]) ++fi + + AC_CHECK_HEADERS([valgrind/memcheck.h]) + +-- +1.9.1 + diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_2.7.1.bb b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_2.7.1.bb deleted file mode 100644 index ae8e3119f..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_2.7.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -require nettle.inc - -LICENSE = "LGPLv2.1+ & GPLv2" -LICENSE_${PN} = "LGPLv2.1+" - -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \ - file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d" - -SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5" -SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40" - -SRC_URI += "\ - file://CVE-2015-8803_8805.patch \ - file://CVE-2015-8804.patch \ - " - -DISABLE_STATIC = "" diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.2.bb b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.3.bb index 2b7977974..b76babfe2 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.3.bb @@ -7,5 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \ file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e" -SRC_URI[md5sum] = "afb15b4764ebf1b4e6d06c62bd4d29e4" -SRC_URI[sha256sum] = "ea4283def236413edab5a4cf9cf32adf540c8df1b9b67641cfc2302fca849d97" +SRC_URI += "\ + file://check-header-files-of-openssl-only-if-enable_.patch \ + " + +SRC_URI[md5sum] = "10f969f78a463704ae73529978148dbe" +SRC_URI[sha256sum] = "46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e" diff --git a/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.2.bb b/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.3.bb index 66aa3474b..d4fc064bf 100644 --- a/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.3.bb @@ -11,8 +11,8 @@ SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ file://pkgconfig.patch \ " -SRC_URI[md5sum] = "226bac7374b9466c6ec26b1c34dab844" -SRC_URI[sha256sum] = "6ddbdddb2cf49a4723f9d1ad6563c480d6760dcb63cb7726b8fc3bc2e1b6c08a" +SRC_URI[md5sum] = "efe1524c53670b5755dc27893d2d68a0" +SRC_URI[sha256sum] = "bca81940436aed0734eb8d0ff8b179e04cc8c087f5625204419f5f45d736a82a" BINCONFIG = "${bindir}/npth-config" 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 new file mode 100644 index 000000000..b3bdd8e08 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/0001-include-stdint.h-for-SSIZE_MAX-and-SIZE_MAX-definiti.patch @@ -0,0 +1,30 @@ +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_4.12.bb b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.13.1.bb index 9345a51f3..63ebecf72 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.12.bb +++ b/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.13.1.bb @@ -10,19 +10,22 @@ 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://nspr.pc.in \ " CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE'" + -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" -SRC_URI[md5sum] = "0de760c1e00a92e180e611cf06ce9589" -SRC_URI[sha256sum] = "e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de" +SRC_URI[md5sum] = "9c44298a6fc478b3c0a4e98f4f9981ed" +SRC_URI[sha256sum] = "5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab" + +CVE_PRODUCT = "netscape_portable_runtime" S = "${WORKDIR}/nspr-${PV}/nspr" @@ -147,7 +150,7 @@ TESTS = " \ inherit autotools -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," do_compile_prepend() { diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/import-layers/yocto-poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch new file mode 100644 index 000000000..d5403397e --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -0,0 +1,48 @@ +From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 22 Feb 2017 11:36:11 +0200 +Subject: [PATCH] nss: fix support cross compiling + +Let some make variables be assigned from outside makefile. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + nss/coreconf/arch.mk | 2 +- + nss/lib/freebl/Makefile | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 06c276f..9c1eb51 100644 +--- a/nss/coreconf/arch.mk ++++ b/nss/coreconf/arch.mk +@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +- OS_RELEASE := $(shell uname -r) ++ OS_RELEASE ?= $(shell uname -r) + endif + + # +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 0ce1425..ebeb411 100644 +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -36,6 +36,12 @@ ifdef USE_64 + DEFINES += -DNSS_USE_64 + endif + ++ifeq ($(OS_TEST),mips) ++ifndef USE_64 ++ DEFINES += -DNS_PTR_LE_32 ++endif ++endif ++ + ifdef USE_ABI32_FPU + DEFINES += -DNSS_USE_ABI32_FPU + endif +-- +2.11.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch b/import-layers/yocto-poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch new file mode 100644 index 000000000..f7f2c217d --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch @@ -0,0 +1,31 @@ +From c8eadfcdfbc1d5a4799e9a264b0f859cb5954c05 Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Tue, 13 Dec 2016 11:40:47 -0700 +Subject: [PATCH 7/7] Fix compilation for X32 + +X32 uses 32-bit pointers, not 64-bit. + +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +--- + nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c b/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c +index 2a3301e..d4ade41 100644 +--- a/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c ++++ b/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c +@@ -87,7 +87,11 @@ static poly1305_state_internal INLINE + * + poly1305_aligned_state(poly1305_state *state) + { ++#ifdef __ILP32__ ++ return (poly1305_state_internal *)(((uint32_t)state + 63) & ~63); ++#else + return (poly1305_state_internal *)(((uint64_t)state + 63) & ~63); ++#endif + } + + /* copy 0-63 bytes */ +-- +2.8.0 + diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch b/import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch deleted file mode 100644 index f0b3550bf..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch +++ /dev/null @@ -1,71 +0,0 @@ -nss: fix support cross compiling - -Let some make variables be assigned from outside makefile. - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Upstream-Status: Inappropriate [configuration] ---- - nss/coreconf/Linux.mk | 12 +++++++++++- - nss/coreconf/arch.mk | 2 +- - nss/lib/freebl/Makefile | 6 ++++++ - 3 files changed, 18 insertions(+), 2 deletions(-) - -diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk ---- a/nss/coreconf/Linux.mk -+++ b/nss/coreconf/Linux.mk -@@ -16,11 +16,21 @@ ifeq ($(USE_PTHREADS),1) - IMPL_STRATEGY = _PTH - endif - -+ifndef CC - CC = gcc -+endif -+ -+ifdef CXX -+CCC = $(CXX) -+else - CCC = g++ -+endif -+ -+ifndef RANLIB - RANLIB = ranlib -+endif - --DEFAULT_COMPILER = gcc -+DEFAULT_COMPILER = $(CC) - - ifeq ($(OS_TARGET),Android) - ifndef ANDROID_NDK -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 6557348..b722412 100644 ---- a/nss/coreconf/arch.mk -+++ b/nss/coreconf/arch.mk -@@ -37,7 +37,7 @@ OS_TEST := $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -- OS_RELEASE := $(shell uname -r) -+ OS_RELEASE ?= $(shell uname -r) - endif - - # -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0d293f1..678f506 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -36,6 +36,12 @@ ifdef USE_64 - DEFINES += -DNSS_USE_64 - endif - -+ifeq ($(OS_TEST),mips) -+ifndef USE_64 -+ DEFINES += -DNS_PTR_LE_32 -+endif -+endif -+ - ifdef USE_ABI32_FPU - DEFINES += -DNSS_USE_ABI32_FPU - endif --- -1.8.1.2 - diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/import-layers/yocto-poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch index 9caaaeb95..9942bf192 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ b/import-layers/yocto-poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch @@ -13,11 +13,11 @@ Index: nss-3.24/nss/lib/freebl/pqg.c @@ -322,8 +322,8 @@ generate_h_candidate(SECItem *hit, mp_in static SECStatus - addToSeed(const SECItem * seed, -- unsigned long addend, -- int seedlen, /* g in 186-1 */ + addToSeed(const SECItem *seed, +- unsigned long addend, +- int seedlen, /* g in 186-1 */ + unsigned long long addend, + int seedlen, /* g in 186-1 */ - SECItem * seedout) + SECItem *seedout) { mp_int s, sum, modulus, tmp; diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.25.bb b/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.28.1.bb index eff09ebbd..fed86fc8e 100644 --- a/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.25.bb +++ b/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.28.1.bb @@ -15,18 +15,19 @@ LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" SRC_URI = "\ - http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_25_RTM/src/${BP}.tar.gz \ - file://nss-fix-support-cross-compiling.patch \ + http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_28_1_RTM/src/${BP}.tar.gz \ + file://0001-nss-fix-support-cross-compiling.patch \ file://nss-no-rpath-for-cross-compiling.patch \ file://nss-fix-incorrect-shebang-of-perl.patch \ file://nss-fix-nsinstall-build.patch \ file://disable-Wvarargs-with-clang.patch \ file://pqg.c-ULL_addend.patch \ + file://Fix-compilation-for-X32.patch \ file://nss.pc.in \ file://signlibs.sh \ " -SRC_URI[md5sum] = "23169c406adc8ac3672d34bf9ea2433d" -SRC_URI[sha256sum] = "5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359" +SRC_URI[md5sum] = "e98d48435cee5792f97ef7fc35a602c3" +SRC_URI[sha256sum] = "58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" @@ -106,6 +107,7 @@ do_compile() { OS_TEST=${OS_TEST} \ RPATH="${RPATH}" } +do_compile[vardepsexclude] += "SITEINFO_BITS" do_install_prepend_class-nativesdk() { @@ -179,6 +181,7 @@ do_install() { install -m 755 -t ${D}/${bindir} $binary done } +do_install[vardepsexclude] += "SITEINFO_BITS" do_install_append() { # Create empty .chk files for the NSS libraries at build time. They could @@ -206,20 +209,21 @@ do_install_append_class-target() { rm ./empty_password } +PACKAGE_WRITE_DEPS += "nss-native" pkg_postinst_${PN} () { if [ -n "$D" ]; then - for I in $D/${libdir}/lib*.chk; do + for I in $D${libdir}/lib*.chk; do DN=`dirname $I` BN=`basename $I .chk` FN=$DN/$BN.so shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi + if [ $? -ne 0 ]; then + exit 1 + fi done - exit 0 + else + signlibs.sh fi - signlibs.sh } PACKAGES =+ "${PN}-smime" diff --git a/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.0.bb b/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.0.2.bb index 9d4551389..a3e9a7e21 100644 --- a/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.0.2.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 = "e2aa4256745377b784c8691f546041b59f6e046b" -PV = "2.0.1+git${SRCPV}" +SRCREV = "6d2872116cd9d6e1617a768f9d72bbf091489b2d" +PV = "2.0.2+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-support/serf/serf_1.3.8.bb b/import-layers/yocto-poky/meta/recipes-support/serf/serf_1.3.9.bb index c498d9097..2be5a069c 100644 --- a/import-layers/yocto-poky/meta/recipes-support/serf/serf_1.3.8.bb +++ b/import-layers/yocto-poky/meta/recipes-support/serf/serf_1.3.9.bb @@ -1,12 +1,10 @@ SUMMARY = "High-Performance Asynchronous HTTP Client Library" -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/s/${BPN}/${BPN}_${PV}.orig.tar.gz \ +SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://norpath.patch \ file://env.patch" -SRC_URI[md5sum] = "713beaf05d7f3329de121e218e2fcb93" -SRC_URI[sha256sum] = "77134cd5010664ca023585bce50978bd4005906ed280ff889f591f86df7c59e4" - -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/s/serf/" +SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57" +SRC_URI[sha256sum] = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.6.bb b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.6.bb deleted file mode 100644 index 2cf50414c..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.6.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] = "10abc5c4e6b22223ff05c3bd70ff9e8f" -SRC_URI[sha256sum] = "b2f8f85b6467933824180d0252bbcaee523f550a8fbc95cc4391bd43c03bc34c" 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 new file mode 100644 index 000000000..849d99903 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.8.bb @@ -0,0 +1,7 @@ +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/sqlite/files/0001-revert-ad601c7962-that-brings-2-increase-of-build-ti.patch b/import-layers/yocto-poky/meta/recipes-support/sqlite/files/0001-revert-ad601c7962-that-brings-2-increase-of-build-ti.patch deleted file mode 100644 index 26540b241..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/sqlite/files/0001-revert-ad601c7962-that-brings-2-increase-of-build-ti.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 4b286b441e8efa9a34eb0db8227748ebffd91c35 Mon Sep 17 00:00:00 2001 -From: Jianxun Zhang <jianxun.zhang@linux.intel.com> -Date: Thu, 13 Oct 2016 09:24:21 -0700 -Subject: [PATCH] revert ad601c7962 that brings 2% increase of build time. - -The comment of the change in sqlite fossil project is: -"For in-memory databases, it does not matter if pcache -entries are marked "clean" or "writable"." - -Upstream Status: Inappropriate - -Signed-off-by: Jianxun Zhang <jianxun.zhang@linux.intel.com> ---- - sqlite3.c | 12 +++--------- - 1 file changed, 3 insertions(+), 9 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index ccddfe6..ecae550 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -13146,7 +13146,7 @@ struct PgHdr { - sqlite3_pcache_page *pPage; /* Pcache object page handle */ - void *pData; /* Page data */ - void *pExtra; /* Extra content */ -- PgHdr *pDirty; /* Transient list of dirty sorted by pgno */ -+ PgHdr *pDirty; /* Transient list of dirty pages */ - Pager *pPager; /* The pager this page is part of */ - Pgno pgno; /* Page number for this page */ - #ifdef SQLITE_CHECK_PAGES -@@ -43504,13 +43504,7 @@ bitvec_end: - /* #include "sqliteInt.h" */ - - /* --** A complete page cache is an instance of this structure. Every --** entry in the cache holds a single page of the database file. The --** btree layer only operates on the cached copy of the database pages. --** --** A page cache entry is "clean" if it exactly matches what is currently --** on disk. A page is "dirty" if it has been modified and needs to be --** persisted to disk. -+** A complete page cache is an instance of this structure. - ** - ** pDirty, pDirtyTail, pSynced: - ** All dirty pages are linked into the doubly linked list using -@@ -48314,7 +48308,7 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){ - pPager->pInJournal = 0; - pPager->nRec = 0; - if( rc==SQLITE_OK ){ -- if( pagerFlushOnCommit(pPager, bCommit) ){ -+ if( MEMDB || pagerFlushOnCommit(pPager, bCommit) ){ - sqlite3PcacheCleanAll(pPager->pPCache); - }else{ - sqlite3PcacheClearWritable(pPager->pPCache); --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc b/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc index 5bff33b85..95ec89cef 100644 --- a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc +++ b/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc @@ -5,7 +5,7 @@ SECTION = "libs" PE = "3" def sqlite_download_version(d): - pvsplit = d.getVar('PV', True).split('.') + pvsplit = d.getVar('PV').split('.') if len(pvsplit) < 4: pvsplit.append('0') return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]]) @@ -17,6 +17,8 @@ S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}" UPSTREAM_CHECK_URI = "http://www.sqlite.org/" UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html" +CVE_PRODUCT = "sqlite" + inherit autotools pkgconfig PACKAGECONFIG ?= "" @@ -31,6 +33,8 @@ EXTRA_OECONF = " \ --disable-static-shell \ " +CFLAGS_append = " -fPIC" + # pread() is in POSIX.1-2001 so any reasonable system must surely support it BUILD_CFLAGS += "-DUSE_PREAD" TARGET_CFLAGS += "-DUSE_PREAD" diff --git a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.14.1.bb b/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.14.1.bb deleted file mode 100644 index 7c8fa4052..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.14.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require sqlite3.inc - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" - -SRC_URI = "\ - http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - file://0001-revert-ad601c7962-that-brings-2-increase-of-build-ti.patch \ - " - -SRC_URI[md5sum] = "3634a90a3f49541462bcaed3474b2684" -SRC_URI[sha256sum] = "bc7182476900017becb81565ecea7775d46ab747a97281aa610f4f45881c47a6" diff --git a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.17.0.bb b/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.17.0.bb new file mode 100644 index 000000000..593cb3202 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.17.0.bb @@ -0,0 +1,10 @@ +require sqlite3.inc + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" + +SRC_URI = "\ + http://www.sqlite.org/2017/sqlite-autoconf-${SQLITE_PV}.tar.gz \ + " +SRC_URI[md5sum] = "450a95a7bde697c9fe4de9ae2fffdcca" +SRC_URI[sha256sum] = "a4e485ad3a16e054765baf6371826b5000beed07e626510896069c0bf013874c" diff --git a/import-layers/yocto-poky/meta/recipes-support/taglib/taglib/CVE-2017-12678.patch b/import-layers/yocto-poky/meta/recipes-support/taglib/taglib/CVE-2017-12678.patch new file mode 100644 index 000000000..4bd9f2be1 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/taglib/taglib/CVE-2017-12678.patch @@ -0,0 +1,40 @@ +From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001 +From: "Stephen F. Booth" <me@sbooth.org> +Date: Sun, 23 Jul 2017 10:11:09 -0400 +Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame + +If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame +which causes problems in rebuildAggregateFrames() when it is assumed +that TDRC is a TextIdentificationFrame + +Upstream-Status: Backport +[https://github.com/taglib/taglib/pull/831/commits/eb9ded1206f18f2c319157337edea2533a40bea6] + +CVE: CVE-2017-12678 + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp +index 759a9b7b..9347ab86 100644 +--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp ++++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp +@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const + tag->frameList("TDAT").size() == 1) + { + TextIdentificationFrame *tdrc = +- static_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front()); ++ dynamic_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front()); + UnknownFrame *tdat = static_cast<UnknownFrame *>(tag->frameList("TDAT").front()); + +- if(tdrc->fieldList().size() == 1 && ++ if(tdrc && ++ tdrc->fieldList().size() == 1 && + tdrc->fieldList().front().size() == 4 && + tdat->data().size() >= 5) + { +-- +2.13.5 + diff --git a/import-layers/yocto-poky/meta/recipes-support/taglib/taglib_1.11.1.bb b/import-layers/yocto-poky/meta/recipes-support/taglib/taglib_1.11.1.bb new file mode 100644 index 000000000..50439bc14 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/taglib/taglib_1.11.1.bb @@ -0,0 +1,43 @@ +SUMMARY = "Library for reading and editing the meta-data of popular audio formats" +SECTION = "libs/multimedia" +HOMEPAGE = "http://taglib.github.io/" +LICENSE = "LGPLv2.1 | MPL-1" +LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \ + file://taglib/audioproperties.h;beginline=1;endline=24;md5=9df2c7399519b7310568a7c55042ecee" + +DEPENDS = "zlib" + +SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz \ + file://CVE-2017-12678.patch \ + " + +SRC_URI[md5sum] = "cee7be0ccfc892fa433d6c837df9522a" +SRC_URI[sha256sum] = "b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b" + +UPSTREAM_CHECK_URI = "http://github.com/taglib/taglib/releases/" + +BINCONFIG = "${bindir}/taglib-config" + +inherit cmake pkgconfig binconfig-disabled + +PACKAGES =+ "${PN}-c" +FILES_${PN}-c = "${libdir}/libtag_c.so.*" + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ + -DCMAKE_DISABLE_FIND_PACKAGE_Boost=TRUE \ + -DHAVE_BOOST_BYTESWAP=FALSE \ + -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD_REQUIRED=OFF \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +" +CXXFLAGS += "-std=c++11" + +do_configure_prepend () { + rm -f ${S}/admin/ltmain.sh + rm -f ${S}/admin/libtool.m4.in +} + +# without -fPIC depending packages failed with many error like: +# | <...>/ld: error: <...>/usr/lib/libtag.a(modfilebase.cpp.o): requires unsupported dynamic reloc R_ARM_THM_MOVW_ABS_NC; recompile with -fPIC +CXXFLAGS += "-fPIC" diff --git a/import-layers/yocto-poky/meta/recipes-support/taglib/taglib_1.9.1.bb b/import-layers/yocto-poky/meta/recipes-support/taglib/taglib_1.9.1.bb deleted file mode 100644 index d125308cc..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/taglib/taglib_1.9.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Library for reading and editing the meta-data of popular audio formats" -SECTION = "libs/multimedia" -HOMEPAGE = "http://taglib.github.io/" -LICENSE = "LGPLv2.1 | MPL-1" -LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \ - file://taglib/audioproperties.h;beginline=1;endline=24;md5=9df2c7399519b7310568a7c55042ecee" - -DEPENDS = "zlib" - -SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "0d35df96822bbd564c5504cb3c2e4d86" -SRC_URI[sha256sum] = "72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a" - -UPSTREAM_CHECK_URI = "http://github.com/taglib/taglib/releases/" - -BINCONFIG = "${bindir}/taglib-config" - -inherit cmake pkgconfig binconfig-disabled - -PACKAGES =+ "${PN}-c" -FILES_${PN}-c = "${libdir}/libtag_c.so.*" - -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" - -do_configure_prepend () { - rm -f ${S}/admin/ltmain.sh - rm -f ${S}/admin/libtool.m4.in - # Don't have a floating dependeny on boost - sed -i -e "s/atomic.hpp/atomic-not-exist.hpp/" ${S}/ConfigureChecks.cmake ${S}/taglib/toolkit/trefcounter.cpp -} - diff --git a/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.44.2.bb b/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.46.1.bb index a0b671e05..0afe625bc 100644 --- a/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.44.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.46.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Virtual terminal emulator GTK+ widget library" BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" LICENSE = "LGPLv2.1+" -DEPENDS = "glib-2.0 gtk+3 intltool-native" +DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" @@ -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] = "eca8f8a9d9f9bb8e9d592d0acfeec015" -SRC_URI[archive.sha256sum] = "a1ea594814bb136a3a9a6c7656b46240571f6a198825c1111007fe99194b0949" +SRC_URI[archive.md5sum] = "e8f4393b9f1ec2e2f3cdb3fd4f5a16de" +SRC_URI[archive.sha256sum] = "8800cf8bc259704a12ad1853fb0eb43bfe3857af15242e6fb9f2c3fd95b3f5c6" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" @@ -27,7 +27,7 @@ export XDG_DATA_DIRS = "${STAGING_DATADIR}" # Package additional files FILES_${PN}-dev += "${datadir}/vala/vapi/*" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "gnutls" PACKAGECONFIG[vala] = "--enable-vala,--disable-vala,vala-native vala" PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" |