diff options
Diffstat (limited to 'yocto-poky/meta/recipes-support')
169 files changed, 2762 insertions, 2602 deletions
diff --git a/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb b/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb index a36f13db5..2b8676fef 100644 --- a/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb +++ b/yocto-poky/meta/recipes-support/apr/apr-util_1.5.4.bb @@ -24,7 +24,6 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --with-dbm=gdbm \ --with-gdbm=${STAGING_DIR_HOST}${prefix} \ --without-sqlite2 \ - --without-sqlite3 \ --with-expat=${STAGING_DIR_HOST}${prefix}" @@ -54,10 +53,10 @@ do_configure_prepend_class-nativesdk() { } do_configure_append_class-nativesdk() { - sed -i "s#\(apr_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk - sed -i "s#\(apr_builders\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk - sed -i "s#\(top_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk - sed -i "s#\(LIBTOOL=\$(apr_builddir)\).*#\1/libtool#" ${S}/build/rules.mk + sed -i "s#\(apr_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk + sed -i "s#\(apr_builders\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk + sed -i "s#\(top_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk + sed -i "s#\(LIBTOOL=\$(apr_builddir)\).*#\1/libtool#" ${B}/build/rules.mk } do_install_append_class-target() { @@ -66,13 +65,22 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config } -FILES_${PN} += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so" -FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/apr_dbm_gdbm.so* ${libdir}/apr-util-1/apr_dbm_gdbm.la" -FILES_${PN}-dbg += "${libdir}/apr-util-1/.debug/*" -FILES_${PN}-staticdev += "${libdir}/apr-util-1/apr_dbm_gdbm.a" +PACKAGECONFIG ??= "crypto" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" +PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" + +#files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} +FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" +FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/*.la" +FILES_${PN}-staticdev += "${libdir}/apr-util-1/*.a" + +INSANE_SKIP_${PN} += "dev-so" inherit ptest +RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-iso8859-1 glibc-gconv-iso8859-2 glibc-gconv-utf-7" + do_compile_ptest() { cd ${B}/test oe_runmake diff --git a/yocto-poky/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch b/yocto-poky/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch new file mode 100644 index 000000000..7521eeb46 --- /dev/null +++ b/yocto-poky/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch @@ -0,0 +1,36 @@ +From d439093aa07a486f559206ac9e5808a6a18218cd Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 19 Nov 2015 18:25:38 -0800 +Subject: [PATCH] configure.in: fix LTFLAGS to make it work with ccache + +When ccache is enabled, libtool requires --tag=CC when use ccache, +otherwise when building apr-util with ccache enabled: + +| libtool: compile: unable to infer tagged configuration +| libtool: error: specify a tag with '--tag' +| libtool: compile: unable to infer tagged configuration +| make[1]: *** [buckets/apr_buckets.lo] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 5a4a988..9d57ae6 100644 +--- a/configure.in ++++ b/configure.in +@@ -246,7 +246,7 @@ case $host in + ;; + *) + if test "x$LTFLAGS" = "x"; then +- LTFLAGS='--silent' ++ LTFLAGS='--silent --tag=CC' + fi + if test "$experimental_libtool" = "yes"; then + # Use a custom-made libtool replacement +-- +1.7.9.5 + diff --git a/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch b/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch index 9569645b8..16499f5ac 100644 --- a/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch +++ b/yocto-poky/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch @@ -8,7 +8,7 @@ Remove the 'tools' dir creation, it always existed. And it caused gen_test_char unexpected rebuilt at do_install time. -Upstream-Status: inappropriate [oe specific] +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- diff --git a/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb b/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb index 1c61e84e5..db1530530 100644 --- a/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb +++ b/yocto-poky/meta/recipes-support/apr/apr_1.5.2.bb @@ -16,6 +16,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://run-ptest \ file://upgrade-and-fix-1.5.1.patch \ file://Fix-packet-discards-HTTP-redirect.patch \ + file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ " SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa" diff --git a/yocto-poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb b/yocto-poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb new file mode 100644 index 000000000..d61c8be24 --- /dev/null +++ b/yocto-poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb @@ -0,0 +1,29 @@ +# Copyright (C) 2015 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Glibc hierarchical argument parsing standalone library" +HOMEPAGE = "http://www.lysator.liu.se/~nisse/misc/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://argp.h;beginline=1;endline=20;md5=008b7e53dea6f9e1d9fdef0d9cf3184a" +SECTION = "libs" + +SRC_URI = "http://www.lysator.liu.se/~nisse/misc/argp-standalone-${PV}.tar.gz \ + file://0001-throw-in-funcdef.patch \ + file://0002-isprint.patch \ + file://out_of_tree_build.patch \ + " +SRC_URI[md5sum] = "720704bac078d067111b32444e24ba69" +SRC_URI[sha256sum] = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be" + +inherit autotools + +CFLAGS += "-fPIC -U__OPTIMIZE__" + +do_install() { + install -D -m 0644 ${B}/libargp.a ${D}${libdir}/libargp.a + install -D -m 0644 ${S}/argp.h ${D}${includedir}/argp.h +} +# +# We will skip parsing for non-musl systems +# +COMPATIBLE_HOST = ".*-musl.*" diff --git a/yocto-poky/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch b/yocto-poky/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch new file mode 100644 index 000000000..a6e2759c5 --- /dev/null +++ b/yocto-poky/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch @@ -0,0 +1,84 @@ +# --- T2-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone +# Copyright (C) 2006 The T2 SDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- T2-COPYRIGHT-NOTE-END --- + + +No __THROW in function implementation. + --jsaw + +Taken from buildroot + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100 ++++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100 +@@ -560,17 +560,17 @@ + # endif + + # ifndef ARGP_EI +-# define ARGP_EI extern __inline__ ++# define ARGP_EI extern inline + # endif + + ARGP_EI void +-__argp_usage (__const struct argp_state *__state) __THROW ++__argp_usage (__const struct argp_state *__state) + { + __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); + } + + ARGP_EI int +-__option_is_short (__const struct argp_option *__opt) __THROW ++__option_is_short (__const struct argp_option *__opt) + { + if (__opt->flags & OPTION_DOC) + return 0; +@@ -582,7 +582,7 @@ + } + + ARGP_EI int +-__option_is_end (__const struct argp_option *__opt) __THROW ++__option_is_end (__const struct argp_option *__opt) + { + return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; + } +--- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100 ++++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100 +@@ -1290,13 +1290,13 @@ + /* Defined here, in case a user is not inlining the definitions in + * argp.h */ + void +-__argp_usage (__const struct argp_state *__state) __THROW ++__argp_usage (__const struct argp_state *__state) + { + __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); + } + + int +-__option_is_short (__const struct argp_option *__opt) __THROW ++__option_is_short (__const struct argp_option *__opt) + { + if (__opt->flags & OPTION_DOC) + return 0; +@@ -1310,7 +1310,7 @@ + } + + int +-__option_is_end (__const struct argp_option *__opt) __THROW ++__option_is_end (__const struct argp_option *__opt) + { + return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; + } diff --git a/yocto-poky/meta/recipes-support/argp-standalone/files/0002-isprint.patch b/yocto-poky/meta/recipes-support/argp-standalone/files/0002-isprint.patch new file mode 100644 index 000000000..1c07eea3c --- /dev/null +++ b/yocto-poky/meta/recipes-support/argp-standalone/files/0002-isprint.patch @@ -0,0 +1,51 @@ +Subject: restrict value range passed to isprint function + +According to C standards isprint argument shall be representable as an +unsigned char or be equal to EOF, otherwise the behaviour is undefined. + +Passing arbitrary ints leads to segfault in nm program from elfutils. + +Restrict isprint argument range to values representable by unsigned char. + +Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> + +Taken from buildroot + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- +Index: b/argp.h +=================================================================== +--- a/argp.h ++++ b/argp.h +@@ -23,6 +23,7 @@ + + #include <stdio.h> + #include <ctype.h> ++#include <limits.h> + + #define __need_error_t + #include <errno.h> +@@ -577,7 +578,7 @@ + else + { + int __key = __opt->key; +- return __key > 0 && isprint (__key); ++ return __key > 0 && __key <= UCHAR_MAX && isprint (__key); + } + } + +Index: b/argp-parse.c +=================================================================== +--- a/argp-parse.c ++++ b/argp-parse.c +@@ -1292,7 +1292,7 @@ + int __key = __opt->key; + /* FIXME: whether or not a particular key implies a short option + * ought not to be locale dependent. */ +- return __key > 0 && isprint (__key); ++ return __key > 0 && __key <= UCHAR_MAX && isprint (__key); + } + } + diff --git a/yocto-poky/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch b/yocto-poky/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch new file mode 100644 index 000000000..b7777cbd9 --- /dev/null +++ b/yocto-poky/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch @@ -0,0 +1,19 @@ +Fix the testsuite to built out of tree +in OE S != B + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending +Index: argp-standalone-1.3/testsuite/Makefile.am +=================================================================== +--- argp-standalone-1.3.orig/testsuite/Makefile.am ++++ argp-standalone-1.3/testsuite/Makefile.am +@@ -5,7 +5,8 @@ TS_ALL = $(TS_PROGS) $(TS_SH) + + noinst_PROGRAMS = $(TS_PROGS) ex1 ex3 ex4 + +-LDADD = ../libargp.a ++AM_CPPFLAGS = -I$(top_srcdir) ++LDADD = $(top_builddir)/libargp.a + + EXTRA_DIST = $(TS_SH) run-tests + CLEANFILES = test.out diff --git a/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb index 7cf17d65d..5a23754b7 100644 --- a/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb +++ b/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb @@ -17,7 +17,6 @@ PACKAGES += "libaspell libpspell aspell-utils" RDEPENDS_${PN}-utils += "perl" -FILES_${PN}-dbg += "${libdir}/aspell-0.60/.debu*" FILES_libaspell = "${libdir}/libaspell.so.* ${libdir}/aspell*" FILES_aspell-utils = "${bindir}/word-list-compress ${bindir}/aspell-import ${bindir}/run-with-aspell ${bindir}/pre*" FILES_${PN} = "${bindir}/aspell" diff --git a/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb b/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.18.1.bb index 7d95fdbd8..b8a93f3dc 100644 --- a/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb +++ b/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.18.1.bb @@ -5,12 +5,12 @@ 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] = "8936488c8cdce0e158f80b2e247527f9" -SRC_URI[sha256sum] = "78efc45ec36383bf785f8636e64a8d866defeb020e00a08f92978f1fc3772ff9" +SRC_URI[md5sum] = "d7040a55df975865ab0d74a4b325afb5" +SRC_URI[sha256sum] = "c4b15f9386d34d464ddad5f6cc85669742c016df87141ceee93513245979c12d" DEPENDS = "dbus glib-2.0 atk at-spi2-core" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig distro_features_check upstream-version-is-even # The at-spi2-core requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" @@ -19,4 +19,3 @@ PACKAGES =+ "${PN}-gnome ${PN}-gtk2" FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug" diff --git a/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.16.0.bb b/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.18.3.bb index 7c12b5428..eced59750 100644 --- a/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.16.0.bb +++ b/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.18.3.bb @@ -8,16 +8,16 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ " -SRC_URI[md5sum] = "be6eeea370f913b7639b609913b2cf02" -SRC_URI[sha256sum] = "1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b1a74d0" +SRC_URI[md5sum] = "fc18801e56f6ce6914126f837d42f556" +SRC_URI[sha256sum] = "ada26add94155f97d0f601a20cb7a0e3fd3ba1588c3520b7288316494027d629" DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native" -inherit autotools gtk-doc pkgconfig distro_features_check +inherit autotools gtk-doc pkgconfig distro_features_check upstream-version-is-even gobject-introspection # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -EXTRA_OECONF = "--disable-introspection --disable-xevie --with-dbus-daemondir=${bindir}" +EXTRA_OECONF = "--disable-xevie --with-dbus-daemondir=${bindir}" FILES_${PN} += "${datadir}/dbus-1/services/*.service \ ${datadir}/dbus-1/accessibility-services/*.service" diff --git a/yocto-poky/meta/recipes-support/atk/atk_2.16.0.bb b/yocto-poky/meta/recipes-support/atk/atk_2.18.0.bb index 0f8f9b520..3c0e82df6 100644 --- a/yocto-poky/meta/recipes-support/atk/atk_2.16.0.bb +++ b/yocto-poky/meta/recipes-support/atk/atk_2.18.0.bb @@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ DEPENDS = "glib-2.0" -inherit gnomebase gtk-doc +inherit gnomebase gtk-doc upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "c7c5002bd6e58b4723a165f1bf312116" -SRC_URI[archive.sha256sum] = "095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562" +SRC_URI[archive.md5sum] = "fd3678f35004b4c92e3da39356996054" +SRC_URI[archive.sha256sum] = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b" BBCLASSEXTEND = "native" EXTRA_OECONF = "--disable-glibtest \ - --disable-introspection" + " diff --git a/yocto-poky/meta/recipes-support/attr/acl.inc b/yocto-poky/meta/recipes-support/attr/acl.inc index b2bc8bac2..198fb4fed 100644 --- a/yocto-poky/meta/recipes-support/attr/acl.inc +++ b/yocto-poky/meta/recipes-support/attr/acl.inc @@ -12,6 +12,8 @@ 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 \ " require ea-acl.inc diff --git a/yocto-poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch b/yocto-poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch new file mode 100644 index 000000000..0b350be56 --- /dev/null +++ b/yocto-poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch @@ -0,0 +1,108 @@ +From e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d Mon Sep 17 00:00:00 2001 +From: Kamil Dudka <kdudka@redhat.com> +Date: Mon, 20 May 2013 16:38:06 +0200 +Subject: [PATCH] test: fix insufficient quoting of '\' + +This is a follow-up to 7f2c91b8369242a8dbc2b304a5b71b2a85f5b855, which +caused sbits-restore.test to fail in the following way in case SELinux +was disabled: + +*** sbits-restore.test *** +[3] $ umask 022 -- ok +[4] $ mkdir d -- ok +[5] $ touch d/g -- ok +[6] $ touch d/u -- ok +[7] $ chmod u+s d/u -- ok +[8] $ chmod g+s d/g -- ok +[9] $ chmod +t d -- ok +[10] $ getfacl -R d > d.acl -- ok +[11] $ rm -R d -- ok +[12] $ mkdir d -- ok +[13] $ touch d/g -- ok +[14] $ touch d/u -- ok +[15] $ setfacl --restore d.acl -- ok +[16] $ ls -dl d | awk '{print $1}' | sed 's/.$//g' -- failed +drwxr-xr- != drwxr-xr-t +[18] $ ls -dl d/u | awk '{print $1}' | sed 's/.$//g' -- failed +-rwSr--r- != -rwSr--r-- +[20] $ ls -dl d/g | awk '{print $1}' | sed 's/.$//g' -- failed +-rw-r-Sr- != -rw-r-Sr-- +[22] $ rm -Rf d -- ok +17 commands (14 passed, 3 failed) + +Upstream-Status: Backport +http://git.savannah.gnu.org/cgit/acl.git/commit/?id=e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d + +Signed-off-by: Kamil Dudka <kdudka@redhat.com> +Signed-off-by: He Zhe <zhe.he@windriver.com> +--- + test/cp.test | 2 +- + test/misc.test | 6 +++--- + test/sbits-restore.test | 6 +++--- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/test/cp.test b/test/cp.test +index 0867f63..a927195 100644 +--- a/test/cp.test ++++ b/test/cp.test +@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given. + > -rw-rw-r--+ + + $ cp f g +- $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g' ++ $ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//g' + > -rw-r--r-- + + $ rm g +diff --git a/test/misc.test b/test/misc.test +index 6e98053..29372b7 100644 +--- a/test/misc.test ++++ b/test/misc.test +@@ -254,7 +254,7 @@ Add some users and groups + Symlink in directory with default ACL? + + $ ln -s d d/l +- $ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g' ++ $ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//g' + > lrwxrwxrwx + + $ ls -dl -L d/l | awk '{print $1}' +@@ -343,7 +343,7 @@ Remove the default ACL + Reset to base entries + + $ setfacl -b d +- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' ++ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' + > drwxr-x--- + + $ getfacl --omit-header d +@@ -355,7 +355,7 @@ Reset to base entries + Now, chmod should change the group_obj entry + + $ chmod 775 d +- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' ++ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' + > drwxrwxr-x + + $ getfacl --omit-header d +diff --git a/test/sbits-restore.test b/test/sbits-restore.test +index de21340..5899b0a 100644 +--- a/test/sbits-restore.test ++++ b/test/sbits-restore.test +@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works + $ touch d/g + $ touch d/u + $ setfacl --restore d.acl +- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' ++ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' + > drwxr-xr-t +- $ ls -dl d/u | awk '{print $1}' | sed 's/\.$//g' ++ $ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//g' + > -rwSr--r-- +- $ ls -dl d/g | awk '{print $1}' | sed 's/\.$//g' ++ $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g' + > -rw-r-Sr-- + $ rm -Rf d +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch b/yocto-poky/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch new file mode 100644 index 000000000..8cc11a63e --- /dev/null +++ b/yocto-poky/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch @@ -0,0 +1,84 @@ +From d2f49ee6fe4850b8dda5b08676b36201d3c43710 Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Wed, 2 Mar 2016 15:46:57 +0800 +Subject: [PATCH] test: fixups on SELinux machines for root testcases + +ls adds a '.' at the end of the permission field list on SELinux +machines, filter this out so root tests work on SELinux machines. + +Upstream-Status: Accepted +http://git.savannah.gnu.org/cgit/acl.git/commit/?id=26a87d36f80d5e98bccb5878834d9e69dadfe3e9 + +Signed-off-by: He Zhe <zhe.he@windriver.com> +--- + test/root/permissions.test | 8 ++++---- + test/root/restore.test | 2 +- + test/root/setfacl.test | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/test/root/permissions.test b/test/root/permissions.test +index 9b9e3de..665339a 100644 +--- a/test/root/permissions.test ++++ b/test/root/permissions.test +@@ -19,7 +19,7 @@ defined permissions. + $ cd d + $ umask 027 + $ touch f +- $ ls -l f | awk -- '{ print $1, $3, $4 }' ++ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' + > -rw-r----- root root + + +@@ -39,7 +39,7 @@ Now, change the ownership of the file to bin:bin and verify that this + gives user bin write access. + + $ chown bin:bin f +- $ ls -l f | awk -- '{ print $1, $3, $4 }' ++ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' + > -rw-r----- bin bin + $ su bin + $ echo bin >> f +@@ -256,12 +256,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them. + $ mkdir -m 600 x + $ chown daemon:daemon x + $ echo j > x/j +- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' ++ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' + > -rw-r----- root root + + $ setfacl -m u:daemon:r x + +- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' ++ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' + > -rw-r----- root root + (With the bug this gives: `ls: x/j: Permission denied'.) + +diff --git a/test/root/restore.test b/test/root/restore.test +index 63a9d01..c85097c 100644 +--- a/test/root/restore.test ++++ b/test/root/restore.test +@@ -21,7 +21,7 @@ Cry immediately if we are not running as root. + $ chown bin passwd + $ chmod u+s passwd + $ setfacl --restore passwd.acl +- $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' ++ $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\\.//g' + > -rwsr-xr-x root root + + $ rm passwd passwd.acl +diff --git a/test/root/setfacl.test b/test/root/setfacl.test +index a46a9f4..7efbad7 100644 +--- a/test/root/setfacl.test ++++ b/test/root/setfacl.test +@@ -12,7 +12,7 @@ Cry immediately if we are not running as root. + $ sg bin + $ umask 027 + $ touch g +- $ ls -dl g | awk '{print $1}' ++ $ ls -dl g | awk '{print $1}' | sed 's/\\.//g' + > -rw-r----- + + $ setfacl -m m:- g +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-support/attr/attr.inc b/yocto-poky/meta/recipes-support/attr/attr.inc index 28c750f98..68609784d 100644 --- a/yocto-poky/meta/recipes-support/attr/attr.inc +++ b/yocto-poky/meta/recipes-support/attr/attr.inc @@ -34,6 +34,6 @@ do_install_ptest() { sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile } -RDEPENDS_${PN}-ptest = "coreutils perl-module-filehandle perl-module-getopt-std perl-module-posix" +RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle perl-module-getopt-std perl-module-posix" -BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file +BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb b/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb index ad40c9b72..44eee3964 100644 --- a/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb +++ b/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb @@ -2,7 +2,9 @@ require attr.inc # configure.ac was missing from the release tarball. This should be fixed in # future releases of attr, remove this when updating the recipe. -SRC_URI_append += "file://attr-Missing-configure.ac.patch" +SRC_URI_append += "file://attr-Missing-configure.ac.patch \ + file://dont-use-decl-macros.patch \ + " SRC_URI[md5sum] = "84f58dec00b60f2dc8fd1c9709291cc7" SRC_URI[sha256sum] = "25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859" diff --git a/yocto-poky/meta/recipes-support/attr/files/dont-use-decl-macros.patch b/yocto-poky/meta/recipes-support/attr/files/dont-use-decl-macros.patch new file mode 100644 index 000000000..9d4b8929e --- /dev/null +++ b/yocto-poky/meta/recipes-support/attr/files/dont-use-decl-macros.patch @@ -0,0 +1,56 @@ +Use extern "C" instead of __BEGIN_DECL/__END_DECL macros +these macros are defined in sys/cdefs.h for glibc and this header is not available on all libc + +anyway they defined like below + +#ifdef __cplusplus +# define __BEGIN_DECLS extern "C" { +# define __END_DECLS } +#else +# define __BEGIN_DECLS /* empty */ +# define __END_DECLS /* empty */ +#endif + +__THROW macro is also not available on musl, defined thusly + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: attr-2.4.47/include/xattr.h +=================================================================== +--- attr-2.4.47.orig/include/xattr.h 2014-04-02 00:01:30.252091280 -0700 ++++ attr-2.4.47/include/xattr.h 2014-04-02 00:12:57.985428099 -0700 +@@ -30,8 +30,20 @@ + #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ + #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ + +- +-__BEGIN_DECLS ++#ifndef __THROW ++# ifndef __GNUC_PREREQ ++# define __GNUC_PREREQ(maj, min) (0) ++# endif ++# if defined __cplusplus && __GNUC_PREREQ (2,8) ++# define __THROW throw () ++# else ++# define __THROW ++# endif ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif + + extern int setxattr (const char *__path, const char *__name, + const void *__value, size_t __size, int __flags) __THROW; +@@ -58,6 +70,8 @@ + extern int lremovexattr (const char *__path, const char *__name) __THROW; + extern int fremovexattr (int __filedes, const char *__name) __THROW; + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif /* __XATTR_H__ */ diff --git a/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.1.bb b/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.1.bb new file mode 100644 index 000000000..8b257d2d1 --- /dev/null +++ b/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.1.bb @@ -0,0 +1,42 @@ +SUMMARY = "Programmable Completion for Bash 4" +HOMEPAGE = "http://bash-completion.alioth.debian.org/" +BUGTRACKER = "https://alioth.debian.org/projects/bash-completion/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SECTION = "console/utils" + +SRC_URI="http://bash-completion.alioth.debian.org/files/${BPN}-${PV}.tar.bz2" + +SRC_URI[md5sum] = "4e2a9f11a4042a38ee79ddcd048e8b9e" +SRC_URI[sha256sum] = "2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f" +UPSTREAM_CHECK_REGEX = "bash-completion-(?P<pver>(?!2008).+)\.tar" + +PARALLEL_MAKE = "" + +inherit autotools + +do_install_append() { + # compatdir + install -d ${D}${sysconfdir}/bash_completion.d/ + echo '. ${datadir}/${BPN}/bash_completion' >${D}${sysconfdir}/bash_completion + + # Delete files already provided by util-linux + local i + for i in cal dmesg eject hexdump hwclock ionice look renice rtcwake su; do + rm ${D}${datadir}/${BPN}/completions/$i + done + + # Delete files for networkmanager + rm ${D}${datadir}/${BPN}/completions/nmcli +} + +RDEPENDS_${PN} = "bash" + +# Some recipes are providing ${PN}-bash-completion packages +PACKAGES =+ "${PN}-extra" +FILES_${PN}-extra = "${datadir}/${BPN}/completions/ \ + ${datadir}/${BPN}/helpers/" + +BBCLASSEXTEND = "nativesdk" diff --git a/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch b/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch new file mode 100644 index 000000000..8ef774f0f --- /dev/null +++ b/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch @@ -0,0 +1,29 @@ +configure.ac: add check for NO_GETCONTEXT definition + +Signed-off-by: Samuel Martin <s.martin49@gmail.com> +[yann.morin.1998@free.fr: add a comment, change variable name, use + AS_IF, remove debug traces, use AC_CHECK_FUNCS (as suggested by + Thomas)] +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> +Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +--- +Upstream-Status: Pending + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- bdwgc-7.2f.orig/configure.ac 2014-06-01 19:00:47.000000000 +0200 ++++ bdwgc-7.2f/configure.ac 2014-12-23 14:13:11.585716713 +0100 +@@ -365,6 +365,12 @@ + AC_MSG_RESULT($ac_cv_fno_strict_aliasing) + fi + ++# Check for getcontext (uClibc can be configured without it, for example) ++AC_CHECK_FUNCS([getcontext]) ++AS_IF([test "$ac_cv_func_getcontext" = "no"], ++ [CFLAGS="$CFLAGS -DNO_GETCONTEXT" ++ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT"]) ++ + case "$host" in + # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 + # and unnecessary everywhere. diff --git a/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch b/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch new file mode 100644 index 000000000..c73c5400c --- /dev/null +++ b/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch @@ -0,0 +1,71 @@ +From 2571df0e30b4976d7a12dbc6fbec4f1c4027924d Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Thu, 28 Jan 2016 04:13:13 +0100 +Subject: [PATCH] Altera NIOS2 support + +Add simple nios2 configuration support. + +* include/private/gcconfig.h (NIOS2): New macro. +* include/private/gcconfig.h (mach_type_known, CPP_WORDSZ, MACH_TYPE, +OS_TYPE, DYNAMIC_LOADING, _end, __data_start, DATASTART, DATAEND, +ALIGNMENT, HBLKSIZE, HBLKSIZE, LINUX_STACKBOTTOM, NO_GETCONTEXT): +Define for NIOS2. + +Signed-off-by: Marek Vasut <marex@denx.de> +Upstream-Status: Backport [ https://github.com/ivmai/bdwgc.git 2571df0e30b4976d7a12dbc6fbec4f1c4027924d ] +--- + include/private/gcconfig.h | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h +index c467c26..92d4727 100644 +--- a/include/private/gcconfig.h ++++ b/include/private/gcconfig.h +@@ -181,6 +181,10 @@ + # endif + # define mach_type_known + # endif ++# if defined(__NIOS2__) || defined(__NIOS2) || defined(__nios2__) ++# define NIOS2 /* Altera NIOS2 */ ++# define mach_type_known ++# endif + # if defined(DGUX) && (defined(i386) || defined(__i386__)) + # define I386 + # ifndef _USING_DGUX +@@ -1658,6 +1662,24 @@ + # endif + # endif + ++# ifdef NIOS2 ++# define CPP_WORDSZ 32 ++# define MACH_TYPE "NIOS2" ++# ifdef LINUX ++# define OS_TYPE "LINUX" ++# define DYNAMIC_LOADING ++ extern int _end[]; ++ extern int __data_start[]; ++# define DATASTART ((ptr_t)(__data_start)) ++# define DATAEND ((ptr_t)(_end)) ++# define ALIGNMENT 4 ++# ifndef HBLKSIZE ++# define HBLKSIZE 4096 ++# endif ++# define LINUX_STACKBOTTOM ++# endif /* Linux */ ++# endif ++ + # ifdef HP_PA + # define MACH_TYPE "HP_PA" + # ifdef __LP64__ +@@ -2622,6 +2644,7 @@ + #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \ + || defined(OPENBSD) || defined(ARM32) \ +- || defined(MIPS) || defined(AVR32))) \ ++ || defined(MIPS) || defined(AVR32) \ ++ || defined(NIOS2))) \ + || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \ + || ((defined(RTEMS) || defined(PLATFORM_ANDROID)) && defined(I386))) \ + && !defined(NO_GETCONTEXT) +-- +2.7.0 + diff --git a/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb b/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb index 95e358f8e..8d4dab399 100644 --- a/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb +++ b/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb @@ -21,16 +21,16 @@ SECTION = "devel" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://README.QUICK;md5=55f5088f90a982fed7af9a4897047ef7" -SRC_URI = "http://www.hboehm.info/gc/gc_source/gc-${PV}.tar.gz \ +SRCREV = "e31cdc288ffbee5bf25f948e19deb5a7ce846971" +SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-7_4 \ file://0001-fix-build-with-musl.patch \ + file://0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch \ + file://0002-Altera-NIOS2-support.patch \ " -SRC_URI[md5sum] = "12c05fd2811d989341d8c6d81f66af87" -SRC_URI[sha256sum] = "63320ad7c45460e4a40e03f5aa4c6893783f21a16416c3282b994f933312afa2" -FILES_${PN}-doc = "/usr/share" +FILES_${PN}-doc = "${datadir}" -REAL_PV = "${@[d.getVar('PV',1)[:-1], d.getVar('PV',1)][(d.getVar('PV',1)[-1]).isdigit()]}" -S = "${WORKDIR}/gc-${REAL_PV}" +S = "${WORKDIR}/git" ARM_INSTRUCTION_SET = "arm" diff --git a/yocto-poky/meta/recipes-support/boost/bjam-native_1.58.0.bb b/yocto-poky/meta/recipes-support/boost/bjam-native_1.60.0.bb index 32646d707..32646d707 100644 --- a/yocto-poky/meta/recipes-support/boost/bjam-native_1.58.0.bb +++ b/yocto-poky/meta/recipes-support/boost/bjam-native_1.60.0.bb diff --git a/yocto-poky/meta/recipes-support/boost/boost-1.58.0.inc b/yocto-poky/meta/recipes-support/boost/boost-1.60.0.inc index b47d09133..a38693e25 100644 --- a/yocto-poky/meta/recipes-support/boost/boost-1.58.0.inc +++ b/yocto-poky/meta/recipes-support/boost/boost-1.60.0.inc @@ -11,12 +11,9 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}" BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" -SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ - file://0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch \ - file://0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch \ -" +SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "b8839650e61e9c1c0a89f371dd475546" -SRC_URI[sha256sum] = "fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5" +SRC_URI[md5sum] = "65a840e1a0b13a558ff19eeb2c4f0cbe" +SRC_URI[sha256sum] = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b" S = "${WORKDIR}/${BOOST_P}" diff --git a/yocto-poky/meta/recipes-support/boost/boost.inc b/yocto-poky/meta/recipes-support/boost/boost.inc index 3288e845f..982446c06 100644 --- a/yocto-poky/meta/recipes-support/boost/boost.inc +++ b/yocto-poky/meta/recipes-support/boost/boost.inc @@ -2,7 +2,8 @@ SUMMARY = "Free peer-reviewed portable C++ source libraries" SECTION = "libs" DEPENDS = "bjam-native zlib bzip2" -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" BOOST_LIBS = "\ atomic \ @@ -18,6 +19,7 @@ BOOST_LIBS = "\ serialization \ signals \ system \ + timer \ test \ thread \ " @@ -59,6 +61,7 @@ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev ${PN}-staticdev" +FILES_${PN} = "" FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so" FILES_${PN}-staticdev = "${libdir}/libboost_*.a" @@ -112,9 +115,9 @@ BJAM_TOOLS = "--ignore-site-config \ '--layout=system' \ " -# use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater paralelism causes bjam to segfault or to ignore -j +# 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(bb, d): +def get_boost_parallel_make(d): pm = d.getVar('PARALLEL_MAKE', True) if pm: # look for '-j' and throw other options (e.g. '-l') away @@ -136,11 +139,11 @@ def get_boost_parallel_make(bb, d): return "" -BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}" -BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ +BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(d)}" +BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ ${BJAM_TOOLS} \ -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/example/user-config.jam \ - --builddir=${S}/${TARGET_SYS} \ + --build-dir=${S}/${TARGET_SYS} \ --disable-icu \ ${BJAM_EXTRA}' @@ -155,7 +158,7 @@ do_boostconfig() { sed -i "/^using python : ${PYTHON_BASEVERSION}"/d ${S}/tools/build/example/user-config.jam echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/example/user-config.jam - echo "using python : 3.4 : : ${STAGING_INCDIR}/python3.4m ;" >> ${S}/tools/build/example/user-config.jam + echo "using python : 3.5 : : ${STAGING_INCDIR}/python3.5m ;" >> ${S}/tools/build/example/user-config.jam CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT} sed -i '/^using python/d' project-config.jam diff --git a/yocto-poky/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch b/yocto-poky/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch new file mode 100644 index 000000000..df7e71fea --- /dev/null +++ b/yocto-poky/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch @@ -0,0 +1,45 @@ +From f50e7bc9fed323c5705c0ed992c03e80eeec1dd6 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely <jwakely@redhat.com> +Date: Mon, 14 Sep 2015 15:05:24 +0100 +Subject: [PATCH] Do not qualify <fenv.h> names that might be macros. + +The patch was imported from the boost-test git repository +(https://github.com/boostorg/test) as of commit id +f50e7bc9fed323c5705c0ed992c03e80eeec1dd6. + +Upstream-Status: Accepted [commit f50e7bc9fed in develop branch] + +Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> +--- + include/boost/test/impl/execution_monitor.ipp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp +index b3e873e..a7bdce2 100644 +--- a/include/boost/test/impl/execution_monitor.ipp ++++ b/include/boost/test/impl/execution_monitor.ipp +@@ -1380,8 +1380,8 @@ enable( unsigned mask ) + + return ~old_cw & BOOST_FPE_ALL; + #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) +- ::feclearexcept(BOOST_FPE_ALL); +- int res = ::feenableexcept( mask ); ++ feclearexcept(BOOST_FPE_ALL); ++ int res = feenableexcept( mask ); + return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; + #else + /* Not Implemented */ +@@ -1417,8 +1417,8 @@ disable( unsigned mask ) + + return ~old_cw & BOOST_FPE_ALL; + #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) +- ::feclearexcept(BOOST_FPE_ALL); +- int res = ::fedisableexcept( mask ); ++ feclearexcept(BOOST_FPE_ALL); ++ int res = fedisableexcept( mask ); + return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; + #else + /* Not Implemented */ +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-support/boost/boost/consider-hardfp.patch b/yocto-poky/meta/recipes-support/boost/boost/consider-hardfp.patch new file mode 100644 index 000000000..66808a69d --- /dev/null +++ b/yocto-poky/meta/recipes-support/boost/boost/consider-hardfp.patch @@ -0,0 +1,19 @@ +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/yocto-poky/meta/recipes-support/boost/boost_1.58.0.bb b/yocto-poky/meta/recipes-support/boost/boost_1.58.0.bb deleted file mode 100644 index c09d5f431..000000000 --- a/yocto-poky/meta/recipes-support/boost/boost_1.58.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -include boost-${PV}.inc -include boost.inc - -SRC_URI += "\ - file://arm-intrinsics.patch \ -" diff --git a/yocto-poky/meta/recipes-support/boost/boost_1.60.0.bb b/yocto-poky/meta/recipes-support/boost/boost_1.60.0.bb new file mode 100644 index 000000000..4d824c85b --- /dev/null +++ b/yocto-poky/meta/recipes-support/boost/boost_1.60.0.bb @@ -0,0 +1,8 @@ +include boost-${PV}.inc +include boost.inc + +SRC_URI += "\ + file://arm-intrinsics.patch \ + file://0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch;striplevel=2 \ + file://consider-hardfp.patch \ +" diff --git a/yocto-poky/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch b/yocto-poky/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch deleted file mode 100644 index 329b4c361..000000000 --- a/yocto-poky/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 817aed0d755bf8c0ba4ef6a77d41538e50b571fd Mon Sep 17 00:00:00 2001 -From: claymore <carlosmf.pt@gmail.com> -Date: Fri, 24 Apr 2015 02:28:47 +0100 -Subject: [PATCH 1/2] mips1 fix added gcc.jam was passing the options -m32 and - -m64 to mips cross-compilers, when those do not use - such options This modification solves it by adding mips - as an exception - -Signed-off-by: Carlos M. Ferreira carlosmf.pt@gmail.com - -Upstream-Status: Backport -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - ---- - tools/build/src/tools/gcc.jam | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index db04534..eff95ae 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -451,7 +451,7 @@ rule setup-address-model ( targets * : sources * : properties * ) - else - { - local arch = [ feature.get-values architecture : $(properties) ] ; -- if $(arch) != arm -+ if $(arch) != arm && $(arch) != mips1 - { - if $(model) = 32 - { --- -1.7.9.5 - diff --git a/yocto-poky/meta/recipes-support/boost/files/0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch b/yocto-poky/meta/recipes-support/boost/files/0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch deleted file mode 100644 index ecf7e550f..000000000 --- a/yocto-poky/meta/recipes-support/boost/files/0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f825634a56b119dfa9d712119a66279cc7635978 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> -Date: Sat, 2 May 2015 14:24:02 +0200 -Subject: [PATCH 2/2] Don't pass -m32/-m64 where it's not supported. - -Only PowerPC, SPARC, and x86 do support the -m32 and -m64 compiler options [1]. - -Rather then excluding all architectures not supporting these options as it is -done in commit c0634341d9ee2c02d3a55c91dafb988afc066c49 [2], include all -architectures that do support them. - -This will fix building Boost for the SuperH architecture with Buildroot [3]. - -[1] https://gcc.gnu.org/onlinedocs/gcc/Option-Summary.html -[2] https://github.com/boostorg/build/commit/c0634341d9ee2c02d3a55c91dafb988afc066c49 -[3] http://autobuild.buildroot.net/results/ccd/ccd5c83963032ba49b1627b1dff39e34a9486943/build-end.log - -Upstream-Status: Backport -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - ---- - tools/build/src/tools/gcc.jam | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index eff95ae..2f6af93 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -451,7 +451,7 @@ rule setup-address-model ( targets * : sources * : properties * ) - else - { - local arch = [ feature.get-values architecture : $(properties) ] ; -- if $(arch) != arm && $(arch) != mips1 -+ if $(arch) = power || $(arch) = sparc || $(arch) = x86 - { - if $(model) = 32 - { --- -1.7.9.5 - diff --git a/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch new file mode 100644 index 000000000..6e2171f75 --- /dev/null +++ b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch @@ -0,0 +1,34 @@ +From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001 +From: Patrick Ohly <patrick.ohly@intel.com> +Date: Thu, 17 Mar 2016 12:38:09 +0100 +Subject: [PATCH] update-ca-certificates: support Toybox + +"mktemp -t" is deprecated and does not work when using Toybox. Replace +with something that works also with Toybox. + +Upstream-Status: Pending + +Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> +--- + sbin/update-ca-certificates | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates +index 79c41bb..ae9e3f1 100755 +--- a/sbin/update-ca-certificates ++++ b/sbin/update-ca-certificates +@@ -113,9 +113,9 @@ trap cleanup 0 + + # Helper files. (Some of them are not simple arrays because we spawn + # subshells later on.) +-TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")" +-ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" +-REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" ++TEMPBUNDLE="$(mktemp -p${TMPDIR:-/tmp} "${CERTBUNDLE}.tmp.XXXXXX")" ++ADDED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")" ++REMOVED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")" + + # Adds a certificate to the list of trusted ones. This includes a symlink + # in /etc/ssl/certs to the certificate file and its inclusion into the +-- +2.1.4 diff --git a/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb index 716e3dfca..e0f193913 100644 --- a/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb +++ b/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb @@ -5,19 +5,19 @@ This derived from Debian's CA Certificates." HOMEPAGE = "http://packages.debian.org/sid/ca-certificates" SECTION = "misc" LICENSE = "GPL-2.0+ & MPL-2.0" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=48d2baf97986999e776b43c8dd9e0c5a" +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_class-native = "" -# tag: debian/20150426 + 2 -SRCREV = "d4790d2832aaac9152f450e06661511067592227" +SRCREV = "f54715702c5c0581c9461f78fd84e2c8d2ec243c" SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ file://0001-update-ca-certificates-remove-c-rehash.patch \ file://0002-update-ca-certificates-use-SYSROOT.patch \ file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ + file://update-ca-certificates-support-Toybox.patch \ file://default-sysroot.patch \ file://sbindir.patch" diff --git a/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb index 66a892a7d..2974e3664 100644 --- a/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb @@ -33,7 +33,6 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/ FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \ ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" -FILES_${PN}-dbg += "${base_libdir}/security/.debug" PACKAGES =+ "pam-plugin-ck-connector" FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so" diff --git a/yocto-poky/meta/recipes-support/createrepo/createrepo/fixstat.patch b/yocto-poky/meta/recipes-support/createrepo/createrepo/fixstat.patch new file mode 100644 index 000000000..d34eb56a8 --- /dev/null +++ b/yocto-poky/meta/recipes-support/createrepo/createrepo/fixstat.patch @@ -0,0 +1,19 @@ +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/yocto-poky/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/yocto-poky/meta/recipes-support/createrepo/createrepo_0.4.11.bb index 5f9ecf65f..2a3231b3a 100644 --- a/yocto-poky/meta/recipes-support/createrepo/createrepo_0.4.11.bb +++ b/yocto-poky/meta/recipes-support/createrepo/createrepo_0.4.11.bb @@ -19,6 +19,7 @@ SRC_URI = "http://createrepo.baseurl.org/download/${BP}.tar.gz \ file://createrepo-dbpath.patch \ file://dumpMetadata-disable-signature-validation.patch \ file://rpm-createsolvedb.py \ + file://fixstat.patch \ " SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2" diff --git a/yocto-poky/meta/recipes-support/curl/curl/CVE-2016-0754.patch b/yocto-poky/meta/recipes-support/curl/curl/CVE-2016-0754.patch deleted file mode 100644 index f0402de08..000000000 --- a/yocto-poky/meta/recipes-support/curl/curl/CVE-2016-0754.patch +++ /dev/null @@ -1,417 +0,0 @@ -From b1bb4ca6d8777683b6a549fb61dba36759da26f4 Mon Sep 17 00:00:00 2001 -From: Ray Satiro <raysatiro@yahoo.com> -Date: Tue, 26 Jan 2016 23:23:15 +0100 -Subject: [PATCH] curl: avoid local drive traversal when saving file (Windows) - -curl does not sanitize colons in a remote file name that is used as the -local file name. This may lead to a vulnerability on systems where the -colon is a special path character. Currently Windows/DOS is the only OS -where this vulnerability applies. - -CVE-2016-0754 - -Bug: http://curl.haxx.se/docs/adv_20160127B.html - -Upstream-Status: Backport -http://curl.haxx.se/CVE-2016-0754.patch - -CVE: CVE-2016-0754 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - src/tool_cb_hdr.c | 40 ++++++------ - src/tool_doswin.c | 174 ++++++++++++++++++++++++++++++++++++++++++++--------- - src/tool_doswin.h | 2 +- - src/tool_operate.c | 29 ++++++--- - 4 files changed, 187 insertions(+), 58 deletions(-) - -diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c -index fd208e8..0fca39f 100644 ---- a/src/tool_cb_hdr.c -+++ b/src/tool_cb_hdr.c -@@ -26,10 +26,11 @@ - #define ENABLE_CURLX_PRINTF - /* use our own printf() functions */ - #include "curlx.h" - - #include "tool_cfgable.h" -+#include "tool_doswin.h" - #include "tool_msgs.h" - #include "tool_cb_hdr.h" - - #include "memdebug.h" /* keep this as LAST include */ - -@@ -112,22 +113,28 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata) - /* this expression below typecasts 'cb' only to avoid - warning: signed and unsigned type in conditional expression - */ - len = (ssize_t)cb - (p - str); - filename = parse_filename(p, len); -- if(filename) { -- outs->filename = filename; -- outs->alloc_filename = TRUE; -- outs->is_cd_filename = TRUE; -- outs->s_isreg = TRUE; -- outs->fopened = FALSE; -- outs->stream = NULL; -- hdrcbdata->honor_cd_filename = FALSE; -- break; -- } -- else -+ if(!filename) -+ return failure; -+ -+#if defined(MSDOS) || defined(WIN32) -+ if(sanitize_file_name(&filename)) { -+ free(filename); - return failure; -+ } -+#endif /* MSDOS || WIN32 */ -+ -+ outs->filename = filename; -+ outs->alloc_filename = TRUE; -+ outs->is_cd_filename = TRUE; -+ outs->s_isreg = TRUE; -+ outs->fopened = FALSE; -+ outs->stream = NULL; -+ hdrcbdata->honor_cd_filename = FALSE; -+ break; - } - } - - return cb; - } -@@ -179,19 +186,16 @@ static char *parse_filename(const char *ptr, size_t len) - return NULL; - } - } - - /* scan for the end letter and stop there */ -- q = p; -- while(*q) { -- if(q[1] && (q[0] == '\\')) -- q++; -- else if(q[0] == stop) -+ for(q = p; *q; ++q) { -+ if(*q == stop) { -+ *q = '\0'; - break; -- q++; -+ } - } -- *q = '\0'; - - /* make sure the file name doesn't end in \r or \n */ - q = strchr(p, '\r'); - if(q) - *q = '\0'; -diff --git a/src/tool_doswin.c b/src/tool_doswin.c -index dd6e8bb..9c6a7a3 100644 ---- a/src/tool_doswin.c -+++ b/src/tool_doswin.c -@@ -83,46 +83,110 @@ __pragma(warning(pop)) - # define _use_lfn(f) ALWAYS_FALSE /* long file names never available */ - #elif defined(__DJGPP__) - # include <fcntl.h> /* _use_lfn(f) prototype */ - #endif - --static const char *msdosify (const char *file_name); --static char *rename_if_dos_device_name (char *file_name); -+static char *msdosify(const char *file_name); -+static char *rename_if_dos_device_name(const char *file_name); - --/* -- * sanitize_dos_name: returns a newly allocated string holding a -- * valid file name which will be a transformation of given argument -- * in case this wasn't already a valid file name. -- * -- * This function takes ownership of given argument, free'ing it before -- * returning. Caller is responsible of free'ing returned string. Upon -- * out of memory condition function returns NULL. -- */ - --char *sanitize_dos_name(char *file_name) -+/* -+Sanitize *file_name. -+Success: (CURLE_OK) *file_name points to a sanitized version of the original. -+ This function takes ownership of the original *file_name and frees it. -+Failure: (!= CURLE_OK) *file_name is unchanged. -+*/ -+CURLcode sanitize_file_name(char **file_name) - { -- char new_name[PATH_MAX]; -+ size_t len; -+ char *p, *sanitized; -+ -+ /* Calculate the maximum length of a filename. -+ FILENAME_MAX is often the same as PATH_MAX, in other words it does not -+ discount the path information. PATH_MAX size is calculated based on: -+ <drive-letter><colon><path-sep><max-filename-len><NULL> */ -+ const size_t max_filename_len = PATH_MAX - 3 - 1; -+ -+ if(!file_name || !*file_name) -+ return CURLE_BAD_FUNCTION_ARGUMENT; -+ -+ len = strlen(*file_name); -+ -+ if(len >= max_filename_len) -+ len = max_filename_len - 1; - -- if(!file_name) -- return NULL; -+ sanitized = malloc(len + 1); - -- if(strlen(file_name) >= PATH_MAX) -- file_name[PATH_MAX-1] = '\0'; /* truncate it */ -+ if(!sanitized) -+ return CURLE_OUT_OF_MEMORY; - -- strcpy(new_name, msdosify(file_name)); -+ strncpy(sanitized, *file_name, len); -+ sanitized[len] = '\0'; - -- Curl_safefree(file_name); -+ for(p = sanitized; *p; ++p ) { -+ const char *banned; -+ if(1 <= *p && *p <= 31) { -+ *p = '_'; -+ continue; -+ } -+ for(banned = "|<>/\\\":?*"; *banned; ++banned) { -+ if(*p == *banned) { -+ *p = '_'; -+ break; -+ } -+ } -+ } - -- return strdup(rename_if_dos_device_name(new_name)); -+#ifdef MSDOS -+ /* msdosify checks for more banned characters for MSDOS, however it allows -+ for some path information to pass through. since we are sanitizing only a -+ filename and cannot allow a path it's important this call be done in -+ addition to and not instead of the banned character check above. */ -+ p = msdosify(sanitized); -+ if(!p) { -+ free(sanitized); -+ return CURLE_BAD_FUNCTION_ARGUMENT; -+ } -+ sanitized = p; -+ len = strlen(sanitized); -+#endif -+ -+ p = rename_if_dos_device_name(sanitized); -+ if(!p) { -+ free(sanitized); -+ return CURLE_BAD_FUNCTION_ARGUMENT; -+ } -+ sanitized = p; -+ len = strlen(sanitized); -+ -+ /* dos_device_name rename will rename a device name, possibly changing the -+ length. If the length is too long now we can't truncate it because we -+ could end up with a device name. In practice this shouldn't be a problem -+ because device names are short, but you never know. */ -+ if(len >= max_filename_len) { -+ free(sanitized); -+ return CURLE_BAD_FUNCTION_ARGUMENT; -+ } -+ -+ *file_name = sanitized; -+ return CURLE_OK; - } - --/* The following functions are taken with modification from the DJGPP -- * port of tar 1.12. They use algorithms originally from DJTAR. */ -+/* The functions msdosify, rename_if_dos_device_name and __crt0_glob_function -+ * were taken with modification from the DJGPP port of tar 1.12. They use -+ * algorithms originally from DJTAR. -+ */ - --static const char *msdosify (const char *file_name) -+/* -+Extra sanitization MSDOS for file_name. -+Returns a copy of file_name that is sanitized by MSDOS standards. -+Warning: path information may pass through. For sanitizing a filename use -+sanitize_file_name which calls this function after sanitizing path info. -+*/ -+static char *msdosify(const char *file_name) - { -- static char dos_name[PATH_MAX]; -+ char dos_name[PATH_MAX]; - static const char illegal_chars_dos[] = ".+, ;=[]" /* illegal in DOS */ - "|<>\\\":?*"; /* illegal in DOS & W95 */ - static const char *illegal_chars_w95 = &illegal_chars_dos[8]; - int idx, dot_idx; - const char *s = file_name; -@@ -199,39 +263,89 @@ static const char *msdosify (const char *file_name) - else - idx++; - } - - *d = '\0'; -- return dos_name; -+ return strdup(dos_name); - } - --static char *rename_if_dos_device_name (char *file_name) -+/* -+Rename file_name if it's a representation of a device name. -+Returns a copy of file_name, and the copy will have contents different from the -+original if a device name was found. -+*/ -+static char *rename_if_dos_device_name(const char *file_name) - { - /* We could have a file whose name is a device on MS-DOS. Trying to - * retrieve such a file would fail at best and wedge us at worst. We need - * to rename such files. */ -- char *base; -+ char *p, *base; - struct_stat st_buf; - char fname[PATH_MAX]; - - strncpy(fname, file_name, PATH_MAX-1); - fname[PATH_MAX-1] = '\0'; - base = basename(fname); - if(((stat(base, &st_buf)) == 0) && (S_ISCHR(st_buf.st_mode))) { - size_t blen = strlen(base); - -- if(strlen(fname) >= PATH_MAX-1) { -+ if(strlen(fname) == PATH_MAX-1) { - /* Make room for the '_' */ - blen--; - base[blen] = '\0'; - } - /* Prepend a '_'. */ - memmove(base + 1, base, blen + 1); - base[0] = '_'; -- strcpy(file_name, fname); - } -- return file_name; -+ -+ /* The above stat check does not identify devices for me in Windows 7. For -+ example a stat on COM1 returns a regular file S_IFREG. According to MSDN -+ stat doc that is the correct behavior, so I assume the above code is -+ legacy, maybe MSDOS or DJGPP specific? */ -+ -+ /* Rename devices. -+ Examples: CON => _CON, CON.EXT => CON_EXT, CON:ADS => CON_ADS */ -+ for(p = fname; p; p = (p == fname && fname != base ? base : NULL)) { -+ size_t p_len; -+ int x = (curl_strnequal(p, "CON", 3) || -+ curl_strnequal(p, "PRN", 3) || -+ curl_strnequal(p, "AUX", 3) || -+ curl_strnequal(p, "NUL", 3)) ? 3 : -+ (curl_strnequal(p, "CLOCK$", 6)) ? 6 : -+ (curl_strnequal(p, "COM", 3) || curl_strnequal(p, "LPT", 3)) ? -+ (('1' <= p[3] && p[3] <= '9') ? 4 : 3) : 0; -+ -+ if(!x) -+ continue; -+ -+ /* the devices may be accessible with an extension or ADS, for -+ example CON.AIR and CON:AIR both access console */ -+ if(p[x] == '.' || p[x] == ':') { -+ p[x] = '_'; -+ continue; -+ } -+ else if(p[x]) /* no match */ -+ continue; -+ -+ p_len = strlen(p); -+ -+ if(strlen(fname) == PATH_MAX-1) { -+ /* Make room for the '_' */ -+ p_len--; -+ p[p_len] = '\0'; -+ } -+ /* Prepend a '_'. */ -+ memmove(p + 1, p, p_len + 1); -+ p[0] = '_'; -+ -+ /* if fname was just modified then the basename pointer must be updated */ -+ if(p == fname) -+ base = basename(fname); -+ } -+ -+ return strdup(fname); - } - - #if defined(MSDOS) && (defined(__DJGPP__) || defined(__GO32__)) - - /* -diff --git a/src/tool_doswin.h b/src/tool_doswin.h -index cd216db..fc83f16 100644 ---- a/src/tool_doswin.h -+++ b/src/tool_doswin.h -@@ -23,11 +23,11 @@ - ***************************************************************************/ - #include "tool_setup.h" - - #if defined(MSDOS) || defined(WIN32) - --char *sanitize_dos_name(char *file_name); -+CURLcode sanitize_file_name(char **filename); - - #if defined(MSDOS) && (defined(__DJGPP__) || defined(__GO32__)) - - char **__crt0_glob_function(char *arg); - -diff --git a/src/tool_operate.c b/src/tool_operate.c -index 30d60cb..272ebd4 100644 ---- a/src/tool_operate.c -+++ b/src/tool_operate.c -@@ -541,30 +541,41 @@ static CURLcode operate_do(struct GlobalConfig *global, - if(!outfile) { - /* extract the file name from the URL */ - result = get_url_file_name(&outfile, this_url); - if(result) - goto show_error; -+ -+#if defined(MSDOS) || defined(WIN32) -+ result = sanitize_file_name(&outfile); -+ if(result) { -+ Curl_safefree(outfile); -+ goto show_error; -+ } -+#endif /* MSDOS || WIN32 */ -+ - if(!*outfile && !config->content_disposition) { - helpf(global->errors, "Remote file name has no length!\n"); - result = CURLE_WRITE_ERROR; - goto quit_urls; - } --#if defined(MSDOS) || defined(WIN32) -- /* For DOS and WIN32, we do some major replacing of -- bad characters in the file name before using it */ -- outfile = sanitize_dos_name(outfile); -- if(!outfile) { -- result = CURLE_OUT_OF_MEMORY; -- goto show_error; -- } --#endif /* MSDOS || WIN32 */ - } - else if(urls) { - /* fill '#1' ... '#9' terms from URL pattern */ - char *storefile = outfile; - result = glob_match_url(&outfile, storefile, urls); - Curl_safefree(storefile); -+ -+#if defined(MSDOS) || defined(WIN32) -+ if(!result) { -+ result = sanitize_file_name(&outfile); -+ if(result) { -+ Curl_safefree(outfile); -+ goto show_error; -+ } -+ } -+#endif /* MSDOS || WIN32 */ -+ - if(result) { - /* bad globbing */ - warnf(config->global, "bad output glob!\n"); - goto quit_urls; - } --- -2.7.0 - diff --git a/yocto-poky/meta/recipes-support/curl/curl/CVE-2016-0755.patch b/yocto-poky/meta/recipes-support/curl/curl/CVE-2016-0755.patch deleted file mode 100644 index 44b9d9a3f..000000000 --- a/yocto-poky/meta/recipes-support/curl/curl/CVE-2016-0755.patch +++ /dev/null @@ -1,138 +0,0 @@ -From d41dcba4e9b69d6b761e3460cc6ae7e8fd8f621f Mon Sep 17 00:00:00 2001 -From: Isaac Boukris <iboukris@gmail.com> -Date: Wed, 13 Jan 2016 11:05:51 +0200 -Subject: [PATCH] NTLM: Fix ConnectionExists to compare Proxy credentials - -Proxy NTLM authentication should compare credentials when -re-using a connection similar to host authentication, as it -authenticate the connection. - -Example: -curl -v -x http://proxy:port http://host/ -U good_user:good_pwd - --proxy-ntlm --next -x http://proxy:port http://host/ - [-U fake_user:fake_pwd --proxy-ntlm] - -CVE-2016-0755 - -Bug: http://curl.haxx.se/docs/adv_20160127A.html - -Upstream-Status: Backport -http://curl.haxx.se/CVE-2016-0755.patch - -CVE: CVE-2016-0755 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - lib/url.c | 62 ++++++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 40 insertions(+), 22 deletions(-) - -Index: curl-7.44.0/lib/url.c -=================================================================== ---- curl-7.44.0.orig/lib/url.c -+++ curl-7.44.0/lib/url.c -@@ -3107,12 +3107,17 @@ ConnectionExists(struct SessionHandle *d - struct connectdata *check; - struct connectdata *chosen = 0; - bool canPipeline = IsPipeliningPossible(data, needle); -+ struct connectbundle *bundle; -+ - #ifdef USE_NTLM -- bool wantNTLMhttp = ((data->state.authhost.want & CURLAUTH_NTLM) || -- (data->state.authhost.want & CURLAUTH_NTLM_WB)) && -- (needle->handler->protocol & PROTO_FAMILY_HTTP) ? TRUE : FALSE; -+ bool wantNTLMhttp = ((data->state.authhost.want & -+ (CURLAUTH_NTLM | CURLAUTH_NTLM_WB)) && -+ (needle->handler->protocol & PROTO_FAMILY_HTTP)); -+ bool wantProxyNTLMhttp = (needle->bits.proxy_user_passwd && -+ ((data->state.authproxy.want & -+ (CURLAUTH_NTLM | CURLAUTH_NTLM_WB)) && -+ (needle->handler->protocol & PROTO_FAMILY_HTTP))); - #endif -- struct connectbundle *bundle; - - *force_reuse = FALSE; - *waitpipe = FALSE; -@@ -3152,9 +3157,6 @@ ConnectionExists(struct SessionHandle *d - curr = bundle->conn_list->head; - while(curr) { - bool match = FALSE; --#if defined(USE_NTLM) -- bool credentialsMatch = FALSE; --#endif - size_t pipeLen; - - /* -@@ -3262,21 +3264,14 @@ ConnectionExists(struct SessionHandle *d - continue; - } - -- if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) --#ifdef USE_NTLM -- || (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE) --#endif -- ) { -- /* This protocol requires credentials per connection or is HTTP+NTLM, -+ if(!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) { -+ /* This protocol requires credentials per connection, - so verify that we're using the same name and password as well */ - if(!strequal(needle->user, check->user) || - !strequal(needle->passwd, check->passwd)) { - /* one of them was different */ - continue; - } --#if defined(USE_NTLM) -- credentialsMatch = TRUE; --#endif - } - - if(!needle->bits.httpproxy || needle->handler->flags&PROTOPT_SSL || -@@ -3335,20 +3330,43 @@ ConnectionExists(struct SessionHandle *d - possible. (Especially we must not reuse the same connection if - partway through a handshake!) */ - if(wantNTLMhttp) { -- if(credentialsMatch && check->ntlm.state != NTLMSTATE_NONE) { -- chosen = check; -+ if(!strequal(needle->user, check->user) || -+ !strequal(needle->passwd, check->passwd)) -+ continue; -+ } -+ else if(check->ntlm.state != NTLMSTATE_NONE) { -+ /* Connection is using NTLM auth but we don't want NTLM */ -+ continue; -+ } -+ -+ /* Same for Proxy NTLM authentication */ -+ if(wantProxyNTLMhttp) { -+ if(!strequal(needle->proxyuser, check->proxyuser) || -+ !strequal(needle->proxypasswd, check->proxypasswd)) -+ continue; -+ } -+ else if(check->proxyntlm.state != NTLMSTATE_NONE) { -+ /* Proxy connection is using NTLM auth but we don't want NTLM */ -+ continue; -+ } - -+ if(wantNTLMhttp || wantProxyNTLMhttp) { -+ /* Credentials are already checked, we can use this connection */ -+ chosen = check; -+ -+ if((wantNTLMhttp && -+ (check->ntlm.state != NTLMSTATE_NONE)) || -+ (wantProxyNTLMhttp && -+ (check->proxyntlm.state != NTLMSTATE_NONE))) { - /* We must use this connection, no other */ - *force_reuse = TRUE; - break; - } -- else if(credentialsMatch) -- /* this is a backup choice */ -- chosen = check; -+ -+ /* Continue look up for a better connection */ - continue; - } - #endif -- - if(canPipeline) { - /* We can pipeline if we want to. Let's continue looking for - the optimal connection to use, i.e the shortest pipe that is not diff --git a/yocto-poky/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/yocto-poky/meta/recipes-support/curl/curl/pkgconfig_fix.patch deleted file mode 100644 index 5d8769d52..000000000 --- a/yocto-poky/meta/recipes-support/curl/curl/pkgconfig_fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Inappropriate [packaging] - -diff -Nurd curl-7.29.0/configure.ac curl-7.29.0/configure.ac ---- curl-7.29.0/configure.ac 2013-02-06 11:47:19.000000000 +0200 -+++ curl-7.29.0/configure.ac 2013-02-16 12:32:22.132327764 +0200 -@@ -1883,6 +1883,7 @@ - AC_SUBST(USE_GNUTLS, [1]) - GNUTLS_ENABLED=1 - USE_GNUTLS="yes" -+ GNUTLS_REQUIRED="gnutls" - curl_ssl_msg="enabled (GnuTLS)" - ], - [ -@@ -1953,6 +1954,8 @@ - ]) - fi - -+AC_SUBST(GNUTLS_REQUIRED) -+ - dnl ---------------------------------------------------- - dnl check for PolarSSL - dnl ---------------------------------------------------- -diff -Nurd curl-7.29.0/libcurl.pc.in curl-7.29.0/libcurl.pc.in ---- curl-7.29.0/libcurl.pc.in 2012-12-12 00:32:22.000000000 +0200 -+++ curl-7.29.0/libcurl.pc.in 2013-02-16 12:33:27.063844337 +0200 -@@ -35,5 +35,5 @@ - Description: Library to transfer files with ftp, http, etc. - Version: @CURLVERSION@ - Libs: -L${libdir} -lcurl --Libs.private: @LIBCURL_LIBS@ -+Libs.private: -ldl -lz - Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ diff --git a/yocto-poky/meta/recipes-support/curl/curl_7.44.0.bb b/yocto-poky/meta/recipes-support/curl/curl_7.44.0.bb deleted file mode 100644 index 419ed8365..000000000 --- a/yocto-poky/meta/recipes-support/curl/curl_7.44.0.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "Command line tool and library for client-side URL transfers" -HOMEPAGE = "http://curl.haxx.se/" -BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker" -SECTION = "console/network" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" - -SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ - file://pkgconfig_fix.patch \ - " - -# curl likes to set -g0 in CFLAGS, so we stop it -# from mucking around with debug options -# -SRC_URI += " file://configure_ac.patch \ - file://CVE-2016-0754.patch \ - file://CVE-2016-0755.patch" - -SRC_URI[md5sum] = "6b952ca00e5473b16a11f05f06aa8dae" -SRC_URI[sha256sum] = "1e2541bae6582bb697c0fbae49e1d3e6fad5d05d5aa80dbd6f072e0a44341814" - -inherit autotools pkgconfig binconfig multilib_header - -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls zlib" -PACKAGECONFIG_class-native = "ipv6 ssl zlib" -PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib" - -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl" -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" -PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" -PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" -PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," - -EXTRA_OECONF = "--without-libidn \ - --enable-crypto-auth \ - --disable-ldap \ - --disable-ldaps \ - --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ -" -# see https://lists.yoctoproject.org/pipermail/poky/2013-December/009435.html -# We should ideally drop ac_cv_sizeof_off_t from site files but until then -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)}" - -do_install_append() { - oe_multilib_header curl/curlbuild.h -} - -do_install_append_class-target() { - # cleanup buildpaths from curl-config - sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/curl-config -} - -PACKAGES =+ "lib${BPN}" - -FILES_lib${BPN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${BPN} += "ca-certificates" - -BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/curl/curl_7.47.1.bb b/yocto-poky/meta/recipes-support/curl/curl_7.47.1.bb new file mode 100644 index 000000000..c2173d8a0 --- /dev/null +++ b/yocto-poky/meta/recipes-support/curl/curl_7.47.1.bb @@ -0,0 +1,68 @@ +SUMMARY = "Command line tool and library for client-side URL transfers" +HOMEPAGE = "http://curl.haxx.se/" +BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker" +SECTION = "console/network" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e664ac" + +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[md5sum] = "9ea3123449439bbd960cd25cf98796fb" +SRC_URI[sha256sum] = "ddc643ab9382e24bbe4747d43df189a0a6ce38fcb33df041b9cb0b3cd47ae98f" + +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[dict] = "--enable-dict,--disable-dict," +PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" +PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," +PACKAGECONFIG[imap] = "--enable-imap,--disable-imap," +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap," +PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps," +PACKAGECONFIG[libidn] = "--with-libidn,--without-libidn,libidn" +PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" +PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," +PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy," +PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" +PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp," +PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," +PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp," +PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl" +PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," +PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," +PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" + +EXTRA_OECONF = " \ + --enable-crypto-auth \ + --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ + --without-libmetalink \ + --without-libpsl \ + --without-nghttp2 \ +" + +do_install_append() { + oe_multilib_header curl/curlbuild.h +} + +do_install_append_class-target() { + # cleanup buildpaths from curl-config + sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/curl-config +} + +PACKAGES =+ "lib${BPN}" + +FILES_lib${BPN} = "${libdir}/lib*.so.*" +RRECOMMENDS_lib${BPN} += "ca-certificates" + +FILES_${PN} += "${datadir}/zsh" + +BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch b/yocto-poky/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch new file mode 100644 index 000000000..d4c6bb8e0 --- /dev/null +++ b/yocto-poky/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch @@ -0,0 +1,32 @@ +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(-) + +diff --git a/dist/Makefile.in b/dist/Makefile.in +index 0a42375..d9e05b9 100644 +--- a/dist/Makefile.in ++++ b/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) +-- +1.7.9.5 + diff --git a/yocto-poky/meta/recipes-support/db/db_5.3.28.bb b/yocto-poky/meta/recipes-support/db/db_5.3.28.bb index e8b814e06..c724f049f 100644 --- a/yocto-poky/meta/recipes-support/db/db_5.3.28.bb +++ b/yocto-poky/meta/recipes-support/db/db_5.3.28.bb @@ -10,7 +10,7 @@ # same system at the same time if really necessary. SECTION = "libs" SUMMARY = "Berkeley Database v5" -HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html" +HOMEPAGE = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" LICENSE = "Sleepycat" VIRTUAL_NAME ?= "virtual/db" RCONFLICTS_${PN} = "db3" @@ -76,6 +76,7 @@ MUTEX = "" MUTEX_arm = "${ARM_MUTEX}" MUTEX_armeb = "${ARM_MUTEX}" EXTRA_OECONF += "${MUTEX}" +EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" # Cancel the site stuff - it's set for db3 and destroys the # configure. diff --git a/yocto-poky/meta/recipes-support/db/db_6.0.30.bb b/yocto-poky/meta/recipes-support/db/db_6.0.30.bb index d49df62b9..50a469b08 100644 --- a/yocto-poky/meta/recipes-support/db/db_6.0.30.bb +++ b/yocto-poky/meta/recipes-support/db/db_6.0.30.bb @@ -10,22 +10,27 @@ # same system at the same time if really necessary. SECTION = "libs" SUMMARY = "Berkeley Database v6" -HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html" +HOMEPAGE = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" LICENSE = "AGPL-3.0" VIRTUAL_NAME ?= "virtual/db" RCONFLICTS_${PN} = "db3" -RECIPE_NO_UPDATE_REASON = "Updating to 6.1.x requires also updating rpm to 5.4.15" +# 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://download.oracle.com/berkeley-db/db-${PV}.tar.gz" SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \ 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;patchdir=.. \ " SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b" SRC_URI[sha256sum] = "608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2" +# 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" inherit autotools @@ -78,6 +83,7 @@ MUTEX = "" MUTEX_arm = "${ARM_MUTEX}" MUTEX_armeb = "${ARM_MUTEX}" EXTRA_OECONF += "${MUTEX}" +EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" # Cancel the site stuff - it's set for db3 and destroys the # configure. diff --git a/yocto-poky/meta/recipes-support/debianutils/debianutils_4.5.1.bb b/yocto-poky/meta/recipes-support/debianutils/debianutils_4.7.bb index 6b665fb2c..6a1d5bf83 100644 --- a/yocto-poky/meta/recipes-support/debianutils/debianutils_4.5.1.bb +++ b/yocto-poky/meta/recipes-support/debianutils/debianutils_4.7.bb @@ -3,12 +3,13 @@ SECTION = "base" LICENSE = "GPLv2 & SMAIL_GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f" -SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz" +SRC_URI = "http://snapshot.debian.org/archive/debian/20160204T040501Z/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] = "487524518cd5833a6a4f7007b5d1bd5b" -SRC_URI[sha256sum] = "a531c23e0105fe01cfa928457a8343a1e947e2621b3cd4d05f4e9656020c63b7" - -S = "${WORKDIR}/${BPN}" +SRC_URI[md5sum] = "00186f527b35e2cecd4db593c6d512d0" +SRC_URI[sha256sum] = "a269cacd40f52f2fa5d5636357714a49e8538459c16d77772efaa23711fe53d9" inherit autotools update-alternatives @@ -34,7 +35,7 @@ FILES_${PN}-run-parts = "${base_bindir}/run-parts.debianutils" RDEPENDS_${PN} += "${PN}-run-parts" -ALTERNATIVE_PRIORITY="100" +ALTERNATIVE_PRIORITY="30" ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which" ALTERNATIVE_${PN}-run-parts = "run-parts" diff --git a/yocto-poky/meta/recipes-support/gdbm/gdbm_1.8.3.bb b/yocto-poky/meta/recipes-support/gdbm/gdbm_1.8.3.bb index af01b6c40..b253dc144 100644 --- a/yocto-poky/meta/recipes-support/gdbm/gdbm_1.8.3.bb +++ b/yocto-poky/meta/recipes-support/gdbm/gdbm_1.8.3.bb @@ -19,6 +19,7 @@ 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}/ diff --git a/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch b/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch new file mode 100644 index 000000000..6da0be9ca --- /dev/null +++ b/yocto-poky/meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch @@ -0,0 +1,57 @@ +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/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/configure.patch b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/configure.patch deleted file mode 100644 index 349da3c6b..000000000 --- a/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/configure.patch +++ /dev/null @@ -1,222 +0,0 @@ -Upstream-Status: Pending - -Updated to apply to gmp-5.1.0 - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> - ---- - acinclude.m4 | 32 +++++++++++++++++--------------- - configure.ac | 26 +++++++++----------------- - 2 files changed, 26 insertions(+), 32 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 227712a..199aa6f 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -40,29 +40,29 @@ dnl a_out.exe - OpenVMS DEC C called via GNV wrapper (gnv.sourceforge.net) - dnl conftest.exe - various DOS compilers - - --define(IA64_PATTERN, -+define([IA64_PATTERN], - [[ia64*-*-* | itanium-*-* | itanium2-*-*]]) - - dnl Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all - dnl of which config.sub accepts. (Though none of which are likely to work - dnl with GMP.) - dnl --define(M68K_PATTERN, -+define([M68K_PATTERN], - [[m68k-*-* | m68[0-9][0-9][0-9]-*-*]]) - --define(POWERPC64_PATTERN, -+define([POWERPC64_PATTERN], - [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]]) - --define(S390_PATTERN, -+define([S390_PATTERN], - [[s390-*-* | z900esa-*-* | z990esa-*-* | z9esa-*-* | z10esa-*-* | z196esa-*-*]]) - --define(S390X_PATTERN, -+define([S390X_PATTERN], - [[s390x-*-* | z900-*-* | z990-*-* | z9-*-* | z10-*-* | z196-*-*]]) - --define(X86_PATTERN, -+define([X86_PATTERN], - [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]]) - --define(X86_64_PATTERN, -+define([X86_64_PATTERN], - [[athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | jaguar-*-* | bulldozer-*-* | piledriver-*-* | steamroller-*-* | excavator-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei*-*-* | x86_64-*-* | nano-*-*]]) - - dnl GMP_FAT_SUFFIX(DSTVAR, DIRECTORY) -@@ -80,7 +80,7 @@ dnl x86 -> x86 - dnl x86/k6 -> k6 - dnl x86/k6/mmx -> k6_mmx - --define(GMP_FAT_SUFFIX, -+define([GMP_FAT_SUFFIX], - [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]]) - - -@@ -89,7 +89,7 @@ dnl ---------------------------------- - dnl Emit code to remove any occurrence of ITEM from $LISTVAR. ITEM can be a - dnl shell expression like $foo if desired. - --define(GMP_REMOVE_FROM_LIST, -+define([GMP_REMOVE_FROM_LIST], - [remove_from_list_tmp= - for remove_from_list_i in $[][$1]; do - if test $remove_from_list_i = [$2]; then :; -@@ -105,12 +105,12 @@ dnl GMP_STRIP_PATH(subdir) - dnl ---------------------- - dnl Strip entries */subdir from $path and $fat_path. - --define(GMP_STRIP_PATH, -+define([GMP_STRIP_PATH], - [GMP_STRIP_PATH_VAR(path, [$1]) - GMP_STRIP_PATH_VAR(fat_path, [$1]) - ]) - --define(GMP_STRIP_PATH_VAR, -+define([GMP_STRIP_PATH_VAR], - [tmp_path= - for i in $[][$1]; do - case $i in -@@ -131,7 +131,7 @@ dnl - dnl Dummy value for GMP_LIMB_BITS is enough - dnl for all current configure-time uses of gmp.h. - --define(GMP_INCLUDE_GMP_H, -+define([GMP_INCLUDE_GMP_H], - [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ - #define GMP_NAIL_BITS $GMP_NAIL_BITS - #define GMP_LIMB_BITS 123 -@@ -146,7 +146,7 @@ dnl Expand at autoconf time to the value of a "#define NAME" from the given - dnl FILE. The regexps here aren't very rugged, but are enough for gmp. - dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted. - --define(GMP_HEADER_GETVAL, -+define([GMP_HEADER_GETVAL], - [patsubst(patsubst( - esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]), - [^.*$1[ ]+],[]), -@@ -160,7 +160,7 @@ dnl The gmp version number, extracted from the #defines in gmp-h.in at - dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits - dnl like 3.0.1 if patchlevel > 0. - --define(GMP_VERSION, -+define([GMP_VERSION], - [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl - .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl - .GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)]) -@@ -1524,7 +1524,9 @@ esac - echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4 - - # All CPUs use asm-defs.m4 --echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i -+echo -n ["include("] >>$gmp_tmpconfigm4i -+echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i -+echo [")"] >>$gmp_tmpconfigm4i - ]) - - -diff --git a/configure.ac b/configure.ac -index 64b2c50..f07b821 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -39,14 +39,6 @@ AC_REVISION($Revision$) - AC_PREREQ(2.59) - AC_INIT(GNU MP, GMP_VERSION, [gmp-bugs@gmplib.org, see https://gmplib.org/manual/Reporting-Bugs.html], gmp) - AC_CONFIG_SRCDIR(gmp-impl.h) --m4_pattern_forbid([^[ \t]*GMP_]) --m4_pattern_allow(GMP_LDFLAGS) --m4_pattern_allow(GMP_LIMB_BITS) --m4_pattern_allow(GMP_MPARAM_H_SUGGEST) --m4_pattern_allow(GMP_NAIL_BITS) --m4_pattern_allow(GMP_NUMB_BITS) --m4_pattern_allow(GMP_NONSTD_ABI) --m4_pattern_allow(GMP_CPU_TYPE) - - # If --target is not used then $target_alias is empty, but if say - # "./configure athlon-pc-freebsd3.5" is used, then all three of -@@ -348,7 +340,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1], - # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is - # called. User selections of CC etc are respected. - # --# Care is taken not to use macros like AC_TRY_COMPILE during the GMP -+# Care is taken not to use macros like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) during the GMP - # pre-testing, since they of course depend on AC_PROG_CC, and also some of - # them cache their results, which is not wanted. - # -@@ -440,7 +432,7 @@ abilist="standard" - # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring - # c89 over cc here. But note that on HP-UX c89 provides a castrated - # environment, and would want to be excluded somehow. Maybe --# AC_PROG_CC_STDC already does enough to stick cc into ANSI mode and -+# already does enough to stick cc into ANSI mode and - # we don't need to worry. - # - cclist="gcc cc" -@@ -1843,7 +1835,7 @@ esac - CFLAGS_or_unset=${CFLAGS-'(unset)'} - CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'} - --cat >&AC_FD_CC <<EOF -+cat >&AS_MESSAGE_LOG_FD() <<EOF - User: - ABI=$ABI - CC=$CC -@@ -2264,7 +2256,6 @@ AC_SUBST(DEFN_LONG_LONG_LIMB) - - # The C compiler and preprocessor, put into ANSI mode if possible. - AC_PROG_CC --AC_PROG_CC_STDC - AC_PROG_CPP - - -@@ -2286,11 +2277,11 @@ AC_SUBST(CCAS) - - # The C++ compiler, if desired. - want_cxx=no -+AC_PROG_CXX - if test $enable_cxx != no; then - test_CXXFLAGS=${CXXFLAGS+set} -- AC_PROG_CXX - -- echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC -+ echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD() - cxxflags_ac_prog_cxx=$CXXFLAGS - cxxflags_list=ac_prog_cxx - -@@ -2412,7 +2403,7 @@ if test "$enable_assembly" = "no"; then - fi - - --cat >&AC_FD_CC <<EOF -+cat >&AS_MESSAGE_LOG_FD() <<EOF - Decided: - ABI=$ABI - CC=$CC -@@ -3781,7 +3772,7 @@ GMP_FINISH - # FIXME: Upcoming version of autoconf/automake may not like broken lines. - # Right now automake isn't accepting the new AC_CONFIG_FILES scheme. - --AC_OUTPUT(Makefile \ -+AC_CONFIG_FILES([Makefile \ - mpf/Makefile mpn/Makefile mpq/Makefile \ - mpz/Makefile printf/Makefile scanf/Makefile rand/Makefile cxx/Makefile \ - tests/Makefile tests/devel/Makefile \ -@@ -3790,7 +3781,8 @@ AC_OUTPUT(Makefile \ - tests/cxx/Makefile \ - doc/Makefile tune/Makefile \ - demos/Makefile demos/calc/Makefile demos/expr/Makefile \ -- gmp.h:gmp-h.in) -+ gmp.h:gmp-h.in]) -+AC_OUTPUT - - AC_MSG_NOTICE([summary of build options: - --- -1.9.1 - diff --git a/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/gmp-6.0.0-ppc64.patch b/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/gmp-6.0.0-ppc64.patch deleted file mode 100644 index 1113b41ec..000000000 --- a/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/gmp-6.0.0-ppc64.patch +++ /dev/null @@ -1,26 +0,0 @@ - -Signed-off-by: Armin Kuster <akuster808@gmail.com> - -This patch with pulled from gmp. -https://gmplib.org/repo/gmp/rev/4a6d258b467f -Upstream-Status: Backport - -# HG changeset patch -# User Torbjorn Granlund <tege@gmplib.org> -# Date 1395835068 -3600 -# Node ID 4a6d258b467f661da0894cc60ecd060f2e3c67c7 -# Parent 301ce2788826a2d4d2725bd5cf01e998638db37a -Provide default for BMOD_1_TO_MOD_1_THRESHOLD. - -diff -r 301ce2788826 -r 4a6d258b467f mpn/powerpc64/mode64/gcd_1.asm ---- a/mpn/powerpc64/mode64/gcd_1.asm Tue Mar 25 15:34:52 2014 +0100 -+++ b/mpn/powerpc64/mode64/gcd_1.asm Wed Mar 26 12:57:48 2014 +0100 -@@ -43,6 +43,9 @@ - define(`n', `r4') - define(`v0', `r5') - -+ifdef(`BMOD_1_TO_MOD_1_THRESHOLD',, -+ `define(`BMOD_1_TO_MOD_1_THRESHOLD',30)') -+ - EXTERN_FUNC(mpn_mod_1) - EXTERN_FUNC(mpn_modexact_1c_odd) diff --git a/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/append_user_provided_flags.patch b/yocto-poky/meta/recipes-support/gmp/gmp-6.1.0/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch index ae1386c4c..325ffe491 100644 --- a/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/append_user_provided_flags.patch +++ b/yocto-poky/meta/recipes-support/gmp/gmp-6.1.0/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch @@ -1,14 +1,20 @@ -Upstream-Status: Inappropriate - -Append the user provided flags to the auto-detected ones. +From d3b9fc523fc11260ced890c35bc5c9e6391c8656 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 14 Dec 2015 14:19:49 +0200 +Subject: [PATCH] Append the user provided flags to the auto-detected ones. +Upstream-Status: Inappropriate Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + configure.ac | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) -Index: gmp-5.1.1/configure.ac -=================================================================== ---- gmp-5.1.1.orig/configure.ac 2014-02-11 15:05:44.925202403 +0200 -+++ gmp-5.1.1/configure.ac 2014-02-11 15:19:03.918511398 +0200 -@@ -1745,8 +1745,12 @@ +diff --git a/configure.ac b/configure.ac +index 9cedfeb..87caee5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1921,8 +1921,12 @@ cclist=$cclist EOF @@ -23,16 +29,16 @@ Index: gmp-5.1.1/configure.ac for abi in $abilist; do abi_last="$abi" -@@ -2175,7 +2179,7 @@ +@@ -2353,7 +2357,7 @@ AC_SUBST(CCAS) + # The C++ compiler, if desired. want_cxx=no - AC_PROG_CXX if test $enable_cxx != no; then - test_CXXFLAGS=${CXXFLAGS+set} + test_CXXFLAGS= + AC_PROG_CXX - echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD() - cxxflags_ac_prog_cxx=$CXXFLAGS -@@ -2202,7 +2206,7 @@ + echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC +@@ -2381,7 +2385,7 @@ if test $enable_cxx != no; then # Automake includes $CPPFLAGS in a C++ compile, so we do the same here. # for cxxflags_choice in $cxxflags_list; do @@ -41,12 +47,15 @@ Index: gmp-5.1.1/configure.ac GMP_PROG_CXX_WORKS($CXX $CPPFLAGS $CXXFLAGS, [want_cxx=yes break]) -@@ -2292,6 +2296,8 @@ +@@ -2477,6 +2481,8 @@ if test "$enable_assembly" = "no"; then # done fi +CFLAGS="$CFLAGS $user_CFLAGS" +CPPFLAGS="$CPPFLAGS $user_CPPFLAGS" - cat >&AS_MESSAGE_LOG_FD() <<EOF + cat >&AC_FD_CC <<EOF Decided: +-- +2.6.2 + diff --git a/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/amd64.patch b/yocto-poky/meta/recipes-support/gmp/gmp-6.1.0/amd64.patch index 564d12d42..564d12d42 100644 --- a/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/amd64.patch +++ b/yocto-poky/meta/recipes-support/gmp/gmp-6.1.0/amd64.patch diff --git a/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/use-includedir.patch b/yocto-poky/meta/recipes-support/gmp/gmp-6.1.0/use-includedir.patch index 74904a253..74904a253 100644 --- a/yocto-poky/meta/recipes-support/gmp/gmp-6.0.0/use-includedir.patch +++ b/yocto-poky/meta/recipes-support/gmp/gmp-6.1.0/use-includedir.patch diff --git a/yocto-poky/meta/recipes-support/gmp/gmp.inc b/yocto-poky/meta/recipes-support/gmp/gmp.inc index 6752a39d1..abac8cf33 100644 --- a/yocto-poky/meta/recipes-support/gmp/gmp.inc +++ b/yocto-poky/meta/recipes-support/gmp/gmp.inc @@ -1,16 +1,12 @@ -SECTION = "devel" SUMMARY = "GNU multiprecision arithmetic library" DESCRIPTION = "GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers" HOMEPAGE = "http://gmplib.org/" - -REVISION ?= "" -SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2" +SECTION = "devel" inherit autotools texinfo -ARM_INSTRUCTION_SET = "arm" - -BBCLASSEXTEND = "native nativesdk" - PACKAGECONFIG ??= "" PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline" + +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" diff --git a/yocto-poky/meta/recipes-support/gmp/gmp_4.2.1.bb b/yocto-poky/meta/recipes-support/gmp/gmp_4.2.1.bb index bfc6a380e..5e8ee29f3 100644 --- a/yocto-poky/meta/recipes-support/gmp/gmp_4.2.1.bb +++ b/yocto-poky/meta/recipes-support/gmp/gmp_4.2.1.bb @@ -7,9 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ file://gmp-h.in;beginline=6;endline=21;md5=e056f74a12c3277d730dbcfb85d2ca34" -SRC_URI += "file://Use-__gnu_inline__-attribute.patch \ - file://gmp_fix_for_automake-1.12.patch \ - " +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/yocto-poky/meta/recipes-support/gmp/gmp_6.0.0.bb b/yocto-poky/meta/recipes-support/gmp/gmp_6.1.0.bb index 19b63e568..de827f5b7 100644 --- a/yocto-poky/meta/recipes-support/gmp/gmp_6.0.0.bb +++ b/yocto-poky/meta/recipes-support/gmp/gmp_6.1.0.bb @@ -1,22 +1,21 @@ require gmp.inc -LICENSE="GPLv2+ | LGPLv3+" - -REVISION="a" +LICENSE = "GPLv2+ | LGPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " -SRC_URI += "file://configure.patch \ - file://amd64.patch \ - file://use-includedir.patch \ - file://append_user_provided_flags.patch \ - file://gmp-6.0.0-ppc64.patch \ - " -SRC_URI[md5sum] = "b7ff2d88cae7f8085bd5006096eed470" -SRC_URI[sha256sum] = "7f8e9a804b9c6d07164cf754207be838ece1219425d64e28cfa3e70d5c759aaf" +REVISION = "" +SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ + file://amd64.patch \ + file://use-includedir.patch \ + file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ + " + +SRC_URI[md5sum] = "86ee6e54ebfc4a90b643a65e402c4048" +SRC_URI[sha256sum] = "498449a994efeba527885c10405993427995d3f86b8768d8cdf8d9dd7c6b73e8" acpaths = "" @@ -31,3 +30,4 @@ do_install_append_class-target() { SSTATE_SCAN_FILES += "gmp.h" +BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch b/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch new file mode 100644 index 000000000..5a178e2ef --- /dev/null +++ b/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch @@ -0,0 +1,27 @@ + +The terms `FAIL` instead of `FAILED` and `SKIP` instead of `SKIPPED` +match what Automake does + +Upstream-Status: Accepted +[ https://git.gnome.org/browse/gnome-desktop-testing/commit/?id=048850731a640532ef55a61df7357fcc6d2ad501 ] + +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- +diff -Naur gnome-desktop-testing-2014.1-orig/src/gnome-desktop-testing-runner.c gnome-desktop-testing-2014.1/src/gnome-desktop-testing-runner.c +--- gnome-desktop-testing-2014.1-orig/src/gnome-desktop-testing-runner.c 2014-01-16 12:58:26.000000000 +0200 ++++ gnome-desktop-testing-2014.1/src/gnome-desktop-testing-runner.c 2015-11-02 11:27:34.010594126 +0200 +@@ -280,12 +280,12 @@ + else if (test->state == TEST_STATE_COMPLETE_FAILED) + { + msgid_value = ONE_TEST_FAILED_MSGID; +- msg = g_strconcat ("FAILED: ", test->name, " (", reason, ")", NULL); ++ msg = g_strconcat ("FAIL: ", test->name, " (", reason, ")", NULL); + } + else if (test->state == TEST_STATE_COMPLETE_SKIPPED) + { + msgid_value = ONE_TEST_SKIPPED_MSGID; +- msg = g_strconcat ("SKIPPED: ", test->name, NULL); ++ msg = g_strconcat ("SKIP: ", test->name, NULL); + } + else + g_assert_not_reached (); diff --git a/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb b/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb index 482de99d4..ccb3d3b7d 100644 --- a/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb +++ b/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb @@ -4,6 +4,7 @@ LICENSE = "LGPLv2+" SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ file://0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch \ + file://update-output-syntax.patch \ " SRC_URI[md5sum] = "a608ad72a77e23a1aecdfd8d07a94baf" SRC_URI[sha256sum] = "1a3eed73678dd22d09d6a7ec4f899557df3e8b4a802affa76d0f163b31286539" diff --git a/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4242.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4242.patch index c9addca28..f0667741c 100644 --- a/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4242.patch +++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4242.patch @@ -11,6 +11,7 @@ git://git.gnupg.org/libgcrypt.git exponents in secure memory. Upstream-Status: Backport +CVE: CVE-2013-4242 Signed-off-by: Kai Kang <kai.kang@windriver.com> -- diff --git a/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4351.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4351.patch index b29ede423..b50a32f40 100644 --- a/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4351.patch +++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4351.patch @@ -1,4 +1,5 @@ Upstream-Status: Backport +CVE: CVE-2013-4351 Index: gnupg-1.4.7/g10/getkey.c =================================================================== diff --git a/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4576.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4576.patch index b1a22f585..5dcde1f9c 100644 --- a/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4576.patch +++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/CVE-2013-4576.patch @@ -1,4 +1,5 @@ Upstream-Status: Backport +CVE: CVE-2013-4576 Index: gnupg-1.4.7/cipher/dsa.c =================================================================== diff --git a/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/GnuPG1-CVE-2012-6085.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/GnuPG1-CVE-2012-6085.patch index 8b5d9a169..362717636 100644 --- a/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/GnuPG1-CVE-2012-6085.patch +++ b/yocto-poky/meta/recipes-support/gnupg/gnupg-1.4.7/GnuPG1-CVE-2012-6085.patch @@ -17,6 +17,7 @@ Date: Thu Dec 20 09:43:41 2012 +0100 (cherry-picked from commit f795a0d59e197455f8723c300eebf59e09853efa) Upstream-Status: Backport +CVE: CVE-2012-6085 Signed-off-by: Saul Wold <sgw@linux.intel.com> diff --git a/yocto-poky/meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch b/yocto-poky/meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch new file mode 100644 index 000000000..4241bc3a2 --- /dev/null +++ b/yocto-poky/meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch @@ -0,0 +1,31 @@ +From 717f994be2466d378e6611a4739c606db6d0dc46 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Sun, 25 Oct 2015 22:44:47 -0400 +Subject: [PATCH] autogen.sh: fix find-version for beta checking + +find-version always assumes that gnupg is beta if autogen.sh is run +out of git-repo. This doesn't work for users whom just take release +tarball and re-run autoconf in their local build dir. + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +--- + autogen.sh | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/autogen.sh b/autogen.sh +index 7effd56..d673432 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -228,7 +228,6 @@ if [ "$myhost" = "find-version" ]; then + rvd=$((0x$(echo ${rev} | head -c 4))) + else + ingit=no +- beta=yes + tmp="-unknown" + rev="0000000" + rvd="0" +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-support/gnupg/gnupg_1.4.7.bb b/yocto-poky/meta/recipes-support/gnupg/gnupg_1.4.7.bb index 6999f81f8..b4ccbfed6 100644 --- a/yocto-poky/meta/recipes-support/gnupg/gnupg_1.4.7.bb +++ b/yocto-poky/meta/recipes-support/gnupg/gnupg_1.4.7.bb @@ -98,7 +98,6 @@ FILES_gpgv = "${bindir}/gpgv" # Exclude debug files from the main packages FILES_${PN} = "${bindir}/* ${datadir}/${BPN} ${libexecdir}/${BPN}/*" -FILES_${PN}-dbg += "${libexecdir}/${BPN}/.debug" PACKAGECONFIG ??= "" PACKAGECONFIG[curl] = "--with-libcurl=${STAGING_LIBDIR},--without-libcurl,curl" diff --git a/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.7.bb b/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.11.bb index 48c7c9622..8e2189bca 100644 --- a/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.7.bb +++ b/yocto-poky/meta/recipes-support/gnupg/gnupg_2.1.11.bb @@ -12,10 +12,11 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ file://pkgconfig.patch \ file://use-pkgconfig-instead-of-npth-config.patch \ file://dirmngr-uses-libgpg-error.patch \ + file://autogen.sh-fix-find-version-for-beta-checking.patch \ " -SRC_URI[md5sum] = "ebdf92b15b8bcd8579b643c7f41a3238" -SRC_URI[sha256sum] = "c18a3776d47fec98892d51d28b6574ef16bf0a25eabb0956231058aaf2e7846e" +SRC_URI[md5sum] = "873302c475c4c90badb67daac90ebd5d" +SRC_URI[sha256sum] = "b7b0fb2c8c5d47d7ec916d4a1097c0ddcb94a12bb1c0ac424ad86b1ee316b61a" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ @@ -39,3 +40,6 @@ do_install_append() { } RDEPENDS_${PN} = "gnutls" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3" diff --git a/yocto-poky/meta/recipes-support/gnutls/gnutls.inc b/yocto-poky/meta/recipes-support/gnutls/gnutls.inc index e9b138a03..e7c91eb80 100644 --- a/yocto-poky/meta/recipes-support/gnutls/gnutls.inc +++ b/yocto-poky/meta/recipes-support/gnutls/gnutls.inc @@ -1,7 +1,6 @@ SUMMARY = "GNU Transport Layer Security Library" HOMEPAGE = "http://www.gnu.org/software/gnutls/" BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" -DEPENDS = "nettle" LICENSE = "GPLv3+ & LGPLv2.1+" LICENSE_${PN} = "LGPLv2.1+" @@ -12,21 +11,36 @@ LICENSE_${PN}-openssl = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" +DEPENDS = "nettle gmp virtual/libiconv" +DEPENDS_append_libc-musl = " argp-standalone" -SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" +SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" inherit autotools texinfo binconfig pkgconfig gettext lib_package -EXTRA_OECONF="--disable-rpath \ - --with-included-libtasn1 \ - --enable-local-libopts \ - --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ - --disable-guile \ - --disable-crywrap \ - --without-p11-kit \ - " +PACKAGECONFIG ??= "libidn zlib" + +PACKAGECONFIG[docs] = "--enable-doc,--disable-doc" +PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn" +PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" +PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" +PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" + +EXTRA_OECONF = " \ + --disable-crywrap \ + --disable-libdane \ + --disable-guile \ + --disable-rpath \ + --enable-local-libopts \ + --enable-openssl-compatibility \ + --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ +" + +LDFLAGS_append_libc-musl = " -largp" +LDFLAGS_append_libc-uclibc = " -luargp -pthread" do_configure_prepend() { for dir in . lib; do @@ -34,16 +48,10 @@ do_configure_prepend() { done } -PACKAGECONFIG ??= "zlib" -PACKAGECONFIG[tpm] = "--with-tpm, --without-tpm, trousers" -PACKAGECONFIG[zlib] = "--with-zlib, --without-zlib, zlib" - PACKAGES =+ "${PN}-openssl ${PN}-xx" FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" -LDFLAGS_append_libc-uclibc += " -pthread" - BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch b/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch new file mode 100644 index 000000000..c5b95eb5b --- /dev/null +++ b/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch @@ -0,0 +1,32 @@ +From 67c638c7e209554d9b19627e9402a20fdabead21 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 4 Dec 2015 13:19:28 +0200 +Subject: [PATCH] configure.ac: fix sed command + +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors +when the S contains "bitbake", fix to "sed 's/\.bak$//'`" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +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 e634236..dc9e6a8 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 +-- +2.6.2 + diff --git a/yocto-poky/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/yocto-poky/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch deleted file mode 100644 index 44a9934b5..000000000 --- a/yocto-poky/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Sat, 17 Jan 2015 17:02:15 +0000 -Subject: [PATCH] configure.ac: fix sed command - -The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors -when the S contains "bitbake", fix to "sed 's/\.bak$//'`" - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c6818a0..1c4582d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";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 --- -2.0.1 - diff --git a/yocto-poky/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb b/yocto-poky/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb deleted file mode 100644 index 018579752..000000000 --- a/yocto-poky/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gnutls.inc - -SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ - file://configure.ac-fix-sed-command.patch \ - file://use-pkg-config-to-locate-zlib.patch \ - " -SRC_URI[md5sum] = "8d01c7e7f2cbc5871fdca832d2260b6b" -SRC_URI[sha256sum] = "b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4" diff --git a/yocto-poky/meta/recipes-support/gnutls/gnutls_3.4.9.bb b/yocto-poky/meta/recipes-support/gnutls/gnutls_3.4.9.bb new file mode 100644 index 000000000..b652f6fac --- /dev/null +++ b/yocto-poky/meta/recipes-support/gnutls/gnutls_3.4.9.bb @@ -0,0 +1,8 @@ +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 \ + " +SRC_URI[md5sum] = "1b3b6d55d0e2b6d01a54f53129f1da9b" +SRC_URI[sha256sum] = "48594fadba33d450f796ec69526cf2bce6ff9bc3dc90fbd7bf38dc3601f57c3f" diff --git a/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.5.bb b/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.7.bb index f874574c5..7f0856945 100644 --- a/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.5.bb +++ b/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.7.bb @@ -12,8 +12,8 @@ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ " -SRC_URI[md5sum] = "81d272697545e82d39f6bd14854b68f0" -SRC_URI[sha256sum] = "89b3b5dce119273431544ecb305081f3530911001bb12e5d76588907edb71bda" +SRC_URI[md5sum] = "12d10ca4ae0a3b95f7aa06a076da39ec" +SRC_URI[sha256sum] = "a40780dc93fc6d819170240e8ece25352058a85fd1d2347ce0f143667d8f11c9" inherit autotools texinfo binconfig lib_package diff --git a/yocto-poky/meta/recipes-support/gpgme/gpgme_1.5.4.bb b/yocto-poky/meta/recipes-support/gpgme/gpgme_1.6.0.bb index 1598377d6..86eda239b 100644 --- a/yocto-poky/meta/recipes-support/gpgme/gpgme_1.5.4.bb +++ b/yocto-poky/meta/recipes-support/gpgme/gpgme_1.6.0.bb @@ -6,7 +6,7 @@ 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=71ba2ae8d6ca034ed10bd099a8cf473c \ + file://src/gpgme.h.in;endline=23;md5=5027eec93a996272a9a0a6a86cf35775 \ file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/${BP}.tar.bz2 \ @@ -14,8 +14,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/${BP}.tar.bz2 \ file://pkgconfig.patch \ " -SRC_URI[md5sum] = "feafa03ea064e1d1dc11bc2b88404623" -SRC_URI[sha256sum] = "bb38c0ec8815c9e94e6047b484984808a8dad9d6bec8df33dc5339fd55ffea6c" +SRC_URI[md5sum] = "60d730d22e8065fd5de309e8b98e304b" +SRC_URI[sha256sum] = "b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d" DEPENDS = "libgpg-error libassuan" @@ -27,6 +27,7 @@ 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 diff --git a/yocto-poky/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch b/yocto-poky/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch new file mode 100644 index 000000000..1519d8469 --- /dev/null +++ b/yocto-poky/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch @@ -0,0 +1,24 @@ +icu: Ticket #11959: pkgdata dies when compiled with lots'o'flags + +See: http://bugs.icu-project.org/trac/ticket/11959 + +The patch avoids premature failure which results in a segfault. + +Upstream-Status: Backport of r38081 +Signed-off-by: Mike Crowe <mac@mcrowe.com> + +Index: source/tools/toolutil/flagparser.c +=================================================================== +--- source/tools/toolutil/flagparser.c (revision 38046) ++++ source/tools/toolutil/flagparser.c (working copy) +@@ -96,8 +96,8 @@ + uprv_free(buffer); + + T_FileStream_close(f); +- +- if (U_FAILURE(*status)) { ++ ++ if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) { + return -1; + } + diff --git a/yocto-poky/meta/recipes-support/icu/icu_55.1.bb b/yocto-poky/meta/recipes-support/icu/icu_56.1.bb index e91b6f3ab..db0de106b 100644 --- a/yocto-poky/meta/recipes-support/icu/icu_55.1.bb +++ b/yocto-poky/meta/recipes-support/icu/icu_56.1.bb @@ -16,11 +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://icu-release-56-1-flagparser-fix.patch \ " SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "e2d523df79d6cb7855c2fbe284f4db29" -SRC_URI[sha256sum] = "e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b" +SRC_URI[md5sum] = "c4a2d71ff56aec5ebfab2a3f059be99d" +SRC_URI[sha256sum] = "3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" +UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" diff --git a/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.58.bb b/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.65.bb index 7112e461b..0b78dc45e 100644 --- a/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.58.bb +++ b/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.65.bb @@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fbc093901857fcd118f065f900982c24" SRC_URI = "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz" -SRC_URI[md5sum] = "34097a0085f0979e28f9db66ec274c5e" -SRC_URI[sha256sum] = "86af5735dce6e4eff2b983e5d8aa9a3dea1b8db702333ff20be89e45f7f35a72" +SRC_URI[md5sum] = "890a08d4f962748e0a0758a8aa471896" +SRC_URI[sha256sum] = "834de5193c8489eedeaf6509457a9b13476702386ae1f3ed4f391a349d630320" # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which # are inhibited by allarch diff --git a/yocto-poky/meta/recipes-support/libassuan/libassuan_2.2.1.bb b/yocto-poky/meta/recipes-support/libassuan/libassuan_2.4.2.bb index 75ae43f02..f376d631e 100644 --- a/yocto-poky/meta/recipes-support/libassuan/libassuan_2.2.1.bb +++ b/yocto-poky/meta/recipes-support/libassuan/libassuan_2.4.2.bb @@ -2,7 +2,9 @@ SUMMARY = "IPC library used by GnuPG and GPGME" HOMEPAGE = "http://www.gnupg.org/related_software/libassuan/" BUGTRACKER = "https://bugs.g10code.com/gnupg/index" -LICENSE = "GPLv3 & LGPLv2.1+" +LICENSE = "GPLv3+ & LGPLv2.1+" +LICENSE_${PN} = "LGPLv2.1+" +LICENSE_${PN}-doc = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/assuan.c;endline=20;md5=0f465544183405055ec179869fc5b5ba \ @@ -13,15 +15,15 @@ DEPENDS = "libgpg-error" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2 \ file://libassuan-add-pkgconfig-support.patch" -SRC_URI[md5sum] = "6290e750ee87be3bfd9579fc44c6a186" -SRC_URI[sha256sum] = "949285bb79345362cb72a40c798defefc007031c60f2f10251720bf60a9de2de" +SRC_URI[md5sum] = "70151995c2330ae1261c0a7ca34cf478" +SRC_URI[sha256sum] = "bb06dc81380b74bf1b64d5849be5c0409a336f3b4c45f20ac688e86d1b5bcb20" BINCONFIG = "${bindir}/libassuan-config" inherit autotools texinfo binconfig-disabled pkgconfig do_configure_prepend () { - # Else these could be used in prefernce to those in aclocal-copy + # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/*.m4 } diff --git a/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch b/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch new file mode 100644 index 000000000..c05107594 --- /dev/null +++ b/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops/0001-Add-initial-nios2-architecture-support.patch @@ -0,0 +1,70 @@ +From 4b005ee56898309e8afba9b3c48cf94f0f5f78e4 Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 15 Mar 2016 10:09:26 +0300 +Subject: [PATCH] Add initial nios2 architecture support + +* src/Makefile.am (nobase_private_HEADERS): Add nios2.h. +* src/atomic_ops.h: Include nios2.h if __nios2__. +* src/atomic_ops/sysdeps/gcc/nios2.h: New file. + +Signed-off-by: Marek Vasut <marex@denx.de> +Upstream-Status: Backport [ https://github.com/ivmai/libatomic_ops.git 4b005ee56898309e8afba9b3c48cf94f0f5f78e4 ] +--- + src/Makefile.am | 1 + + src/atomic_ops.h | 3 +++ + src/atomic_ops/sysdeps/gcc/nios2.h | 17 +++++++++++++++++ + 3 files changed, 21 insertions(+) + create mode 100644 src/atomic_ops/sysdeps/gcc/nios2.h + +diff --git a/src/Makefile.am b/src/Makefile.am +index fc09b27..d463427 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -79,6 +79,7 @@ nobase_private_HEADERS = atomic_ops/ao_version.h \ + atomic_ops/sysdeps/gcc/ia64.h \ + atomic_ops/sysdeps/gcc/m68k.h \ + atomic_ops/sysdeps/gcc/mips.h \ ++ atomic_ops/sysdeps/gcc/nios2.h \ + atomic_ops/sysdeps/gcc/powerpc.h \ + atomic_ops/sysdeps/gcc/s390.h \ + atomic_ops/sysdeps/gcc/sh.h \ +diff --git a/src/atomic_ops.h b/src/atomic_ops.h +index 33fe00e..ec02ba4 100644 +--- a/src/atomic_ops.h ++++ b/src/atomic_ops.h +@@ -262,6 +262,9 @@ + # if defined(__m68k__) + # include "atomic_ops/sysdeps/gcc/m68k.h" + # endif /* __m68k__ */ ++# if defined(__nios2__) ++# include "atomic_ops/sysdeps/gcc/nios2.h" ++# endif /* __nios2__ */ + # if defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) \ + || defined(__powerpc64__) || defined(__ppc64__) + # include "atomic_ops/sysdeps/gcc/powerpc.h" +diff --git a/src/atomic_ops/sysdeps/gcc/nios2.h b/src/atomic_ops/sysdeps/gcc/nios2.h +new file mode 100644 +index 0000000..f402cbb +--- /dev/null ++++ b/src/atomic_ops/sysdeps/gcc/nios2.h +@@ -0,0 +1,17 @@ ++/* ++ * Copyright (C) 2016 Marek Vasut <marex@denx.de> ++ * ++ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED ++ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. ++ * ++ * Permission is hereby granted to use or copy this program ++ * for any purpose, provided the above notices are retained on all copies. ++ * Permission to modify the code and to distribute modified code is granted, ++ * provided the above notices are retained, and a notice that the code was ++ * modified is included with the above copyright notice. ++ */ ++ ++#include "../test_and_set_t_is_ao_t.h" ++#include "generic.h" ++ ++#define AO_T_IS_INT +-- +2.7.0 + diff --git a/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb b/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb index 4d0e299f4..fdb70d8ef 100644 --- a/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb +++ b/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.4.2.bb @@ -7,7 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \ " -SRC_URI = "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${PV}.tar.gz" +SRC_URI = "\ + http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${PV}.tar.gz \ + file://0001-Add-initial-nios2-architecture-support.patch \ + " SRC_URI[md5sum] = "1d6538604b314d2fccdf86915e5c0857" SRC_URI[sha256sum] = "04fa615f62992547bcbda562260e28b504bc4c06e2f985f267f3ade30304b5dd" diff --git a/yocto-poky/meta/recipes-support/libbsd/files/CVE-2016-2090.patch b/yocto-poky/meta/recipes-support/libbsd/files/CVE-2016-2090.patch deleted file mode 100644 index 2eaae1386..000000000 --- a/yocto-poky/meta/recipes-support/libbsd/files/CVE-2016-2090.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c8f0723d2b4520bdd6b9eb7c3e7976de726d7ff7 Mon Sep 17 00:00:00 2001 -From: Hanno Boeck <hanno@hboeck.de> -Date: Wed, 27 Jan 2016 15:10:11 +0100 -Subject: [PATCH] Fix heap buffer overflow in fgetwln() - -In the function fgetwln() there's a 4 byte heap overflow. - -There is a while loop that has this check to see whether there's still -enough space in the buffer: - - if (!fb->len || wused > fb->len) { - -If this is true more memory gets allocated. However this test won't be -true if wused == fb->len, but at that point wused already points out -of the buffer. Some lines later there's a write to the buffer: - - fb->wbuf[wused++] = wc; - -This bug was found with the help of address sanitizer. - -Warned-by: ASAN -Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=93881 -Signed-off-by: Guillem Jover <guillem@hadrons.org> - -Upstream-Status: Backport -http://cgit.freedesktop.org/libbsd/commit/?id=c8f0723d2b4520bdd6b9eb7c3e7976de726d7ff7 - -CVE: CVE-2016-2090 -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - src/fgetwln.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/fgetwln.c b/src/fgetwln.c -index 9ee0776..aa3f927 100644 ---- a/src/fgetwln.c -+++ b/src/fgetwln.c -@@ -60,7 +60,7 @@ fgetwln(FILE *stream, size_t *lenp) - fb->fp = stream; - - while ((wc = fgetwc(stream)) != WEOF) { -- if (!fb->len || wused > fb->len) { -+ if (!fb->len || wused >= fb->len) { - wchar_t *wp; - - if (fb->len) --- -2.3.5 - diff --git a/yocto-poky/meta/recipes-support/libbsd/libbsd_0.7.0.bb b/yocto-poky/meta/recipes-support/libbsd/libbsd_0.7.0.bb deleted file mode 100644 index 8d9a708a1..000000000 --- a/yocto-poky/meta/recipes-support/libbsd/libbsd_0.7.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2013 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Library of utility functions from BSD systems" -DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ - and lacking on others like GNU systems, thus making it easier to port \ - projects with strong BSD origins, without needing to embed the same \ - code over and over again on each project." - -HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" -LICENSE = "BSD-4-Clause & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=f1530ea92aeaa1c5e2547cfd43905d8c" -SECTION = "libs" -DEPENDS = "" - -SRC_URI = "http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://CVE-2016-2090.patch \ - " - -SRC_URI[md5sum] = "fcceb4e66fd448ca4ed42ba22a8babb0" -SRC_URI[sha256sum] = "0f3b0e17e5c34c038126e0a04351b11e23c6101a7d0ce3beeab29bb6415c10bb" - -inherit autotools pkgconfig diff --git a/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.2.bb b/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.2.bb new file mode 100644 index 000000000..3335386d8 --- /dev/null +++ b/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.2.bb @@ -0,0 +1,43 @@ +# Copyright (C) 2013 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Library of utility functions from BSD systems" +DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ + and lacking on others like GNU systems, thus making it easier to port \ + projects with strong BSD origins, without needing to embed the same \ + code over and over again on each project." + +HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" +# There seems to be more licenses used in the code, I don't think we want to list them all here, complete list: +# OE @ ~/projects/libbsd $ grep ^License: COPYING | sort +# License: BSD-2-clause +# License: BSD-2-clause +# License: BSD-2-clause-NetBSD +# License: BSD-2-clause-author +# License: BSD-2-clause-verbatim +# License: BSD-3-clause +# License: BSD-3-clause +# License: BSD-3-clause +# License: BSD-3-clause-Peter-Wemm +# License: BSD-3-clause-Regents +# License: BSD-4-clause-Christopher-G-Demetriou +# License: BSD-4-clause-Niels-Provos +# License: BSD-5-clause-Peter-Wemm +# License: Beerware +# License: Expat +# License: ISC +# License: ISC-Original +# License: public-domain +# License: public-domain-Colin-Plumb +LICENSE = "BSD-4-Clause & ISC & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=145ec05a217d8f879f29cfc5f83084be" +SECTION = "libs" + +SRC_URI = " \ + http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ +" + +SRC_URI[md5sum] = "cdee252ccff978b50ad2336278c506c9" +SRC_URI[sha256sum] = "b2f644cae94a6e2fe109449c20ad79a0f6ee4faec2205b07eefa0020565e250a" + +inherit autotools pkgconfig diff --git a/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb b/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb index a31d5dc43..571546766 100644 --- a/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb +++ b/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb @@ -23,7 +23,6 @@ EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' PYINC='${STAGING_INCDIR} PACKAGES += "${PN}-python" -FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-support/libcap/libcap_2.24.bb b/yocto-poky/meta/recipes-support/libcap/libcap_2.24.bb index 36b94ee74..a701019bb 100644 --- a/yocto-poky/meta/recipes-support/libcap/libcap_2.24.bb +++ b/yocto-poky/meta/recipes-support/libcap/libcap_2.24.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://sites.google.com/site/fullycapable/" LICENSE = "BSD | GPLv2" LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" -DEPENDS = "perl-native-runtime" +DEPENDS = "hostperl-runtime-native" SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz" @@ -72,6 +72,5 @@ FILES_${PN}-dev += "${base_libdir}/*.so" # pam files FILES_${PN} += "${base_libdir}/security/*.so" -FILES_${PN}-dbg += "${base_libdir}/security/.debug/*.so" BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.8.bb b/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.11.bb index 2b1b91063..9df792320 100644 --- a/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.8.bb +++ b/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.11.bb @@ -11,11 +11,10 @@ SECTION = "x11/utils" DEPENDS = "glib-2.0 libxml2 zlib" BBCLASSEXTEND = "native" EXTRA_OECONF += "--enable-Bsymbolic=auto" -PR = "r2" BINCONFIG = "${bindir}/croco-0.6-config" inherit autotools pkgconfig gnomebase gtk-doc binconfig-disabled -SRC_URI[archive.md5sum] = "767e73c4174f75b99695d4530fd9bb80" -SRC_URI[archive.sha256sum] = "ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570" +SRC_URI[archive.md5sum] = "dabc1911dfbfa85f8e6859ca47863168" +SRC_URI[archive.sha256sum] = "132b528a948586b0dfa05d7e9e059901bca5a3be675b6071a90a90b81ae5a056" diff --git a/yocto-poky/meta/recipes-support/libevdev/libevdev_1.4.2.bb b/yocto-poky/meta/recipes-support/libevdev/libevdev_1.4.6.bb index f851305c5..c8163e3bf 100644 --- a/yocto-poky/meta/recipes-support/libevdev/libevdev_1.4.2.bb +++ b/yocto-poky/meta/recipes-support/libevdev/libevdev_1.4.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] = "debfcd5153558eba25a8e71eb2534ae8" -SRC_URI[sha256sum] = "7c77b213f075706d428a2af54b66bf86b03a68e9fb390e7ec48cf55065970643" +SRC_URI[md5sum] = "9b3f25bd8fb0f8efa4944d34668dddc0" +SRC_URI[sha256sum] = "7b2ae1a0c7f9f7a96198ddc8fd167f090f233d6cbd8168b847e4f968445132d3" inherit autotools pkgconfig diff --git a/yocto-poky/meta/recipes-support/libevent/libevent_2.0.22.bb b/yocto-poky/meta/recipes-support/libevent/libevent_2.0.22.bb index 58c263c4d..df8a31c58 100644 --- a/yocto-poky/meta/recipes-support/libevent/libevent_2.0.22.bb +++ b/yocto-poky/meta/recipes-support/libevent/libevent_2.0.22.bb @@ -14,6 +14,8 @@ SRC_URI = " \ SRC_URI[md5sum] = "c4c56f986aa985677ca1db89630a2e11" SRC_URI[sha256sum] = "71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3" +UPSTREAM_CHECK_URI = "http://libevent.org/" + S = "${WORKDIR}/${BPN}-${PV}-stable" PACKAGECONFIG ??= "" diff --git a/yocto-poky/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch b/yocto-poky/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch new file mode 100644 index 000000000..db96e6354 --- /dev/null +++ b/yocto-poky/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch @@ -0,0 +1,32 @@ +From a5efaa96fd934eb245c234a5275fcf62698ef986 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 2 Apr 2015 21:38:03 -0700 +Subject: [PATCH] mips: Use compiler internal define for linux + +__linux__ is defined by compiler when building for +linux platforms, lets use it + + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mips/ffitarget.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mips/ffitarget.h b/src/mips/ffitarget.h +index 717d659..6faa358 100644 +--- a/src/mips/ffitarget.h ++++ b/src/mips/ffitarget.h +@@ -32,7 +32,7 @@ + #error "Please do not include ffitarget.h directly into your source. Use ffi.h instead." + #endif + +-#ifdef linux ++#ifdef __linux__ + # include <asm/sgidefs.h> + #elif defined(__rtems__) + /* +-- +2.1.4 + diff --git a/yocto-poky/meta/recipes-support/libffi/libffi/not-win32.patch b/yocto-poky/meta/recipes-support/libffi/libffi/not-win32.patch new file mode 100644 index 000000000..1e90125ed --- /dev/null +++ b/yocto-poky/meta/recipes-support/libffi/libffi/not-win32.patch @@ -0,0 +1,22 @@ +libffi's configure assumes that cross-compiled builds are complicated and +introduces convoluted path manipulation involving gcc search paths to the +install paths, resulting in paths like -L/usr/lib/../lib/ appearing in +libffi.pc. When pkg-config is then used to obtain the linker flags for libffi +it can't tell that this path is on the default search path and returns +$SYSROOT/usr/lib/../lib which then gets written all over the target sysroot. +This then means the sstate can't be shared and triggers QA errors. + +As this block is generally pointless, disable it. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- a/configure.ac~ 2014-11-12 11:56:51.000000000 +0000 ++++ b/configure.ac 2016-02-04 14:02:53.765710532 +0000 +@@ -593,5 +593,5 @@ + # These variables are only ever used when we cross-build to X86_WIN32. + # And we only support this with GCC, so... +-if test "x$GCC" = "xyes"; then ++if false; then + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then
\ No newline at end of file diff --git a/yocto-poky/meta/recipes-support/libffi/libffi_3.2.1.bb b/yocto-poky/meta/recipes-support/libffi/libffi_3.2.1.bb new file mode 100644 index 000000000..72e25fb9d --- /dev/null +++ b/yocto-poky/meta/recipes-support/libffi/libffi_3.2.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "A portable foreign function interface library" +DESCRIPTION = "The `libffi' library provides a portable, high level programming interface to various calling \ +conventions. This allows a programmer to call any function specified by a call interface description at run \ +time. FFI stands for Foreign Function Interface. A foreign function interface is the popular name for the \ +interface that allows code written in one language to call code written in another language. The `libffi' \ +library really only provides the lowest, machine dependent layer of a fully featured foreign function interface. \ +A layer must exist above `libffi' that handles type conversions for values passed between the two languages." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b" + +SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.tar.gz \ + file://not-win32.patch \ + file://0001-mips-Use-compiler-internal-define-for-linux.patch \ + " + +SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43" +SRC_URI[sha256sum] = "d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37" + +EXTRA_OECONF += "--disable-builddir" + +inherit autotools texinfo + +FILES_${PN}-dev += "${libdir}/libffi-${PV}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.3.bb b/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.4.bb index 36752692b..f20496803 100644 --- a/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.3.bb +++ b/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.4.bb @@ -11,15 +11,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ " -SRC_URI[md5sum] = "3ff38200701658f7e80e25ed395d92dd" -SRC_URI[sha256sum] = "c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9" +SRC_URI[md5sum] = "74997d75e7e87dc73398746fd373bf52" +SRC_URI[sha256sum] = "7804f6f28cb3d1bc8ffb3151ab7ff0c063b27c5f9b06c682eb903e01cf25502f" S = "${WORKDIR}/libfm-${PV}" EXTRA_OECONF = "--with-extra-only --with-gtk=no" -PR = "r1" - inherit autotools pkgconfig gtk-doc do_configure[dirs] =+ "${S}/m4" diff --git a/yocto-poky/meta/recipes-support/libfm/libfm_1.2.3.bb b/yocto-poky/meta/recipes-support/libfm/libfm_1.2.4.bb index e9ff6569c..866b11a9a 100644 --- a/yocto-poky/meta/recipes-support/libfm/libfm_1.2.3.bb +++ b/yocto-poky/meta/recipes-support/libfm/libfm_1.2.4.bb @@ -2,7 +2,7 @@ SUMMARY = "Library for file management" HOMEPAGE = "http://pcmanfm.sourceforge.net/" LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b \ file://src/fm.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007 \ file://src/base/fm-config.h;beginline=10;endline=23;md5=ef1f84da64b3c01cca447212f7ef6007 \ file://src/fm-gtk.h;beginline=6;endline=19;md5=646baa4955c04fe768f2ca27b92ac8dd" @@ -13,10 +13,8 @@ DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra ge SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz" -SRC_URI[md5sum] = "3ff38200701658f7e80e25ed395d92dd" -SRC_URI[sha256sum] = "c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9" - -PR = "r1" +SRC_URI[md5sum] = "74997d75e7e87dc73398746fd373bf52" +SRC_URI[sha256sum] = "7804f6f28cb3d1bc8ffb3151ab7ff0c063b27c5f9b06c682eb903e01cf25502f" inherit autotools pkgconfig gtk-doc distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" @@ -25,7 +23,6 @@ do_configure[dirs] =+ "${S}/m4" PACKAGES += "${PN}-mime" FILES_${PN}-mime = "${datadir}/mime/" -FILES_${PN}-dbg += "${libdir}/libfm/modules/.debug" do_install_append () { # remove files which are part of libfm-extra diff --git a/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2015-7511_1.patch b/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2015-7511_1.patch deleted file mode 100644 index 14c25b9ad..000000000 --- a/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2015-7511_1.patch +++ /dev/null @@ -1,245 +0,0 @@ -From 2ef48ba59c32bfa1a9265d5eea8ab225a658903a Mon Sep 17 00:00:00 2001 -From: Werner Koch <wk@gnupg.org> -Date: Thu, 9 Jan 2014 19:14:09 +0100 -Subject: [PATCH] ecc: Make a macro shorter. - -* src/mpi.h (MPI_EC_TWISTEDEDWARDS): Rename to MPI_EC_EDWARDS. CHnage -all users. -* cipher/ecc-curves.c (domain_parms): Add parameters for Curve3617 as -comment. -* mpi/ec.c (dup_point_twistededwards): Rename to dup_point_edwards. -(add_points_twistededwards): Rename to add_points_edwards. - -Signed-off-by: Werner Koch <wk@gnupg.org> - -Upstream-Status: Backport -2ef48ba59c32bfa1a9265d5eea8ab225a658903a - -CVE: CVE-2015-7511 depend patch -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - cipher/ecc-curves.c | 22 +++++++++++++++++++--- - cipher/ecc-misc.c | 4 ++-- - cipher/ecc.c | 8 ++++---- - mpi/ec.c | 22 +++++++++++----------- - src/mpi.h | 11 ++++++++--- - 5 files changed, 44 insertions(+), 23 deletions(-) - -Index: libgcrypt-1.6.3/cipher/ecc-curves.c -=================================================================== ---- libgcrypt-1.6.3.orig/cipher/ecc-curves.c -+++ libgcrypt-1.6.3/cipher/ecc-curves.c -@@ -105,7 +105,7 @@ static const ecc_domain_parms_t domain_p - { - /* (-x^2 + y^2 = 1 + dx^2y^2) */ - "Ed25519", 256, 0, -- MPI_EC_TWISTEDEDWARDS, ECC_DIALECT_ED25519, -+ MPI_EC_EDWARDS, ECC_DIALECT_ED25519, - "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFED", - "-0x01", - "-0x2DFC9311D490018C7338BF8688861767FF8FF5B2BEBE27548A14B235ECA6874A", -@@ -113,6 +113,22 @@ static const ecc_domain_parms_t domain_p - "0x216936D3CD6E53FEC0A4E231FDD6DC5C692CC7609525A7B2C9562D608F25D51A", - "0x6666666666666666666666666666666666666666666666666666666666666658" - }, -+#if 0 /* No real specs yet found. */ -+ { -+ /* x^2 + y^2 = 1 + 3617x^2y^2 mod 2^414 - 17 */ -+ "Curve3617", -+ "0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" -+ "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF", -+ MPI_EC_EDWARDS, 0, -+ "0x01", -+ "0x0e21", -+ "0x07FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEB3CC92414CF" -+ "706022B36F1C0338AD63CF181B0E71A5E106AF79", -+ "0x1A334905141443300218C0631C326E5FCD46369F44C03EC7F57FF35498A4AB4D" -+ "6D6BA111301A73FAA8537C64C4FD3812F3CBC595", -+ "0x22" -+ }, -+#endif /*0*/ - { - "NIST P-192", 192, 1, - MPI_EC_WEIERSTRASS, ECC_DIALECT_STANDARD, -@@ -404,7 +420,7 @@ _gcry_ecc_fill_in_curve (unsigned int nb - switch (domain_parms[idx].model) - { - case MPI_EC_WEIERSTRASS: -- case MPI_EC_TWISTEDEDWARDS: -+ case MPI_EC_EDWARDS: - break; - case MPI_EC_MONTGOMERY: - return GPG_ERR_NOT_SUPPORTED; -@@ -1039,7 +1055,7 @@ _gcry_ecc_get_mpi (const char *name, mpi - if (name[1] != '@') - return _gcry_mpi_ec_ec2os (ec->Q, ec); - -- if (!strcmp (name+2, "eddsa") && ec->model == MPI_EC_TWISTEDEDWARDS) -+ if (!strcmp (name+2, "eddsa") && ec->model == MPI_EC_EDWARDS) - { - unsigned char *encpk; - unsigned int encpklen; -Index: libgcrypt-1.6.3/cipher/ecc-misc.c -=================================================================== ---- libgcrypt-1.6.3.orig/cipher/ecc-misc.c -+++ libgcrypt-1.6.3/cipher/ecc-misc.c -@@ -79,7 +79,7 @@ _gcry_ecc_model2str (enum gcry_mpi_ec_mo - { - case MPI_EC_WEIERSTRASS: str = "Weierstrass"; break; - case MPI_EC_MONTGOMERY: str = "Montgomery"; break; -- case MPI_EC_TWISTEDEDWARDS: str = "Twisted Edwards"; break; -+ case MPI_EC_EDWARDS: str = "Edwards"; break; - } - return str; - } -@@ -252,7 +252,7 @@ _gcry_ecc_compute_public (mpi_point_t Q, - - if (!d || !G || !ec->p || !ec->a) - return NULL; -- if (ec->model == MPI_EC_TWISTEDEDWARDS && !ec->b) -+ if (ec->model == MPI_EC_EDWARDS && !ec->b) - return NULL; - - if (ec->dialect == ECC_DIALECT_ED25519 -Index: libgcrypt-1.6.3/cipher/ecc.c -=================================================================== ---- libgcrypt-1.6.3.orig/cipher/ecc.c -+++ libgcrypt-1.6.3/cipher/ecc.c -@@ -642,7 +642,7 @@ ecc_check_secret_key (gcry_sexp_t keypar - if (!curvename) - { - sk.E.model = ((flags & PUBKEY_FLAG_EDDSA) -- ? MPI_EC_TWISTEDEDWARDS -+ ? MPI_EC_EDWARDS - : MPI_EC_WEIERSTRASS); - sk.E.dialect = ((flags & PUBKEY_FLAG_EDDSA) - ? ECC_DIALECT_ED25519 -@@ -774,7 +774,7 @@ ecc_sign (gcry_sexp_t *r_sig, gcry_sexp_ - if (!curvename) - { - sk.E.model = ((ctx.flags & PUBKEY_FLAG_EDDSA) -- ? MPI_EC_TWISTEDEDWARDS -+ ? MPI_EC_EDWARDS - : MPI_EC_WEIERSTRASS); - sk.E.dialect = ((ctx.flags & PUBKEY_FLAG_EDDSA) - ? ECC_DIALECT_ED25519 -@@ -938,7 +938,7 @@ ecc_verify (gcry_sexp_t s_sig, gcry_sexp - if (!curvename) - { - pk.E.model = ((sigflags & PUBKEY_FLAG_EDDSA) -- ? MPI_EC_TWISTEDEDWARDS -+ ? MPI_EC_EDWARDS - : MPI_EC_WEIERSTRASS); - pk.E.dialect = ((sigflags & PUBKEY_FLAG_EDDSA) - ? ECC_DIALECT_ED25519 -@@ -1528,7 +1528,7 @@ compute_keygrip (gcry_md_hd_t md, gcry_s - if (!curvename) - { - model = ((flags & PUBKEY_FLAG_EDDSA) -- ? MPI_EC_TWISTEDEDWARDS -+ ? MPI_EC_EDWARDS - : MPI_EC_WEIERSTRASS); - dialect = ((flags & PUBKEY_FLAG_EDDSA) - ? ECC_DIALECT_ED25519 -Index: libgcrypt-1.6.3/mpi/ec.c -=================================================================== ---- libgcrypt-1.6.3.orig/mpi/ec.c -+++ libgcrypt-1.6.3/mpi/ec.c -@@ -605,7 +605,7 @@ _gcry_mpi_ec_get_affine (gcry_mpi_t x, g - } - return -1; - -- case MPI_EC_TWISTEDEDWARDS: -+ case MPI_EC_EDWARDS: - { - gcry_mpi_t z; - -@@ -725,7 +725,7 @@ dup_point_montgomery (mpi_point_t result - - /* RESULT = 2 * POINT (Twisted Edwards version). */ - static void --dup_point_twistededwards (mpi_point_t result, mpi_point_t point, mpi_ec_t ctx) -+dup_point_edwards (mpi_point_t result, mpi_point_t point, mpi_ec_t ctx) - { - #define X1 (point->x) - #define Y1 (point->y) -@@ -811,8 +811,8 @@ _gcry_mpi_ec_dup_point (mpi_point_t resu - case MPI_EC_MONTGOMERY: - dup_point_montgomery (result, point, ctx); - break; -- case MPI_EC_TWISTEDEDWARDS: -- dup_point_twistededwards (result, point, ctx); -+ case MPI_EC_EDWARDS: -+ dup_point_edwards (result, point, ctx); - break; - } - } -@@ -977,9 +977,9 @@ add_points_montgomery (mpi_point_t resul - - /* RESULT = P1 + P2 (Twisted Edwards version).*/ - static void --add_points_twistededwards (mpi_point_t result, -- mpi_point_t p1, mpi_point_t p2, -- mpi_ec_t ctx) -+add_points_edwards (mpi_point_t result, -+ mpi_point_t p1, mpi_point_t p2, -+ mpi_ec_t ctx) - { - #define X1 (p1->x) - #define Y1 (p1->y) -@@ -1087,8 +1087,8 @@ _gcry_mpi_ec_add_points (mpi_point_t res - case MPI_EC_MONTGOMERY: - add_points_montgomery (result, p1, p2, ctx); - break; -- case MPI_EC_TWISTEDEDWARDS: -- add_points_twistededwards (result, p1, p2, ctx); -+ case MPI_EC_EDWARDS: -+ add_points_edwards (result, p1, p2, ctx); - break; - } - } -@@ -1106,7 +1106,7 @@ _gcry_mpi_ec_mul_point (mpi_point_t resu - unsigned int i, loops; - mpi_point_struct p1, p2, p1inv; - -- if (ctx->model == MPI_EC_TWISTEDEDWARDS) -+ if (ctx->model == MPI_EC_EDWARDS) - { - /* Simple left to right binary method. GECC Algorithm 3.27 */ - unsigned int nbits; -@@ -1269,7 +1269,7 @@ _gcry_mpi_ec_curve_point (gcry_mpi_point - log_fatal ("%s: %s not yet supported\n", - "_gcry_mpi_ec_curve_point", "Montgomery"); - break; -- case MPI_EC_TWISTEDEDWARDS: -+ case MPI_EC_EDWARDS: - { - /* a · x^2 + y^2 - 1 - b · x^2 · y^2 == 0 */ - ec_pow2 (x, x, ctx); -Index: libgcrypt-1.6.3/src/mpi.h -=================================================================== ---- libgcrypt-1.6.3.orig/src/mpi.h -+++ libgcrypt-1.6.3/src/mpi.h -@@ -245,13 +245,18 @@ void _gcry_mpi_snatch_point (gcry_mpi_t - /* Models describing an elliptic curve. */ - enum gcry_mpi_ec_models - { -- -+ /* The Short Weierstrass equation is -+ y^2 = x^3 + ax + b -+ */ - MPI_EC_WEIERSTRASS = 0, -+ /* The Montgomery equation is -+ by^2 = x^3 + ax^2 + x -+ */ - MPI_EC_MONTGOMERY, -- MPI_EC_TWISTEDEDWARDS -- /* The equation for Twisted Edwards curves is -+ /* The Twisted Edwards equation is - ax^2 + y^2 = 1 + bx^2y^2 - Note that we use 'b' instead of the commonly used 'd'. */ -+ MPI_EC_EDWARDS - }; - - /* Dialects used with elliptic curves. It is easier to keep the diff --git a/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2015-7511_2.patch b/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2015-7511_2.patch deleted file mode 100644 index 8093a18cf..000000000 --- a/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2015-7511_2.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 88e1358962e902ff1cbec8d53ba3eee46407851a Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Wed, 25 Nov 2015 12:46:19 +0900 -Subject: [PATCH] ecc: Constant-time multiplication for Weierstrass curve. - -* mpi/ec.c (_gcry_mpi_ec_mul_point): Use simple left-to-right binary -method for Weierstrass curve when SCALAR is secure. - -Upstream-Status: Backport - -http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=88e1358962e902ff1cbec8d53ba3eee46407851a - -CVE: CVE-2015-7511 fix -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - mpi/ec.c | 19 +++++++++++++++---- - 1 file changed, 15 insertions(+), 4 deletions(-) - -Index: libgcrypt-1.6.3/mpi/ec.c -=================================================================== ---- libgcrypt-1.6.3.orig/mpi/ec.c -+++ libgcrypt-1.6.3/mpi/ec.c -@@ -1106,16 +1106,27 @@ _gcry_mpi_ec_mul_point (mpi_point_t resu - unsigned int i, loops; - mpi_point_struct p1, p2, p1inv; - -- if (ctx->model == MPI_EC_EDWARDS) -+ if (ctx->model == MPI_EC_EDWARDS -+ || (ctx->model == MPI_EC_WEIERSTRASS -+ && mpi_is_secure (scalar))) - { - /* Simple left to right binary method. GECC Algorithm 3.27 */ - unsigned int nbits; - int j; - - nbits = mpi_get_nbits (scalar); -- mpi_set_ui (result->x, 0); -- mpi_set_ui (result->y, 1); -- mpi_set_ui (result->z, 1); -+ if (ctx->model == MPI_EC_WEIERSTRASS) -+ { -+ mpi_set_ui (result->x, 1); -+ mpi_set_ui (result->y, 1); -+ mpi_set_ui (result->z, 0); -+ } -+ else -+ { -+ mpi_set_ui (result->x, 0); -+ mpi_set_ui (result->y, 1); -+ mpi_set_ui (result->z, 1); -+ } - - if (mpi_is_secure (scalar)) - { diff --git a/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc b/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc index 683be780f..5478253e0 100644 --- a/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc +++ b/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc @@ -22,8 +22,6 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ BINCONFIG = "${bindir}/libgcrypt-config" -PR = "r1" - inherit autotools texinfo binconfig-disabled pkgconfig EXTRA_OECONF = "--disable-asm --with-capabilities" diff --git a/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb b/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb deleted file mode 100644 index db89faf80..000000000 --- a/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.6.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libgcrypt.inc - -SRC_URI += "\ - file://CVE-2015-7511_1.patch \ - file://CVE-2015-7511_2.patch \ - " -SRC_URI[md5sum] = "de03b867d02fdf115a1bac8bb8b5c3a3" -SRC_URI[sha256sum] = "69e94e1a7084d94e1a6ca26d436068cb74862d10a7353cfae579a2d88674ff09" diff --git a/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.6.5.bb b/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.6.5.bb new file mode 100644 index 000000000..717a23f1c --- /dev/null +++ b/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.6.5.bb @@ -0,0 +1,4 @@ +require libgcrypt.inc + +SRC_URI[md5sum] = "f24fcb684932d4b5ed85f2f05cb1d9f8" +SRC_URI[sha256sum] = "202bf109ccf2d614565c849f3e5687b94cde972167b35261e094252367627bc6" diff --git a/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb b/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.21.bb index c69930a92..0dd16025a 100644 --- a/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb +++ b/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.21.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=8b204918f0ca707136394d8bb20c7ebc \ + file://src/gpg-error.h.in;endline=23;md5=93d3155af141ae3b369a5d09ca9d6234 \ file://src/init.c;endline=20;md5=8f5a9b59634f4aebcd0ec9d3ebd53bfe" @@ -15,8 +15,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ file://0001-libgpg-error-Add-nios2-support.patch \ " -SRC_URI[md5sum] = "c04c16245b92829281f43b5bef7d16da" -SRC_URI[sha256sum] = "53120e1333d5c5d28d87ff2854e9e98719c8e214152f17ad5291704d25c4978b" +SRC_URI[md5sum] = "ab0b5aba6d0a185b41d07bda804fd8b2" +SRC_URI[sha256sum] = "b7dbdb3cad63a740e9f0c632a1da32d4afdb694ec86c8625c98ea0691713b84d" BINCONFIG = "${bindir}/gpg-error-config" diff --git a/yocto-poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch b/yocto-poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch new file mode 100644 index 000000000..c5c0cb076 --- /dev/null +++ b/yocto-poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch @@ -0,0 +1,33 @@ +From 918cd8764a845a9d25918a444fbaa5070d2be609 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Fri, 21 Aug 2015 16:38:05 +0300 +Subject: [PATCH] Remove cmake check for Perl + +We set "CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY" in cmake bbclass to +make sure cmake does not find host programs. In this case we actually +are fine with host perl: remove the check. + +Upstream-Status: Inappropriate [workaround] + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d5aad80..5cc9863 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -91,8 +91,7 @@ if(SHARED_ONLY) + set(LIBRARY_TYPE SHARED) + endif() + +-# must have Perl to create the derived stuff +-find_package(Perl REQUIRED) ++set(PERL_EXECUTABLE perl) + + # MSVC specific definitions + if(WIN32) +-- +2.1.4 + diff --git a/yocto-poky/meta/recipes-support/libical/libical_1.0.0.bb b/yocto-poky/meta/recipes-support/libical/libical_1.0.0.bb deleted file mode 100644 index be6b635ca..000000000 --- a/yocto-poky/meta/recipes-support/libical/libical_1.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" -HOMEPAGE = "https://github.com/libical/libical" -BUGTRACKER = "https://github.com/libical/libical/issues" -LICENSE = "LGPLv2.1 | MPL-1" -LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ - file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" -SECTION = "libs" - -SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "f4b8e33ae5efb2f025eb43ce69682a36" -SRC_URI[sha256sum] = "0072e83834092315772e6719b85fc8b11530b1ff53f4d108315fb38cddbce8c2" - -inherit autotools diff --git a/yocto-poky/meta/recipes-support/libical/libical_2.0.0.bb b/yocto-poky/meta/recipes-support/libical/libical_2.0.0.bb new file mode 100644 index 000000000..1042e6fa3 --- /dev/null +++ b/yocto-poky/meta/recipes-support/libical/libical_2.0.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" +HOMEPAGE = "https://github.com/libical/libical" +BUGTRACKER = "https://github.com/libical/libical/issues" +LICENSE = "LGPLv2.1 | MPL-1" +LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ + file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" +SECTION = "libs" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + file://Remove-cmake-check-for-Perl.patch \ + " +DEPENDS = "icu" + +SRC_URI[md5sum] = "6bf8e5f5a3ba88baf390d0134e05d76e" +SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da" +UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" + +inherit cmake + +FILES_${PN}-dev += "${libdir}/cmake/*" + +# +# Turn specific library paths in the pkgconfig file into standard library entries +# +do_install_append () { + sed -i -e "s#${STAGING_LIBDIR}/lib\([a-z0-9]*\)\.so#-l\1#g" ${D}${libdir}/pkgconfig/libical.pc +} diff --git a/yocto-poky/meta/recipes-support/libmpc/libmpc_1.0.3.bb b/yocto-poky/meta/recipes-support/libmpc/libmpc_1.0.3.bb index f3e5a18ea..4f1f5242f 100644 --- a/yocto-poky/meta/recipes-support/libmpc/libmpc_1.0.3.bb +++ b/yocto-poky/meta/recipes-support/libmpc/libmpc_1.0.3.bb @@ -8,6 +8,8 @@ SRC_URI = "http://www.multiprecision.org/mpc/download/mpc-${PV}.tar.gz" SRC_URI[md5sum] = "d6a1d5f8ddea3abd2cc3e98f58352d26" SRC_URI[sha256sum] = "617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3" +UPSTREAM_CHECK_URI = "http://www.multiprecision.org/index.php?prog=mpc&page=download" + S = "${WORKDIR}/mpc-${PV}" BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/libnl/libnl_3.2.25.bb b/yocto-poky/meta/recipes-support/libnl/libnl_3.2.25.bb index 97814fb13..cabe84107 100644 --- a/yocto-poky/meta/recipes-support/libnl/libnl_3.2.25.bb +++ b/yocto-poky/meta/recipes-support/libnl/libnl_3.2.25.bb @@ -25,14 +25,12 @@ FILES_${PN} = "${libdir}/libnl-3.so.* \ ${sysconfdir}" RREPLACES_${PN} = "libnl2" RCONFLICTS_${PN} = "libnl2" -FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug" -FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \ - ${libdir}/libnl/cli/*/*.la" FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl ${PN}-idiag" FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ - ${libdir}/libnl/cli/*/*.so.* \ + ${libdir}/libnl/cli/*/*.so \ + ${libdir}/libnl/cli/*/*.la \ ${sbindir}/nl-*" FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" diff --git a/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch deleted file mode 100644 index aff1cb184..000000000 --- a/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -From 1921498bcc06408e8b051a3a9e9ce4182998f748 Mon Sep 17 00:00:00 2001 -From: David Schleef <ds@schleef.org> -Date: Fri, 8 Apr 2011 10:05:49 -0700 -Subject: [PATCH 10/10] Fix --enable-vfp flag - -Patch from Christophe Lyon, fixes #36084. ---- - configure.ac | 4 ++-- - liboil/arm/Makefile.am | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 98c81fb..407d88c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -188,8 +188,8 @@ fi - AC_ARG_ENABLE(vfp, - AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]), - enable_vfp=$enableval,enable_vfp=yes) --if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then -- AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"], -+if test "x$enable_vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then -+ AS_COMPILER_FLAG(["-mfpu=vfp"], - [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"], - true) - #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"], -diff --git a/liboil/arm/Makefile.am b/liboil/arm/Makefile.am -index ead08ed..cd8d9fa 100644 ---- a/liboil/arm/Makefile.am -+++ b/liboil/arm/Makefile.am -@@ -6,4 +6,5 @@ libarm_la_SOURCES = \ - math_vfp_asm.S - - libarm_la_CFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS) -+libarm_la_CCASFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS) - --- -1.7.6 - diff --git a/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch deleted file mode 100644 index c8e3c1f72..000000000 --- a/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=31358 - -configure: fix whitelisting of x86_64 unaligned memory access - -Fix typo in whitelist so cross-compile works for x86_64. - -Upstream-Status: Inappropriate [configuration] - ---- liboil-0.3.17/m4/as-unaligned-access.m4.orig 2009-02-26 14:40:08.000000000 -0500 -+++ liboil-0.3.17/m4/as-unaligned-access.m4 2010-11-03 12:19:55.000000000 -0400 -@@ -9,7 +9,7 @@ - _AS_ECHO_N([(blacklisted) ]) - as_cv_unaligned_access=no - ;; -- i?86*|x86_64|amd64|powerpc*|m68k*|cris*) -+ i?86*|x86_64*|amd64*|powerpc*|m68k*|cris*) - _AS_ECHO_N([(whitelisted) ]) - as_cv_unaligned_access=yes - ;; diff --git a/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch deleted file mode 100644 index 473380e9f..000000000 --- a/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch +++ /dev/null @@ -1,222 +0,0 @@ -Upstream-Status: Pending - -Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors. - -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -2011/12/01 - - -Index: liboil-0.3.17/liboil/amd64/wavelet.c -=================================================================== ---- liboil-0.3.17.orig/liboil/amd64/wavelet.c -+++ liboil-0.3.17/liboil/amd64/wavelet.c -@@ -21,14 +21,14 @@ deinterleave2_asm (int16_t *d1, int16_t - asm volatile ("\n" - " sub $2, %%rcx\n" - "1:\n" -- " movw (%1,%%rcx,4), %%ax\n" -- " movw %%ax, (%0,%%rcx,2)\n" -- " movw 2(%1,%%rcx,4), %%ax\n" -- " movw %%ax, (%2,%%rcx,2)\n" -- " movw 4(%1,%%rcx,4), %%ax\n" -- " movw %%ax, 2(%0,%%rcx,2)\n" -- " movw 6(%1,%%rcx,4), %%ax\n" -- " movw %%ax, 2(%2,%%rcx,2)\n" -+ " movw (%q1,%%rcx,4), %%ax\n" -+ " movw %%ax, (%q0,%%rcx,2)\n" -+ " movw 2(%q1,%%rcx,4), %%ax\n" -+ " movw %%ax, (%q2,%%rcx,2)\n" -+ " movw 4(%q1,%%rcx,4), %%ax\n" -+ " movw %%ax, 2(%q0,%%rcx,2)\n" -+ " movw 6(%q1,%%rcx,4), %%ax\n" -+ " movw %%ax, 2(%q2,%%rcx,2)\n" - " sub $2, %%rcx\n" - " jge 1b\n" - : "+r" (d1), "+r" (s_2xn), "+r" (d2), "+c" (n) -@@ -53,20 +53,20 @@ deinterleave2_mmx (int16_t *d1, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%1,%%rcx,4), %%mm0\n" -- " movq 8(%1,%%rcx,4), %%mm1\n" -+ " movq (%q1,%%rcx,4), %%mm0\n" -+ " movq 8(%q1,%%rcx,4), %%mm1\n" - " pslld $16, %%mm0\n" - " pslld $16, %%mm1\n" - " psrad $16, %%mm0\n" - " psrad $16, %%mm1\n" - " packssdw %%mm1, %%mm0\n" -- " movq %%mm0, (%0,%%rcx,2)\n" -- " movq (%1,%%rcx,4), %%mm0\n" -- " movq 8(%1,%%rcx,4), %%mm1\n" -+ " movq %%mm0, (%q0,%%rcx,2)\n" -+ " movq (%q1,%%rcx,4), %%mm0\n" -+ " movq 8(%q1,%%rcx,4), %%mm1\n" - " psrad $16, %%mm0\n" - " psrad $16, %%mm1\n" - " packssdw %%mm1, %%mm0\n" -- " movq %%mm0, (%2,%%rcx,2)\n" -+ " movq %%mm0, (%q2,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %3, %%ecx\n" - " jl 1b\n" -@@ -93,10 +93,10 @@ deinterleave2_mmx_2 (int16_t *d1, int16_ - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " pshufw $0xd8, (%1,%%rcx,4), %%mm0\n" -- " movd %%mm0, (%0,%%rcx,2)\n" -- " pshufw $0x8d, (%1,%%rcx,4), %%mm0\n" -- " movd %%mm0, (%2,%%rcx,2)\n" -+ " pshufw $0xd8, (%q1,%%rcx,4), %%mm0\n" -+ " movd %%mm0, (%q0,%%rcx,2)\n" -+ " pshufw $0x8d, (%q1,%%rcx,4), %%mm0\n" -+ " movd %%mm0, (%q2,%%rcx,2)\n" - " add $2, %%rcx\n" - " cmp %3, %%ecx\n" - " jl 1b\n" -@@ -123,16 +123,16 @@ deinterleave2_mmx_3 (int16_t *d1, int16_ - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%1,%%rcx,4), %%mm1\n" -- " movq (%1,%%rcx,4), %%mm2\n" -- " movq 8(%1,%%rcx,4), %%mm0\n" -+ " movq (%q1,%%rcx,4), %%mm1\n" -+ " movq (%q1,%%rcx,4), %%mm2\n" -+ " movq 8(%q1,%%rcx,4), %%mm0\n" - " punpcklwd %%mm0, %%mm1\n" - " punpckhwd %%mm0, %%mm2\n" - " movq %%mm1, %%mm0\n" - " punpcklwd %%mm2, %%mm0\n" - " punpckhwd %%mm2, %%mm1\n" -- " movq %%mm0, (%0,%%rcx,2)\n" -- " movq %%mm1, (%2,%%rcx,2)\n" -+ " movq %%mm0, (%q0,%%rcx,2)\n" -+ " movq %%mm1, (%q2,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %3, %%ecx\n" - " jl 1b\n" -@@ -159,26 +159,26 @@ deinterleave2_mmx_4 (int16_t *d1, int16_ - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%1,%%rcx,4), %%mm1\n" -+ " movq (%q1,%%rcx,4), %%mm1\n" - " movq %%mm1, %%mm2\n" -- " movq 8(%1,%%rcx,4), %%mm0\n" -- " movq 16(%1,%%rcx,4), %%mm5\n" -+ " movq 8(%q1,%%rcx,4), %%mm0\n" -+ " movq 16(%q1,%%rcx,4), %%mm5\n" - " punpcklwd %%mm0, %%mm1\n" - " movq %%mm5, %%mm6\n" - " punpckhwd %%mm0, %%mm2\n" -- " movq 24(%1,%%rcx,4), %%mm4\n" -+ " movq 24(%q1,%%rcx,4), %%mm4\n" - " movq %%mm1, %%mm0\n" - " punpcklwd %%mm4, %%mm5\n" - " punpcklwd %%mm2, %%mm0\n" - " punpckhwd %%mm4, %%mm6\n" - " punpckhwd %%mm2, %%mm1\n" - " movq %%mm5, %%mm4\n" -- " movq %%mm0, (%0,%%rcx,2)\n" -+ " movq %%mm0, (%q0,%%rcx,2)\n" - " punpcklwd %%mm6, %%mm4\n" -- " movq %%mm1, (%2,%%rcx,2)\n" -+ " movq %%mm1, (%q2,%%rcx,2)\n" - " punpckhwd %%mm6, %%mm5\n" -- " movq %%mm4, 8(%0,%%rcx,2)\n" -- " movq %%mm5, 8(%2,%%rcx,2)\n" -+ " movq %%mm4, 8(%q0,%%rcx,2)\n" -+ " movq %%mm5, 8(%q2,%%rcx,2)\n" - " add $8, %%rcx\n" - " cmp %3, %%ecx\n" - " jl 1b\n" -@@ -252,13 +252,13 @@ interleave2_mmx (int16_t *d_2xn, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%1,%%rcx,2), %%mm0\n" -- " movq (%2,%%rcx,2), %%mm1\n" -+ " movq (%q1,%%rcx,2), %%mm0\n" -+ " movq (%q2,%%rcx,2), %%mm1\n" - " movq %%mm0, %%mm2\n" - " punpckhwd %%mm1, %%mm0\n" - " punpcklwd %%mm1, %%mm2\n" -- " movq %%mm2, (%0,%%rcx,4)\n" -- " movq %%mm0, 8(%0,%%rcx,4)\n" -+ " movq %%mm2, (%q0,%%rcx,4)\n" -+ " movq %%mm0, 8(%q0,%%rcx,4)\n" - " add $4, %%rcx\n" - " cmp %3, %%ecx\n" - " jl 1b\n" -@@ -285,12 +285,12 @@ lift_add_shift1_mmx (int16_t *d, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%2,%%rcx,2), %%mm1\n" -- " movq (%3,%%rcx,2), %%mm2\n" -+ " movq (%q2,%%rcx,2), %%mm1\n" -+ " movq (%q3,%%rcx,2), %%mm2\n" - " paddw %%mm2, %%mm1\n" - " psraw $1, %%mm1\n" -- " paddw (%1,%%rcx,2), %%mm1\n" -- " movq %%mm1, (%0,%%rcx,2)\n" -+ " paddw (%q1,%%rcx,2), %%mm1\n" -+ " movq %%mm1, (%q0,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %4, %%ecx\n" - " jl 1b\n" -@@ -317,13 +317,13 @@ lift_sub_shift1_mmx (int16_t *d, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%2,%%rcx,2), %%mm1\n" -- " movq (%3,%%rcx,2), %%mm2\n" -- " movq (%1,%%rcx,2), %%mm0\n" -+ " movq (%q2,%%rcx,2), %%mm1\n" -+ " movq (%q3,%%rcx,2), %%mm2\n" -+ " movq (%q1,%%rcx,2), %%mm0\n" - " paddw %%mm2, %%mm1\n" - " psraw $1, %%mm1\n" - " psubw %%mm1, %%mm0\n" -- " movq %%mm0, (%0,%%rcx,2)\n" -+ " movq %%mm0, (%q0,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %4, %%ecx\n" - " jl 1b\n" -@@ -350,12 +350,12 @@ lift_add_shift2_mmx (int16_t *d, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%2,%%rcx,2), %%mm1\n" -- " movq (%3,%%rcx,2), %%mm2\n" -+ " movq (%q2,%%rcx,2), %%mm1\n" -+ " movq (%q3,%%rcx,2), %%mm2\n" - " paddw %%mm2, %%mm1\n" - " psraw $2, %%mm1\n" -- " paddw (%1,%%rcx,2), %%mm1\n" -- " movq %%mm1, (%0,%%rcx,2)\n" -+ " paddw (%q1,%%rcx,2), %%mm1\n" -+ " movq %%mm1, (%q0,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %4, %%ecx\n" - " jl 1b\n" -@@ -382,13 +382,13 @@ lift_sub_shift2_mmx (int16_t *d, int16_t - asm volatile ("\n" - " xor %%rcx, %%rcx\n" - "1:\n" -- " movq (%2,%%rcx,2), %%mm1\n" -- " movq (%3,%%rcx,2), %%mm2\n" -- " movq (%1,%%rcx,2), %%mm0\n" -+ " movq (%q2,%%rcx,2), %%mm1\n" -+ " movq (%q3,%%rcx,2), %%mm2\n" -+ " movq (%q1,%%rcx,2), %%mm0\n" - " paddw %%mm2, %%mm1\n" - " psraw $2, %%mm1\n" - " psubw %%mm1, %%mm0\n" -- " movq %%mm0, (%0,%%rcx,2)\n" -+ " movq %%mm0, (%q0,%%rcx,2)\n" - " add $4, %%rcx\n" - " cmp %4, %%ecx\n" - " jl 1b\n" diff --git a/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch b/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch deleted file mode 100644 index 892d44131..000000000 --- a/yocto-poky/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - ---- liboil-0.3.9/liboil/liboilfunction.c.old 2006-09-18 13:03:20.000000000 +0100 -+++ liboil-0.3.9/liboil/liboilfunction.c 2006-09-18 13:04:10.000000000 +0100 -@@ -345,7 +345,9 @@ - return; - } - -- test = oil_test_new (klass); -+ klass->chosen_impl = klass->reference_impl; -+ klass->func = klass->reference_impl->func; -+/* test = oil_test_new (klass); - if (test == NULL) { - OIL_ERROR ("failed to test function class %s", klass->name); - return; -@@ -385,7 +387,7 @@ - klass->chosen_impl = min_impl; - klass->func = min_impl->func; - -- oil_test_free (test); -+ oil_test_free (test);*/ - } - - static void diff --git a/yocto-poky/meta/recipes-support/liboil/liboil_0.3.17.bb b/yocto-poky/meta/recipes-support/liboil/liboil_0.3.17.bb deleted file mode 100644 index 03b778521..000000000 --- a/yocto-poky/meta/recipes-support/liboil/liboil_0.3.17.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Library of simple functions optimized for various CPUs" -HOMEPAGE = "http://liboil.freedesktop.org/" -BUGTRACKER = "https://bugs.freedesktop.org/" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=ad80780d9c5205d63481a0184e199a15 \ - file://liboil/liboil.h;endline=28;md5=95c794a66b88800d949fed17e437d9fb \ - file://liboil/liboilcpu.c;endline=28;md5=89da69a61d88eedcba066f42353fb75a \ - file://examples/example1.c;endline=29;md5=9d4dad9fcbbdf0441ee063f8af5170c9 \ - file://testsuite/trans.c;endline=29;md5=380ecd43121fe3dcc0d8d7e5984f283d" - -DEPENDS = "glib-2.0" -PR = "r5" - -SRC_URI = "http://liboil.freedesktop.org/download/${BPN}-${PV}.tar.gz \ - file://no-tests.patch \ - file://fix-unaligned-whitelist.patch \ - file://0001-Fix-enable-vfp-flag.patch \ - file://liboil_fix_for_x32.patch \ - " - -SRC_URI[md5sum] = "47dc734f82faeb2964d97771cfd2e701" -SRC_URI[sha256sum] = "105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69" - -inherit autotools pkgconfig - -ARM_INSTRUCTION_SET = "arm" diff --git a/yocto-poky/meta/recipes-support/libpcre/libpcre_8.38.bb b/yocto-poky/meta/recipes-support/libpcre/libpcre_8.38.bb index c5676073e..384c2fe79 100644 --- a/yocto-poky/meta/recipes-support/libpcre/libpcre_8.38.bb +++ b/yocto-poky/meta/recipes-support/libpcre/libpcre_8.38.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=7e4937814aee14758c1c95b59c80c44d" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/pcre/pcre/${PV}/pcre-${PV}.tar.bz2 \ +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 \ @@ -22,12 +22,13 @@ S = "${WORKDIR}/pcre-${PV}" PROVIDES += "pcre" DEPENDS += "bzip2 zlib" -PACKAGECONFIG ??= "pcre8" +PACKAGECONFIG ??= "pcre8 unicode-properties" PACKAGECONFIG[pcre8] = "--enable-pcre8,--disable-pcre8" PACKAGECONFIG[pcre16] = "--enable-pcre16,--disable-pcre16" PACKAGECONFIG[pcre32] = "--enable-pcre32,--disable-pcre32" PACKAGECONFIG[pcretest-readline] = "--enable-pcretest-libreadline,--disable-pcretest-libreadline,readline," +PACKAGECONFIG[unicode-properties] = "--enable-unicode-properties,--disable-unicode-properties" BINCONFIG = "${bindir}/pcre-config" @@ -36,7 +37,7 @@ inherit autotools binconfig-disabled ptest EXTRA_OECONF = "\ --enable-newline-is-lf \ --enable-rebuild-chartables \ - --enable-utf8 \ + --enable-utf \ --with-link-size=2 \ --with-match-limit=10000000 \ " diff --git a/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.11.bb index 06d0b9ba9..8cc90bb8e 100644 --- a/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.11.bb +++ b/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.11.bb @@ -6,30 +6,31 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" -DEPENDS = "gconf glib-2.0" +DEPENDS = "glib-2.0" SRC_URI = "${DEBIAN_MIRROR}/main/libp/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0001-test-Include-sys-select.h-for-select.patch \ " + SRC_URI[md5sum] = "3cd1ae2a4abecf44b3f24d6639d2cd84" SRC_URI[sha256sum] = "dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b" inherit cmake pkgconfig -EXTRA_OECMAKE = "-DWITH_WEBKIT=no -DWITH_GNOME=yes -DWITH_KDE4=no \ - -DWITH_PYTHON=no -DWITH_PERL=no -DWITH_MOZJS=no -DWITH_NM=no -DLIB_INSTALL_DIR=${libdir} -DLIBEXEC_INSTALL_DIR=${libexecdir}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)} gnome3" +PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" +PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no" + +EXTRA_OECMAKE += " \ + -DWITH_KDE4=no \ + -DWITH_MOZJS=no \ + -DWITH_NM=no \ + -DWITH_PERL=no \ + -DWITH_PYTHON=no \ + -DWITH_WEBKIT=no \ + -DLIB_INSTALL_DIR=${libdir} \ + -DLIBEXEC_INSTALL_DIR=${libexecdir} \ +" FILES_${PN} += "${libdir}/${BPN}/${PV}/modules" FILES_${PN}-dev += "${datadir}/cmake" -FILES_${PN}-dbg += "${libdir}/${BPN}/${PV}/plugins/.debug/ ${libdir}/${BPN}/${PV}/modules/.debug/" - -do_configure_prepend() { - export HOST_SYS=${HOST_SYS} - export BUILD_SYS=${BUILD_SYS} -} - -python() { - if incompatible_license_contains("GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "": - d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE", False).replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no")) - d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS", False).split() if i != "gconf")) -} diff --git a/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb b/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb deleted file mode 100644 index 044db31f4..000000000 --- a/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "An HTTP library implementation in C" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -SECTION = "x11/gnome/libs" - -DEPENDS = "glib-2.0 gnutls libxml2 sqlite3 intltool-native" - -# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Enable -# by default but let it be easily disabled. -PACKAGECONFIG ??= "gnome" -PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome" - -SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" -SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" - -SRC_URI[md5sum] = "9a84d66e1b7ccd3bd340574b11eccc15" -SRC_URI[sha256sum] = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b" - -S = "${WORKDIR}/libsoup-${PV}" - -inherit autotools gettext pkgconfig - -# glib-networking is needed for SSL, proxies, etc. -RRECOMMENDS_${PN} = "glib-networking" diff --git a/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb b/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb new file mode 100644 index 000000000..f6e3db2c9 --- /dev/null +++ b/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.52.2.bb @@ -0,0 +1,34 @@ +SUMMARY = "An HTTP library implementation in C" +HOMEPAGE = "https://wiki.gnome.org/Projects/libsoup" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/gnome/libs" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native" + +SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" + +SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" + +SRC_URI[md5sum] = "e4757d09012ed93822b1ee41435fec24" +SRC_URI[sha256sum] = "db55628b5c7d952945bb71b236469057c8dfb8dea0c271513579c6273c2093dc" + +S = "${WORKDIR}/libsoup-${PV}" + +inherit autotools gettext pkgconfig upstream-version-is-even gobject-introspection + +# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. +PACKAGECONFIG ??= "" +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome" + +EXTRA_OECONF = "--disable-vala" + +# When built without gnome support, libsoup-2.4 will contain only one shared lib +# and will therefore become subject to renaming by debian.bbclass. Prevent +# renaming in order to keep the package name consistent regardless of whether +# gnome support is enabled or disabled. +DEBIAN_NOAUTONAME_${PN} = "1" + +# glib-networking is needed for SSL, proxies, etc. +RRECOMMENDS_${PN} = "glib-networking" diff --git a/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.5.bb b/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.6.bb index 45cf63330..bb701227f 100644 --- a/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.5.bb +++ b/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.6.bb @@ -21,8 +21,8 @@ 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] = "1a705bcdcb83799d544137617b377cfd" -SRC_URI[sha256sum] = "1a8c0772467850bef7197318a95f44abbb678ea83cbf119a3500cc7848276a17" +SRC_URI[md5sum] = "dfae4ff5583649ed24d8f368f1d0543b" +SRC_URI[sha256sum] = "9625eec2507f4789ebb6fc48ebda98be0e0168979a2f68aa8b680bf8eeabbd47" inherit autotools texinfo BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-Fix-build-on-mips-musl.patch b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-Fix-build-on-mips-musl.patch new file mode 100644 index 000000000..5426fcc5c --- /dev/null +++ b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-Fix-build-on-mips-musl.patch @@ -0,0 +1,90 @@ +From e623c7703945a5eb6c9a30586ec5e23b2f7396f6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 23 Mar 2016 06:08:59 +0000 +Subject: [PATCH] Fix build on mips/musl + +Do not include endian.h on musl it includes +further headers which can not be compiled in __ASSEMBLER__ + mode + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/coredump/_UCD_internal.h | 34 ++++++++++++++++++++++++++++++++++ + src/mips/getcontext.S | 3 +-- + 2 files changed, 35 insertions(+), 2 deletions(-) + +diff --git a/src/coredump/_UCD_internal.h b/src/coredump/_UCD_internal.h +index 3c95a2a..80acc15 100644 +--- a/src/coredump/_UCD_internal.h ++++ b/src/coredump/_UCD_internal.h +@@ -34,6 +34,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + #ifdef HAVE_SYS_PROCFS_H + #include <sys/procfs.h> /* struct elf_prstatus */ + #endif ++#include <sys/reg.h> + #include <errno.h> + #include <string.h> + #include <limits.h> +@@ -44,6 +45,39 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + #include "libunwind_i.h" + ++#ifndef __GLIBC__ ++#define EF_REG0 6 ++#define EF_REG1 7 ++#define EF_REG2 8 ++#define EF_REG3 9 ++#define EF_REG4 10 ++#define EF_REG5 11 ++#define EF_REG6 12 ++#define EF_REG7 13 ++#define EF_REG8 14 ++#define EF_REG9 15 ++#define EF_REG10 16 ++#define EF_REG11 17 ++#define EF_REG12 18 ++#define EF_REG13 19 ++#define EF_REG14 20 ++#define EF_REG15 21 ++#define EF_REG16 22 ++#define EF_REG17 23 ++#define EF_REG18 24 ++#define EF_REG19 25 ++#define EF_REG20 26 ++#define EF_REG21 27 ++#define EF_REG22 28 ++#define EF_REG23 29 ++#define EF_REG24 30 ++#define EF_REG25 31 ++#define EF_REG28 34 ++#define EF_REG29 35 ++#define EF_REG30 36 ++#define EF_REG31 37 ++#endif ++ + + #if SIZEOF_OFF_T == 4 + typedef uint32_t uoff_t; +diff --git a/src/mips/getcontext.S b/src/mips/getcontext.S +index d1dbd57..de9b681 100644 +--- a/src/mips/getcontext.S ++++ b/src/mips/getcontext.S +@@ -24,12 +24,11 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + #include "offsets.h" +-#include <endian.h> + + .text + + #if _MIPS_SIM == _ABIO32 +-# if __BYTE_ORDER == __BIG_ENDIAN ++# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + # define OFFSET 4 + # else + # define OFFSET 0 +-- +1.8.3.1 + diff --git a/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-backtrace-Use-only-with-glibc-and-uclibc.patch b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-backtrace-Use-only-with-glibc-and-uclibc.patch new file mode 100644 index 000000000..9aed419a1 --- /dev/null +++ b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-backtrace-Use-only-with-glibc-and-uclibc.patch @@ -0,0 +1,45 @@ +From 04437142399662b576bd55a85485c6dcc14d0812 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 31 Dec 2015 06:44:07 +0000 +Subject: [PATCH] backtrace: Use only with glibc and uclibc + +backtrace API is glibc specific not linux specific +so make it behave so. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + tests/test-coredump-unwind.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c +index 5254708..8767b42 100644 +--- a/tests/test-coredump-unwind.c ++++ b/tests/test-coredump-unwind.c +@@ -57,7 +57,9 @@ + #include <grp.h> + + /* For SIGSEGV handler code */ ++#ifdef __GLIBC__ + #include <execinfo.h> ++#endif + #include <sys/ucontext.h> + + #include <libunwind-coredump.h> +@@ -238,11 +240,11 @@ void handle_sigsegv(int sig, siginfo_t *info, void *ucontext) + ip); + + { ++#ifdef __GLIBC__ + /* glibc extension */ + void *array[50]; + int size; + size = backtrace(array, 50); +-#ifdef __linux__ + backtrace_symbols_fd(array, size, 2); + #endif + } +-- +2.6.4 + diff --git a/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-disable-tests.patch b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-disable-tests.patch new file mode 100644 index 000000000..7309ffd86 --- /dev/null +++ b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-disable-tests.patch @@ -0,0 +1,31 @@ +From b07435a90bd636ee718e2238fb46c74a6dd5e069 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 22 Mar 2016 16:41:13 +0000 +Subject: [PATCH] disable tests + +Tests use getcontext() API which is +not there on musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Inappropriate [MUSL-only] + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index e24fe1e..15380e4 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,7 +39,7 @@ endif + + nodist_include_HEADERS = include/libunwind-common.h + +-SUBDIRS = src tests doc ++SUBDIRS = src doc + + noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \ + include/compiler.h include/libunwind_i.h include/mempool.h \ +-- +1.8.3.1 + diff --git a/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-x86-Stub-out-x86_local_resume.patch b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-x86-Stub-out-x86_local_resume.patch new file mode 100644 index 000000000..371013aaa --- /dev/null +++ b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/0001-x86-Stub-out-x86_local_resume.patch @@ -0,0 +1,54 @@ +From f5df01655a4b76d4fe415747de581d94ac593e6a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 22 Mar 2016 16:19:29 +0000 +Subject: [PATCH] x86: Stub out x86_local_resume() + +its purpose seems +to be unwinding across signal handler boundaries, which cannot happen +in correct programs anyway. Replacing the whole function with +something like *(volatile char *)0=0; (i.e. crash), gets a working +libunwind + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/x86/Gos-linux.c | 22 +--------------------- + 1 file changed, 1 insertion(+), 21 deletions(-) + +diff --git a/src/x86/Gos-linux.c b/src/x86/Gos-linux.c +index 31f83ba..3aaa34e 100644 +--- a/src/x86/Gos-linux.c ++++ b/src/x86/Gos-linux.c +@@ -281,27 +281,7 @@ x86_r_uc_addr (ucontext_t *uc, int reg) + HIDDEN int + x86_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg) + { +- struct cursor *c = (struct cursor *) cursor; +- ucontext_t *uc = c->uc; +- +- /* Ensure c->pi is up-to-date. On x86, it's relatively common to be +- missing DWARF unwind info. We don't want to fail in that case, +- because the frame-chain still would let us do a backtrace at +- least. */ +- dwarf_make_proc_info (&c->dwarf); +- +- if (unlikely (c->sigcontext_format != X86_SCF_NONE)) +- { +- struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr; +- +- Debug (8, "resuming at ip=%x via sigreturn(%p)\n", c->dwarf.ip, sc); +- sigreturn (sc); +- } +- else +- { +- Debug (8, "resuming at ip=%x via setcontext()\n", c->dwarf.ip); +- setcontext (uc); +- } ++ *(volatile char *)0=0; + return -UNW_EINVAL; + } + #endif +-- +1.8.3.1 + diff --git a/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch index d55250281..0dff2c86d 100644 --- a/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch +++ b/yocto-poky/meta/recipes-support/libunwind/libunwind-1.1/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch @@ -17,6 +17,7 @@ the commented AC_CHECK_LIB test in acinclude.m4 is uncommented to make sure we link against libatomic_ops. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Upstream-Status: Pending Taken from: diff --git a/yocto-poky/meta/recipes-support/libunwind/libunwind.inc b/yocto-poky/meta/recipes-support/libunwind/libunwind.inc index 6660af22c..1c342d392 100644 --- a/yocto-poky/meta/recipes-support/libunwind/libunwind.inc +++ b/yocto-poky/meta/recipes-support/libunwind/libunwind.inc @@ -1,11 +1,10 @@ +SUMMARY = "Library for obtaining the call-chain of a program" DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" HOMEPAGE = "http://www.nongnu.org/libunwind" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5" DEPENDS += "libatomic-ops" -SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" - inherit autotools PACKAGECONFIG ??= "" @@ -25,7 +24,9 @@ LDFLAGS_append_x86-64 = " -fuse-ld=gold" LDFLAGS_append_arm = " -fuse-ld=gold" LDFLAGS_append_aarch64 = " -fuse-ld=gold" -LDFLAGS_append_powerpc = " -fuse-ld=gold" -LDFLAGS_append_powerpc64 = " -fuse-ld=gold" +LDFLAGS_append_powerpc = " -fuse-ld=gold -mbss-plt" +LDFLAGS_append_powerpc64 = " -fuse-ld=gold -mbss-plt" + +SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared -lssp" BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-support/libunwind/libunwind_1.1.bb b/yocto-poky/meta/recipes-support/libunwind/libunwind_1.1.bb index aa62bcc66..aff84092a 100644 --- a/yocto-poky/meta/recipes-support/libunwind/libunwind_1.1.bb +++ b/yocto-poky/meta/recipes-support/libunwind/libunwind_1.1.bb @@ -1,14 +1,19 @@ require libunwind.inc -SRC_URI += "\ - file://Support-building-with-older-compilers.patch \ - file://AArch64-port.patch \ - file://Fix-test-case-link-failure-on-PowerPC-systems-with-Altivec.patch \ - file://Link-libunwind-to-libgcc_s-rather-than-libgcc.patch \ - file://0001-Invalid-dwarf-opcodes-can-cause-references-beyond-th.patch \ - file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ + file://Support-building-with-older-compilers.patch \ + file://AArch64-port.patch \ + file://Fix-test-case-link-failure-on-PowerPC-systems-with-Altivec.patch \ + file://Link-libunwind-to-libgcc_s-rather-than-libgcc.patch \ + file://0001-Invalid-dwarf-opcodes-can-cause-references-beyond-th.patch \ + file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ + file://0001-backtrace-Use-only-with-glibc-and-uclibc.patch \ +" +SRC_URI_append_libc-musl = "\ + file://0001-x86-Stub-out-x86_local_resume.patch \ + file://0001-disable-tests.patch \ + file://0001-Fix-build-on-mips-musl.patch \ " - SRC_URI[md5sum] = "fb4ea2f6fbbe45bf032cd36e586883ce" SRC_URI[sha256sum] = "9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a" diff --git a/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch b/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch new file mode 100644 index 000000000..690872b4a --- /dev/null +++ b/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-Support-for-NIOS2-architecture.patch @@ -0,0 +1,144 @@ +From add566b913e1b5cd4974a2167157dc08d8245ab0 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 + +Add support for the Altera NIOS2 CPU archirecture. The atomic operations +are handled by the GCC. The memory barriers on this systems are entirely +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 + + configure.ac | 1 + + urcu/arch/nios2.h | 40 ++++++++++++++++++++++++++++++++++++++++ + urcu/uatomic/nios2.h | 32 ++++++++++++++++++++++++++++++++ + 5 files changed, 75 insertions(+) + create mode 100644 urcu/arch/nios2.h + create mode 100644 urcu/uatomic/nios2.h + +diff --git a/LICENSE b/LICENSE +index 3147094..a06fdcc 100644 +--- a/LICENSE ++++ b/LICENSE +@@ -45,6 +45,7 @@ compiler.h + arch/s390.h + uatomic/alpha.h + uatomic/mips.h ++uatomic/nios2.h + uatomic/s390.h + system.h + +diff --git a/README.md b/README.md +index f6b290f..6fe9c1e 100644 +--- a/README.md ++++ b/README.md +@@ -43,6 +43,7 @@ Currently, the following architectures are supported: + - S390, S390x + - ARM 32/64 + - MIPS ++ - NIOS2 + - Alpha + - ia64 + - Sparcv9 32/64 +diff --git a/configure.ac b/configure.ac +index 39a7777..71a7d71 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -124,6 +124,7 @@ AS_CASE([$host_cpu], + [arm*], [ARCHTYPE="arm"], + [aarch64], [ARCHTYPE="aarch64"], + [mips*], [ARCHTYPE="mips"], ++ [nios2*], [ARCHTYPE="nios2"], + [tile*], [ARCHTYPE="tile"], + [hppa*], [ARCHTYPE="hppa"], + [ARCHTYPE="unknown"] +diff --git a/urcu/arch/nios2.h b/urcu/arch/nios2.h +new file mode 100644 +index 0000000..030d1bc +--- /dev/null ++++ b/urcu/arch/nios2.h +@@ -0,0 +1,40 @@ ++#ifndef _URCU_ARCH_NIOS2_H ++#define _URCU_ARCH_NIOS2_H ++ ++/* ++ * arch_nios2.h: trivial definitions for the NIOS2 architecture. ++ * ++ * Copyright (c) 2016 Marek Vasut <marex@denx.de> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#include <urcu/compiler.h> ++#include <urcu/config.h> ++#include <urcu/syscall-compat.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#define cmm_mb() cmm_barrier() ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#include <urcu/arch/generic.h> ++ ++#endif /* _URCU_ARCH_NIOS2_H */ +diff --git a/urcu/uatomic/nios2.h b/urcu/uatomic/nios2.h +new file mode 100644 +index 0000000..5b3c303 +--- /dev/null ++++ b/urcu/uatomic/nios2.h +@@ -0,0 +1,32 @@ ++#ifndef _URCU_UATOMIC_ARCH_NIOS2_H ++#define _URCU_UATOMIC_ARCH_NIOS2_H ++ ++/* ++ * Atomic exchange operations for the NIOS2 architecture. Let GCC do it. ++ * ++ * Copyright (c) 2016 Marek Vasut <marex@denx.de> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to ++ * deal in the Software without restriction, including without limitation the ++ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ++ * IN THE SOFTWARE. ++ */ ++ ++#include <urcu/compiler.h> ++#include <urcu/system.h> ++#include <urcu/uatomic/generic.h> ++ ++#endif /* _URCU_UATOMIC_ARCH_NIOS2_H */ +-- +2.7.0 + diff --git a/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-uatomic-Specify-complete-types-for-atomic-function-c.patch b/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-uatomic-Specify-complete-types-for-atomic-function-c.patch deleted file mode 100644 index 5ad0bbd15..000000000 --- a/yocto-poky/meta/recipes-support/liburcu/liburcu/0001-uatomic-Specify-complete-types-for-atomic-function-c.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 6af790818d074c103c4797f1ce764896f183e028 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 22 Aug 2015 21:35:03 -0700 -Subject: [PATCH] uatomic: Specify complete types for atomic function calls - -This was unearthed by clang compiler where it complained about parameter -mismatch, gcc doesnt notice this - -urcu/uatomic/generic.h:190:10: error: address argument to atomic builtin -must be a pointer to integer or pointer ('void *' invalid) - return __sync_add_and_fetch_4(addr, val); - -Fixed all instances thusly - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - urcu/uatomic/generic.h | 40 ++++++++++++++++++++-------------------- - 1 file changed, 20 insertions(+), 20 deletions(-) - -diff --git a/urcu/uatomic/generic.h b/urcu/uatomic/generic.h -index 37f59cc..0046ffd 100644 ---- a/urcu/uatomic/generic.h -+++ b/urcu/uatomic/generic.h -@@ -65,17 +65,17 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old, - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- return __sync_val_compare_and_swap_1(addr, old, _new); -+ return __sync_val_compare_and_swap_1((unsigned char *)addr, old, _new); - #endif - #ifdef UATOMIC_HAS_ATOMIC_SHORT - case 2: -- return __sync_val_compare_and_swap_2(addr, old, _new); -+ return __sync_val_compare_and_swap_2((unsigned short int *)addr, old, _new); - #endif - case 4: -- return __sync_val_compare_and_swap_4(addr, old, _new); -+ return __sync_val_compare_and_swap_4((unsigned int *)addr, old, _new); - #if (CAA_BITS_PER_LONG == 64) - case 8: -- return __sync_val_compare_and_swap_8(addr, old, _new); -+ return __sync_val_compare_and_swap_8((unsigned long *)addr, old, _new); - #endif - } - _uatomic_link_error(); -@@ -100,20 +100,20 @@ void _uatomic_and(void *addr, unsigned long val, - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- __sync_and_and_fetch_1(addr, val); -+ __sync_and_and_fetch_1((unsigned char *)addr, val); - return; - #endif - #ifdef UATOMIC_HAS_ATOMIC_SHORT - case 2: -- __sync_and_and_fetch_2(addr, val); -+ __sync_and_and_fetch_2((unsigned short int *)addr, val); - return; - #endif - case 4: -- __sync_and_and_fetch_4(addr, val); -+ __sync_and_and_fetch_4((unsigned int *)addr, val); - return; - #if (CAA_BITS_PER_LONG == 64) - case 8: -- __sync_and_and_fetch_8(addr, val); -+ __sync_and_and_fetch_8((unsigned long *)addr, val); - return; - #endif - } -@@ -139,20 +139,20 @@ void _uatomic_or(void *addr, unsigned long val, - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- __sync_or_and_fetch_1(addr, val); -+ __sync_or_and_fetch_1((unsigned char *)addr, val); - return; - #endif - #ifdef UATOMIC_HAS_ATOMIC_SHORT - case 2: -- __sync_or_and_fetch_2(addr, val); -+ __sync_or_and_fetch_2((unsigned short int *)addr, val); - return; - #endif - case 4: -- __sync_or_and_fetch_4(addr, val); -+ __sync_or_and_fetch_4((unsigned int *)addr, val); - return; - #if (CAA_BITS_PER_LONG == 64) - case 8: -- __sync_or_and_fetch_8(addr, val); -+ __sync_or_and_fetch_8((unsigned long *)addr, val); - return; - #endif - } -@@ -180,17 +180,17 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val, - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- return __sync_add_and_fetch_1(addr, val); -+ return __sync_add_and_fetch_1((unsigned char *)addr, val); - #endif - #ifdef UATOMIC_HAS_ATOMIC_SHORT - case 2: -- return __sync_add_and_fetch_2(addr, val); -+ return __sync_add_and_fetch_2((unsigned short int *)addr, val); - #endif - case 4: -- return __sync_add_and_fetch_4(addr, val); -+ return __sync_add_and_fetch_4((unsigned int *)addr, val); - #if (CAA_BITS_PER_LONG == 64) - case 8: -- return __sync_add_and_fetch_8(addr, val); -+ return __sync_add_and_fetch_8((unsigned long *)addr, val); - #endif - } - _uatomic_link_error(); -@@ -218,7 +218,7 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len) - - do { - old = uatomic_read((unsigned char *)addr); -- } while (!__sync_bool_compare_and_swap_1(addr, old, val)); -+ } while (!__sync_bool_compare_and_swap_1((unsigned char *)addr, old, val)); - - return old; - } -@@ -230,7 +230,7 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len) - - do { - old = uatomic_read((unsigned short *)addr); -- } while (!__sync_bool_compare_and_swap_2(addr, old, val)); -+ } while (!__sync_bool_compare_and_swap_2((unsigned short int *)addr, old, val)); - - return old; - } -@@ -241,7 +241,7 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len) - - do { - old = uatomic_read((unsigned int *)addr); -- } while (!__sync_bool_compare_and_swap_4(addr, old, val)); -+ } while (!__sync_bool_compare_and_swap_4((unsigned int *)addr, old, val)); - - return old; - } -@@ -252,7 +252,7 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len) - - do { - old = uatomic_read((unsigned long *)addr); -- } while (!__sync_bool_compare_and_swap_8(addr, old, val)); -+ } while (!__sync_bool_compare_and_swap_8((unsigned long *)addr, old, val)); - - return old; - } --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-support/liburcu/liburcu/0002-Support-for-aarch64_be.patch b/yocto-poky/meta/recipes-support/liburcu/liburcu/0002-Support-for-aarch64_be.patch new file mode 100644 index 000000000..a10ccd7d8 --- /dev/null +++ b/yocto-poky/meta/recipes-support/liburcu/liburcu/0002-Support-for-aarch64_be.patch @@ -0,0 +1,19 @@ +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/yocto-poky/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch b/yocto-poky/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch deleted file mode 100644 index 535a7384c..000000000 --- a/yocto-poky/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 7b3df100346128d780f218b881d563d1fd12e310 Mon Sep 17 00:00:00 2001 -From: Jonathan Liu <net147@gmail.com> -Date: Mon, 20 Oct 2014 13:46:10 +1100 -Subject: [PATCH] Revert "Blacklist ARM gcc 4.8.0, 4.8.1, 4.8.2" - -This reverts commit 4b79310aa3d408ba30fee02cc497a68072d38a99. -OE-Core is using a patched GCC 4.8.2 which is able to compile liburcu -properly. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Jonathan Liu <net147@gmail.com> ---- - urcu/compiler.h | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/urcu/compiler.h b/urcu/compiler.h -index 1e30903..19534f0 100644 ---- a/urcu/compiler.h -+++ b/urcu/compiler.h -@@ -108,23 +108,4 @@ - - #define CAA_ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) - --/* -- * Don't allow compiling with buggy compiler. -- */ -- --#ifdef __GNUC__ --# define URCU_GCC_VERSION (__GNUC__ * 10000 \ -- + __GNUC_MINOR__ * 100 \ -- + __GNUC_PATCHLEVEL__) -- --/* -- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854 -- */ --# ifdef __ARMEL__ --# if URCU_GCC_VERSION >= 40800 && URCU_GCC_VERSION <= 40802 --# error Your gcc version produces clobbered frame accesses --# endif --# endif --#endif -- - #endif /* _URCU_COMPILER_H */ --- -2.1.2 - diff --git a/yocto-poky/meta/recipes-support/liburcu/liburcu/aarch64.patch b/yocto-poky/meta/recipes-support/liburcu/liburcu/aarch64.patch deleted file mode 100644 index c6cc8c2fd..000000000 --- a/yocto-poky/meta/recipes-support/liburcu/liburcu/aarch64.patch +++ /dev/null @@ -1,19 +0,0 @@ -libucru: recognize aarch64 - -Make the same as "arm" internally. - -Upstream-Status: Pending - -Signed-off-by: joe.slater@windriver.com - - ---- a/configure.ac -+++ b/configure.ac -@@ -77,6 +77,7 @@ AS_CASE([$host_cpu], - [alpha*], [ARCHTYPE="alpha"], - [ia64], [ARCHTYPE="gcc"], - [arm*], [ARCHTYPE="arm"], -+ [aarch64], [ARCHTYPE="arm"], - [mips*], [ARCHTYPE="mips"], - [tile*], [ARCHTYPE="gcc"], - [ARCHTYPE="unknown"] diff --git a/yocto-poky/meta/recipes-support/liburcu/liburcu_0.8.7.bb b/yocto-poky/meta/recipes-support/liburcu/liburcu_0.8.7.bb deleted file mode 100644 index a7f4f51b5..000000000 --- a/yocto-poky/meta/recipes-support/liburcu/liburcu_0.8.7.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Userspace RCU (read-copy-update) library" -HOMEPAGE = "http://lttng.org/urcu" -BUGTRACKER = "http://lttng.org/project/issues" - -LICENSE = "LGPLv2.1+ & MIT-style" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0f060c30a27922ce9c0d557a639b4fa3 \ - file://urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ - file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42" - -SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ - file://Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch \ - file://aarch64.patch \ - file://0001-uatomic-Specify-complete-types-for-atomic-function-c.patch \ - " - -SRC_URI[md5sum] = "7a6ee17871d31226db3f618e28351d22" -SRC_URI[sha256sum] = "b523f22c4726ca6bb77a77d258e76d8c33c89724433bd65313024b98e55c4295" - -S = "${WORKDIR}/userspace-rcu-${PV}" -CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" -inherit autotools diff --git a/yocto-poky/meta/recipes-support/liburcu/liburcu_0.9.1.bb b/yocto-poky/meta/recipes-support/liburcu/liburcu_0.9.1.bb new file mode 100644 index 000000000..aadc32ff7 --- /dev/null +++ b/yocto-poky/meta/recipes-support/liburcu/liburcu_0.9.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "Userspace RCU (read-copy-update) library" +HOMEPAGE = "http://lttng.org/urcu" +BUGTRACKER = "http://lttng.org/project/issues" + +LICENSE = "LGPLv2.1+ & MIT-style" +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[md5sum] = "124eaeea06863271c0bdf2a0cc1d8e4b" +SRC_URI[sha256sum] = "f8d278e9d95bec97c9ba954fc4c3fb584936bc0010713a8fe358b916bafd8715" + +S = "${WORKDIR}/userspace-rcu-${PV}" +CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" +inherit autotools diff --git a/yocto-poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb b/yocto-poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb index 646872cb9..1ddbe238f 100644 --- a/yocto-poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb +++ b/yocto-poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb @@ -25,6 +25,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4" SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a" +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libusb/files/libusb-compat-0.1/" +UPSTREAM_CHECK_REGEX = "/libusb-compat-(?P<pver>(\d+[\.\-_]*)+)/$" + BINCONFIG = "${bindir}/libusb-config" inherit autotools pkgconfig binconfig-disabled lib_package diff --git a/yocto-poky/meta/recipes-support/libusb/libusb1/no-dll.patch b/yocto-poky/meta/recipes-support/libusb/libusb1/no-dll.patch new file mode 100644 index 000000000..6e6bb83d1 --- /dev/null +++ b/yocto-poky/meta/recipes-support/libusb/libusb1/no-dll.patch @@ -0,0 +1,19 @@ +As all invokes all-recursive which uses sub-makes to invoke all-am, the +resulting makefile wants to build libusb-1.0.la twice. In non-parallel builds +the second attempt is skipped as the target already exists, but in highly +parallel builds it's likely that two makes will be building libusb-1.0.la at the +same time. + +Solve this by removing the explicit all target, which as libusb-1.0.dll isn't +built under Linux is redundant anyway. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/libusb/Makefile.am b/libusb/Makefile.am +index 0cab0a0..c880213 100644 +--- a/libusb/Makefile.am ++++ b/libusb/Makefile.am +@@ -1,2 +0,0 @@ +-all: libusb-1.0.la libusb-1.0.dll +- diff --git a/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.19.bb b/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.20.bb index a20e1fcdb..4cad2d4be 100644 --- a/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.19.bb +++ b/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.20.bb @@ -9,10 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" BBCLASSEXTEND = "native nativesdk" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ + file://no-dll.patch \ " -SRC_URI[md5sum] = "f9e2bb5879968467e5ca756cb4e1fa7e" -SRC_URI[sha256sum] = "6c502c816002f90d4f76050a6429c3a7e0d84204222cbff2dce95dd773ba6840" +SRC_URI[md5sum] = "1d4eb194eaaa2bcfbba28102768c7dbf" +SRC_URI[sha256sum] = "cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff" S = "${WORKDIR}/libusb-${PV}" diff --git a/yocto-poky/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch b/yocto-poky/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch index e4d09c2ac..f4113efba 100644 --- a/yocto-poky/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch +++ b/yocto-poky/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch @@ -8,6 +8,7 @@ We need to check that the parent node is an element before dereferencing its namespace Upstream-Status: Backport +CVE: CVE-2015-7995 https://git.gnome.org/browse/libxslt/commit/?id=7ca19df892ca22d9314e95d59ce2abdeff46b617 diff --git a/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.28.bb b/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.28.bb index 87fabecda..23ac599de 100644 --- a/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.28.bb +++ b/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.28.bb @@ -8,13 +8,16 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458" SECTION = "libs" DEPENDS = "libxml2" -SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \ +SRC_URI = "ftp://xmlsoft.org/libxslt/libxslt-${PV}.tar.gz \ file://pkgconfig_fix.patch \ file://pkgconfig.patch \ file://CVE-2015-7995.patch" SRC_URI[md5sum] = "9667bf6f9310b957254fdcf6596600b7" SRC_URI[sha256sum] = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c" + +UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar" + S = "${WORKDIR}/libxslt-${PV}" BINCONFIG = "${bindir}/xslt-config" diff --git a/yocto-poky/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch b/yocto-poky/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch index 3c4a00ef3..61fa7e569 100644 --- a/yocto-poky/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch +++ b/yocto-poky/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch @@ -10,6 +10,7 @@ The patch comes from https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2 Upstream-Status: Backport +CVE: CVE-2014-9130 Signed-off-by: Yue Tao <yue.tao@windriver.com> diff --git a/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.3.bb b/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.3.bb index af19b5451..ee8a23893 100644 --- a/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.3.bb +++ b/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.3.bb @@ -12,6 +12,8 @@ SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz \ SRC_URI[md5sum] = "6969398cd2fbc56a6af570b5273c56a9" SRC_URI[sha256sum] = "6835a08bd992c8257641791e9a6a2b35b02336c8de26d0a8577953747e514a16" +UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/" + S = "${WORKDIR}/mpfr-${PV}" BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/neon/neon_0.30.1.bb b/yocto-poky/meta/recipes-support/neon/neon_0.30.1.bb index 0244314a6..b6cfd5076 100644 --- a/yocto-poky/meta/recipes-support/neon/neon_0.30.1.bb +++ b/yocto-poky/meta/recipes-support/neon/neon_0.30.1.bb @@ -4,24 +4,35 @@ SECTION = "libs" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037" -DEPENDS = "zlib libxml2 expat time gnutls libproxy" -DEPENDS_class-native = "zlib-native libxml2-native expat-native gnutls-native" - -BBCLASSEXTEND = "native" 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" -BINCONFIG = "${bindir}/neon-config" - inherit autotools binconfig-disabled lib_package pkgconfig -EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" -EXTRA_OECONF += "--without-gssapi" +# Enable gnutls or openssl, not both +PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib" +PACKAGECONFIG_class-native = "expat gnutls webdav zlib" + +PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" +PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" +PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" +PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" +PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" +PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" +PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" + +EXTRA_OECONF += "--enable-shared" do_compile_append() { oe_runmake -C test } + +BINCONFIG = "${bindir}/neon-config" + +BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8803_8805.patch b/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch index b4ff228f6..a956f426b 100644 --- a/yocto-poky/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8803_8805.patch +++ b/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch @@ -8,18 +8,16 @@ Same fix for both. Signed-off-by: Armin Kuster <akuster@mvista.com> -Index: nettle-3.1.1/ecc-256.c +Index: nettle-2.7.1/ecc-256.c =================================================================== ---- nettle-3.1.1.orig/ecc-256.c -+++ nettle-3.1.1/ecc-256.c -@@ -113,8 +113,19 @@ ecc_256_modp (const struct ecc_modulo *p +--- 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); - -- /* We multiply by two low limbs of p, 2^96 - 1, so we could use -- shifts rather than mul. */ + /* -+ n-1 n-2 n-3 n-4 ++ n-1 n-2 n-3 n-4 + +---+---+---+---+ + | u1| u0| u low | + +---+---+---+---+ @@ -27,38 +25,40 @@ Index: nettle-3.1.1/ecc-256.c + +-------+---+ + |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. */ ++ 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, p->m, 2, q1); - t += cnd_sub_n (q2, rp + n - 3, p->m, 1); + 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; -@@ -124,7 +135,10 @@ ecc_256_modp (const struct ecc_modulo *p +@@ -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, p->m, 3); +- u1 += cnd_add_n (t, rp + n - 4, ecc->p, 3); + -+ cy = cnd_add_n (t, rp + n - 4, p->m, 2); ++ cy = cnd_add_n (t, rp + n - 4, ecc->p, 2); + u0 += cy; + u1 += (u0 < cy); u1 -= (-t) & 0xffffffff; } rp[2] = u0; -@@ -211,7 +225,7 @@ ecc_256_modq (const struct ecc_modulo *q +@@ -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, q->m, 2); + t = cnd_add_n (t, rp + n - 4, ecc->q, 2); u1 += t; -Index: nettle-3.1.1/ChangeLog +Index: nettle-2.7.1/ChangeLog =================================================================== ---- nettle-3.1.1.orig/ChangeLog -+++ nettle-3.1.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> + @@ -66,6 +66,6 @@ Index: nettle-3.1.1/ChangeLog + reported by Hanno Böck. + (ecc_256_modq): Fixed another carry propagation bug. + - 2015-04-24 Niels Möller <nisse@lysator.liu.se> + 2013-05-28 Niels Möller <nisse@lysator.liu.se> - * Released nettle-3.1.1. + * Released nettle-2.7.1. diff --git a/yocto-poky/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8804.patch b/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch index 1d34db735..73723a998 100644 --- a/yocto-poky/meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8804.patch +++ b/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8804.patch @@ -4,10 +4,10 @@ Upstream-Status: Backport CVE: CVE-2015-8804 Signed-off-by: Armin Kuster <akuster@mvista.com> -Index: nettle-3.1.1/ChangeLog +Index: nettle-2.7.1/ChangeLog =================================================================== ---- nettle-3.1.1.orig/ChangeLog -+++ nettle-3.1.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> + @@ -20,20 +20,11 @@ Index: nettle-3.1.1/ChangeLog 2015-12-10 Niels Möller <nisse@lysator.liu.se> * ecc-256.c (ecc_256_modp): Fixed carry propagation bug. Problem -Index: nettle-3.1.1/x86_64/ecc-384-modp.asm +Index: nettle-2.7.1/x86_64/ecc-384-modp.asm =================================================================== ---- nettle-3.1.1.orig/x86_64/ecc-384-modp.asm -+++ nettle-3.1.1/x86_64/ecc-384-modp.asm -@@ -1,7 +1,7 @@ - C x86_64/ecc-384-modp.asm - - ifelse(< -- Copyright (C) 2013 Niels Möller -+ Copyright (C) 2013, 2015 Niels Möller - - This file is part of GNU Nettle. - -@@ -33,7 +33,7 @@ ifelse(< +--- 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>) @@ -42,7 +33,7 @@ Index: nettle-3.1.1/x86_64/ecc-384-modp.asm define(<T0>, <%rbx>) define(<T1>, <%rcx>) define(<T2>, <%rdx>) -@@ -48,8 +48,8 @@ define(<H4>, <%r13>) +@@ -35,8 +35,8 @@ define(<H4>, <%r13>) define(<H5>, <%r14>) define(<C2>, <%r15>) define(<C0>, H5) C Overlap @@ -53,7 +44,7 @@ Index: nettle-3.1.1/x86_64/ecc-384-modp.asm PROLOGUE(nettle_ecc_384_modp) W64_ENTRY(2, 0) -@@ -61,34 +61,38 @@ PROLOGUE(nettle_ecc_384_modp) +@@ -48,34 +48,38 @@ PROLOGUE(nettle_ecc_384_modp) push %r14 push %r15 @@ -116,7 +107,7 @@ Index: nettle-3.1.1/x86_64/ecc-384-modp.asm xor C2, C2 add H4, H0 -@@ -127,118 +131,95 @@ PROLOGUE(nettle_ecc_384_modp) +@@ -114,118 +118,95 @@ PROLOGUE(nettle_ecc_384_modp) adc H3, T5 adc $0, C0 diff --git a/yocto-poky/meta/recipes-support/nettle/nettle.inc b/yocto-poky/meta/recipes-support/nettle/nettle.inc index fafff6d8d..af51fb6c7 100644 --- a/yocto-poky/meta/recipes-support/nettle/nettle.inc +++ b/yocto-poky/meta/recipes-support/nettle/nettle.inc @@ -2,10 +2,6 @@ SUMMARY = "A low level cryptographic library" HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/" SECTION = "libs" -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" - DEPENDS += "gmp" SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz \ @@ -13,13 +9,12 @@ SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5" -SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40" - -EXTRA_OECONF = "--disable-openssl" +UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" inherit autotools ptest +EXTRA_OECONF = "--disable-openssl" + do_configure_prepend() { if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then cp ${S}/aclocal.m4 ${S}/acinclude.m4 @@ -39,5 +34,4 @@ do_install_ptest() { install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ } - BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/nettle/nettle_2.7.1.bb b/yocto-poky/meta/recipes-support/nettle/nettle_2.7.1.bb index ae2574a23..d4df0a3a8 100644 --- a/yocto-poky/meta/recipes-support/nettle/nettle_2.7.1.bb +++ b/yocto-poky/meta/recipes-support/nettle/nettle_2.7.1.bb @@ -10,3 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 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/yocto-poky/meta/recipes-support/nettle/nettle_3.1.1.bb b/yocto-poky/meta/recipes-support/nettle/nettle_3.2.bb index 4a40e9ae5..2b7977974 100644 --- a/yocto-poky/meta/recipes-support/nettle/nettle_3.1.1.bb +++ b/yocto-poky/meta/recipes-support/nettle/nettle_3.2.bb @@ -7,10 +7,5 @@ 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 += "\ - file://CVE-2015-8803_8805.patch \ - file://CVE-2015-8804.patch \ - " - -SRC_URI[md5sum] = "b40fa88dc32f37a182b6b42092ebb144" -SRC_URI[sha256sum] = "5fd4d25d64d8ddcb85d0d897572af73b05b4d163c6cc49438a5bfbb8ff293d4c" +SRC_URI[md5sum] = "afb15b4764ebf1b4e6d06c62bd4d29e4" +SRC_URI[sha256sum] = "ea4283def236413edab5a4cf9cf32adf540c8df1b9b67641cfc2302fca849d97" diff --git a/yocto-poky/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/yocto-poky/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch new file mode 100644 index 000000000..23228067e --- /dev/null +++ b/yocto-poky/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch @@ -0,0 +1,105 @@ +From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Sat, 30 Jan 2016 07:18:02 +0100 +Subject: [PATCH] Add nios2 support + +Add support for the nios2 CPU. + +Signed-off-by: Marek Vasut <marex@denx.de> +Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] +--- + nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ + nspr/pr/include/md/_linux.h | 14 ++++++++++++++ + 2 files changed, 59 insertions(+) + +diff --git a/pr/include/md/_linux.cfg b/nspr/pr/include/md/_linux.cfg +index 8cbf0cb..150676b 100644 +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg +@@ -972,6 +972,51 @@ + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#elif defined(__nios2__) ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 4 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 4 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #elif defined(__or1k__) + + #undef IS_LITTLE_ENDIAN +diff --git a/pr/include/md/_linux.h b/nspr/pr/include/md/_linux.h +index d378db5..18260be 100644 +--- a/pr/include/md/_linux.h ++++ b/pr/include/md/_linux.h +@@ -55,6 +55,8 @@ + #define _PR_SI_ARCHITECTURE "avr32" + #elif defined(__m32r__) + #define _PR_SI_ARCHITECTURE "m32r" ++#elif defined(__nios2__) ++#define _PR_SI_ARCHITECTURE "nios2" + #elif defined(__or1k__) + #define _PR_SI_ARCHITECTURE "or1k" + #else +@@ -125,6 +127,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); + #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet + #endif + ++#if defined(__nios2__) ++#if defined(__GNUC__) ++/* Use GCC built-in functions */ ++#define _PR_HAVE_ATOMIC_OPS ++#define _MD_INIT_ATOMIC() ++#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) ++#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) ++#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) ++#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) ++#endif ++#endif ++ + #if defined(__or1k__) + #if defined(__GNUC__) + /* Use GCC built-in functions */ +-- +2.7.0.rc3 + diff --git a/yocto-poky/meta/recipes-support/nspr/nspr_4.10.8.bb b/yocto-poky/meta/recipes-support/nspr/nspr_4.12.bb index bc6001888..168341bc0 100644 --- a/yocto-poky/meta/recipes-support/nspr/nspr_4.10.8.bb +++ b/yocto-poky/meta/recipes-support/nspr/nspr_4.12.bb @@ -9,12 +9,20 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz file://remove-rpath-from-tests.patch \ file://fix-build-on-x86_64.patch \ file://remove-srcdir-from-configure-in.patch \ - " + file://0002-Add-nios2-support.patch \ + file://nspr.pc.in \ +" -SRC_URI += "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'" -SRC_URI[md5sum] = "8d7c5bd0a5b0a7d0e705be66479030a0" -SRC_URI[sha256sum] = "507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15" +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" S = "${WORKDIR}/nspr-${PV}/nspr" @@ -137,8 +145,6 @@ TESTS = " \ xnotify \ zerolen" -PR = "r1" - inherit autotools do_compile_prepend() { @@ -171,6 +177,5 @@ do_install_append() { FILES_${PN} = "${libdir}/lib*.so" FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ ${includedir}/* ${datadir}/aclocal/* " -FILES_${PN}-dbg += "${libdir}/nspr/tests/.debug/*" BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch b/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch new file mode 100644 index 000000000..82f25743a --- /dev/null +++ b/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch @@ -0,0 +1,53 @@ +From d1345871b992f9a055c968963967e728da1a7ffb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Jan 2016 20:29:06 +0000 +Subject: [PATCH] nss-myhostname: Check for nss.h presense before use + +We do not have nss.h on musl e.g. and configury is already checking for +nss.h presence, use this to define needed data structures if nss.h is +missing on a given libc implementation on a platform + +include stdint.h for uint32_h definition + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + nss-myhostname.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/nss-myhostname.c b/nss-myhostname.c +index 293166c..6f287f5 100644 +--- a/nss-myhostname.c ++++ b/nss-myhostname.c +@@ -21,7 +21,27 @@ + ***/ + + #include <limits.h> ++#include <stdint.h> ++#ifdef HAVE_NSS_H + #include <nss.h> ++#else ++enum nss_status { ++ NSS_STATUS_TRYAGAIN = -2, ++ NSS_STATUS_UNAVAIL, ++ NSS_STATUS_NOTFOUND, ++ NSS_STATUS_SUCCESS, ++ NSS_STATUS_RETURN ++}; ++/* Data structure used for the 'gethostbyname4_r' function. */ ++struct gaih_addrtuple ++ { ++ struct gaih_addrtuple *next; ++ char *name; ++ int family; ++ uint32_t addr[4]; ++ uint32_t scopeid; ++ }; ++#endif + #include <sys/types.h> + #include <netdb.h> + #include <errno.h> +-- +2.7.0 + diff --git a/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb b/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb index bbce9e9af..de5b7cf59 100644 --- a/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb +++ b/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb @@ -6,7 +6,9 @@ HOMEPAGE = "http://0pointer.de/lennart/projects/nss-myhostname/" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" -SRC_URI = "http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${PV}.tar.gz \ + file://0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch \ + " SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f" SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67e7caf2" diff --git a/yocto-poky/meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch b/yocto-poky/meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch new file mode 100644 index 000000000..cb3ad0068 --- /dev/null +++ b/yocto-poky/meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch @@ -0,0 +1,27 @@ +From 8758c6a4508a5ca01505a8d69a269c912ce10bee Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 18 Jan 2016 18:26:16 +0000 +Subject: [PATCH] Fix build failure on opensuse 13.1 + +Upstream-Status: Inappropriate [gcc 4.8 specific issue] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + nss/cmd/modutil/install-ds.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/cmd/modutil/install-ds.h b/nss/cmd/modutil/install-ds.h +index 3a3afb3..433efe0 100644 +--- a/nss/cmd/modutil/install-ds.h ++++ b/nss/cmd/modutil/install-ds.h +@@ -243,7 +243,7 @@ struct Pk11Install_Info_str { + Pk11Install_Info* + Pk11Install_Info_new(); + void +-Pk11Install_Info_init(); ++Pk11Install_Info_init(Pk11Install_Info* _this); + void + Pk11Install_Info_delete(Pk11Install_Info* _this); + /*// Returns NULL for success, error message if parse error.*/ +-- +1.8.4.5 + diff --git a/yocto-poky/meta/recipes-support/nss/nss_3.19.2.bb b/yocto-poky/meta/recipes-support/nss/nss_3.21.bb index 23a4a1f8d..d2e24112d 100644 --- a/yocto-poky/meta/recipes-support/nss/nss_3.19.2.bb +++ b/yocto-poky/meta/recipes-support/nss/nss_3.21.bb @@ -15,17 +15,21 @@ 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_19_2_RTM/src/${BP}.tar.gz \ + http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/${BP}.tar.gz \ file://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://0001-Fix-build-failure-on-opensuse-13.1.patch \ file://nss.pc.in \ file://signlibs.sh \ " -SRC_URI[md5sum] = "b02ffd1e8e8ef5f8512fa02d8ca9db3d" -SRC_URI[sha256sum] = "1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae" +SRC_URI[md5sum] = "3c8b2ed880dd3a8d86c9e0151afe6eba" +SRC_URI[sha256sum] = "3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239" + +UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" +UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" inherit siteinfo @@ -38,6 +42,10 @@ TDS = "${S}/tentative-dist-staging" TARGET_CC_ARCH += "${LDFLAGS}" +do_configure_prepend_libc-musl () { + sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk +} + do_compile_prepend_class-native() { export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE} export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} @@ -47,6 +55,11 @@ do_compile_prepend_class-nativesdk() { export LDFLAGS="" } +do_compile_prepend_class-native() { + # Need to set RPATH so that chrpath will do its job correctly + RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" +} + do_compile() { export CROSS_COMPILE=1 export NATIVE_CC="gcc" @@ -81,12 +94,15 @@ do_compile() { export USE_X32=1 fi + export NSS_DISABLE_GTESTS=1 + # We can modify CC in the environment, but if we set it via an # argument to make, nsinstall, a host program, will also build with it! # export CC="${CC} -g" make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} + OS_TEST=${OS_TEST} \ + RPATH="${RPATH}" } @@ -126,6 +142,8 @@ do_install() { export USE_X32=1 fi + export NSS_DISABLE_GTESTS=1 + make -C ./nss \ CCC="${CXX}" \ OS_TEST=${OS_TEST} \ @@ -217,7 +235,6 @@ FILES_${PN}-dev = "\ ${libdir}/pkgconfig/* \ ${includedir}/* \ " -# FILES_${PN}-dbg is populated automatically BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb b/yocto-poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb index ee7795117..a4efff161 100644 --- a/yocto-poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb +++ b/yocto-poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" -inherit autotools gettext pkgconfig +inherit autotools gettext pkgconfig upstream-version-is-even DEPENDS = "libtasn1 libffi" @@ -12,9 +12,10 @@ SRC_URI[sha256sum] = "ef3a339fcf6aa0e32c8c23f79ba7191e57312be2bda8b24e6d121c2670 EXTRA_OECONF = "--without-trust-paths" -FILES_${PN}-dev += " \ +FILES_${PN} += " \ ${libdir}/p11-kit-proxy.so \ - ${libdir}/pkcs11/p11-kit-trust.so \ -" -FILES_${PN}-dev += "${libdir}/pkcs11/*.la" -FILES_${PN}-dbg += "${libdir}/pkcs11/.debug" + ${libdir}/pkcs11/*.so \ + ${libdir}/pkcs11/*.la" + +# PN contains p11-kit-proxy.so, a symlink to a loadable module +INSANE_SKIP_${PN} = "dev-so" diff --git a/yocto-poky/meta/recipes-support/ptest-runner/files/ptest-runner b/yocto-poky/meta/recipes-support/ptest-runner/files/ptest-runner deleted file mode 100644 index c618f1148..000000000 --- a/yocto-poky/meta/recipes-support/ptest-runner/files/ptest-runner +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -ANYFAILED=no -echo "START: $0" - -for libdir in /usr/lib* -do - - [ ! -d "$libdir" ] && continue - - for x in `ls -d $libdir/*/ptest 2>/dev/null` - do - [ ! -f $x/run-ptest ] && continue - [ -h `dirname $x` ] && continue - - date "+%Y-%m-%dT%H:%M" - echo "BEGIN: $x" - cd "$x" - ./run-ptest || ANYFAILED=yes - echo "END: $x" - date "+%Y-%m-%dT%H:%M" - done -done -echo "STOP: $0" -if [ "$ANYFAILED" = "yes" ]; then - exit 1 -fi -exit 0 diff --git a/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb b/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb deleted file mode 100644 index bc1b0a4d4..000000000 --- a/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "A simple shell script to run all installed ptests" -DESCRIPTION = "The ptest-runner package installs a ptest-runner \ -shell script which loops through all installed ptest test suites and \ -runs them in sequence." -HOMEPAGE = "https://wiki.yoctoproject.org/wiki/Ptest" -SRC_URI += "file://ptest-runner" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -INHIBIT_DEFAULT_DEPS = "1" - -S = "${WORKDIR}" - -do_install () { - mkdir -p ${D}${bindir} - install -m 0755 ${WORKDIR}/ptest-runner ${D}${bindir} -} - -do_patch[noexec] = "1" -do_configure[noexec] = "1" -do_compile[noexec] = "1" -do_build[noexec] = "1" diff --git a/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.0.bb b/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.0.bb new file mode 100644 index 000000000..7081afbeb --- /dev/null +++ b/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "A C program to run all installed ptests" +DESCRIPTION = "The ptest-runner2 package installs a ptest-runner \ +program which loops through all installed ptest test suites and \ +runs them in sequence." +HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" + +SRCREV = "8bfdf946e784f4d5757bebee1fbc4b4a3d7a95c4" +PV = "2.0+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/ptest-runner2" +S = "${WORKDIR}/git" + +FILES_${PN} = "${bindir}/ptest-runner" + +EXTRA_OEMAKE = "-e MAKEFLAGS=" + +do_compile () { + oe_runmake +} + +do_install () { + install -D -m 0755 ${WORKDIR}/git/ptest-runner ${D}${bindir}/ptest-runner +} diff --git a/yocto-poky/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch b/yocto-poky/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch deleted file mode 100644 index 67a28ab77..000000000 --- a/yocto-poky/meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch +++ /dev/null @@ -1,105 +0,0 @@ -Upstream-Status: Pending - -Add pkgconfig support to pth. - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - -Index: Makefile.in -=========================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -47,6 +47,9 @@ datadir = @datadir@ - - DESTDIR = - -+pkgconfigdir = ${libdir}/pkgconfig -+pkgconfig_DATA = pth.pc -+ - ## - ## ____ TOOL DEFINITIONS ___________________________________________ - ## -@@ -216,7 +219,7 @@ test_pthread: test_pthread.o test_common.o libpthread.la - - # install the package - install: all-for-install -- @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ -+ @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA - @touch .done-install >/dev/null 2>&1 || $(TRUE) - @$(MAKE) $(MKFLAGS) what-next - install-dirs: -@@ -227,6 +230,7 @@ install-dirs: - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3 - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(datadir)/aclocal -+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(pkgconfigdir) - install-pth: - $(SHTOOL) install -c -m 755 pth-config $(DESTDIR)$(bindir)/pth-config - $(SHTOOL) install -c -m 644 $(S)pth-config.1 $(DESTDIR)$(mandir)/man1/pth-config.1 -@@ -242,12 +246,16 @@ install-pthread: - $(SHTOOL) install -c -m 644 $(S)pthread.3 $(DESTDIR)$(mandir)/man3/pthread.3 - @umask 022; $(LIBTOOL) --mode=install \ - $(SHTOOL) install -c libpthread.la $(DESTDIR)$(libdir)/libpthread.la -+install-pkgconfigDATA: $(pkgconfig_DATA) -+ $(SHTOOL) install -c -m 644 $(pkgconfig_DATA) $(DESTDIR)$(pkgconfigdir)/$(pkgconfig_DATA) - - # uninstall the package - uninstall: -- @$(MAKE) $(MKFLAGS) @UNINSTALL_PTHREAD@ uninstall-pth uninstall-dirs -+ @$(MAKE) $(MKFLAGS) uninstall-pkgconfigDATA @UNINSTALL_PTHREAD@ uninstall-pth uninstall-dirs - @touch .done-uninstall >/dev/null 2>&1 || $(TRUE) - @$(MAKE) $(MKFLAGS) what-next -+uninstall-pkgconfigDATA: -+ $(RM) $(DESTDIR)$(pkgconfigdir)/$(pkgconfig_DATA) - uninstall-pthread: - $(RM) $(DESTDIR)$(bindir)/pthread-config - $(RM) $(DESTDIR)$(mandir)/man1/pthread-config.1 -@@ -271,6 +279,7 @@ uninstall-dirs: - -$(RMDIR) $(DESTDIR)$(includedir) >/dev/null 2>&1 || $(TRUE) - -$(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE) - -$(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE) -+ -$(RMDIR) $(DESTDIR)$(pkgconfigdir) > /dev/null 2>&1 ||$(TRUE) - - # strip down the source tree to its minimum - striptease: -Index: configure.ac -=========================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -656,6 +656,13 @@ pth_acmac.h dnl - chmod +rx pthread-config - chmod +rx pth-config - )dnl -+ -+PTH_VERSION=`echo $PTH_VERSION_STR | cut -d' ' -f1` -+AC_SUBST(PTH_VERSION) -+ -+AC_CONFIG_FILES([pth.pc]) -+AC_OUTPUT -+ - if test ".$enable_pthread" = .no; then - rm -f pthread-config - rm -f pthread.h -Index: pth.pc.in -=========================================================== ---- /dev/null -+++ b/pth.pc.in -@@ -0,0 +1,16 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+bindir=@bindir@ -+mandir=@mandir@ -+datadir=@datadir@ -+acdir=@datadir@/aclocal -+ -+Name: pth -+Description: GNU Portable Threads -+Requires: -+Version: @PTH_VERSION@ -+Libs: -L${libdir} -lpth -+Libs.private: -+Cflags: -I${includedir} --- -1.7.5.4 - diff --git a/yocto-poky/meta/recipes-support/pth/files/pth-fix-parallel.patch b/yocto-poky/meta/recipes-support/pth/files/pth-fix-parallel.patch deleted file mode 100644 index 08edaff15..000000000 --- a/yocto-poky/meta/recipes-support/pth/files/pth-fix-parallel.patch +++ /dev/null @@ -1,48 +0,0 @@ -From df06b8170745eac347acb95f9f374f257621254f Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Thu, 29 Jan 2015 18:11:00 -0800 -Subject: [PATCH] Makefile.in: fix for parallel build - -Fixed: -* do_compile - pth_uctx.c:31:19: fatal error: pth_p.h: No such file or directory - #include "pth_p.h" - ^ -compilation terminated. -make: *** [pth_uctx.lo] Error 1 - -* do_install: - cp: cannot create regular file `image/usr/lib/pkgconfig/#INST@15507#': No such file or directory - -Upstream-Status: Pending -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - Makefile.in | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index de0390d..381a0ee 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -219,7 +219,8 @@ test_pthread: test_pthread.o test_common.o libpthread.la - - # install the package - install: all-for-install -- @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA -+ @$(MAKE) $(MKFLAGS) install-dirs -+ @$(MAKE) $(MKFLAGS) install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA - @touch .done-install >/dev/null 2>&1 || $(TRUE) - @$(MAKE) $(MKFLAGS) what-next - install-dirs: -@@ -432,7 +433,7 @@ TAGS: - ## (AUTOMATICALLY UPDATED - DO NOT EDIT) - ## - --$(LOBJS): Makefile -+$(LOBJS): Makefile pth_p.h - - # DO NOT REMOVE - pth_attr.lo: pth_attr.c pth_p.h pth_vers.c pth.h pth_acdef.h pth_acmac.h --- -1.7.9.5 - diff --git a/yocto-poky/meta/recipes-support/pth/pth_2.0.7.bb b/yocto-poky/meta/recipes-support/pth/pth_2.0.7.bb deleted file mode 100644 index 9037769b7..000000000 --- a/yocto-poky/meta/recipes-support/pth/pth_2.0.7.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "GNU Portable Threads library" -HOMEPAGE = "http://www.gnu.org/software/pth/" -SECTION = "libs" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;beginline=12;endline=15;md5=a48af114a80c222cafd37f24370a77b1" -PR = "r3" - -python __anonymous () { - import re - uc_os = (re.match('.*uclibc*', d.getVar('TARGET_OS', True)) != None) - if uc_os: - raise bb.parse.SkipPackage("incompatible with uClibc") -} - -SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \ - file://pth-add-pkgconfig-support.patch \ - file://pth-fix-parallel.patch \ - " - -SRC_URI[md5sum] = "9cb4a25331a4c4db866a31cbe507c793" -SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232" - -BINCONFIG = "${bindir}/pth-config" - -inherit autotools binconfig-disabled pkgconfig - -do_configure() { - ( cd ${S}; gnu-configize ) - ( cd ${S}; autoconf ) - oe_runconf -} diff --git a/yocto-poky/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch new file mode 100644 index 000000000..4bd9d31c0 --- /dev/null +++ b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch @@ -0,0 +1,60 @@ +From 99679fda405e535a282f04a4decc2381154a749f Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Mon, 15 Feb 2016 15:59:58 -0700 +Subject: [PATCH 1/2] If the libc is lacking argp, use libargp + +Patch pulled from Gentoo: + + On glibc systems, argp is provided by libc. However, on + uclibc and other systems which lack argp in their C library, + argp might be provided by a stand alone library, libargp. + This patch adds tests to the build system to find who provides + argp. + + X-Gentoo-Bug: 292191 + X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=292191 + Reported-by: Ed Wildgoose <gentoo@wildgooses.com> + Signed-off-by: Anthony G. Basile <blueness@gentoo.org> + +Upstream-Status: Pending +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +--- + configure.ac | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 27a2dba..04fcd25 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -82,6 +82,28 @@ AS_IF( + ] + ) + ++dnl First check if we have argp available from libc ++AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [#include <argp.h>], ++ [int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;] ++ )], ++ [libc_has_argp="true"], ++ [libc_has_argp="false"] ++) ++ ++dnl If libc doesn't provide argp, then test for libargp ++if test "$libc_has_argp" = "false" ; then ++ AC_MSG_WARN("libc does not have argp") ++ AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"]) ++ ++ if test "$have_argp" = "false"; then ++ AC_MSG_ERROR("no libargp found") ++ else ++ LIBS+=" -largp" ++ fi ++fi ++ + dnl ----------------- + dnl Configure options + dnl ----------------- +-- +2.2.1 + diff --git a/yocto-poky/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch new file mode 100644 index 000000000..1c8a79ce0 --- /dev/null +++ b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch @@ -0,0 +1,92 @@ +From afc8712a9e6c72fbd03c36f84ecf8703e5d22a8c Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Mon, 15 Feb 2016 16:11:32 -0700 +Subject: [PATCH 2/2] Add argument to control the libargp dependency + +This ensures that the builds are always deterministic. If the argument isn't +passed, the default behavior is to use libargp if the libc doesn't have argp. + +Upstream-Status: Pending +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +--- + configure.ac | 55 ++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 36 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 04fcd25..11a5321 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,6 +32,13 @@ AC_ARG_WITH([libgcrypt], + [with_libgcrypt=check] + ) + ++AC_ARG_WITH([libargp], ++ AS_HELP_STRING([--without-libargp], ++ [Disable libargp support. Systems whose libc lacks argp can use libargp instead. (Default: check if libc lacks argp)]), ++ [with_libargp=$withval], ++ [with_libargp=check] ++) ++ + dnl Make sure anyone changing configure.ac/Makefile.am has a clue + AM_MAINTAINER_MODE + +@@ -82,27 +89,37 @@ AS_IF( + ] + ) + +-dnl First check if we have argp available from libc +-AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [#include <argp.h>], +- [int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;] +- )], +- [libc_has_argp="true"], +- [libc_has_argp="false"] ++dnl Determine if we need libargp: either user requested, or libc has no argp ++AS_IF( ++ [test "x$with_libargp" != "xyes"], ++ [ ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [#include <argp.h>], ++ [int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;] ++ )], ++ [need_libargp=no], ++ [need_libargp=yes ++ if test "x$with_libargp" = "xno"; then ++ AC_MSG_FAILURE([libargp disabled and libc does not have argp]) ++ fi] ++ ) ++ ], ++ [need_libargp=yes], + ) + +-dnl If libc doesn't provide argp, then test for libargp +-if test "$libc_has_argp" = "false" ; then +- AC_MSG_WARN("libc does not have argp") +- AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"]) +- +- if test "$have_argp" = "false"; then +- AC_MSG_ERROR("no libargp found") +- else +- LIBS+=" -largp" +- fi +-fi ++dnl Check for libargp ++AS_IF( ++ [test "x$need_libargp" = "xyes"], ++ [ ++ AC_CHECK_LIB( ++ [argp], ++ [argp_parse], ++ [LIBS="$LIBS -largp"], ++ [AC_MSG_FAILURE([libargp not found])] ++ ) ++ ] ++) + + dnl ----------------- + dnl Configure options +-- +2.2.1 + diff --git a/yocto-poky/meta/recipes-support/rng-tools/rng-tools/default b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/default new file mode 100644 index 000000000..7aede9be0 --- /dev/null +++ b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/default @@ -0,0 +1,3 @@ +# Specify rng device +#RNG_DEVICE=/dev/hwrng +RNG_DEVICE=/dev/urandom diff --git a/yocto-poky/meta/recipes-support/rng-tools/rng-tools/init b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/init new file mode 100644 index 000000000..7cf78393a --- /dev/null +++ b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/init @@ -0,0 +1,49 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/rng-tools and type +# > update-rc.d rng-tools defaults 60 +# + +rngd=/usr/sbin/rngd +test -x "$rngd" || exit 1 + +if [ -e /etc/default/rng-tools ]; then + . /etc/default/rng-tools +fi + +if [ -n "$RNG_DEVICE" ]; then + EXTRA_ARGS="-- -r $RNG_DEVICE" +fi + + +case "$1" in + start) + echo -n "Starting random number generator daemon" + start-stop-daemon -S -q -x $rngd $EXTRA_ARGS + echo "." + ;; + stop) + echo -n "Stopping random number generator daemon" + start-stop-daemon -K -q -n rngd + echo "." + ;; + reload|force-reload) + echo -n "Signalling rng daemon restart" + start-stop-daemon -K -q -s 1 -x $rngd + start-stop-daemon -K -q -s 1 -x $rngd + ;; + restart) + echo -n "Stopping random number generator daemon" + start-stop-daemon -K -q -n rngd + echo "." + echo -n "Starting random number generator daemon" + start-stop-daemon -S -q -x $rngd $EXTRA_ARGS + echo "." + ;; + *) + echo "Usage: /etc/init.d/rng-tools {start|stop|reload|restart|force-reload}" + exit 1 +esac + +exit 0 diff --git a/yocto-poky/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch new file mode 100644 index 000000000..e691315d1 --- /dev/null +++ b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch @@ -0,0 +1,63 @@ +In case of uclibc, use libuargp + +If we use uclibc for system libraries, select libuargp + +Upstream-Status: Pending + +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- +diff -Naur rng-tools-5-orig/configure.ac rng-tools-5/configure.ac +--- rng-tools-5-orig/configure.ac 2016-02-24 18:11:24.023690235 +0200 ++++ rng-tools-5/configure.ac 2016-02-24 18:14:49.763118138 +0200 +@@ -39,6 +39,13 @@ + [with_libargp=check] + ) + ++AC_ARG_ENABLE([uclibc], ++ AS_HELP_STRING([--enable-uclibc], [Use uclibc for system libraries]), ++ use_uclibc=yes, use_uclibc=no) ++AM_CONDITIONAL(USE_UCLIBC, test "x$use_uclibc" = "xyes") ++AS_IF([test "x$use_uclibc" = "xyes"], [AC_DEFINE(USE_UCLIBC)]) ++AH_TEMPLATE([USE_UCLIBC], [Defined if uclibc libraries are used.]) ++ + dnl Make sure anyone changing configure.ac/Makefile.am has a clue + AM_MAINTAINER_MODE + +@@ -101,7 +108,7 @@ + [need_libargp=no], + [need_libargp=yes + if test "x$with_libargp" = "xno"; then +- AC_MSG_FAILURE([libargp disabled and libc does not have argp]) ++ AC_MSG_WARN([libargp disabled and libc does not have argp]) + fi] + ) + ], +@@ -110,7 +117,7 @@ + + dnl Check for libargp + AS_IF( +- [test "x$need_libargp" = "xyes"], ++ [test "x$need_libargp" = "xyes" -a "x$use_uclibc" = "xno"], + [ + AC_CHECK_LIB( + [argp], +@@ -120,6 +127,19 @@ + ) + ] + ) ++ ++dnl Check for libuargp ++AS_IF( ++ [test "x$use_uclibc" = "xyes"], ++ [ ++ AC_CHECK_LIB( ++ [uargp], ++ [argp_parse], ++ [LIBS="$LIBS -luargp"], ++ [AC_MSG_FAILURE([libuargp not found])] ++ ) ++ ] ++) + + dnl ----------------- + dnl Configure options diff --git a/yocto-poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch new file mode 100644 index 000000000..142257181 --- /dev/null +++ b/yocto-poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch @@ -0,0 +1,31 @@ +Fix underquoted m4 entry. This causes a failure if gcrypt isn't present: + +| configure: libgcrypt support disabled +| ../rng-tools-5/configure: line 4345: ac_fn_c_try_link: command not found +| configure: error: in `/media/build1/poky/build/tmp/work/i586-poky-linux/rng-tools/5-r0/build': + +RP +2016/2/16 + +Index: rng-tools-5/configure.ac +=================================================================== +--- rng-tools-5.orig/configure.ac ++++ rng-tools-5/configure.ac +@@ -71,7 +71,7 @@ AS_IF( + [test "x$with_libgcrypt" != "xno"], + [ + AC_CHECK_HEADER([gcrypt.h], +- AC_CHECK_LIB( ++ [AC_CHECK_LIB( + [gcrypt], + [gcry_check_version], , + [ +@@ -80,7 +80,7 @@ AS_IF( + AC_MSG_NOTICE([libgcrypt support disabled]) + fi + ] +- ), ++ )], + [if test "x$with_libgcrypt" != "xcheck"; then + AC_MSG_FAILURE([libgcrypt headers not found]); else + AC_MSG_NOTICE([libgcrypt support disabled]) diff --git a/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb b/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb new file mode 100644 index 000000000..913a092fd --- /dev/null +++ b/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb @@ -0,0 +1,46 @@ +SUMMARY = "Random number generator daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0b6f033afe6db235e559456585dc8cdc" + +SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/gkernel/${BP}.tar.gz \ + file://0001-If-the-libc-is-lacking-argp-use-libargp.patch \ + file://0002-Add-argument-to-control-the-libargp-dependency.patch \ + file://underquote.patch \ + file://uclibc-libuargp-configure.patch \ + file://init \ + file://default" + +SRC_URI[md5sum] = "6726cdc6fae1f5122463f24ae980dd68" +SRC_URI[sha256sum] = "60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e" + +# As the recipe doesn't inherit systemd.bbclass, we need to set this variable +# manually to avoid unnecessary postinst/preinst generated. +python () { + if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") +} + +inherit autotools update-rc.d + +PACKAGECONFIG = "libgcrypt" +PACKAGECONFIG_libc-musl = "libargp" +PACKAGECONFIG_libc-uclibc = "libuargp" +PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," +PACKAGECONFIG[libuargp] = "--enable-uclibc,,," +PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," + +do_install_append() { + # Only install the init script when 'sysvinit' is in DISTRO_FEATURES. + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d "${D}${sysconfdir}/init.d" + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools + sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ + ${D}${sysconfdir}/init.d/rng-tools + + install -d "${D}${sysconfdir}/default" + install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools + fi +} + +INITSCRIPT_NAME = "rng-tools" +INITSCRIPT_PARAMS = "start 30 2 3 4 5 . stop 30 0 6 1 ." diff --git a/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.4.bb b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.4.bb deleted file mode 100644 index 8c4fde806..000000000 --- a/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.4.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] = "16c02f7b658fff2a9c207406d388ea31" -SRC_URI[sha256sum] = "bbc0bd023f497dfd75e1ca73441cbbb5a63617d9e14f2790b868361cc055b5b1" diff --git a/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.6.bb b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.6.bb new file mode 100644 index 000000000..2cf50414c --- /dev/null +++ b/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.6.bb @@ -0,0 +1,7 @@ +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/yocto-poky/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch b/yocto-poky/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch deleted file mode 100644 index e3bfd5f65..000000000 --- a/yocto-poky/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch +++ /dev/null @@ -1,30 +0,0 @@ -[PATCH] using the dynamic library - -Upstream-Status: Inappropriate [configuration] - -building statically-linked sqlite3 failed since sqlite3.o is generated in -different dir, even if link successes, the size of sqlite3 is become larger, -so use the dynamic link, ref: http://patchwork.openembedded.org/patch/93293/ - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 88bc23d..fe50f20 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,7 +7,8 @@ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 - - bin_PROGRAMS = sqlite3 - sqlite3_SOURCES = shell.c sqlite3.h --sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@ -+sqlite3_LDADD = @READLINE_LIBS@ libsqlite3.la -+ - - include_HEADERS = sqlite3.h sqlite3ext.h - --- -1.9.1 - diff --git a/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc b/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc index 2e3791bfc..5bff33b85 100644 --- a/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc +++ b/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc @@ -1,34 +1,53 @@ SUMMARY = "Embeddable SQL database engine" HOMEPAGE = "http://www.sqlite.org" SECTION = "libs" -DEPENDS = "readline ncurses" -DEPENDS_class-native = "" -LICENSE = "PD" + +PE = "3" + +def sqlite_download_version(d): + pvsplit = d.getVar('PV', True).split('.') + if len(pvsplit) < 4: + pvsplit.append('0') + return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]]) + +SQLITE_PV = "${@sqlite_download_version(d)}" + +S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}" + +UPSTREAM_CHECK_URI = "http://www.sqlite.org/" +UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html" inherit autotools pkgconfig -EXTRA_OECONF = "--enable-shared --enable-threadsafe" -EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline" -export config_BUILD_CC = "${BUILD_CC}" -export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" -export config_BUILD_LIBS = "${BUILD_LDFLAGS}" -export config_TARGET_CC = "${CC}" -export config_TARGET_LINK = "${CCLD}" -export config_TARGET_CFLAGS = "${CFLAGS}" -export config_TARGET_LFLAGS = "${LDFLAGS}" +PACKAGECONFIG ?= "" +PACKAGECONFIG_class-native = "" + +PACKAGECONFIG[editline] = "--enable-editline,--disable-editline,libedit" +PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline ncurses" + +EXTRA_OECONF = " \ + --enable-shared \ + --enable-threadsafe \ + --disable-static-shell \ +" # pread() is in POSIX.1-2001 so any reasonable system must surely support it BUILD_CFLAGS += "-DUSE_PREAD" TARGET_CFLAGS += "-DUSE_PREAD" +# Provide column meta-data API +BUILD_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" +TARGET_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" + PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" FILES_${PN} = "${bindir}/*" FILES_lib${BPN} = "${libdir}/*.so.*" FILES_lib${BPN}-dev = "${libdir}/*.la ${libdir}/*.so \ - ${libdir}/pkgconfig ${includedir}" + ${libdir}/pkgconfig ${includedir}" FILES_lib${BPN}-doc = "${docdir} ${mandir} ${infodir}" FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" + AUTO_LIBNAME_PKGS = "${MLPREFIX}lib${BPN}" BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-support/sqlite/sqlite3/fix-disable-static-shell.patch b/yocto-poky/meta/recipes-support/sqlite/sqlite3/fix-disable-static-shell.patch new file mode 100644 index 000000000..6f39ae266 --- /dev/null +++ b/yocto-poky/meta/recipes-support/sqlite/sqlite3/fix-disable-static-shell.patch @@ -0,0 +1,61 @@ +From ede5db83e38cc8ad8c9be291cd8985f7ad99f291 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <armccurdy@gmail.com> +Date: Tue, 16 Feb 2016 14:00:00 -0800 +Subject: [PATCH] fix --disable-static-shell + +Upstream sqlite seems to be moving further and further away from +allowing the sqlite3 command line tool to be dynamically linked with +sqlite. + +The --disable-static-shell configure option added in 3.10.0 no longer +has any effect in 3.11.0. For now patch things up and make it work. + +Upstream-Status: Pending + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> +--- + Makefile.am | 13 +++++++++++-- + configure.ac | 2 +- + 2 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 0e09cfc..608c0fd 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,9 +6,18 @@ libsqlite3_la_SOURCES = sqlite3.c + libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 + + bin_PROGRAMS = sqlite3 +-sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h +-sqlite3_LDADD = @READLINE_LIBS@ ++sqlite3_SOURCES = shell.c sqlite3.h ++EXTRA_sqlite3_SOURCES = sqlite3.c ++sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@ + sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ ++ ++# Warning: Adding SQLITE_ENABLE_EXPLAIN_COMMENTS to sqlite3_CFLAGS doesn't ++# actually have any effect if we link the sqlite3 command line tool with the ++# libsqlite3.so shared library (which will contain a version of sqlite3.c ++# compiled with the default AM_CFLAGS above). If SQLITE_ENABLE_EXPLAIN_COMMENTS ++# debug is required, then sqlite3 must not be configured with ++# --disable-static-shell ++ + sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS + + include_HEADERS = sqlite3.h sqlite3ext.h +diff --git a/configure.ac b/configure.ac +index 8e7fd69..ada559e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -130,7 +130,7 @@ AC_ARG_ENABLE(static-shell, [AS_HELP_STRING( + [statically link libsqlite3 into shell tool [default=yes]])], + [], [enable_static_shell=yes]) + if test x"$enable_static_shell" == "xyes"; then +- EXTRA_SHELL_OBJ=sqlite3.$OBJEXT ++ EXTRA_SHELL_OBJ=sqlite3-sqlite3.$OBJEXT + else + EXTRA_SHELL_OBJ=libsqlite3.la + fi +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.11.0.bb b/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.11.0.bb new file mode 100644 index 000000000..992d20cd5 --- /dev/null +++ b/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.11.0.bb @@ -0,0 +1,11 @@ +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://fix-disable-static-shell.patch \ +" + +SRC_URI[md5sum] = "a6cdc3e0a6e5087d620037ae0c48720d" +SRC_URI[sha256sum] = "508d4dcbcf7a7181e95c717a1dc4ae3c0880b3d593be0c4b40abb6c3a0e201fb" diff --git a/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb b/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb deleted file mode 100644 index c72ad50f6..000000000 --- a/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -require sqlite3.inc - -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" - -def sqlite_download_version(d): - pvsplit = d.getVar('PV', True).split('.') - return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]]) - -PE = "3" -SQLITE_PV = "${@sqlite_download_version(d)}" -SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - file://0001-using-the-dynamic-library.patch \ -" - -SRC_URI[md5sum] = "a18bfc015cd49a1e7a961b7b77bc3b37" -SRC_URI[sha256sum] = "8382e55a4e7d853c93038562ca3dd00307937fccf1c6b65ddd813e503a56d626" - -S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}" - -# Provide column meta-data API -BUILD_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" -TARGET_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" - diff --git a/yocto-poky/meta/recipes-support/taglib/taglib_1.9.1.bb b/yocto-poky/meta/recipes-support/taglib/taglib_1.9.1.bb index 1f278144e..d125308cc 100644 --- a/yocto-poky/meta/recipes-support/taglib/taglib_1.9.1.bb +++ b/yocto-poky/meta/recipes-support/taglib/taglib_1.9.1.bb @@ -12,6 +12,8 @@ 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 diff --git a/yocto-poky/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch b/yocto-poky/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch index 240777180..9b9980397 100644 --- a/yocto-poky/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch +++ b/yocto-poky/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch @@ -1,4 +1,5 @@ Upstream-Status: Backport +CVE: CVE-2012-2738 Signed-off-by: Ross Burton <ross.burton@intel.com> From e524b0b3bd8fad844ffa73927c199545b892cdbd Mon Sep 17 00:00:00 2001 diff --git a/yocto-poky/meta/recipes-support/vte/vte.inc b/yocto-poky/meta/recipes-support/vte/vte.inc index 07b9e10dc..8565cc2ad 100644 --- a/yocto-poky/meta/recipes-support/vte/vte.inc +++ b/yocto-poky/meta/recipes-support/vte/vte.inc @@ -1,17 +1,15 @@ SUMMARY = "Virtual terminal emulator GTK+ widget library" BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" LICENSE = "LGPLv2.0" -DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub" +DEPENDS = " glib-2.0 gtk+ intltool-native ncurses" RDEPENDS_libvte = "vte-termcap" -inherit gnome gtk-doc distro_features_check +inherit gnome gtk-doc distro_features_check upstream-version-is-even gobject-introspection ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" -EXTRA_OECONF = "--disable-python --disable-introspection" +EXTRA_OECONF = "--disable-python" PACKAGES =+ "libvte vte-termcap" FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper" -FILES_${PN}-dbg =+ "${libexecdir}/.debug ${prefix}/src ${bindir}/.debug \ - ${libdir}/.debug" FILES_vte-termcap = "${datadir}/vte/termcap-0.0" diff --git a/yocto-poky/meta/recipes-support/vte/vte_0.28.2.bb b/yocto-poky/meta/recipes-support/vte/vte_0.28.2.bb index 8b4e7f71d..74087ca83 100644 --- a/yocto-poky/meta/recipes-support/vte/vte_0.28.2.bb +++ b/yocto-poky/meta/recipes-support/vte/vte_0.28.2.bb @@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" PR = "r6" SRC_URI += "file://obsolete_automake_macros.patch \ - file://cve-2012-2738.patch" + file://cve-2012-2738.patch \ + " CFLAGS += "-D_GNU_SOURCE" |
