diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-16 17:11:34 -0800 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-08 18:21:44 -0500 |
| commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
| tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-support | |
| parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
| download | talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.gz talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.zip | |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-support')
136 files changed, 1704 insertions, 2090 deletions
diff --git a/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch b/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch new file mode 100644 index 000000000..6809fa60b --- /dev/null +++ b/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch @@ -0,0 +1,32 @@ +From 036f90748247417dbfa714b1b912ca7dd4053f04 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 23 Jul 2018 14:12:35 +0800 +Subject: [PATCH] apr: fix ptest hang in teststr + +ptest hang in teststr since turns into a non-terminating loop, +fix by below backported patch. + +Upstream-Status: Backport[https://github.com/apache/apr/commit/ + 2e8fbff4ecf82d0decf6baf774c209948f2f4998?diff=unified] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + test/teststr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/teststr.c b/test/teststr.c +index d9a5054..951a830 100644 +--- a/test/teststr.c ++++ b/test/teststr.c +@@ -307,7 +307,7 @@ static void overflow_strfsize(abts_case *tc, void *data) + for (; off < 999999999; off += 999) { + apr_strfsize(off, buf); + } +- for (off = 1; off < LONG_MAX && off > 0; off *= 2) { ++ for (off = LONG_MAX; off > 1; off /= 2) { + apr_strfsize(off, buf); + apr_strfsize(off + 1, buf); + apr_strfsize(off - 1, buf); +-- +2.7.4 + diff --git a/poky/meta/recipes-support/apr/apr_1.6.3.bb b/poky/meta/recipes-support/apr/apr_1.6.3.bb index 7563a381d..7bfb69855 100644 --- a/poky/meta/recipes-support/apr/apr_1.6.3.bb +++ b/poky/meta/recipes-support/apr/apr_1.6.3.bb @@ -18,6 +18,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ + file://0008-apr-fix-ptest-hang-in-teststr.patch \ " SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa" diff --git a/poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb index 19a7155d6..161bb5ce2 100644 --- a/poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb +++ b/poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb @@ -25,7 +25,10 @@ FILES_${PN} = "${bindir}/aspell" FILES_libpspell = "${libdir}/libpspell.so.*" FILES_${PN}-dev += "${bindir}/pspell-config" -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" + inherit autotools-brokensep gettext texinfo binconfig-disabled BINCONFIG = "${bindir}/pspell-config" diff --git a/poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb b/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb index 8617bb871..16d8e45ee 100644 --- a/poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb +++ b/poky/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb @@ -3,15 +3,13 @@ HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" +SRC_URI[archive.md5sum] = "355c7916a69513490cb83ad34016b169" +SRC_URI[archive.sha256sum] = "61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "eeec6cead3350dca48a235271c105b3e" -SRC_URI[sha256sum] = "b4f0c27b61dbffba7a5b5ba2ff88c8cee10ff8dac774fa5b79ce906853623b75" +DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2" -DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core" - -inherit autotools pkgconfig distro_features_check upstream-version-is-even +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase distro_features_check upstream-version-is-even # The at-spi2-core requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" diff --git a/poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch b/poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch deleted file mode 100644 index 1f8c9f374..000000000 --- a/poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch +++ /dev/null @@ -1,52 +0,0 @@ -From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Tue, 21 Jun 2016 16:00:02 +0300 -Subject: [PATCH] build: Add --with-systemduserunitdir - -Default to "pkg-config --variable=systemduserunitdir systemd" but -allow overriding the value. - -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> - ---- - bus/Makefile.am | 2 +- - configure.ac | 9 +++++++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/bus/Makefile.am b/bus/Makefile.am -index 688f82a..10cde62 100644 ---- a/bus/Makefile.am -+++ b/bus/Makefile.am -@@ -29,7 +29,7 @@ org.a11y.Bus.service: org.a11y.Bus.service.in - EXTRA_DIST += org.a11y.Bus.service.in - CLEANFILES += org.a11y.Bus.service - --systemd_userdir = $(prefix)/lib/systemd/user -+systemd_userdir = $(systemduserunitdir) - systemd_user_DATA = at-spi-dbus-bus.service - at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile - $(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ -diff --git a/configure.ac b/configure.ac -index 8c4fca2..1415cca 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -146,6 +146,15 @@ else - fi - AC_SUBST(DBUS_SERVICES_DIR) - -+AC_ARG_WITH([systemduserunitdir], -+ AS_HELP_STRING([--with-systemduserunitdir=DIR], -+ [Directory for systemd service files]), -+ [], -+ [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)]) -+AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) -+ -+AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) -+ - GOBJECT_INTROSPECTION_CHECK([1.32.0]) - - AC_SUBST(LIBTOOL_EXPORT_OPTIONS) --- -2.14.1 - diff --git a/poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb deleted file mode 100644 index 521ee3b96..000000000 --- a/poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" -HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ - file://0001-build-Add-with-systemduserunitdir.patch \ - " - -SRC_URI[md5sum] = "4a042e4c801fdb793788b749eab21485" -SRC_URI[sha256sum] = "c80e0cdf5e3d713400315b63c7deffa561032a6c37289211d8afcfaa267c2615" - -DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" - -inherit autotools gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECONF = " \ - --with-systemduserunitdir=${systemd_user_unitdir} \ - --with-dbus-daemondir=${bindir}" - -FILES_${PN} += "${datadir}/dbus-1/services/*.service \ - ${datadir}/dbus-1/accessibility-services/*.service \ - ${datadir}/defaults/at-spi2 \ - ${systemd_user_unitdir}/at-spi-dbus-bus.service \ - " diff --git a/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb new file mode 100644 index 000000000..7975f58ba --- /dev/null +++ b/poky/meta/recipes-support/atk/at-spi2-core_2.28.0.bb @@ -0,0 +1,39 @@ +SUMMARY = "Assistive Technology Service Provider Interface (dbus core)" +HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + " + +SRC_URI[md5sum] = "9c42f79636ed1c0e908b7483d789b32e" +SRC_URI[sha256sum] = "42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87" + +DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" + +inherit meson gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ + -Ddbus_daemon=${bindir}" + +GTKDOC_ENABLE_FLAG = "-Denable_docs=true" +GTKDOC_DISABLE_FLAG = "-Denable_docs=false" + +GI_ENABLE_FLAG = "-Denable-introspection=yes" +GI_DISABLE_FLAG = "-Denable-introspection=no" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " + +FILES_${PN} += "${datadir}/dbus-1/services/*.service \ + ${datadir}/dbus-1/accessibility-services/*.service \ + ${datadir}/defaults/at-spi2 \ + ${systemd_user_unitdir}/at-spi-dbus-bus.service \ + " diff --git a/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch b/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch new file mode 100644 index 000000000..047e81fb6 --- /dev/null +++ b/poky/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch @@ -0,0 +1,38 @@ +Upstream-Status: Submitted + +From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman <jpuhlman@mvista.com> +Date: Thu, 14 Jun 2018 17:21:49 +0000 +Subject: [PATCH] Switch from filename to basename + +When atk-enum-types.h is installed in to a system, the user likely has +no access to the location where the headers were built, especially if +the software was built in a sysroot environment. If the headers were +built for a mulitlib environment, the build pathing may be different. +Subsequently, if two mulitlib variants of atk are installed together the +headers conflict for no other reason then they were built in two +different locations. Switching from filename to basename, still should +provide sufficient information on the providence of the enums, while not +conflicting for really no good reason. + +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> +--- + atk/atk-enum-types.h.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template +index 7b4cec4..8321c24 100644 +--- a/atk/atk-enum-types.h.template ++++ b/atk/atk-enum-types.h.template +@@ -14,7 +14,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.14.1.459.g238e487 + diff --git a/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch new file mode 100644 index 000000000..c604a984a --- /dev/null +++ b/poky/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch @@ -0,0 +1,28 @@ +From 3838757d29590cc1ef99c97f7268377322fc17e9 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Fri, 6 Apr 2018 12:04:00 +0800 +Subject: [PATCH] meson.build: enable introspection for cross-compile + +It works fine in OE-core and doesn't need to be disabled. Let the user decide +if it should be disabled or not. + +Upstream-Status: Pending + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + atk/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atk/meson.build b/atk/meson.build +index 7b5a683..855e28f 100644 +--- a/atk/meson.build ++++ b/atk/meson.build +@@ -139,7 +139,7 @@ libatk_dep = declare_dependency(link_with: libatk, + + disable_introspection = get_option('disable_introspection') + +-if not meson.is_cross_build() and not disable_introspection ++if not disable_introspection + gnome.generate_gir(libatk, + sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], + namespace: 'Atk', diff --git a/poky/meta/recipes-support/atk/atk_2.26.1.bb b/poky/meta/recipes-support/atk/atk_2.26.1.bb deleted file mode 100644 index 685b5991d..000000000 --- a/poky/meta/recipes-support/atk/atk_2.26.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Accessibility toolkit for GNOME" -HOMEPAGE = "http://live.gnome.org/GAP/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/libs" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ - file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" - -DEPENDS = "glib-2.0" - -inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection - -SRC_URI[archive.md5sum] = "7cddcc313b9a3efd19b2ddf079ba68f5" -SRC_URI[archive.sha256sum] = "ef00ff6b83851dddc8db38b4d9faeffb99572ba150b0664ee02e46f015ea97cb" - -BBCLASSEXTEND = "native" - diff --git a/poky/meta/recipes-support/atk/atk_2.28.1.bb b/poky/meta/recipes-support/atk/atk_2.28.1.bb new file mode 100644 index 000000000..26b13b69d --- /dev/null +++ b/poky/meta/recipes-support/atk/atk_2.28.1.bb @@ -0,0 +1,37 @@ +SUMMARY = "Accessibility toolkit for GNOME" +HOMEPAGE = "http://live.gnome.org/GAP/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/libs" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ + file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" + +# Need gettext-native as Meson can't turn off i18n +DEPENDS = "gettext-native glib-2.0" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection + +GTKDOC_ENABLE_FLAG = "-Denable_docs=true" +GTKDOC_DISABLE_FLAG = "-Denable_docs=false" + +GI_ENABLE_FLAG = "-Ddisable_introspection=false" +GI_DISABLE_FLAG = "-Ddisable_introspection=true" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " + +SRC_URI_append = " \ + file://0001-meson.build-enable-introspection-for-cross-compile.patch \ + file://0001-Switch-from-filename-to-basename.patch \ + " +SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11" +SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc" + +BBCLASSEXTEND = "native" + diff --git a/poky/meta/recipes-support/attr/acl_2.2.52.bb b/poky/meta/recipes-support/attr/acl_2.2.52.bb index 8f3dc45cf..8b89de9b4 100644 --- a/poky/meta/recipes-support/attr/acl_2.2.52.bb +++ b/poky/meta/recipes-support/attr/acl_2.2.52.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ DEPENDS = "attr" SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \ - file://configure.ac;subdir=${S} \ + file://configure.ac;subdir=${BP} \ file://run-ptest \ file://acl-fix-the-order-of-expected-output-of-getfacl.patch \ file://test-fix-insufficient-quoting-of.patch \ diff --git a/poky/meta/recipes-support/attr/attr.inc b/poky/meta/recipes-support/attr/attr.inc index 24ef5adfd..9fc0f33cc 100644 --- a/poky/meta/recipes-support/attr/attr.inc +++ b/poky/meta/recipes-support/attr/attr.inc @@ -23,7 +23,11 @@ do_install_append() { s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', } -inherit ptest +inherit ptest update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "setfattr" +ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" do_install_ptest() { tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) diff --git a/poky/meta/recipes-support/bash-completion/bash-completion_2.7.bb b/poky/meta/recipes-support/bash-completion/bash-completion_2.8.bb index f519b3f3d..85064343e 100644 --- a/poky/meta/recipes-support/bash-completion/bash-completion_2.7.bb +++ b/poky/meta/recipes-support/bash-completion/bash-completion_2.8.bb @@ -9,8 +9,8 @@ SECTION = "console/utils" SRC_URI = "https://github.com/scop/bash-completion/releases/download/${PV}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "28117492bdc9408438e6041683a423ce" -SRC_URI[sha256sum] = "41ba892d3f427d4a686de32673f35401bc947a7801f684127120cdb13641441e" +SRC_URI[md5sum] = "201b6ae62f7d5fb5b1b25e34427db919" +SRC_URI[sha256sum] = "c01f5570f5698a0dda8dc9cfb2a83744daa1ec54758373a6e349bd903375f54d" UPSTREAM_CHECK_REGEX = "bash-completion-(?P<pver>(?!2008).+)\.tar" UPSTREAM_CHECK_URI = "https://github.com/scop/bash-completion/releases" @@ -25,7 +25,7 @@ do_install_append() { # Delete files already provided by util-linux local i - for i in mount umount rfkill; do + for i in mount umount; do rm ${D}${datadir}/${BPN}/completions/$i done } diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch b/poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch deleted file mode 100644 index b3298ce2d..000000000 --- a/poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch +++ /dev/null @@ -1,34 +0,0 @@ -Add config option --with-dev-dsp. - -Upstream-Status: Pending - -Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> ---- ---- a/configure.ac -+++ b/configure.ac -@@ -106,6 +106,16 @@ AC_ARG_WITH(python,[ --with-python[[=AR - fi - ]) - -+AC_ARG_WITH(dev-dsp,[ --with-dev-dsp enables dev/dsp for entropy producing. auto for auto-detecting dev/dep on host. [[default=no]]],[ -+ if test "$withval" = yes; then -+ AC_DEFINE([HAVE_DEV_DSP], 1) -+ else -+ if test "$withval" = auto; then -+ ac_detect_dev_dsp=yes -+ fi -+ fi -+ ],[ac_detect_dev_dsp=no]) -+ - # Check for expert mode - if test "$ac_enable_expert_mode" = yes; then - BEE_EXPERT_MODE -@@ -464,7 +474,7 @@ linux*) - ac_cv_have_dev_dsp=no - fi - ]) -- if test "$ac_cv_have_dev_dsp" = yes; then -+ if test "$ac_cv_have_dev_dsp" = yes && test "$ac_detect_dev_dsp" = yes; then - AC_DEFINE([HAVE_DEV_DSP], 1) - fi - ;; diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch b/poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch deleted file mode 100644 index 3e5513fce..000000000 --- a/poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -beecrypt: enable ptest support - -Upstream-Status: Inappropriate [embedded specific] - -Add install-ptest rules. - -Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---- - Makefile.am | 3 +++ - tests/Makefile.am | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index b7e7869..5076f59 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -73,3 +73,6 @@ DISTCLEANFILES = mpopt.s blowfishopt.s sha1opt.s - - bench: - (cd tests && $(MAKE) $(AM_MAKEFLAGS) bench) -+ -+install-ptest: -+ (cd tests && $(MAKE) $(AM_MAKEFLAGS) check_PROGRAMS) -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 1604e5e..d8db8d8 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -101,3 +101,6 @@ bench: benchme benchrsa benchhf benchbc - ./benchbc AES 128 - ./benchbc Blowfish 128 - ./benchbc Blowfish 128 -+ -+check_PROGRAMS: -+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) --- -1.8.1.2 - diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch b/poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch deleted file mode 100644 index 91b1fa6ef..000000000 --- a/poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch +++ /dev/null @@ -1,43 +0,0 @@ -We are unable to run code at configure time in a cross environemnt, but as we -control the build we can be fairly certain this dependency is met. - -Upstream-Status: Inappropriate [embedded specific] - -JL 05/07/10 -Index: beecrypt-4.2.1/configure.ac -=================================================================== ---- beecrypt-4.2.1.orig/configure.ac 2010-11-26 17:12:25.000000000 +0800 -+++ beecrypt-4.2.1/configure.ac 2010-11-26 17:12:30.000000000 +0800 -@@ -292,32 +292,6 @@ - # Predefines and checks for C++ API support - AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code]) - --if test "$ac_with_cplusplus" = yes; then -- AC_MSG_CHECKING([for IBM's ICU library version >= 2.8]) -- AC_LANG_PUSH(C) -- AC_RUN_IFELSE([ -- AC_LANG_PROGRAM([[#include <unicode/uversion.h>]],[[ -- #if U_ICU_VERSION_MAJOR_NUM < 2 -- exit(1); -- #elif U_ICU_VERSION_MAJOR_NUM == 2 -- # if U_ICU_VERSION_MINOR_NUM < 8 -- exit(1); -- # else -- exit(0); -- # endif -- #else -- exit(0); -- #endif -- ]])],[ -- AC_MSG_RESULT([yes]) -- ],[ -- AC_MSG_RESULT([no]) -- AC_MSG_WARN([disabling cplusplus]) -- ac_with_cplusplus=no -- ]) -- AC_LANG_POP(C) --fi -- - AM_CONDITIONAL([WITH_CPLUSPLUS],[test "$ac_with_cplusplus" = yes]) - - if test "$ac_with_cplusplus" = yes ; then diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch b/poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch deleted file mode 100644 index 8144e39be..000000000 --- a/poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch +++ /dev/null @@ -1,39 +0,0 @@ - -gcc-4.7 seems to be stricter about some things, so follow -the suggestion from the error/note information. - - ../../x86_64-linux-libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I../.. - x86_64-linux-libtool: compile: g++ -DHAVE_CONFIG_H -I. -I../.. -I../../include -isyst - In file included from ../../include/beecrypt/c++/util/Hashtable.h:42:0, - from ../../include/beecrypt/c++/util/Properties.h:36, - from Properties.cxx:25: - ../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::uti - Properties.cxx:228:1: required from here - ../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not decl - ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent b - ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' ins - ../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::uti - Properties.cxx:228:1: required from here - ../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not decl - ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent b - ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' ins - - -Upstream-Status: Pending - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - - -Index: beecrypt-4.2.1/include/beecrypt/c++/util/AbstractSet.h -=================================================================== ---- beecrypt-4.2.1.orig/include/beecrypt/c++/util/AbstractSet.h -+++ beecrypt-4.2.1/include/beecrypt/c++/util/AbstractSet.h -@@ -56,7 +56,7 @@ namespace beecrypt { - if (c->size() != size()) - return false; - -- return containsAll(*c); -+ return this->containsAll(*c); - } - return false; - } diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch b/poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch deleted file mode 100644 index 6cb0c0020..000000000 --- a/poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch +++ /dev/null @@ -1,47 +0,0 @@ -Fix visibility of various C++ functions, inspired by a similar patch in the Fink -project: -http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html - -JL 05/07/10 - -Upstream-Status: Pending - -Index: beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h -=================================================================== ---- beecrypt-4.2.1.orig/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:22:57.000000000 +0800 -+++ beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:23:01.000000000 +0800 -@@ -147,13 +147,13 @@ - mutable bytearray* enc; - - BeeCertificate(); -- BeeCertificate(InputStream& in) throw (IOException); - - void encodeTBS(DataOutputStream& out) const throw (IOException); - - bytearray* encodeTBS() const throw (CertificateEncodingException); - - public: -+ BeeCertificate(InputStream& in) throw (IOException); - BeeCertificate(const BeeCertificate&) throw (CloneNotSupportedException); - virtual ~BeeCertificate(); - -Index: beecrypt-4.2.1/include/beecrypt/c++/security/Security.h -=================================================================== ---- beecrypt-4.2.1.orig/include/beecrypt/c++/security/Security.h 2010-11-26 17:20:55.000000000 +0800 -+++ beecrypt-4.2.1/include/beecrypt/c++/security/Security.h 2010-11-26 17:21:36.000000000 +0800 -@@ -61,7 +61,6 @@ - friend class SecureRandom; - friend class Signature; - -- private: - struct spi - { - Object* cspi; -@@ -76,6 +75,7 @@ - static spi* getSpi(const String& algo, const String& type, const Provider&) throw (NoSuchAlgorithmException); - static spi* getFirstSpi(const String& type); - -+ private: - static const String& getKeyStoreDefault(); - - static bool _init; diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/run-ptest b/poky/meta/recipes-support/beecrypt/beecrypt/run-ptest deleted file mode 100644 index 2ee294d99..000000000 --- a/poky/meta/recipes-support/beecrypt/beecrypt/run-ptest +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -cd tests -for i in `ls`; do ./$i; if [ $? -eq 0 ]; then echo "PASS: $i"; \ - else echo "FAIL: $i"; fi; done diff --git a/poky/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/poky/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb deleted file mode 100644 index 1e626f154..000000000 --- a/poky/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb +++ /dev/null @@ -1,48 +0,0 @@ -# Beecrypt OE build file -# Copyright (C) 2004-2005, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -SUMMARY = "A general-purpose cryptography library" -HOMEPAGE = "http://sourceforge.net/projects/beecrypt" - -SRC_URI = "${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \ - file://disable-icu-check.patch \ - file://fix-security.patch \ - file://fix-for-gcc-4.7.patch \ - file://run-ptest \ - file://beecrypt-enable-ptest-support.patch \ - file://add-option-dev-dsp.patch \ - " - -SRC_URI[md5sum] = "8441c014170823f2dff97e33df55af1e" -SRC_URI[sha256sum] = "286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d" - -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \ - file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589 \ - file://include/beecrypt/beecrypt.h;endline=20;md5=47a93eef539aac237eef86297a4d71c1" - -PR = "r3" - -inherit autotools multilib_header ptest -acpaths="" - -do_install_append() { - oe_multilib_header beecrypt/gnu.h -} - -EXTRA_OECONF = "--without-python --enable-shared --enable-static --disable-openmp --with-java=no" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[cplusplus] = "--with-cplusplus,--without-cplusplus,icu" - -FILES_${PN} = "${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.*" -FILES_${PN}-dev += "${libdir}/${BPN}/*.so ${libdir}/${BPN}/*.la" -FILES_${PN}-staticdev += "${libdir}/${BPN}/*.a" - -BBCLASSEXTEND = "native nativesdk" - -do_install_ptest () { - mkdir ${D}${PTEST_PATH}/tests - cp -r ${B}/tests/.libs/test* ${D}${PTEST_PATH}/tests -} diff --git a/poky/meta/recipes-support/boost/bjam-native_1.66.0.bb b/poky/meta/recipes-support/boost/bjam-native_1.68.0.bb index 92c86a3ef..94f96e62d 100644 --- a/poky/meta/recipes-support/boost/bjam-native_1.66.0.bb +++ b/poky/meta/recipes-support/boost/bjam-native_1.68.0.bb @@ -6,7 +6,7 @@ SECTION = "devel" inherit native SRC_URI += "file://bjam-native-build-bjam.debug.patch \ - file://0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch" +" do_compile() { ./bootstrap.sh --with-toolset=gcc diff --git a/poky/meta/recipes-support/boost/boost-1.66.0.inc b/poky/meta/recipes-support/boost/boost-1.68.0.inc index fe2b8639f..b367a80b6 100644 --- a/poky/meta/recipes-support/boost/boost-1.66.0.inc +++ b/poky/meta/recipes-support/boost/boost-1.68.0.inc @@ -12,8 +12,8 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "b2dfbd6c717be4a7bb2d88018eaccf75" -SRC_URI[sha256sum] = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9" +SRC_URI[md5sum] = "7fbd1890f571051f2a209681d57d486a" +SRC_URI[sha256sum] = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" diff --git a/poky/meta/recipes-support/boost/boost.inc b/poky/meta/recipes-support/boost/boost.inc index 0ff5b7a77..c4faea211 100644 --- a/poky/meta/recipes-support/boost/boost.inc +++ b/poky/meta/recipes-support/boost/boost.inc @@ -9,6 +9,7 @@ BOOST_LIBS = "\ atomic \ chrono \ container \ + contract \ date_time \ exception \ filesystem \ @@ -134,9 +135,8 @@ BJAM_TOOLS = "--ignore-site-config \ '--layout=system' \ " -# 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 -BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}" +# use PARALLEL_MAKE to speed up the build +BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d')}" BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ ${BJAM_TOOLS} \ -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ diff --git a/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch b/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch new file mode 100644 index 000000000..c2ac49e58 --- /dev/null +++ b/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch @@ -0,0 +1,48 @@ +From c99f798407e44c86e9f64f5b1adf3b4d0549eef2 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <Mingli.Yu@windriver.com> +Date: Fri, 15 Jun 2018 16:21:56 +0800 +Subject: [PATCH] make_x86_64_sysv_elf_gas.S: set .file section + +Set .file section explicitly for .S files to avoid +the linker introduces the host path in symbols for +object files whose source file is .S +Otherwise, there is a host path in the symbols as below: +$ readelf --wide --symbols /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/libboost_context.so.1.67.0 + +42: 0000000000000000 0 FILE LOCAL DEFAULT ABS /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/asm/make_x86_64_sysv_elf_gas.o + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + libs/context/src/asm/make_i386_sysv_elf_gas.S | 1 + + libs/context/src/asm/make_x86_64_sysv_elf_gas.S | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libs/context/src/asm/make_i386_sysv_elf_gas.S b/libs/context/src/asm/make_i386_sysv_elf_gas.S +index de77e88..b76de26 100644 +--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S ++++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "make_i386_sysv_elf_gas.S" + .text + .globl make_fcontext + .align 2 +diff --git a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S +index 25a0c00..0ef3756 100644 +--- a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S ++++ b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "make_x86_64_sysv_elf_gas.S" + .text + .globl make_fcontext + .type make_fcontext,@function +-- +2.7.4 + diff --git a/poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch b/poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch deleted file mode 100644 index 26f3cbb05..000000000 --- a/poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch +++ /dev/null @@ -1,65 +0,0 @@ -From e4d3a7470b307693660d0412732e7266d1738d8c Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Tue, 13 Dec 2016 10:29:17 -0700 -Subject: [PATCH 6/6] Don't set up -m32/-m64, we do that ourselves - -Upstream-Status: Inappropriate -Signed-off-by: Christopher Larson <chris_larson@mentor.com> - ---- - tools/build/src/tools/gcc.jam | 39 --------------------------------------- - 1 file changed, 39 deletions(-) - -diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index e4fc6c32..37914fd0 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -337,45 +337,6 @@ rule set-address-model-options ( targets * : sources * : properties * ) - { - local option ; - local target-os = [ feature.get-values target-os : $(properties) ] ; -- if $(target-os) = aix -- { -- if $(model) = 32 -- { -- option = -maix32 ; -- } -- else -- { -- option = -maix64 ; -- } -- } -- else if $(target-os) = hpux -- { -- if $(model) = 32 -- { -- option = -milp32 ; -- } -- else -- { -- option = -mlp64 ; -- } -- } -- else -- { -- local arch = [ feature.get-values architecture : $(properties) ] ; -- if $(arch) = power || $(arch) = sparc || $(arch) = x86 -- { -- if $(model) = 32 -- { -- option = -m32 ; -- } -- else if $(model) = 64 -- { -- option = -m64 ; -- } -- } -- # For darwin, the model can be 32_64. darwin.jam will handle that -- # on its own. -- } - OPTIONS on $(targets) += $(option) ; - } - } --- -2.15.1 - diff --git a/poky/meta/recipes-support/boost/boost_1.66.0.bb b/poky/meta/recipes-support/boost/boost_1.66.0.bb deleted file mode 100644 index 63b82a599..000000000 --- a/poky/meta/recipes-support/boost/boost_1.66.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require boost-${PV}.inc -require boost.inc - -SRC_URI += "\ - file://arm-intrinsics.patch \ - file://boost-CVE-2012-2677.patch \ - file://boost-math-disable-pch-for-gcc.patch \ - file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ - file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ - file://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \ -" diff --git a/poky/meta/recipes-support/boost/boost_1.68.0.bb b/poky/meta/recipes-support/boost/boost_1.68.0.bb new file mode 100644 index 000000000..c7958a4c5 --- /dev/null +++ b/poky/meta/recipes-support/boost/boost_1.68.0.bb @@ -0,0 +1,11 @@ +require boost-${PV}.inc +require boost.inc + +SRC_URI += "\ + file://arm-intrinsics.patch \ + file://boost-CVE-2012-2677.patch \ + file://boost-math-disable-pch-for-gcc.patch \ + file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ + file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ + file://0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch \ + " diff --git a/poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch b/poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch deleted file mode 100644 index a75133d2b..000000000 --- a/poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5685527364198597f25fc1c6236cb64cbc3de44f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 4 Oct 2017 18:16:08 +0300 -Subject: [PATCH] Fix a strange assert typo; how was this released without - noticing? - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - tools/build/src/engine/debugger.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/build/src/engine/debugger.c b/tools/build/src/engine/debugger.c -index 802f262..152a7e6 100644 ---- a/tools/build/src/engine/debugger.c -+++ b/tools/build/src/engine/debugger.c -@@ -1092,7 +1092,7 @@ static void debug_start_child( int argc, const char * * argv ) - PROCESS_INFORMATION pi = { NULL, NULL, 0, 0 }; - STARTUPINFO si = { sizeof( STARTUPINFO ), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0 }; -- assert( DEBUG_STATE == DEBUG_NO_CHILD ); -+ assert( debug_state == DEBUG_NO_CHILD ); - if ( ! CreatePipe( &pipe1[ 0 ], &pipe1[ 1 ], &sa, 0 ) ) - { - printf("internal error\n"); -@@ -1176,7 +1176,7 @@ static void debug_start_child( int argc, const char * * argv ) - int read_fd; - int pid; - int i; -- assert( DEBUG_STATE == DEBUG_NO_CHILD ); -+ assert( debug_state == DEBUG_NO_CHILD ); - pipe(pipe1); - pipe(pipe2); - pid = fork(); --- -2.14.1 - diff --git a/poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb b/poky/meta/recipes-support/ca-certificates/ca-certificates_20180409.bb index 350294858..0d57083c5 100644 --- a/poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb +++ b/poky/meta/recipes-support/ca-certificates/ca-certificates_20180409.bb @@ -5,7 +5,7 @@ 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=e7358b9541ccf3029e9705ed8de57968" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=aeb420429b1659507e0a5a1b123e8308" # This is needed to ensure we can run the postinst at image creation time DEPENDS = "" @@ -14,7 +14,7 @@ DEPENDS_class-nativesdk = "openssl-native" # Need c_rehash from openssl and run-parts from debianutils PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" -SRCREV = "34b8e19e541b8af4076616b2e170c7a70cdaded0" +SRCREV = "dbbd11e56af93bb79f21d0ee6059a901f83f70a5" SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ file://0002-update-ca-certificates-use-SYSROOT.patch \ @@ -26,7 +26,6 @@ SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ " S = "${WORKDIR}/git" -SYSROOT_DIRS_class-native += "${sysconfdir} ${datadir}/ca-certificates" inherit allarch diff --git a/poky/meta/recipes-support/curl/curl_7.61.0.bb b/poky/meta/recipes-support/curl/curl_7.61.0.bb index 207837946..56327a632 100644 --- a/poky/meta/recipes-support/curl/curl_7.61.0.bb +++ b/poky/meta/recipes-support/curl/curl_7.61.0.bb @@ -19,12 +19,14 @@ SRC_URI[sha256sum] = "5f6f336921cf5b84de56afbd08dfb70adeef2303751ffb3e570c936c6d CVE_PRODUCT = "curl libcurl" inherit autotools pkgconfig binconfig multilib_header -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls proxy threaded-resolver zlib" -PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver zlib" -PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver zlib" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls libidn proxy threaded-resolver verbose zlib" +PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" +PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" +PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" +PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," @@ -35,6 +37,7 @@ PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap," PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps," PACKAGECONFIG[libidn] = "--with-libidn2,--without-libidn2,libidn2" PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" +PACKAGECONFIG[mbedtls] = "--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls" PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy," @@ -46,9 +49,12 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" +PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" EXTRA_OECONF = " \ + --disable-libcurl-option \ + --disable-ntlm-wb \ --enable-crypto-auth \ --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ --without-libmetalink \ @@ -71,4 +77,7 @@ RRECOMMENDS_lib${BPN} += "ca-certificates" FILES_${PN} += "${datadir}/zsh" +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" + BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/poky/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch deleted file mode 100644 index 6a8eada60..000000000 --- a/poky/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch +++ /dev/null @@ -1,50 +0,0 @@ -Original patch submitted by jbowler@nslu2-linux.org on 2005-11-17: - -db: fix thumb uclibc operation in 4.3.29 - - uclibc thumb builds were using libpthread to implement mutexes, the - - uclibc version seems to be a stub (at least on thumb). This commit - - fixes the ARM/gcc-assembly mutex implementation so that it has thumb - - support and the resultant db4 works (tested on LE Thumb uclibc) - -Upstream-Status: Inappropriate [embedded specific] - -Author: jbowler@nslu2-linux.org - -Index: db-6.0.30/src/dbinc/mutex_int.h -=================================================================== ---- db-6.0.30.orig/src/dbinc/mutex_int.h -+++ db-6.0.30/src/dbinc/mutex_int.h -@@ -474,6 +474,25 @@ typedef unsigned char tsl_t; - - #ifdef LOAD_ACTUAL_MUTEX_CODE - /* gcc/arm: 0 is clear, 1 is set. */ -+#if defined __thumb__ -+#define MUTEX_SET(tsl) ({ \ -+ int __r, __p; \ -+ __asm__ volatile( \ -+ ".align 2\n\t" \ -+ "bx pc\n\t" \ -+ "nop\n\t" \ -+ ".arm\n\t" \ -+ "swpb %0, %2, [%3]\n\t" \ -+ "eor %0, %0, #1\n\t" \ -+ "orr %1, pc, #1\n\t" \ -+ "bx %1\n\t" \ -+ ".force_thumb" \ -+ : "=&r" (__r), "=r" (__p) \ -+ : "r" (1), "r" (tsl) \ -+ ); \ -+ __r & 1; \ -+}) -+#else - #define MUTEX_SET(tsl) ({ \ - int __r; \ - __asm__ volatile( \ -@@ -484,6 +503,7 @@ typedef unsigned char tsl_t; - ); \ - __r & 1; \ - }) -+#endif - - #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0) - #define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0) diff --git a/poky/meta/recipes-support/db/db_5.3.28.bb b/poky/meta/recipes-support/db/db_5.3.28.bb index 093ee4490..b7ed2c798 100644 --- a/poky/meta/recipes-support/db/db_5.3.28.bb +++ b/poky/meta/recipes-support/db/db_5.3.28.bb @@ -21,8 +21,7 @@ PR = "r1" PE = "1" SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" -SRC_URI += "file://arm-thumb-mutex_db5.patch \ - file://fix-parallel-build.patch \ +SRC_URI += "file://fix-parallel-build.patch \ file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \ file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ file://sequence-type.patch \ @@ -47,7 +46,6 @@ inherit lib_package PACKAGES =+ "${PN}-cxx" FILES_${PN}-cxx = "${libdir}/*cxx*so" - # The dev package has the .so link (as in db3) and the .a's - # it is therefore incompatible (cannot be installed at the # same time) as the db3 package @@ -59,18 +57,8 @@ FILES_SOLIBSDEV = "${libdir}/libdb.so ${libdir}/libdb_cxx.so" # All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) DB5_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql" -EXTRA_OECONF = "${DB5_CONFIG} --enable-shared --enable-cxx --with-sysroot" - -# Override the MUTEX setting here, the POSIX library is -# the default - "POSIX/pthreads/library". -# Don't ignore the nice SWP instruction on the ARM: -# These enable the ARM assembler mutex code, this won't -# work with thumb compilation... -ARM_MUTEX = "--with-mutex=ARM/gcc-assembly" -MUTEX = "" -MUTEX_arm = "${ARM_MUTEX}" -MUTEX_armeb = "${ARM_MUTEX}" -EXTRA_OECONF += "${MUTEX} STRIP=true" +EXTRA_OECONF = "${DB5_CONFIG} --enable-shared --enable-cxx --with-sysroot STRIP=true" + EXTRA_OEMAKE += "LIBTOOL='./${HOST_SYS}-libtool'" EXTRA_AUTORECONF += "--exclude=autoheader -I ${S}/dist/aclocal -I${S}/dist/aclocal_java" diff --git a/poky/meta/recipes-support/debianutils/debianutils_4.8.4.bb b/poky/meta/recipes-support/debianutils/debianutils_4.8.6.bb index 300e6f131..c37e842eb 100644 --- a/poky/meta/recipes-support/debianutils/debianutils_4.8.4.bb +++ b/poky/meta/recipes-support/debianutils/debianutils_4.8.6.bb @@ -3,15 +3,13 @@ SECTION = "base" LICENSE = "GPLv2 & SMAIL_GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f" -SRC_URI = "http://snapshot.debian.org/archive/debian/20180129T164727Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" +SRC_URI = "http://snapshot.debian.org/archive/debian/20180626T205238Z/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] = "a6dcd496b4f79b3c452c3a74c2d3f89c" -SRC_URI[sha256sum] = "c061ab99aea61f892043b7624b021ab5b193e9c6bbfd474da0fbcdd506be1eb2" - -S = "${WORKDIR}/${BPN}" +SRC_URI[md5sum] = "f0f1fa39383815fb7950dcee52be4361" +SRC_URI[sha256sum] = "db09047144dadf6a35d0f28977fbef83b0dd60ca32e6c8512cce2444a6423f73" inherit autotools update-alternatives diff --git a/poky/meta/recipes-support/dos2unix/dos2unix_7.4.0.bb b/poky/meta/recipes-support/dos2unix/dos2unix_7.4.0.bb new file mode 100644 index 000000000..9a7127068 --- /dev/null +++ b/poky/meta/recipes-support/dos2unix/dos2unix_7.4.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "Convert text file line endings between CRLF and LF" +DESCRIPTION = "The Dos2unix package includes utilities dos2unix and \ +unix2dos to convert plain text files in DOS or Mac format to Unix \ +format and vice versa." +HOMEPAGE = "http://waterlan.home.xs4all.nl/dos2unix.html" +SECTION = "support" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=1b78fca784db24f4a40e30b300787f3f" + +SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix" +UPSTREAM_CHECK_GITTAGREGEX = "dos2unix-(?P<pver>(\d+(\.\d+)+))" + +# Release 7.4.0 +SRCREV = "1182533bde3c1fe65be2ead465e87671faa2c027" + +S = "${WORKDIR}/git/dos2unix" + +inherit gettext perlnative + +# The dos2unix NLS relies on po4a-native, while po4a recipe is +# provided by meta-perl layer, so make it optional here, you +# need have meta-perl in bblayers.conf before enabling nls in +# PACKAGECONFIG. +PACKAGECONFIG ??= "" +PACKAGECONFIG[nls] = "ENABLE_NLS=1,ENABLE_NLS=,po4a-native" + +EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS} LDFLAGS_USER='${LDFLAGS}'" +EXTRA_OEMAKE_class-native = "ENABLE_NLS=" + +do_install () { + oe_runmake DESTDIR="${D}${base_prefix}" install +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/fribidi/fribidi/meson.patch b/poky/meta/recipes-support/fribidi/fribidi/meson.patch new file mode 100644 index 000000000..8b3c4a991 --- /dev/null +++ b/poky/meta/recipes-support/fribidi/fribidi/meson.patch @@ -0,0 +1,44 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From f5feb6c599adb52f24656f8589868039b0d14272 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Fri, 7 Sep 2018 20:57:11 +0200 +Subject: [PATCH] Build generator executables natively + +They are run during the build and not installed in the end. Without +this one gets the following error from meson: "ERROR: Can not use +target gen-unicode-version as a generator because it is cross-built +and no exe wrapper is defined. You might want to set it to native +instead." + +Closes #87. + +--- + gen.tab/meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/gen.tab/meson.build b/gen.tab/meson.build +index 6006d98..8c21e98 100644 +--- a/gen.tab/meson.build ++++ b/gen.tab/meson.build +@@ -33,7 +33,8 @@ gen_unicode_version = executable('gen-unicode-version', + 'gen-unicode-version.c', + include_directories: incs, + c_args: native_args, +- install: false) ++ install: false, ++ native: true) + + fribidi_unicode_version_h = custom_target('fribidi-unicode-version.h', + input: files('unidata/ReadMe.txt', 'unidata/BidiMirroring.txt'), +@@ -67,7 +68,8 @@ foreach tab : tabs + gen_prog_src, 'packtab.c', + include_directories: incs, + c_args: native_args, +- install: false) ++ install: false, ++ native: true) + + tab_inc_file = custom_target(gen_prog_name, + input: gen_prog_inputs, diff --git a/poky/meta/recipes-support/fribidi/fribidi_1.0.5.bb b/poky/meta/recipes-support/fribidi/fribidi_1.0.5.bb new file mode 100644 index 000000000..63b2da649 --- /dev/null +++ b/poky/meta/recipes-support/fribidi/fribidi_1.0.5.bb @@ -0,0 +1,17 @@ +SUMMARY = "Free Implementation of the Unicode Bidirectional Algorithm" +SECTION = "libs" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ + file://meson.patch" +SRC_URI[md5sum] = "0f97f65038545340316ec0f4bd53df0b" +SRC_URI[sha256sum] = "6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce" + +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" + +inherit meson lib_package pkgconfig + +CVE_PRODUCT = "gnu_fribidi" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/gdbm/files/ptest.patch b/poky/meta/recipes-support/gdbm/files/ptest.patch index b9461bec6..1e67dbd55 100644 --- a/poky/meta/recipes-support/gdbm/files/ptest.patch +++ b/poky/meta/recipes-support/gdbm/files/ptest.patch @@ -1,4 +1,4 @@ -From 4e4b70a4a3dcf1fdbee9e68bed3b62f42b197a3a Mon Sep 17 00:00:00 2001 +From 41448708e163c8ec1f980464e7dd6741db427c8a Mon Sep 17 00:00:00 2001 From: Josep Puigdemont <josep.puigdemont@enea.com> Date: Sun, 4 May 2014 16:02:07 +0200 Subject: [PATCH] Add install-ptest rules. @@ -9,14 +9,14 @@ Upstream-Status: Pending --- Makefile.am | 5 +++++ - tests/Makefile.am | 12 +++++++++++- - 2 files changed, 16 insertions(+), 1 deletion(-) + tests/Makefile.am | 11 +++++++++++ + 2 files changed, 16 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 4cdc734..24b99f0 100644 +index ecc03df..9fbbda5 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -45,3 +45,8 @@ ChangeLog: +@@ -55,3 +55,8 @@ ChangeLog: awk -f $(top_srcdir)/git2chg.awk \ -v append=$(top_srcdir)/$(prev_change_log) > ChangeLog; \ fi @@ -26,14 +26,13 @@ index 4cdc734..24b99f0 100644 + $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ + done diff --git a/tests/Makefile.am b/tests/Makefile.am -index 3dbb580..22ffc44 100644 +index dbe17dd..06f537f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -130,4 +130,14 @@ dtfetch_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la - dtdel_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la - d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la +@@ -169,3 +169,14 @@ EXTRA_DIST += \ + gdbmtool/base.exp\ + config/default.exp -- +buildtests: $(check_PROGRAMS) $(TESTSUITE) + +install-ptest: $(check_PROGRAMS) $(TESTSUITE) @@ -45,6 +44,3 @@ index 3dbb580..22ffc44 100644 + $(INSTALL_PROGRAM) $$file $(DESTDIR) ; \ + fi \ + done --- -2.11.0 - diff --git a/poky/meta/recipes-support/gdbm/gdbm_1.14.1.bb b/poky/meta/recipes-support/gdbm/gdbm_1.18.bb index 54e5696e4..aad430095 100644 --- a/poky/meta/recipes-support/gdbm/gdbm_1.14.1.bb +++ b/poky/meta/recipes-support/gdbm/gdbm_1.18.bb @@ -10,8 +10,8 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://ptest.patch \ " -SRC_URI[md5sum] = "c2ddcb3897efa0f57484af2bd4f4f848" -SRC_URI[sha256sum] = "cdceff00ffe014495bed3aed71c7910aa88bf29379f795abc0f46d4ee5f8bc5f" +SRC_URI[md5sum] = "e316f8e4a3e7e4f23955be65d54fec48" +SRC_URI[sha256sum] = "b8822cb4769e2d759c828c06f196614936c88c141c3132b18252fe25c2b635ce" inherit autotools gettext texinfo lib_package ptest @@ -31,7 +31,7 @@ do_install_append () { ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h } -RDEPENDS_${PN}-ptest += "diffutils" +RDEPENDS_${PN}-ptest += "diffutils ${PN}-bin" do_compile_ptest() { oe_runmake -C tests buildtests diff --git a/poky/meta/recipes-support/gmp/gmp.inc b/poky/meta/recipes-support/gmp/gmp.inc index abac8cf33..948b89288 100644 --- a/poky/meta/recipes-support/gmp/gmp.inc +++ b/poky/meta/recipes-support/gmp/gmp.inc @@ -3,7 +3,7 @@ DESCRIPTION = "GMP is a free library for arbitrary precision arithmetic, operati HOMEPAGE = "http://gmplib.org/" SECTION = "devel" -inherit autotools texinfo +inherit autotools texinfo multilib_header PACKAGECONFIG ??= "" PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline" diff --git a/poky/meta/recipes-support/gmp/gmp_6.1.2.bb b/poky/meta/recipes-support/gmp/gmp_6.1.2.bb index b008710d0..c745dbbfe 100644 --- a/poky/meta/recipes-support/gmp/gmp_6.1.2.bb +++ b/poky/meta/recipes-support/gmp/gmp_6.1.2.bb @@ -25,6 +25,10 @@ EXTRA_OECONF_mipsarchr6_append = " --disable-assembly" PACKAGES =+ "libgmpxx" FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}" +do_install_append() { + oe_multilib_header gmp.h +} + do_install_prepend_class-target() { sed -i \ -e "s|--sysroot=${STAGING_DIR_HOST}||g" \ diff --git a/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index 3e3a64df2..5f1dd30f8 100644 --- a/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -1,4 +1,4 @@ -From 0b97148c3aad0993a9aeb088596fa63a2fec5328 Mon Sep 17 00:00:00 2001 +From 7eb7efb9ce89c66e14c194773c4dcf6478a6ca4d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -8,15 +8,16 @@ This should avoid clashes with the host gpg-agent observed on autobuilders. Upstream-Status: Inappropriate [oe-core specific, and only for -native] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 382ef1d..0570d7c 100644 +index 59a2e60..12d390b 100644 --- a/configure.ac +++ b/configure.ac -@@ -1818,7 +1818,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1841,7 +1841,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) @@ -25,6 +26,3 @@ index 382ef1d..0570d7c 100644 [The name of the agent socket]) AC_DEFINE_UNQUOTED(GPG_AGENT_EXTRA_SOCK_NAME, "S.gpg-agent.extra", [The name of the agent socket for remote access]) --- -2.15.1 - diff --git a/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-12020.patch b/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-12020.patch deleted file mode 100644 index 14698dba7..000000000 --- a/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-12020.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 13f135c7a252cc46cff96e75968d92b6dc8dce1b Mon Sep 17 00:00:00 2001 -From: Werner Koch <wk@gnupg.org> -Date: Fri, 8 Jun 2018 10:45:21 +0200 -Subject: [PATCH] gpg: Sanitize diagnostic with the original file name. - -* g10/mainproc.c (proc_plaintext): Sanitize verbose output. --- - -This fixes a forgotten sanitation of user supplied data in a verbose -mode diagnostic. The mention CVE is about using this to inject -status-fd lines into the stderr output. Other harm good as well be -done. Note that GPGME based applications are not affected because -GPGME does not fold status output into stderr. - -CVE-id: CVE-2018-12020 -GnuPG-bug-id: 4012 - -Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=13f135c7a252cc46cff96e75968d92b6dc8dce1b] - -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> ---- - g10/mainproc.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/g10/mainproc.c b/g10/mainproc.c -index d2ceec2fd..a9da08f74 100644 ---- a/g10/mainproc.c -+++ b/g10/mainproc.c -@@ -851,7 +851,14 @@ proc_plaintext( CTX c, PACKET *pkt ) - if (pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8)) - log_info (_("Note: sender requested \"for-your-eyes-only\"\n")); - else if (opt.verbose) -- log_info (_("original file name='%.*s'\n"), pt->namelen, pt->name); -+ { -+ /* We don't use print_utf8_buffer because that would require a -+ * string change which we don't want in 2.2. It is also not -+ * clear whether the filename is always utf-8 encoded. */ -+ char *tmp = make_printable_string (pt->name, pt->namelen, 0); -+ log_info (_("original file name='%.*s'\n"), (int)strlen (tmp), tmp); -+ xfree (tmp); -+ } - - free_md_filter_context (&c->mfx); - if (gcry_md_open (&c->mfx.md, 0, 0)) --- -2.13.3 - diff --git a/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-9234.patch b/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-9234.patch deleted file mode 100644 index d4ba1d863..000000000 --- a/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-9234.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ce055269c80f6e7c1393c0deec7bc5f0d37895ea Mon Sep 17 00:00:00 2001 -From: Sinan Kaya <okaya@kernel.org> -Date: Sun, 23 Sep 2018 04:05:47 +0000 -Subject: [PATCH] g10: Fix filtering by PK->REQ_USAGE - -Upstream-Status: Backport [https://dev.gnupg.org/rGa17d2d1f690ebe5d005b4589a5fe378b6487c657] -CVE: CVE-2018-9234 -Signed-off-by: Sinan Kaya <okaya@kernel.org> ---- - g10/getkey.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/g10/getkey.c b/g10/getkey.c -index e31e023..ca2500c 100644 ---- a/g10/getkey.c -+++ b/g10/getkey.c -@@ -1810,6 +1810,8 @@ get_pubkey_byfprint (ctrl_t ctrl, PKT_public_key *pk, kbnode_t *r_keyblock, - ctx.items[0].mode = fprint_len == 16 ? KEYDB_SEARCH_MODE_FPR16 - : KEYDB_SEARCH_MODE_FPR20; - memcpy (ctx.items[0].u.fpr, fprint, fprint_len); -+ if (pk) -+ ctx.req_usage = pk->req_usage; - rc = lookup (ctrl, &ctx, 0, &kb, &found_key); - if (!rc && pk) - pk_from_block (pk, kb, found_key); --- -2.19.0 - diff --git a/poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb b/poky/meta/recipes-support/gnupg/gnupg_2.2.9.bb index 5a3688acf..b7d23b8d3 100644 --- a/poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb +++ b/poky/meta/recipes-support/gnupg/gnupg_2.2.9.bb @@ -14,15 +14,13 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0002-use-pkgconfig-instead-of-npth-config.patch \ file://0003-dirmngr-uses-libgpg-error.patch \ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ - file://CVE-2018-12020.patch \ - file://CVE-2018-9234.patch \ " SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch" -SRC_URI[md5sum] = "709e5af5bba84d251c520222e720972f" -SRC_URI[sha256sum] = "401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec" +SRC_URI[md5sum] = "52c895a81f514a65e08923736c38654a" +SRC_URI[sha256sum] = "6278eaabffa1ebc9fa2ceb3dc53eea9a1505ab02a668a86dd6fec06951af2164" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ diff --git a/poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch b/poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch deleted file mode 100644 index b6e7bc965..000000000 --- a/poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch +++ /dev/null @@ -1,29 +0,0 @@ -From eaab55bb6d48643163eebbc9ca575a9ca2a8e03f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 21 Feb 2017 17:10:07 +0200 -Subject: [PATCH] configure.ac: fix sed command - -The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors -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(-) - -Index: gnutls-3.5.16/configure.ac -=================================================================== ---- gnutls-3.5.16.orig/configure.ac -+++ gnutls-3.5.16/configure.ac -@@ -955,7 +955,7 @@ YEAR=`date +%Y` - AC_SUBST([YEAR], $YEAR) - - for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do -- nam=$(basename $i|sed 's/.bak//g') -+ nam=$(basename $i|sed 's/\.bak$//') - if test "$create_libopts_links" = "yes";then - rm -f "src/$nam.stamp" - rm -f "src/$nam" diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb b/poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb deleted file mode 100644 index 7624a203d..000000000 --- a/poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require gnutls.inc - -SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \ - file://arm_eabi.patch \ - " -SRC_URI[md5sum] = "4b65ae3ffef59f3eeed51a6166ff12b3" -SRC_URI[sha256sum] = "20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/gnutls/gnutls.inc b/poky/meta/recipes-support/gnutls/gnutls_3.6.3.bb index 98ec8d966..441bbecf1 100644 --- a/poky/meta/recipes-support/gnutls/gnutls.inc +++ b/poky/meta/recipes-support/gnutls/gnutls_3.6.3.bb @@ -17,7 +17,12 @@ DEPENDS_append_libc-musl = " argp-standalone" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" +SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ + file://arm_eabi.patch \ +" + +SRC_URI[md5sum] = "d3b1b05c2546b80832101a423a80faf8" +SRC_URI[sha256sum] = "ed642b66a4ecf4851ab2d809cd1475c297b6201d8e8bd14b4d1c08b53ffca993" inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc @@ -25,10 +30,8 @@ PACKAGECONFIG ??= "libidn" # You must also have CONFIG_SECCOMP enabled in the kernel for # seccomp to work. -# PACKAGECONFIG[seccomp] = "ac_cv_libseccomp=yes,ac_cv_libseccomp=no,libseccomp" - -PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn" +PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2" PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" @@ -57,3 +60,5 @@ PACKAGES =+ "${PN}-openssl ${PN}-xx" FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index f1997e15a..ae9a46ed4 100644 --- a/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,7 +1,7 @@ -From 265faf8fe0acaca2043a248a4df02b0868ffa6de Mon Sep 17 00:00:00 2001 +From c452ba58dd2f99d6e624421697417cc018f9a67a Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Wed, 16 Aug 2017 02:00:08 -0400 -Subject: [PATCH 1/4] pkgconfig +Date: Fri, 29 Jun 2018 14:35:41 +0800 +Subject: [PATCH 1/7] pkgconfig Update gpgme to use pkgconfig instead of -config files since its simpler and less error prone when cross compiling. @@ -11,7 +11,7 @@ RP 2015/4/17 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Rebase to 1.9.0 +Rebase to 1.11.1 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- @@ -25,10 +25,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> create mode 100644 src/gpgme.pc.in diff --git a/configure.ac b/configure.ac -index 6ea4bcd..2a0d528 100644 +index 2a35404..7485cdf 100644 --- a/configure.ac +++ b/configure.ac -@@ -887,6 +887,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -886,6 +886,7 @@ AC_CONFIG_FILES(Makefile src/Makefile src/versioninfo.rc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) @@ -37,7 +37,7 @@ index 6ea4bcd..2a0d528 100644 AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in) diff --git a/src/Makefile.am b/src/Makefile.am -index ce6f1d4..5f38fee 100644 +index 0a196e0..cecaf8f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,12 +19,14 @@ @@ -54,7 +54,7 @@ index ce6f1d4..5f38fee 100644 +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gpgme.pc gpgme-pthread.pc - bin_PROGRAMS = gpgme-tool + bin_PROGRAMS = gpgme-tool gpgme-json diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in new file mode 100644 @@ -299,5 +299,5 @@ index 0000000..b69539f +Requires: libassuan gpg-error \ No newline at end of file -- -1.8.3.1 +2.7.4 diff --git a/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch index d20271e31..4f5cedaca 100644 --- a/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +++ b/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch @@ -1,7 +1,7 @@ -From 30f7a694cc4568ecb24f77c83a6123ed3f4075fa Mon Sep 17 00:00:00 2001 +From 45d828356efc140a1492befb1e6dc59a9f4e16b5 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Wed, 31 Jan 2018 10:44:19 +0800 -Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used +Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used gpg-error-config was modified by OE to always return an error. So we want to find an alternative way to retrieve whatever it @@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in -index f9dda20..9f5d61f 100755 +index 2595073..60b5257 100755 --- a/lang/python/setup.py.in +++ b/lang/python/setup.py.in @@ -26,7 +26,6 @@ import shutil @@ -30,7 +30,7 @@ index f9dda20..9f5d61f 100755 gpgme_config_flags = ["--thread=pthread"] gpgme_config = ["gpgme-config"] + gpgme_config_flags gpgme_h = "" -@@ -174,14 +173,7 @@ class BuildExtFirstHack(build): +@@ -157,14 +156,7 @@ class BuildExtFirstHack(build): def _generate_errors_i(self): @@ -47,5 +47,5 @@ index f9dda20..9f5d61f 100755 filter_re = re.compile(r'GPG_ERR_[^ ]* =') rewrite_re = re.compile(r' *(.*) = .*') -- -1.8.3.1 +2.7.4 diff --git a/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch index 7c9cccc0e..330bec659 100644 --- a/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +++ b/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch @@ -1,7 +1,7 @@ -From 93aae34ee70b8d50b31a19a65d6ac8290cb148ae Mon Sep 17 00:00:00 2001 +From 60baf9ebf30bed0e2ee3c7c5a74d5b6d50035862 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 30 Jan 2018 15:28:49 +0800 -Subject: [PATCH 2/4] Correctly install python modules +Subject: [PATCH 3/7] Correctly install python modules Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> @@ -29,5 +29,5 @@ index 8d74cbd..ce4f0a5 100644 done -- -1.8.3.1 +2.7.4 diff --git a/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch b/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch index d2b039dac..1a60f79b6 100644 --- a/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch +++ b/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch @@ -1,7 +1,7 @@ -From 32ecc3f058307060e40af86127cd226248a73c41 Mon Sep 17 00:00:00 2001 +From fd7dcceeee439eb479edbb418bab635343414ee6 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Wed, 16 Aug 2017 02:06:45 -0400 -Subject: [PATCH 3/4] python import +Subject: [PATCH 4/7] python import Don't check for output on stderr to know if an import worked, host inputrc and sysroot readline can cause warnings on stderr. @@ -30,5 +30,5 @@ index b990d5b..318b089 100644 else AC_MSG_RESULT([no]) -- -1.8.3.1 +2.7.4 diff --git a/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch index 963ae874c..2da79043d 100644 --- a/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch +++ b/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch @@ -1,7 +1,7 @@ -From 6dcedc4dd055af902719b1a1cb10daa935a27f58 Mon Sep 17 00:00:00 2001 +From a58d90632a9907be3e8001800a143ac19075241a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 13 Apr 2017 16:40:27 +0300 -Subject: [PATCH 4/4] gpgme-config: skip all /lib* or /usr/lib* directories in +Subject: [PATCH 5/7] gpgme-config: skip all /lib* or /usr/lib* directories in output The logic was not working in multilib setups which use other @@ -27,5 +27,5 @@ index a4d152e..8342865 100644 ;; -L*|-l*) -- -1.8.3.1 +2.7.4 diff --git a/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch index 8cc8983e2..26ff47237 100644 --- a/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch +++ b/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch @@ -1,7 +1,7 @@ -From 180a5669e4a13a550b1b0dcef1689b6c0470fe54 Mon Sep 17 00:00:00 2001 +From 4f83750ce402b65d16cc09f8a0274a7ec76fc634 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Wed, 31 Jan 2018 11:01:09 +0800 -Subject: [PATCH] fix build path issue +Subject: [PATCH 6/7] fix build path issue Get the "--root" directory supplied to the "install" command, and use it as a prefix to strip off the purported filename @@ -33,5 +33,5 @@ index ce4f0a5..5a468f1 100644 done -- -1.8.3.1 +2.7.4 diff --git a/poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch b/poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch index ce3745cca..63eeacf30 100644 --- a/poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch +++ b/poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch @@ -1,7 +1,7 @@ -From f47e8c6f9e461803468a64581d3640d873352eaa Mon Sep 17 00:00:00 2001 +From d3087348348b4a7fcfb05bf2a75b4a63453e1c77 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 1 Feb 2018 10:14:30 +0800 -Subject: [PATCH] qt/python: Add variables to tests +Subject: [PATCH 7/7] qt/python: Add variables to tests * configure.ac, lang/python/Makefile.am: New variable to `lang/python', set to `lang/python' if RUN_LANG_PYTHON_TESTS @@ -19,10 +19,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 608c376..fad7467 100644 +index 7485cdf..4aa216d 100644 --- a/configure.ac +++ b/configure.ac -@@ -536,6 +536,17 @@ AC_ARG_ENABLE(g13-test, +@@ -535,6 +535,17 @@ AC_ARG_ENABLE(g13-test, run_g13_test=$enableval) AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes") @@ -41,7 +41,7 @@ index 608c376..fad7467 100644 # Checks for header files. AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 8d74cbd..43b5d1e 100644 +index 5a468f1..43b9788 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am @@ -24,7 +24,10 @@ EXTRA_DIST = \ @@ -74,5 +74,5 @@ index ab85960..a244ede 100644 EXTRA_DIST = README -- -1.8.3.1 +2.7.4 diff --git a/poky/meta/recipes-support/gpgme/gpgme_1.10.0.bb b/poky/meta/recipes-support/gpgme/gpgme_1.11.1.bb index f015f3ad7..86fae9460 100644 --- a/poky/meta/recipes-support/gpgme/gpgme_1.10.0.bb +++ b/poky/meta/recipes-support/gpgme/gpgme_1.11.1.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=9d157d08a69059344e6f82abd2d25781 \ + file://src/gpgme.h.in;endline=23;md5=4d6319e587fd944adfe61a41a8f15b36 \ file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" @@ -20,8 +20,8 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://0007-qt-python-Add-variables-to-tests.patch \ " -SRC_URI[md5sum] = "78b1533c593478982ee2fc548260c563" -SRC_URI[sha256sum] = "1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693" +SRC_URI[md5sum] = "129c46fb85a7ffa41e43345e48aee884" +SRC_URI[sha256sum] = "2d1b111774d2e3dd26dcd7c251819ce4ef774ec5e566251eb9308fa7542fbd6f" DEPENDS = "libgpg-error libassuan" RDEPENDS_${PN}-cpp += "libstdc++" @@ -60,7 +60,7 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ --disable-lang-python-test \ ' -inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} +inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} export PKG_CONFIG='pkg-config' diff --git a/poky/meta/recipes-support/icu/icu.inc b/poky/meta/recipes-support/icu/icu.inc index 983118cd6..e20085fbf 100644 --- a/poky/meta/recipes-support/icu/icu.inc +++ b/poky/meta/recipes-support/icu/icu.inc @@ -19,7 +19,9 @@ BINCONFIG = "${bindir}/icu-config" ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" -inherit autotools pkgconfig binconfig +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" # ICU needs the native build directory as an argument to its --with-cross-build option when # cross-compiling. Taken the situation that different builds may share a common sstate-cache @@ -31,6 +33,8 @@ EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" +ASNEEDED = "" + # strtod_l() is not supported by musl; also xlocale.h is missing # It is not possible to disable its use via configure switches or env vars # so monkey patching is needed. diff --git a/poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch b/poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch deleted file mode 100644 index f0c49e197..000000000 --- a/poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d6b57c1b4eb9a24d9d95342a961c93946539c93b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 24 Jun 2017 22:52:40 -0700 -Subject: [PATCH 3/4] i18n: Drop include <xlocale.h> - -glibc 2.26 drops this header - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - source/i18n/digitlst.cpp | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/source/i18n/digitlst.cpp b/source/i18n/digitlst.cpp -index 8e86fa7..0bdbb2c 100644 ---- a/i18n/digitlst.cpp -+++ b/i18n/digitlst.cpp -@@ -62,11 +62,7 @@ - #endif - - #if U_USE_STRTOD_L --# if U_HAVE_XLOCALE_H --# include <xlocale.h> --# else --# include <locale.h> --# endif -+# include <locale.h> - #endif - - // *************************************************************************** --- -2.14.2 - diff --git a/poky/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch b/poky/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch new file mode 100644 index 000000000..20e3d8356 --- /dev/null +++ b/poky/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch @@ -0,0 +1,27 @@ +From fcfd57105b4bdb30d906df152ef01748fa95daff Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin <abrodkin@synopsys.com> +Date: Thu, 13 Sep 2018 17:13:20 +0300 +Subject: [PATCH] icu: Add ARC support + +Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> + +Upstream-Status: Submitted [ https://github.com/unicode-org/icu/pull/149 ] +--- + i18n/double-conversion-utils.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h +index 57fc49b231a3..0bd3e8340673 100644 +--- a/i18n/double-conversion-utils.h ++++ b/i18n/double-conversion-utils.h +@@ -86,7 +86,7 @@ inline void abort_noreturn() { abort(); } + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ + defined(__AARCH64EL__) || defined(__aarch64__) || \ +- defined(__riscv) ++ defined(__riscv) || defined(__arc__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) + #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS +2.17.1 + diff --git a/poky/meta/recipes-support/icu/icu_60.2.bb b/poky/meta/recipes-support/icu/icu_62.1.bb index 585a92bc4..4e3750b99 100644 --- a/poky/meta/recipes-support/icu/icu_60.2.bb +++ b/poky/meta/recipes-support/icu/icu_62.1.bb @@ -1,6 +1,6 @@ require icu.inc -LIC_FILES_CHKSUM = "file://../LICENSE;md5=675f2d069434d8a1e4e6b0dcf4379226" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=63752c57bd0b365c9af9f427ef79c819" def icu_download_version(d): pvsplit = d.getVar('PV').split('.') @@ -16,14 +16,14 @@ BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ - file://0001-i18n-Drop-include-xlocale.h.patch \ + file://0002-Add-ARC-support.patch \ " SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "43861b127744b3c0b9d7f386f4b9fa40" -SRC_URI[sha256sum] = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418" +SRC_URI[md5sum] = "490ad9d920158e0314e10ba74ae9a150" +SRC_URI[sha256sum] = "3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" diff --git a/poky/meta/recipes-support/iso-codes/iso-codes_3.77.bb b/poky/meta/recipes-support/iso-codes/iso-codes_4.1.bb index 52e56ca55..1761ded44 100644 --- a/poky/meta/recipes-support/iso-codes/iso-codes_3.77.bb +++ b/poky/meta/recipes-support/iso-codes/iso-codes_4.1.bb @@ -1,9 +1,12 @@ SUMMARY = "ISO language, territory, currency, script codes and their translations" +HOMEPAGE = "https://salsa.debian.org/iso-codes-team/iso-codes" +BUGTRACKER = "https://salsa.debian.org/iso-codes-team/iso-codes/issues" + LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://salsa.debian.org/iso-codes-team/iso-codes.git;protocol=http" -SRCREV = "0a932d3e1e6d9058a6ef874c8ff1dc4a193bc030" +SRCREV = "164802d5fd8c7a8167816fd86a62b286680619f0" # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which # are inhibited by allarch diff --git a/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb b/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.6.bb index f7b416352..32d26a34e 100644 --- a/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb +++ b/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.6.bb @@ -3,13 +3,13 @@ HOMEPAGE = "https://github.com/ivmai/libatomic_ops/" SECTION = "optional" PROVIDES += "libatomics-ops" LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://doc/LICENSING.txt;md5=e00dd5c8ac03a14c5ae5225a4525fa2d \ - " + " PV .= "+git${SRCPV}" SRCBRANCH ?= "release-7_6" -SRCREV = "5ae4b4aeea2baf13752d07e3038c47f70f06dcac" +SRCREV = "76ffb3b87946e4c372d112d8d00786632deab934" SRC_URI = "git://github.com/ivmai/libatomic_ops;branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch b/poky/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch deleted file mode 100644 index 54617b506..000000000 --- a/poky/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch +++ /dev/null @@ -1,376 +0,0 @@ -From 88adbe1a855b7aa95bd925c80ed83c86f3fc42e3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 6 Nov 2016 09:39:31 -0800 -Subject: [PATCH 1/3] Replace __BEGIN_DECLS and __END_DECLS - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- -Upstream-Status: Pending - - include/bsd/err.h | 10 ++++++++-- - include/bsd/libutil.h | 10 ++++++++-- - include/bsd/md5.h | 10 ++++++++-- - include/bsd/nlist.h | 10 ++++++++-- - include/bsd/readpassphrase.h | 10 ++++++++-- - include/bsd/stdio.h | 10 ++++++++-- - include/bsd/stdlib.h | 12 +++++++++--- - include/bsd/string.h | 12 +++++++++--- - include/bsd/stringlist.h | 10 ++++++++-- - include/bsd/unistd.h | 10 ++++++++-- - include/bsd/vis.h | 10 ++++++++-- - include/bsd/wchar.h | 10 ++++++++-- - src/hash/sha512.h | 10 ++++++++-- - 13 files changed, 106 insertions(+), 28 deletions(-) - -diff --git a/include/bsd/err.h b/include/bsd/err.h -index 12fd051..43dfc32 100644 ---- a/include/bsd/err.h -+++ b/include/bsd/err.h -@@ -42,7 +42,10 @@ - - #include <stdarg.h> - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - void warnc(int code, const char *format, ...) - __printflike(2, 3); - void vwarnc(int code, const char *format, va_list ap) -@@ -51,6 +54,9 @@ void errc(int status, int code, const char *format, ...) - __printflike(3, 4); - void verrc(int status, int code, const char *format, va_list ap) - __printflike(3, 0); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif -diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h -index 45b3b15..9c936e5 100644 ---- a/include/bsd/libutil.h -+++ b/include/bsd/libutil.h -@@ -53,7 +53,10 @@ struct pidfh { - ino_t pf_ino; - }; - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - int humanize_number(char *buf, size_t len, int64_t bytes, - const char *suffix, int scale, int flags); - int expand_number(const char *_buf, uint64_t *_num); -@@ -66,7 +69,10 @@ int pidfile_close(struct pidfh *pfh); - int pidfile_remove(struct pidfh *pfh); - - char *fparseln(FILE *, size_t *, size_t *, const char[3], int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - /* humanize_number(3) */ - #define HN_DECIMAL 0x01 -diff --git a/include/bsd/md5.h b/include/bsd/md5.h -index 5f3ae46..5d80e5c 100644 ---- a/include/bsd/md5.h -+++ b/include/bsd/md5.h -@@ -30,7 +30,10 @@ typedef struct MD5Context { - #include <sys/cdefs.h> - #include <sys/types.h> - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - void MD5Init(MD5_CTX *); - void MD5Update(MD5_CTX *, const uint8_t *, size_t) - __attribute__((__bounded__(__string__,2,3))); -@@ -49,6 +52,9 @@ char *MD5FileChunk(const char *, char *, off_t, off_t) - char *MD5Data(const uint8_t *, size_t, char *) - __attribute__((__bounded__(__string__,1,2))) - __attribute__((__bounded__(__minbytes__,3,MD5_DIGEST_STRING_LENGTH))); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif /* LIBBSD_MD5_H */ -diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h -index cb297e8..e63bbbd 100644 ---- a/include/bsd/nlist.h -+++ b/include/bsd/nlist.h -@@ -88,8 +88,14 @@ struct nlist { - - #define N_FORMAT "%08x" /* namelist value format; XXX */ - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - extern int nlist(const char *filename, struct nlist *list); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif -diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h -index 14744b8..fa73361 100644 ---- a/include/bsd/readpassphrase.h -+++ b/include/bsd/readpassphrase.h -@@ -34,8 +34,14 @@ - #include <sys/cdefs.h> - #include <sys/types.h> - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - char * readpassphrase(const char *, char *, size_t, int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif /* !LIBBSD_READPASSPHRASE_H */ -diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h -index 4b69983..18645b7 100644 ---- a/include/bsd/stdio.h -+++ b/include/bsd/stdio.h -@@ -45,7 +45,10 @@ - #endif - #include <sys/types.h> - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - const char *fmtcheck(const char *, const char *); - - /* XXX: The function requires cooperation from the system libc to store the -@@ -73,7 +76,10 @@ FILE *funopen(const void *cookie, - #define fwopen(cookie, fn) funopen(cookie, NULL, fn, NULL, NULL) - - int fpurge(FILE *fp); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif - #endif -diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h -index ebc9638..c4b54b6 100644 ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -46,7 +46,10 @@ - #include <sys/stat.h> - #include <stdint.h> - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - uint32_t arc4random(void); - void arc4random_stir(void); - void arc4random_addrandom(unsigned char *dat, int datlen); -@@ -67,7 +70,7 @@ int sradixsort(const unsigned char **base, int nmemb, - const unsigned char *table, unsigned endbyte); - - void *reallocf(void *ptr, size_t size); --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) -+#if defined(_GNU_SOURCE) && defined(__GLIBC__) - void *reallocarray(void *ptr, size_t nmemb, size_t size); - #endif - -@@ -75,6 +78,9 @@ long long strtonum(const char *nptr, long long minval, long long maxval, - const char **errstr); - - char *getbsize(int *headerlenp, long *blocksizep); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif -diff --git a/include/bsd/string.h b/include/bsd/string.h -index 6798bf6..fa1193f 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -36,15 +36,21 @@ - #include <sys/cdefs.h> - #include <sys/types.h> - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - size_t strlcpy(char *dst, const char *src, size_t siz); - size_t strlcat(char *dst, const char *src, size_t siz); - char *strnstr(const char *str, const char *find, size_t str_len); - void strmode(mode_t mode, char *str); - --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) -+#if defined(_GNU_SOURCE) && defined(__GLIBC__) - void explicit_bzero(void *buf, size_t len); - #endif --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif -diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h -index ff30cac..4600f6b 100644 ---- a/include/bsd/stringlist.h -+++ b/include/bsd/stringlist.h -@@ -43,12 +43,18 @@ typedef struct _stringlist { - size_t sl_cur; - } StringList; - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - StringList *sl_init(void); - int sl_add(StringList *, char *); - void sl_free(StringList *, int); - char *sl_find(StringList *, const char *); - int sl_delete(StringList *, const char *, int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif /* LIBBSD_STRINGLIST_H */ -diff --git a/include/bsd/unistd.h b/include/bsd/unistd.h -index 1f9c5f8..5b2f4c7 100644 ---- a/include/bsd/unistd.h -+++ b/include/bsd/unistd.h -@@ -45,7 +45,10 @@ - #define S_ISTXT S_ISVTX - #endif - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - extern int optreset; - - #ifdef LIBBSD_OVERLAY -@@ -68,6 +71,9 @@ void setproctitle(const char *fmt, ...) - __printflike(1, 2); - - int getpeereid(int s, uid_t *euid, gid_t *egid); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif -diff --git a/include/bsd/vis.h b/include/bsd/vis.h -index 970dfdd..621d3c6 100644 ---- a/include/bsd/vis.h -+++ b/include/bsd/vis.h -@@ -74,7 +74,10 @@ - - #include <sys/cdefs.h> - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - char *vis(char *, int, int, int); - int strvis(char *, const char *, int); - int strvisx(char *, const char *, size_t, int); -@@ -83,6 +86,9 @@ int strunvis(char *, const char *); - int strunvisx(char *, const char *, int); - ssize_t strnunvis(char *, const char *, size_t); - int unvis(char *, int, int *, int); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif /* !LIBBSD_VIS_H */ -diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h -index 33a500e..aa70742 100644 ---- a/include/bsd/wchar.h -+++ b/include/bsd/wchar.h -@@ -43,12 +43,18 @@ - #include <sys/cdefs.h> - #include <sys/types.h> - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - wchar_t *fgetwln(FILE *stream, size_t *len); - - size_t wcslcat(wchar_t *dst, const wchar_t *src, size_t size); - size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t size); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif - #endif -diff --git a/src/hash/sha512.h b/src/hash/sha512.h -index 4f368a1..27ddc24 100644 ---- a/src/hash/sha512.h -+++ b/src/hash/sha512.h -@@ -39,7 +39,10 @@ typedef struct SHA512Context { - unsigned char buf[128]; - } SHA512_CTX; - --__BEGIN_DECLS -+/* __BEGIN_DECLS */ -+#ifdef __cplusplus -+extern "C" { -+#endif - - void SHA512_Init(SHA512_CTX *); - void SHA512_Update(SHA512_CTX *, const void *, size_t); -@@ -48,6 +51,9 @@ char *SHA512_End(SHA512_CTX *, char *); - char *SHA512_File(const char *, char *); - char *SHA512_FileChunk(const char *, char *, off_t, off_t); - char *SHA512_Data(const void *, unsigned int, char *); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif -+/* __END_DECLS */ - - #endif /* !_SHA512_H_ */ --- -1.9.1 - diff --git a/poky/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch b/poky/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch new file mode 100644 index 000000000..8abb876c7 --- /dev/null +++ b/poky/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch @@ -0,0 +1,46 @@ +From 13c32916b4baab58d93940d57fea9ff0777f1931 Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Tue, 5 Jun 2018 19:21:46 +0300 +Subject: [PATCH] flopen: Add missing <fcntl.h> include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 993828d84ee (Add flopenat() function from FreeBSD) dropped the +fcntl.h header. This breaks the build with musl libc: + +flopen.c: In function ‘vflopenat’: +flopen.c:60:14: error: ‘O_CREAT’ undeclared (first use in this function) + if (flags & O_CREAT) { + ^~~~~~~ + +Restore the fcntl.h header include to fix the build. + +Fixes: commit 993828d84eed0468c6c15b2818e534e6b134b8e4 +Submitted-also-by: parazyd <parazyd@dyne.org> +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +Signed-off-by: Guillem Jover <guillem@hadrons.org> + +Upstream-Status: Backport +[https://gitlab.freedesktop.org/libbsd/libbsd/commit/13c32916b4baab58d93940d57fea9ff0777f1931] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + src/flopen.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/flopen.c b/src/flopen.c +index b9972c9..ff20d07 100644 +--- a/src/flopen.c ++++ b/src/flopen.c +@@ -32,6 +32,7 @@ + #include <sys/stat.h> + + #include <errno.h> ++#include <fcntl.h> + #include <stdarg.h> + #include <unistd.h> + +-- +2.7.4 + diff --git a/poky/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch b/poky/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch deleted file mode 100644 index 7e3a5b3be..000000000 --- a/poky/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b6972f1c29ebf073cbe19a4a669ee093259792a0 Mon Sep 17 00:00:00 2001 -From: Fabio Berton <fabio.berton@ossystems.com.br> -Date: Mon, 30 Jan 2017 12:00:33 -0200 -Subject: [PATCH] src/libbsd-overlay.pc.in: Set Cflags to use -I instead of - -isystem -Organization: O.S. Systems Software LTDA. - -pkg-config currently only handles -I and -L correctly, but misses --isystem, so we need to do this workaround to fix this issue. - -There's a open bug in: -https://bugzilla.freedesktop.org/show_bug.cgi?id=99516 - -Upstream-Status: Pending - -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> ---- - src/libbsd-overlay.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libbsd-overlay.pc.in b/src/libbsd-overlay.pc.in -index ac8bf89..65dc3ae 100644 ---- a/src/libbsd-overlay.pc.in -+++ b/src/libbsd-overlay.pc.in -@@ -8,4 +8,4 @@ Description: Utility functions from BSD systems (overlay) - Version: @VERSION@ - URL: https://libbsd.freedesktop.org/ - Libs: -L${libdir} -lbsd --Cflags: -isystem ${includedir}/bsd -DLIBBSD_OVERLAY -+Cflags: -I${includedir}/bsd -DLIBBSD_OVERLAY --- -2.11.0 - diff --git a/poky/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch b/poky/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch deleted file mode 100644 index 60da15eb8..000000000 --- a/poky/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 28fc66e8b848709a2e69dba7f07694248e0154e8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 6 Nov 2016 09:40:43 -0800 -Subject: [PATCH 2/3] Remove funopen() - -Musl doesnt have prerequisites for it. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Inappropriate [musl specific] - - man/Makefile.am | 1 - - src/Makefile.am | 1 - - test/Makefile.am | 1 - - 3 files changed, 3 deletions(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 28192c0..a22787d 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -168,7 +168,6 @@ dist_man_MANS = \ - fmtcheck.3bsd \ - fparseln.3bsd \ - fpurge.3bsd \ -- funopen.3bsd \ - getbsize.3bsd \ - getmode.3bsd \ - getpeereid.3bsd \ -diff --git a/src/Makefile.am b/src/Makefile.am -index ad83dbf..13225a3 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -76,7 +76,6 @@ libbsd_la_SOURCES = \ - fmtcheck.c \ - fparseln.c \ - fpurge.c \ -- funopen.c \ - getbsize.c \ - getpeereid.c \ - hash/md5.c \ -diff --git a/test/Makefile.am b/test/Makefile.am -index d86539a..b32ed2e 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -36,7 +36,6 @@ check_PROGRAMS = \ - endian \ - humanize \ - fgetln \ -- funopen \ - fparseln \ - fpurge \ - md5 \ diff --git a/poky/meta/recipes-support/libbsd/libbsd_0.8.7.bb b/poky/meta/recipes-support/libbsd/libbsd_0.9.1.bb index 552a85c4d..2b75cdf95 100644 --- a/poky/meta/recipes-support/libbsd/libbsd_0.8.7.bb +++ b/poky/meta/recipes-support/libbsd/libbsd_0.9.1.bb @@ -9,16 +9,14 @@ DESCRIPTION = "This library provides useful functions commonly found on BSD syst 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 +# OE @ ~/projects/libbsd $ grep ^License: COPYING | sort -u # 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-author +# License: BSD-3-clause-John-Birrell # License: BSD-3-clause-Regents # License: BSD-4-clause-Christopher-G-Demetriou # License: BSD-4-clause-Niels-Provos @@ -30,20 +28,16 @@ HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" # License: public-domain # License: public-domain-Colin-Plumb LICENSE = "BSD-4-Clause & ISC & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=08fc4e66be4526715dab09c5fba5e9e8" +LIC_FILES_CHKSUM = "file://COPYING;md5=b552602fda69e34c753d26de383f33c5" SECTION = "libs" SRC_URI = " \ http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch \ -" -SRC_URI_append_libc-musl = " \ - file://0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch \ - file://0002-Remove-funopen.patch \ + file://0001-flopen-Add-missing-fcntl.h-include.patch \ " -SRC_URI[md5sum] = "d9e6980fbfe44f94fd92b89a33cce67d" -SRC_URI[sha256sum] = "f548f10e5af5a08b1e22889ce84315b1ebe41505b015c9596bad03fd13a12b31" +SRC_URI[md5sum] = "a74b80c4143afa032c90226a4518fffe" +SRC_URI[sha256sum] = "56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4" inherit autotools pkgconfig diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch b/poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch index 59591eb46..d60a0a39b 100644 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch @@ -1,4 +1,4 @@ -From b01bb2694f66cd981e6d61523433dc3eb5ed32f2 Mon Sep 17 00:00:00 2001 +From b4a354ae8d4f7c2ec3ec421c7d8a790cc57e77a9 Mon Sep 17 00:00:00 2001 From: Li xin <lixin.fnst@cn.fujitsu.com> Date: Sat, 18 Jul 2015 23:03:30 +0900 Subject: [PATCH] configure.ac - Avoid an incorrect check for python. @@ -8,30 +8,32 @@ Upstream-Status: pending Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - bindings/python/Makefile.am | 3 ++- - configure.ac | 15 ++------------- - 2 files changed, 4 insertions(+), 14 deletions(-) + bindings/python/Makefile.am | 4 +++- + configure.ac | 17 ++--------------- + 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am -index 82b9bb8..f9fe7a8 100644 +index 999b184..c8e49db 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am -@@ -23,7 +23,8 @@ SUBDIRS = test +@@ -23,7 +23,9 @@ + SUBDIRS = test CONFIG_CLEAN_FILES = *.loT *.rej *.orig AM_CFLAGS = -fPIC -DPIC - PYLIBVER ?= python$(PYTHON_VERSION) -AM_CPPFLAGS = -I. -I$(top_builddir) -I@PYINCLUDEDIR@ ++PYLIBVER ?= python$(PYTHON_VERSION) +PYINC ?= /usr/include/$(PYLIBVER) +AM_CPPFLAGS = -I. -I$(top_builddir) -I$(PYINC) - LIBS = $(top_builddir)/src/libcap-ng.la SWIG_FLAGS = -python SWIG_INCLUDES = ${AM_CPPFLAGS} + pyexec_PYTHON = capng.py diff --git a/configure.ac b/configure.ac -index 1d777d5..9d90f64 100644 +index 7f66179..079d026 100644 --- a/configure.ac +++ b/configure.ac -@@ -123,19 +123,8 @@ if test x$use_python = xno ; then +@@ -123,21 +123,8 @@ if test x$use_python = xno ; then else AC_MSG_RESULT(testing) AM_PATH_PYTHON @@ -39,11 +41,13 @@ index 1d777d5..9d90f64 100644 -if test -f ${PYINCLUDEDIR}/Python.h ; then - python_found="yes" - AC_SUBST(PYINCLUDEDIR) +- pybind_dir="python" +- AC_SUBST(pybind_dir) - AC_MSG_NOTICE(Python bindings will be built) -else - python_found="no" - if test x$use_python = xyes ; then -- AC_MSG_ERROR([Python explicitly required and python headers found]) +- AC_MSG_ERROR([Python explicitly requested and python headers were not found]) - else - AC_MSG_WARN("Python headers not found - python bindings will not be made") - fi @@ -54,5 +58,5 @@ index 1d777d5..9d90f64 100644 AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") -- -1.8.4.2 +2.7.4 diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.8.bb b/poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb index 358319419..aff6259db 100644 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.8.bb +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.9.bb @@ -12,8 +12,8 @@ SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ inherit lib_package autotools python3native -SRC_URI[md5sum] = "0dece96644bd798020e170fbf7663802" -SRC_URI[sha256sum] = "c21af997445cd4107a55d386f955c5ea6f6e96ead693e9151277c0ab5f97d05f" +SRC_URI[md5sum] = "2398d695508fab9ce33668c53a89b0e9" +SRC_URI[sha256sum] = "4a1532bcf3731aade40936f6d6a586ed5a66ca4c7455e1338d1f6c3e09221328" DEPENDS += "swig-native python3" diff --git a/poky/meta/recipes-support/libcap/libcap_2.25.bb b/poky/meta/recipes-support/libcap/libcap_2.25.bb index d619a2eb4..6df674547 100644 --- a/poky/meta/recipes-support/libcap/libcap_2.25.bb +++ b/poky/meta/recipes-support/libcap/libcap_2.25.bb @@ -32,7 +32,7 @@ PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam" EXTRA_OEMAKE = " \ INDENT= \ - lib=${@os.path.basename('${libdir}')} \ + lib='${baselib}' \ RAISE_SETFCAP=no \ DYNAMIC=yes \ BUILD_GPERF=yes \ diff --git a/poky/meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch b/poky/meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch new file mode 100644 index 000000000..3c7572700 --- /dev/null +++ b/poky/meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch @@ -0,0 +1,19 @@ +Do not echo compiler info in a comment line to check_stdint.h which causes +multilib install file conflict. + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +diff --git a/m4/ax_create_stdint_h.m4 b/m4/ax_create_stdint_h.m4 +index 33a21f8..eacc37a 100644 +--- a/m4/ax_create_stdint_h.m4 ++++ b/m4/ax_create_stdint_h.m4 +@@ -272,7 +272,6 @@ echo "#ifndef" $_ac_stdint_h >$ac_stdint + echo "#define" $_ac_stdint_h "1" >>$ac_stdint + echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint + echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint +-echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint + if test "_$ac_cv_header_stdint_t" != "_" ; then + echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint + echo "#include <stdint.h>" >>$ac_stdint diff --git a/poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb b/poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb index e646d4396..3bb48a75a 100644 --- a/poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb +++ b/poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb @@ -5,7 +5,8 @@ SECTION = "devel" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" -SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz" +SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ + file://not-echo-compiler-info-to-check_stdint.h.patch" SRC_URI[md5sum] = "31b17c6075820a434119592941186f70" SRC_URI[sha256sum] = "464201098bee00e90f5c4bdfa94a5d3ead8d641f9025b560a27755a83b824234" UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" diff --git a/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch b/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch deleted file mode 100644 index 8ac11ec49..000000000 --- a/poky/meta/recipes-support/libcroco/libcroco/CVE-2017-7961.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5fa3165613b77b516e2b0dc128f73b673bd3ec8b Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro <qignacio@amazon.com> -Date: Sun, 16 Apr 2017 13:56:09 +0200 -Subject: [PATCH] tknzr: support only max long rgb values - -This fixes a possible out of bound when reading rgbs which -are longer than the support MAXLONG - -Upstream-Status: Backport [https://git.gnome.org/browse/libcroco/patch/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7] -CVE: CVE-2017-7961 -Signed-off-by: Sinan Kaya <okaya@kernel.org> ---- - src/cr-tknzr.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c -index e3af0ee..76886ec 100644 ---- a/src/cr-tknzr.c -+++ b/src/cr-tknzr.c -@@ -1280,6 +1280,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - red = num->val; - cr_num_destroy (num); - num = NULL; -@@ -1299,6 +1304,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - PEEK_BYTE (a_this, 1, &next_bytes[0]); - if (next_bytes[0] == '%') { - SKIP_CHARS (a_this, 1); --- -2.19.0 - diff --git a/poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb b/poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb index c7507e0d5..5b962ee73 100644 --- a/poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb +++ b/poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb @@ -16,8 +16,7 @@ BINCONFIG = "${bindir}/croco-0.6-config" inherit gnomebase gtk-doc binconfig-disabled -SRC_URI += "file://CVE-2017-7960.patch \ - file://CVE-2017-7961.patch " +SRC_URI += "file://CVE-2017-7960.patch" SRC_URI[archive.md5sum] = "bc0984fce078ba2ce29f9500c6b9ddce" SRC_URI[archive.sha256sum] = "ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860" diff --git a/poky/meta/recipes-support/libevdev/libevdev_1.5.8.bb b/poky/meta/recipes-support/libevdev/libevdev_1.5.9.bb index c1380144b..f59c60eee 100644 --- a/poky/meta/recipes-support/libevdev/libevdev_1.5.8.bb +++ b/poky/meta/recipes-support/libevdev/libevdev_1.5.9.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] = "c25a8c3939e4ad59a5e9e5e1e354832d" -SRC_URI[sha256sum] = "6083d81e46609da8ba80cb826c02d9080764a6dec33c8267ccb7e158833d4c6d" +SRC_URI[md5sum] = "a1ca11e961c1efed720fac4130881904" +SRC_URI[sha256sum] = "e1663751443bed9d3e76a4fe2caf6fa866a79705d91cacad815c04e706198a75" inherit autotools pkgconfig diff --git a/poky/meta/recipes-support/libevent/libevent_2.1.8.bb b/poky/meta/recipes-support/libevent/libevent_2.1.8.bb index 83ce4644c..0f91e05a6 100644 --- a/poky/meta/recipes-support/libevent/libevent_2.1.8.bb +++ b/poky/meta/recipes-support/libevent/libevent_2.1.8.bb @@ -28,12 +28,16 @@ inherit autotools # Needed for Debian packaging LEAD_SONAME = "libevent-2.1.so" -inherit ptest +inherit ptest multilib_header DEPENDS = "zlib" BBCLASSEXTEND = "native nativesdk" +do_install_append() { + oe_multilib_header event2/event-config.h +} + do_install_ptest() { install -d ${D}${PTEST_PATH}/test for file in ${B}/test/.libs/regress ${B}/test/.libs/test* diff --git a/poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb b/poky/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb index c0fd83ef3..734d010d3 100644 --- a/poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb +++ b/poky/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb @@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ " -SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" -SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" +SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b" +SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72" S = "${WORKDIR}/libfm-${PV}" diff --git a/poky/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch b/poky/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch new file mode 100644 index 000000000..f4c89127f --- /dev/null +++ b/poky/meta/recipes-support/libfm/libfm/0001-Do-not-add-library-path-to-avoid-host-contamination.patch @@ -0,0 +1,23 @@ +From 07260295e031e845e38ba874fa6ab500790c4aaf Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 2 May 2018 16:48:47 +0300 +Subject: [PATCH] Do not add library path to avoid host contamination + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/modules/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am +index e61f4e0..01c15bd 100644 +--- a/src/modules/Makefile.am ++++ b/src/modules/Makefile.am +@@ -11,7 +11,6 @@ AM_CPPFLAGS = \ + # tell libtool we compile module not library + AM_LDFLAGS = \ + -no-undefined -module -avoid-version -shared -export-dynamic \ +- -L$(libdir) \ + $(GIO_LIBS) + + # the module should be linked only with libfm, not libfm-gtk or whatever diff --git a/poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch b/poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch deleted file mode 100644 index 40e53291e..000000000 --- a/poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch +++ /dev/null @@ -1,76 +0,0 @@ -From ed4ca8c0b17ff5d3c768b92409c1787e3f3f1841 Mon Sep 17 00:00:00 2001 -From: Andriy Grytsenko <andrej@rep.kiev.ua> -Date: Sun, 26 Nov 2017 22:30:15 +0200 -Subject: [PATCH 2/2] Enclose text in <programlisting> into <![CDATA[ - -New gtk-doc fails on tag-like data in it. -See https://bugs.freedesktop.org/show_bug.cgi?id=101585 -That is definitely bug of gtk-doc but let workaround it. - -Upstream-Status: Backport [https://git.lxde.org/gitweb/?p=lxde/libfm.git;a=commit;h=b072ee0400432d72fdf86ba9fed74a7e0ec11ec1] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - src/base/fm-module.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/base/fm-module.c b/src/base/fm-module.c -index d364b2d..2e8c978 100644 ---- a/src/base/fm-module.c -+++ b/src/base/fm-module.c -@@ -44,7 +44,7 @@ - * of that type should include: - * <example id="example-fm-dummy-h"> - * <title>Sample of fm-dummy.h</title> -- * <programlisting> -+ * <programlisting><![CDATA[ - * #include <libfm/fm.h> - * - * #define FM_MODULE_dummy_VERSION 1 -@@ -54,7 +54,7 @@ - * } FmDummyInit; - * - * extern FmDummyInit fm_module_init_dummy; -- * </programlisting> -+ * ]]></programlisting> - * </example> - * The FM_MODULE_dummy_VERSION is a number which should be increased each - * time something in FmDummyInit structure is changed. The FmDummyInit -@@ -65,7 +65,7 @@ - * module handling in your code: - * <example id="example-fm-dummy-widget-c"> - * <title>Sample of fm-dummy-widget.c</title> -- * <programlisting> -+ * <programlisting><![CDATA[ - * #include "fm-dummy.h" - * - * FM_MODULE_DEFINE_TYPE(dummy, FmDummyInit, 1) -@@ -87,7 +87,7 @@ - * result = module->get_new("test sample"); - * return result; - * } -- * </programlisting> -+ * ]]></programlisting> - * </example> - * - * Third thing application should do is to register module type on the -@@ -108,7 +108,7 @@ - * interface (see the fm-dummy.h header example above): - * <example id="example-fm-dummy-test-c"> - * <title>Sample of module dummy/test</title> -- * <programlisting> -+ * <programlisting><![CDATA[ - * #include "fm-dummy.h" - * - * FM_DEFINE_MODULE(dummy, test) -@@ -121,7 +121,7 @@ - * FmDummyInit fm_module_init_dummy = { - * fm_dummy_test_get_new; - * }; -- * </programlisting> -+ * ]]></programlisting> - * </example> - * The fm_module_init_dummy should be exactly the same structure that is - * defined in the header file above. --- -2.15.1 - diff --git a/poky/meta/recipes-support/libfm/libfm_1.2.5.bb b/poky/meta/recipes-support/libfm/libfm_1.3.0.2.bb index 596408353..62d6a51e8 100644 --- a/poky/meta/recipes-support/libfm/libfm_1.2.5.bb +++ b/poky/meta/recipes-support/libfm/libfm_1.3.0.2.bb @@ -13,11 +13,11 @@ DEPENDS = "glib-2.0 glib-2.0-native pango gtk+3 menu-cache intltool-native libex SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch \ - file://0001-Enclose-text-in-programlisting-into-CDATA.patch \ + file://0001-Do-not-add-library-path-to-avoid-host-contamination.patch \ " -SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" -SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" +SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b" +SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72" inherit autotools pkgconfig gtk-doc gettext distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/poky/meta/recipes-support/libgcrypt/files/CVE-2018-0495.patch b/poky/meta/recipes-support/libgcrypt/files/CVE-2018-0495.patch deleted file mode 100644 index c16bd3abd..000000000 --- a/poky/meta/recipes-support/libgcrypt/files/CVE-2018-0495.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 9010d1576e278a4274ad3f4aa15776c28f6ba965 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Wed, 13 Jun 2018 15:28:58 +0900 -Subject: [PATCH] ecc: Add blinding for ECDSA. - -* cipher/ecc-ecdsa.c (_gcry_ecc_ecdsa_sign): Blind secret D with -randomized nonce B. - --- - -Reported-by: Keegan Ryan <Keegan.Ryan@nccgroup.trust> -CVE-id: CVE-2018-0495 - -Upstream-Status: Backport [http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=9010d1576e278a4274ad3f4aa15776c28f6ba965] - -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> ---- - cipher/ecc-ecdsa.c | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/cipher/ecc-ecdsa.c b/cipher/ecc-ecdsa.c -index 1484830b..140e8c09 100644 ---- a/cipher/ecc-ecdsa.c -+++ b/cipher/ecc-ecdsa.c -@@ -50,6 +50,8 @@ _gcry_ecc_ecdsa_sign (gcry_mpi_t input, ECC_secret_key *skey, - const void *abuf; - unsigned int abits, qbits; - mpi_ec_t ctx; -+ gcry_mpi_t b; /* Random number needed for blinding. */ -+ gcry_mpi_t bi; /* multiplicative inverse of B. */ - - if (DBG_CIPHER) - log_mpidump ("ecdsa sign hash ", input ); -@@ -61,6 +63,15 @@ _gcry_ecc_ecdsa_sign (gcry_mpi_t input, ECC_secret_key *skey, - if (rc) - return rc; - -+ b = mpi_snew (qbits); -+ bi = mpi_snew (qbits); -+ do -+ { -+ _gcry_mpi_randomize (b, qbits, GCRY_WEAK_RANDOM); -+ mpi_mod (b, b, skey->E.n); -+ } -+ while (!mpi_invm (bi, b, skey->E.n)); -+ - k = NULL; - dr = mpi_alloc (0); - sum = mpi_alloc (0); -@@ -115,8 +126,11 @@ _gcry_ecc_ecdsa_sign (gcry_mpi_t input, ECC_secret_key *skey, - } - while (!mpi_cmp_ui (r, 0)); - -- mpi_mulm (dr, skey->d, r, skey->E.n); /* dr = d*r mod n */ -- mpi_addm (sum, hash, dr, skey->E.n); /* sum = hash + (d*r) mod n */ -+ mpi_mulm (dr, b, skey->d, skey->E.n); -+ mpi_mulm (dr, dr, r, skey->E.n); /* dr = d*r mod n (blinded with b) */ -+ mpi_mulm (sum, b, hash, skey->E.n); -+ mpi_addm (sum, sum, dr, skey->E.n); /* sum = hash + (d*r) mod n (blinded with b) */ -+ mpi_mulm (sum, bi, sum, skey->E.n); /* undo blinding by b^-1 */ - mpi_invm (k_1, k, skey->E.n); /* k_1 = k^(-1) mod n */ - mpi_mulm (s, k_1, sum, skey->E.n); /* s = k^(-1)*(hash+(d*r)) mod n */ - } -@@ -129,6 +143,8 @@ _gcry_ecc_ecdsa_sign (gcry_mpi_t input, ECC_secret_key *skey, - } - - leave: -+ mpi_free (b); -+ mpi_free (bi); - _gcry_mpi_ec_free (ctx); - point_free (&I); - mpi_free (x); --- -2.13.3 - diff --git a/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.2.bb b/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.3.bb index 9d036c8fb..cefa8365e 100644 --- a/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.2.bb +++ b/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.3.bb @@ -10,7 +10,8 @@ LICENSE_${PN}-dev = "GPLv2+ & LGPLv2.1+" LICENSE_dumpsexp-dev = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff" + file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \ + file://LICENSES;md5=840e3bcb754e5046ffeda7619034cbd8" DEPENDS = "libgpg-error" @@ -20,10 +21,9 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \ file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \ - file://CVE-2018-0495.patch \ " -SRC_URI[md5sum] = "cfb0b5c79eab07686b6898160a407139" -SRC_URI[sha256sum] = "c8064cae7558144b13ef0eb87093412380efa16c4ee30ad12ecb54886a524c07" +SRC_URI[md5sum] = "3139c2402e844985a67fb288a930534d" +SRC_URI[sha256sum] = "66ec90be036747602f2b48f98312361a9180c97c68a690a5f376fa0f67d0af7c" BINCONFIG = "${bindir}/libgcrypt-config" diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch b/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch new file mode 100644 index 000000000..03b0ce77e --- /dev/null +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch @@ -0,0 +1,298 @@ +From d4fd6975671477721936060771aa4d7d07fb0910 Mon Sep 17 00:00:00 2001 +From: Werner Koch <wk@gnupg.org> +Date: Tue, 18 Sep 2018 14:54:08 +0200 +Subject: [PATCH libgpg-error] syscfg: Support ARC CPUs and simplify aliasing + table. + +* src/mkheader.c (xmalloc): New. +(xstrdup): Implement using xmalloc. +(canon_host_triplet): Add supporr for arc CPU. Adjust alias table to +also alias *-pc-*. Rename ibm to unknown. Add internal arg. Add +unknown vendor hack. +(main): New mode to just print the canonicalized form. +* src/Makefile.am (lock_obj_pub): s/-(pc|ibm)-/-unknown/. Also rename +files accordingly. +-- + +config.sub does no real aliasing and thus we would need to add several +vendors to the alising tables despite that this has no technical +meanding. Instead we now replace the vendor with "unknown" for the +4-part-"triplets". This change will make maintenace easier. + +Signed-off-by: Werner Koch <wk@gnupg.org> + +Upstream-Status: Backport [ http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=48c8f8ddfc80 ] +--- + src/Makefile.am | 16 ++-- + src/mkheader.c | 92 ++++++++++++++++--- + ...-gnu.h => lock-obj-pub.i686-unknown-gnu.h} | 0 + ... lock-obj-pub.i686-unknown-kfreebsd-gnu.h} | 0 + ... => lock-obj-pub.i686-unknown-linux-gnu.h} | 0 + ...=> lock-obj-pub.s390x-unknown-linux-gnu.h} | 0 + ...ock-obj-pub.x86_64-unknown-kfreebsd-gnu.h} | 0 + ...> lock-obj-pub.x86_64-unknown-linux-gnu.h} | 0 + ...ock-obj-pub.x86_64-unknown-linux-gnux32.h} | 0 + ... lock-obj-pub.x86_64-unknown-linux-musl.h} | 0 + 10 files changed, 85 insertions(+), 23 deletions(-) + rename src/syscfg/{lock-obj-pub.i686-pc-gnu.h => lock-obj-pub.i686-unknown-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.i686-pc-kfreebsd-gnu.h => lock-obj-pub.i686-unknown-kfreebsd-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.i686-pc-linux-gnu.h => lock-obj-pub.i686-unknown-linux-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.s390x-ibm-linux-gnu.h => lock-obj-pub.s390x-unknown-linux-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.x86_64-pc-kfreebsd-gnu.h => lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-gnu.h => lock-obj-pub.x86_64-unknown-linux-gnu.h} (100%) + rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-gnux32.h => lock-obj-pub.x86_64-unknown-linux-gnux32.h} (100%) + rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-musl.h => lock-obj-pub.x86_64-unknown-linux-musl.h} (100%) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 42998e46a3bc..8ec582ef99fb 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -52,9 +52,9 @@ lock_obj_pub = \ + syscfg/lock-obj-pub.arm-apple-darwin.h \ + syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.i386-apple-darwin.h \ +- syscfg/lock-obj-pub.i686-pc-gnu.h \ +- syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h \ +- syscfg/lock-obj-pub.i686-pc-linux-gnu.h \ ++ syscfg/lock-obj-pub.i686-unknown-gnu.h \ ++ syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h \ ++ syscfg/lock-obj-pub.i686-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.m68k-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.mips-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.mips64el-unknown-linux-gnuabi64.h \ +@@ -66,16 +66,16 @@ lock_obj_pub = \ + syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ + syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ +- syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ ++ syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sparc64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.x86_64-apple-darwin.h \ +- syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h \ +- syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h \ +- syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h \ +- syscfg/lock-obj-pub.x86_64-pc-linux-musl.h \ ++ syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h \ ++ syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h \ ++ syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h \ ++ syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h \ + syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.ia64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.mingw32.h +diff --git a/src/mkheader.c b/src/mkheader.c +index 2fc5fada66a4..7a38a1bec1a4 100644 +--- a/src/mkheader.c ++++ b/src/mkheader.c +@@ -51,17 +51,27 @@ xfree (void *a) + + + static char * +-xstrdup (const char *string) ++xmalloc (size_t n) + { + char *p; +- size_t len = strlen (string) + 1; + +- p = malloc (len); ++ p = malloc (n); + if (!p) + { + fputs (PGM ": out of core\n", stderr); + exit (1); + } ++ return p; ++} ++ ++ ++static char * ++xstrdup (const char *string) ++{ ++ char *p; ++ size_t len = strlen (string) + 1; ++ ++ p = xmalloc (len); + memcpy (p, string, len); + return p; + } +@@ -69,23 +79,31 @@ xstrdup (const char *string) + + /* Return a malloced string with TRIPLET. If TRIPLET has an alias + return that instead. In general build-aux/config.sub should do the +- aliasing but some returned triplets are anyway identical and thus we +- use this function to map it to the canonical form. */ ++ aliasing but some returned triplets are anyway identical and thus ++ we use this function to map it to the canonical form. ++ NO_VENDOR_HACK is for internal use; caller must call with 0. */ + static char * +-canon_host_triplet (const char *triplet) ++canon_host_triplet (const char *triplet, int no_vendor_hack) + { + struct { + const char *name; + const char *alias; + } tbl[] = { +- {"i486-pc-linux-gnu", "i686-pc-linux-gnu" }, ++ {"i486-pc-linux-gnu", "i686-unknown-linux-gnu" }, + {"i586-pc-linux-gnu" }, +- {"i486-pc-gnu", "i686-pc-gnu"}, ++ {"i686-pc-linux-gnu" }, ++ {"arc-oe-linux-uclibc" }, /* Other CPU but same struct. */ ++ ++ {"i486-pc-gnu", "i686-unknown-gnu"}, + {"i586-pc-gnu"}, +- {"i486-pc-kfreebsd-gnu", "i686-pc-kfreebsd-gnu"}, ++ {"i686-pc-gnu"}, ++ ++ {"i486-pc-kfreebsd-gnu", "i686-unknown-kfreebsd-gnu"}, + {"i586-pc-kfreebsd-gnu"}, ++ {"i686-pc-kfreebsd-gnu"}, + +- {"x86_64-pc-linux-gnuhardened1", "x86_64-pc-linux-gnu" }, ++ {"x86_64-pc-linux-gnuhardened1", "x86_64-unknown-linux-gnu" }, ++ {"x86_64-pc-linux-gnu" }, + + {"powerpc-unknown-linux-gnuspe", "powerpc-unknown-linux-gnu" }, + +@@ -98,6 +116,7 @@ canon_host_triplet (const char *triplet) + }; + int i; + const char *lastalias = NULL; ++ const char *s; + + for (i=0; tbl[i].name; i++) + { +@@ -110,6 +129,36 @@ canon_host_triplet (const char *triplet) + return xstrdup (lastalias); + } + } ++ for (i=0, s=triplet; *s; s++) ++ if (*s == '-') ++ i++; ++ if (i > 2 && !no_vendor_hack) ++ { ++ /* We have a 4 part "triplet": CPU-VENDOR-KERNEL-SYSTEM where ++ * the last two parts replace the OS part of a real triplet. ++ * The VENDOR part is then in general useless because ++ * KERNEL-SYSTEM is specific enough. We now do a second pass by ++ * replacing VENDOR with "unknown". */ ++ char *p; ++ char *buf = xmalloc (strlen (triplet) + 7 + 1); ++ ++ for (p=buf,s=triplet,i=0; *s; s++) ++ { ++ *p++ = *s; ++ if (*s == '-' && ++i == 1) ++ { ++ memcpy (p, "unknown-",8); ++ p += 8; ++ for (s++; *s != '-'; s++) ++ ; ++ } ++ } ++ *p = 0; ++ p = canon_host_triplet (buf, 1); ++ xfree (buf); ++ return p; ++ } ++ + return xstrdup (triplet); + } + +@@ -558,7 +607,7 @@ write_special (const char *fname, int lnr, const char *tag) + int + main (int argc, char **argv) + { +- FILE *fp; ++ FILE *fp = NULL; + char line[LINESIZE]; + int lnr = 0; + const char *fname, *s; +@@ -571,11 +620,22 @@ main (int argc, char **argv) + argc--; argv++; + } + +- if (argc != 6) ++ if (argc == 1) ++ { ++ /* Print just the canonicalized host triplet. */ ++ host_triplet = canon_host_triplet (argv[0], 0); ++ printf ("%s\n", host_triplet); ++ goto leave; ++ } ++ else if (argc == 6) ++ ; /* Standard operation. */ ++ else + { + fputs ("usage: " PGM + " host_os host_triplet template.h config.h" +- " version version_number\n", ++ " version version_number\n" ++ " " PGM ++ " host_triplet\n", + stderr); + return 1; + } +@@ -586,7 +646,7 @@ main (int argc, char **argv) + hdr_version = argv[4]; + hdr_version_number = argv[5]; + +- host_triplet = canon_host_triplet (host_triplet_raw); ++ host_triplet = canon_host_triplet (host_triplet_raw, 0); + + srcdir = malloc (strlen (fname) + 2 + 1); + if (!srcdir) +@@ -677,13 +737,15 @@ main (int argc, char **argv) + "End:\n" + "*/\n", stdout); + ++ leave: + if (ferror (stdout)) + { + fprintf (stderr, PGM ": error writing to stdout: %s\n", strerror (errno)); + return 1; + } + +- fclose (fp); ++ if (fp) ++ fclose (fp); + + xfree (host_triplet); + return 0; +diff --git a/src/syscfg/lock-obj-pub.i686-pc-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.i686-pc-gnu.h +rename to src/syscfg/lock-obj-pub.i686-unknown-gnu.h +diff --git a/src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h +rename to src/syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h +diff --git a/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-linux-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h +rename to src/syscfg/lock-obj-pub.i686-unknown-linux-gnu.h +diff --git a/src/syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h b/src/syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h +rename to src/syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h +diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h +rename to src/syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h +diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h +rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h +diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h +rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h +diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-musl.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h +similarity index 100% +rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-musl.h +rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch b/poky/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch new file mode 100644 index 000000000..197652f28 --- /dev/null +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch @@ -0,0 +1,35 @@ +From ae6a3f20345dac4b9daab8c39ac2d3fb3f2c21e3 Mon Sep 17 00:00:00 2001 +From: Werner Koch <wk@gnupg.org> +Date: Fri, 21 Sep 2018 14:37:21 +0200 +Subject: [PATCH Libgpg-error] syscfg: Add support for arc-unknown-linux-gnu + +* src/mkheader.c (canon_host_triplet): Add to table. +-- + +Note that unknown in the above triplet is actually a wildcard for 4 +part triplets. + +Signed-off-by: Werner Koch <wk@gnupg.org> + +Upstream-Status: Backport [http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=f4f0da74f526d7e35cedbc2e93454df6440dbfa5] +--- + src/mkheader.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/mkheader.c b/src/mkheader.c +index 7a38a1bec1a4..a4866e96ef43 100644 +--- a/src/mkheader.c ++++ b/src/mkheader.c +@@ -92,7 +92,8 @@ canon_host_triplet (const char *triplet, int no_vendor_hack) + {"i486-pc-linux-gnu", "i686-unknown-linux-gnu" }, + {"i586-pc-linux-gnu" }, + {"i686-pc-linux-gnu" }, +- {"arc-oe-linux-uclibc" }, /* Other CPU but same struct. */ ++ {"arc-oe-linux-gnu" }, /* Other CPU but same struct. */ ++ {"arc-oe-linux-uclibc" }, /* and uclibc is also the same. */ + + {"i486-pc-gnu", "i686-unknown-gnu"}, + {"i586-pc-gnu"}, +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 9ffeedbe5..3066613d4 100644 --- a/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch @@ -1,15 +1,26 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# +From ec309e20b5a27d42a5fb915c328d61e924ab5f19 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 29 Mar 2018 15:12:17 +0800 +Subject: [PATCH] support pkgconfig Upstream-Status: Pending -Index: libgpg-error-1.17/configure.ac -=================================================================== ---- libgpg-error-1.17.orig/configure.ac -+++ libgpg-error-1.17/configure.ac -@@ -529,6 +529,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make +Rebase to 1.28 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 1 + + src/Makefile.am | 4 ++- + src/gpg-error.m4 | 71 +++-------------------------------------------------- + src/gpg-error.pc.in | 11 +++++++++ + 4 files changed, 18 insertions(+), 69 deletions(-) + create mode 100644 src/gpg-error.pc.in + +diff --git a/configure.ac b/configure.ac +index aca9300..f7794e9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -621,6 +621,7 @@ AC_CONFIG_FILES([src/Makefile tests/Makefile]) AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest]) AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) @@ -17,33 +28,33 @@ Index: libgpg-error-1.17/configure.ac AC_OUTPUT -Index: libgpg-error-1.17/src/Makefile.am -=================================================================== ---- libgpg-error-1.17.orig/src/Makefile.am -+++ libgpg-error-1.17/src/Makefile.am -@@ -75,6 +75,8 @@ nodist_include_HEADERS = gpg-error.h - bin_SCRIPTS = gpg-error-config +diff --git a/src/Makefile.am b/src/Makefile.am +index 268c2ab..95f8459 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -87,6 +87,8 @@ bin_SCRIPTS = gpg-error-config + nodist_bin_SCRIPTS = gpgrt-config m4datadir = $(datadir)/aclocal - m4data_DATA = gpg-error.m4 + m4data_DATA = gpg-error.m4 gpgrt.m4 +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gpg-error.pc EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkerrnos.awk errnos.in README \ -@@ -82,7 +84,7 @@ EXTRA_DIST = mkstrtable.awk err-sources. +@@ -94,7 +96,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ - err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ + err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 gpgrt.m4 \ gpg-error.vers gpg-error.def.in \ - versioninfo.rc.in gpg-error.w32-manifest.in \ + versioninfo.rc.in gpg-error.w32-manifest.in gpg-error.pc \ $(lock_obj_pub) BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ -Index: libgpg-error-1.17/src/gpg-error.m4 -=================================================================== ---- libgpg-error-1.17.orig/src/gpg-error.m4 -+++ libgpg-error-1.17/src/gpg-error.m4 -@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_wa +diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 +index 60c88d8..2ef7e3e 100644 +--- a/src/gpg-error.m4 ++++ b/src/gpg-error.m4 +@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPG_ERROR], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -132,10 +143,11 @@ Index: libgpg-error-1.17/src/gpg-error.m4 ifelse([$3], , :, [$3]) fi AC_SUBST(GPG_ERROR_CFLAGS) -Index: libgpg-error-1.17/src/gpg-error.pc.in -=================================================================== +diff --git a/src/gpg-error.pc.in b/src/gpg-error.pc.in +new file mode 100644 +index 0000000..bc0b174 --- /dev/null -+++ libgpg-error-1.17/src/gpg-error.pc.in ++++ b/src/gpg-error.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -148,3 +160,6 @@ Index: libgpg-error-1.17/src/gpg-error.pc.in +Version: @VERSION@ +Libs: -L${libdir} -lgpg-error +Cflags: -I${includedir} +-- +1.8.3.1 + diff --git a/poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb b/poky/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb index b74f079f5..e552001cb 100644 --- a/poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb +++ b/poky/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb @@ -5,8 +5,8 @@ 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=beae1e44d8d5c265d194760276033a7c \ - file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc" + file://src/gpg-error.h.in;beginline=2;endline=18;md5=524d4e810c4dcdc38e4fa28e70a13bf8 \ + file://src/init.c;beginline=2;endline=17;md5=f01cdfcf747af5380590cfd9bbfeaaf7" SECTION = "libs" @@ -14,20 +14,27 @@ SECTION = "libs" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ + file://0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch \ + file://0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch \ " - -SRC_URI[md5sum] = "5217ef3e76a7275a2a3b569a12ddc989" -SRC_URI[sha256sum] = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2" +SRC_URI[md5sum] = "ef3d928a5a453fa701ecc3bb22be1c64" +SRC_URI[sha256sum] = "c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca" BINCONFIG = "${bindir}/gpg-error-config" -inherit autotools binconfig-disabled pkgconfig gettext multilib_header +inherit autotools binconfig-disabled pkgconfig gettext multilib_header multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/gpgrt-config" + CPPFLAGS += "-P" do_compile_prepend() { TARGET_FILE=linux-gnu if [ ${TARGET_OS} = "mingw32" ]; then # There are no arch specific syscfg files for mingw32 TARGET_FILE= + elif [ ${TARGET_ARCH} = "arc" ]; then + # ARC syscfg file is automatically aliased to i686-pc-linux-gnu + TARGET_FILE= elif [ ${TARGET_OS} != "linux" ]; then TARGET_FILE=${TARGET_OS} fi @@ -36,12 +43,14 @@ do_compile_prepend() { aarch64_be) TUPLE=aarch64-unknown-linux-gnu ;; arm) TUPLE=arm-unknown-linux-gnueabi ;; armeb) TUPLE=arm-unknown-linux-gnueabi ;; - i586|i686) TUPLE=i686-pc-linux-gnu ;; + i586|i686) TUPLE=i686-unknown-linux-gnu;; mips64*) TUPLE=mips64el-unknown-linux-gnuabi64 ;; mips*el) TUPLE=mipsel-unknown-linux-gnu ;; mips*) TUPLE=mips-unknown-linux-gnu ;; - x86_64) TUPLE=x86_64-pc-linux-gnu ;; - *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; + x86_64) TUPLE=x86_64-unknown-linux-gnu ;; + ppc64) TUPLE=powerpc64-unknown-linux-gnu ;; + ppc64le) TUPLE=powerpc64le-unknown-linux-gnu ;; + *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; esac if [ -n "$TARGET_FILE" ]; then diff --git a/poky/meta/recipes-support/libical/libical_2.0.0.bb b/poky/meta/recipes-support/libical/libical_2.0.0.bb index dcc21cc16..daa47abcb 100644 --- a/poky/meta/recipes-support/libical/libical_2.0.0.bb +++ b/poky/meta/recipes-support/libical/libical_2.0.0.bb @@ -17,3 +17,10 @@ SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf2 UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" inherit cmake pkgconfig + +do_install_append_class-target () { + # Remove build host references + sed -i \ + -e 's,${STAGING_LIBDIR},${libdir},g' \ + ${D}${libdir}/cmake/LibIcal/LibIcalTargets-noconfig.cmake +} diff --git a/poky/meta/recipes-support/libpcre/libpcre2_10.30.bb b/poky/meta/recipes-support/libpcre/libpcre2_10.31.bb index 46c2d630e..a10c312e9 100644 --- a/poky/meta/recipes-support/libpcre/libpcre2_10.30.bb +++ b/poky/meta/recipes-support/libpcre/libpcre2_10.31.bb @@ -8,14 +8,14 @@ SUMMARY = "Perl Compatible Regular Expressions version 2" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=12d55e15a0c6da5c645ba40382bd3293" +LIC_FILES_CHKSUM = "file://LICENCE;md5=f5e4bde9fd0493d0967b4dba9899590f" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ file://pcre-cross.patch \ " -SRC_URI[md5sum] = "d3adf4b130eed854a530390f00020a65" -SRC_URI[sha256sum] = "90bd41c605d30e3745771eb81928d779f158081a51b2f314bbcc1f73de5773db" +SRC_URI[md5sum] = "e0b91c891a3c49050f7fd15de33d0ba4" +SRC_URI[sha256sum] = "e07d538704aa65e477b6a392b32ff9fc5edf75ab9a40ddfc876186c4ff4d68ac" CVE_PRODUCT = "pcre2" diff --git a/poky/meta/recipes-support/libpcre/libpcre_8.41.bb b/poky/meta/recipes-support/libpcre/libpcre_8.42.bb index 0187c08f5..3a488c00b 100644 --- a/poky/meta/recipes-support/libpcre/libpcre_8.41.bb +++ b/poky/meta/recipes-support/libpcre/libpcre_8.42.bb @@ -6,7 +6,7 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=60da32d84d067f53e22071c4ecb4384d" +LIC_FILES_CHKSUM = "file://LICENCE;md5=fc5026403b44c868c25fc9546f7feb05" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://pcre-cross.patch \ file://fix-pcre-name-collision.patch \ @@ -14,8 +14,8 @@ SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://Makefile \ " -SRC_URI[md5sum] = "c160d22723b1670447341b08c58981c1" -SRC_URI[sha256sum] = "e62c7eac5ae7c0e7286db61ff82912e1c0b7a0c13706616e94a7dd729321b530" +SRC_URI[md5sum] = "085b6aa253e0f91cae70b3cdbe8c1ac2" +SRC_URI[sha256sum] = "2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301" CVE_PRODUCT = "pcre" diff --git a/poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb b/poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb index 991c9d832..dd7ad922d 100644 --- a/poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb +++ b/poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb @@ -22,11 +22,12 @@ PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no" EXTRA_OECMAKE += " \ - -DWITH_KDE4=no \ + -DWITH_KDE=no \ -DWITH_MOZJS=no \ -DWITH_NM=no \ -DWITH_PERL=no \ - -DWITH_PYTHON=no \ + -DWITH_PYTHON2=no \ + -DWITH_PYTHON3=no \ -DWITH_WEBKIT=no \ -DLIB_INSTALL_DIR=${libdir} \ -DLIBEXEC_INSTALL_DIR=${libexecdir} \ diff --git a/poky/meta/recipes-support/libsoup/libsoup-2.4_2.60.3.bb b/poky/meta/recipes-support/libsoup/libsoup-2.4_2.62.3.bb index e2e7ff4aa..aaa3cc510 100644 --- a/poky/meta/recipes-support/libsoup/libsoup-2.4_2.60.3.bb +++ b/poky/meta/recipes-support/libsoup/libsoup-2.4_2.62.3.bb @@ -10,9 +10,8 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" - -SRC_URI[md5sum] = "4cf8937d161d3dd71a65f1684e317824" -SRC_URI[sha256sum] = "1b0dc762f23abe4e0d29b77370e539fd35f31d8e8e0318d6ddccff395be68a22" +SRC_URI[md5sum] = "dfbf30af5fb6190bfafc5aa6abcc9dce" +SRC_URI[sha256sum] = "d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172" S = "${WORKDIR}/libsoup-${PV}" diff --git a/poky/meta/recipes-support/libunistring/libunistring_0.9.9.bb b/poky/meta/recipes-support/libunistring/libunistring_0.9.10.bb index ab7cba522..97fac4ecf 100644 --- a/poky/meta/recipes-support/libunistring/libunistring_0.9.9.bb +++ b/poky/meta/recipes-support/libunistring/libunistring_0.9.10.bb @@ -16,15 +16,15 @@ SECTION = "devel" LICENSE = "LGPLv3+ | GPLv2" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://README;beginline=45;endline=65;md5=08287d16ba8d839faed8d2dc14d7d6a5 \ - file://doc/libunistring.texi;md5=efb80a3799a60f95feaf80661d4f204c \ + file://doc/libunistring.texi;md5=287fa6075f78a3c85c1a52b0a92547cd \ " 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] = "4f689e37e4c3bd67de5786aa51d98b13" -SRC_URI[sha256sum] = "f5e90c08f9e5427ca3a2c0c53f19aa38b25c500913510ad25afef86448bea84a" +SRC_URI[md5sum] = "0d3274e9838396b12200f8b54ddaf43b" +SRC_URI[sha256sum] = "a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b" inherit autotools texinfo BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libunwind/libunwind.inc b/poky/meta/recipes-support/libunwind/libunwind.inc index b9c532d3a..36851d07e 100644 --- a/poky/meta/recipes-support/libunwind/libunwind.inc +++ b/poky/meta/recipes-support/libunwind/libunwind.inc @@ -14,8 +14,6 @@ PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, lat EXTRA_OECONF_arm = "--enable-debug-frame" EXTRA_OECONF_aarch64 = "--enable-debug-frame" -SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared -lssp" - do_install_append () { oe_multilib_header libunwind.h } diff --git a/poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb b/poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb index 37a762486..e7fb2b219 100644 --- a/poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb +++ b/poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb @@ -21,3 +21,5 @@ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared" diff --git a/poky/meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch b/poky/meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch new file mode 100644 index 000000000..b026782bd --- /dev/null +++ b/poky/meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch @@ -0,0 +1,157 @@ +From fdfad81006c2c964781b616f0a75578507be809c Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Wed, 21 Mar 2018 17:38:41 -0400 +Subject: [PATCH] Add support for the RISC-V architecture + +Tested in QEMU 2.12.0-rc0, requires --disable-compiler-tls to go +through the benchmarks reliably. + +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> +Upstream-Status: Backport +--- + configure.ac | 1 + + include/Makefile.am | 2 ++ + include/urcu/arch/riscv.h | 49 ++++++++++++++++++++++++++++++++++++++++++++ + include/urcu/uatomic/riscv.h | 44 +++++++++++++++++++++++++++++++++++++++ + 4 files changed, 96 insertions(+) + create mode 100644 include/urcu/arch/riscv.h + create mode 100644 include/urcu/uatomic/riscv.h + +diff --git a/configure.ac b/configure.ac +index d0b4a9ac..9145081a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -151,6 +151,7 @@ AS_CASE([$host_cpu], + [tile*], [ARCHTYPE="tile"], + [hppa*], [ARCHTYPE="hppa"], + [m68k], [ARCHTYPE="m68k"], ++ [riscv*], [ARCHTYPE="riscv"], + [ARCHTYPE="unknown"] + ) + +diff --git a/include/Makefile.am b/include/Makefile.am +index dcdf304b..36667b43 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -27,6 +27,7 @@ EXTRA_DIST = urcu/arch/aarch64.h \ + urcu/arch/mips.h \ + urcu/arch/nios2.h \ + urcu/arch/ppc.h \ ++ urcu/arch/riscv.h \ + urcu/arch/s390.h \ + urcu/arch/sparc64.h \ + urcu/arch/tile.h \ +@@ -43,6 +44,7 @@ EXTRA_DIST = urcu/arch/aarch64.h \ + urcu/uatomic/mips.h \ + urcu/uatomic/nios2.h \ + urcu/uatomic/ppc.h \ ++ urcu/uatomic/riscv.h \ + urcu/uatomic/s390.h \ + urcu/uatomic/sparc64.h \ + urcu/uatomic/tile.h \ +diff --git a/include/urcu/arch/riscv.h b/include/urcu/arch/riscv.h +new file mode 100644 +index 00000000..1fd7d62b +--- /dev/null ++++ b/include/urcu/arch/riscv.h +@@ -0,0 +1,49 @@ ++#ifndef _URCU_ARCH_RISCV_H ++#define _URCU_ARCH_RISCV_H ++ ++/* ++ * arch/riscv.h: definitions for the RISC-V architecture ++ * ++ * Copyright (c) 2018 Michael Jeanson <mjeanson@efficios.com> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#include <urcu/compiler.h> ++#include <urcu/config.h> ++#include <urcu/syscall-compat.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#include <stdlib.h> ++#include <sys/time.h> ++ ++/* ++ * On Linux, define the membarrier system call number if not yet available in ++ * the system headers. ++ */ ++#if (defined(__linux__) && !defined(__NR_membarrier)) ++#define __NR_membarrier 283 ++#endif ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#include <urcu/arch/generic.h> ++ ++#endif /* _URCU_ARCH_RISCV_H */ +diff --git a/include/urcu/uatomic/riscv.h b/include/urcu/uatomic/riscv.h +new file mode 100644 +index 00000000..a6700e17 +--- /dev/null ++++ b/include/urcu/uatomic/riscv.h +@@ -0,0 +1,44 @@ ++/* ++ * Atomic exchange operations for the RISC-V architecture. Let GCC do it. ++ * ++ * Copyright (c) 2018 Michael Jeanson <mjeanson@efficios.com> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to ++ * deal in the Software without restriction, including without limitation the ++ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ++ * IN THE SOFTWARE. ++ */ ++ ++#ifndef _URCU_ARCH_UATOMIC_RISCV_H ++#define _URCU_ARCH_UATOMIC_RISCV_H ++ ++#include <urcu/compiler.h> ++#include <urcu/system.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#define UATOMIC_HAS_ATOMIC_BYTE ++#define UATOMIC_HAS_ATOMIC_SHORT ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#include <urcu/uatomic/generic.h> ++ ++#endif /* _URCU_ARCH_UATOMIC_RISCV_H */ diff --git a/poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb b/poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb index 459c04a7a..5eb91e144 100644 --- a/poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb +++ b/poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb @@ -8,12 +8,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \ file://include/urcu/uatomic/x86.h;beginline=4;endline=21;md5=58e50bbd8a2f073bb5500e6554af0d0b" SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ + file://Add-support-for-the-RISC-V-architecture.patch \ " SRC_URI[md5sum] = "281a2f92fdc39c40ad6b76f6631fdbd7" SRC_URI[sha256sum] = "9c09220be4435dc27fcd22d291707b94b97f159e0c442fbcd60c168f8f79eb06" S = "${WORKDIR}/userspace-rcu-${PV}" -inherit autotools +inherit autotools multilib_header CPPFLAGS_append_riscv64 = " -pthread -D_REENTRANT" + +do_install_append() { + oe_multilib_header urcu/config.h +} diff --git a/poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch deleted file mode 100644 index b88440dec..000000000 --- a/poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 340f911f9e3f4ff6b01682c5341c959060782af2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 2 Apr 2015 19:18:45 -0700 -Subject: [PATCH] usb.h: Include sys/types.h - -We need the definitions for things like u_intX_t - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libusb/usb.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libusb/usb.h b/libusb/usb.h -index 84e730f..caffae2 100644 ---- a/libusb/usb.h -+++ b/libusb/usb.h -@@ -31,6 +31,8 @@ - - #include <dirent.h> - -+#include <sys/types.h> -+ - /* - * USB spec information - * --- -2.1.4 - diff --git a/poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb b/poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb deleted file mode 100644 index 1ddbe238f..000000000 --- a/poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "libusb-0.1 compatibility layer for libusb1" -DESCRIPTION = "libusb-0.1 compatible layer for libusb1, a drop-in replacement \ -that aims to look, feel and behave exactly like libusb-0.1" -HOMEPAGE = "http://www.libusb.org/" -BUGTRACKER = "http://www.libusb.org/report" -SECTION = "libs" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423" -DEPENDS = "libusb1" - -# Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0), -# so here libusb-0.1 is removed completely instead of adding virtual/libusb0. -# Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power -# consumption. -PROVIDES = "libusb virtual/libusb0" -BBCLASSEXTEND = "native nativesdk" - -PE = "1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ - file://0001-usb.h-Include-sys-types.h.patch \ - " - -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 - -EXTRA_OECONF = "--libdir=${base_libdir}" - -do_install_append() { - install -d ${D}${libdir} - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} - fi -} diff --git a/poky/meta/recipes-support/libusb/libusb1/run-ptest b/poky/meta/recipes-support/libusb/libusb1/run-ptest new file mode 100755 index 000000000..eaa47a2bc --- /dev/null +++ b/poky/meta/recipes-support/libusb/libusb1/run-ptest @@ -0,0 +1,29 @@ +#!/bin/sh + +echo +echo "---------------------------- libusb1 tests ---------------------------" +echo + +./stress | { \ +while read -r str +do + echo "$str" + if [ "${str#*Starting test run:}" != "$str" ] + then + name="${str#Starting test run: }" + name="${name%...}" + else + case "$str" in + "Success (0)") + echo "PASS: $name" + ;; + "Failure (1)" | "Error (2)") + echo "FAIL: $name" + ;; + "Skip (3)") + echo "SKIP: $name" + ;; + esac + fi +done +} diff --git a/poky/meta/recipes-support/libusb/libusb1_1.0.21.bb b/poky/meta/recipes-support/libusb/libusb1_1.0.22.bb index 1fefd1475..0c6e116dd 100644 --- a/poky/meta/recipes-support/libusb/libusb1_1.0.21.bb +++ b/poky/meta/recipes-support/libusb/libusb1_1.0.22.bb @@ -10,14 +10,15 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ file://no-dll.patch \ + file://run-ptest \ " -SRC_URI[md5sum] = "1da9ea3c27b3858fa85c5f4466003e44" -SRC_URI[sha256sum] = "7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b" +SRC_URI[md5sum] = "466267889daead47674df933cea9cacb" +SRC_URI[sha256sum] = "75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157" S = "${WORKDIR}/libusb-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest # Don't configure udev by default since it will cause a circular # dependecy with udev package, which depends on libusb @@ -30,6 +31,14 @@ do_install_append() { fi } +do_compile_ptest() { + oe_runmake -C tests stress +} + +do_install_ptest() { + install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} +} + FILES_${PN} += "${base_libdir}/*.so.*" FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" diff --git a/poky/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch b/poky/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch new file mode 100644 index 000000000..ea3ae51e9 --- /dev/null +++ b/poky/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch @@ -0,0 +1,80 @@ +libxslt-1.1.32: Fix handling of RVTs returned from nested EXSLT functions + +[No upstream tracking] -- https://bugzilla.gnome.org/show_bug.cgi?id=792580 + +Set the context variable to NULL when evaluating EXSLT functions. +Fixes potential use-after-free errors or memory leaks. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxslt/commit/8bd32f7753ac253a54279a0b6a88d15a57076bb0] +bug: 792580 +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> + +diff --git a/libexslt/functions.c b/libexslt/functions.c +index dc794e3..8511cb0 100644 +--- a/libexslt/functions.c ++++ b/libexslt/functions.c +@@ -280,6 +280,7 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) { + exsltFuncFunctionData *func; + xmlNodePtr paramNode, oldInsert, fake; + int oldBase; ++ void *oldCtxtVar; + xsltStackElemPtr params = NULL, param; + xsltTransformContextPtr tctxt = xsltXPathGetTransformContext(ctxt); + int i, notSet; +@@ -418,11 +419,14 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) { + fake = xmlNewDocNode(tctxt->output, NULL, + (const xmlChar *)"fake", NULL); + oldInsert = tctxt->insert; ++ oldCtxtVar = tctxt->contextVariable; + tctxt->insert = fake; ++ tctxt->contextVariable = NULL; + xsltApplyOneTemplate (tctxt, tctxt->node, + func->content, NULL, NULL); + xsltLocalVariablePop(tctxt, tctxt->varsBase, -2); + tctxt->insert = oldInsert; ++ tctxt->contextVariable = oldCtxtVar; + tctxt->varsBase = oldBase; /* restore original scope */ + if (params != NULL) + xsltFreeStackElemList(params); +diff --git a/tests/docs/bug-209.xml b/tests/docs/bug-209.xml +new file mode 100644 +index 0000000..69d62f2 +--- /dev/null ++++ b/tests/docs/bug-209.xml +@@ -0,0 +1 @@ ++<doc/> +diff --git a/tests/general/bug-209.out b/tests/general/bug-209.out +new file mode 100644 +index 0000000..e829790 +--- /dev/null ++++ b/tests/general/bug-209.out +@@ -0,0 +1,2 @@ ++<?xml version="1.0"?> ++<result/> +diff --git a/tests/general/bug-209.xsl b/tests/general/bug-209.xsl +new file mode 100644 +index 0000000..fe69ac6 +--- /dev/null ++++ b/tests/general/bug-209.xsl +@@ -0,0 +1,21 @@ ++<xsl:stylesheet ++ version="1.0" ++ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ++ xmlns:func="http://exslt.org/functions" ++ extension-element-prefixes="func"> ++ ++ <xsl:template match="/"> ++ <xsl:variable name="v" select="func:a()" /> ++ <xsl:copy-of select="$v"/> ++ </xsl:template> ++ ++ <func:function name="func:a"> ++ <func:result select="func:b()" /> ++ </func:function> ++ ++ <func:function name="func:b"> ++ <func:result> ++ <result/> ++ </func:result> ++ </func:function> ++</xsl:stylesheet> diff --git a/poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb b/poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb index 6a03f7769..f0fa5e723 100644 --- a/poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb +++ b/poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb @@ -8,7 +8,10 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458" SECTION = "libs" DEPENDS = "libxml2" -SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz" +SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz \ + file://fix-rvts-handling.patch \ + " + SRC_URI[md5sum] = "1fc72f98e98bf4443f1651165f3aa146" SRC_URI[sha256sum] = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460" diff --git a/poky/meta/recipes-support/libyaml/libyaml_0.1.7.bb b/poky/meta/recipes-support/libyaml/libyaml_0.2.1.bb index b167f031a..d77891825 100644 --- a/poky/meta/recipes-support/libyaml/libyaml_0.1.7.bb +++ b/poky/meta/recipes-support/libyaml/libyaml_0.2.1.bb @@ -5,13 +5,11 @@ HOMEPAGE = "http://pyyaml.org/wiki/LibYAML" SECTION = "libs/devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5591701d32590f9fa94f3bfee820b634" -SRC_URI = "http://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz \ - " - -SRC_URI[md5sum] = "1abf45bd3a96374fa55ca63b32f9f2f9" -SRC_URI[sha256sum] = "8088e457264a98ba451a90b8661fcb4f9d6f478f7265d48322a196cec2480729" +SRC_URI = "http://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz" +SRC_URI[md5sum] = "72724b9736923c517e5a8fc6757ef03d" +SRC_URI[sha256sum] = "78281145641a080fb32d6e7a87b9c0664d611dcb4d542e90baf731f51cbb59cd" S = "${WORKDIR}/yaml-${PV}" diff --git a/poky/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch b/poky/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch deleted file mode 100644 index 00494e801..000000000 --- a/poky/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch +++ /dev/null @@ -1,82 +0,0 @@ -From d4768d9e29b805096a86aa13c0d30ee8215af4df Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Mon, 26 Jun 2017 12:07:09 +0300 -Subject: [PATCH] tests/Makefile: don't use LIBDIR as variable - -LIBDIR may be overriden with a environment variable: In this case make -clean breaks. Use another variable name. - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Upstream-Status: Backport ---- - tests/Makefile | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/tests/Makefile b/tests/Makefile -index 97fa782..51dd038 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -32,7 +32,7 @@ DESTDIR ?= - PREFIX ?= /usr/local - BINDIR := $(PREFIX)/bin - MANDIR := $(PREFIX)/share/man/man1 --LIBDIR := ../lib -+LZ4DIR := ../lib - PRGDIR := ../programs - VOID := /dev/null - TESTDIR := versionsTest -@@ -43,7 +43,7 @@ CFLAGS += -g -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-e - -Wdeclaration-after-statement -Wstrict-prototypes \ - -Wpointer-arith -Wstrict-aliasing=1 - CFLAGS += $(MOREFLAGS) --CPPFLAGS:= -I$(LIBDIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ -+CPPFLAGS:= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ - FLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) - - -@@ -79,31 +79,31 @@ lz4c32: # create a 32-bits version for 32/64 interop tests - $(MAKE) -C $(PRGDIR) clean $@ CFLAGS="-m32 $(CFLAGS)" - cp $(LZ4) $(LZ4)c32 - --fullbench : $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/lz4frame.o $(LIBDIR)/xxhash.o fullbench.c -+fullbench : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/lz4frame.o $(LZ4DIR)/xxhash.o fullbench.c - $(CC) $(FLAGS) $^ -o $@$(EXT) - --fullbench-lib: fullbench.c $(LIBDIR)/xxhash.c -- $(MAKE) -C $(LIBDIR) liblz4.a -- $(CC) $(FLAGS) $^ -o $@$(EXT) $(LIBDIR)/liblz4.a -+fullbench-lib: fullbench.c $(LZ4DIR)/xxhash.c -+ $(MAKE) -C $(LZ4DIR) liblz4.a -+ $(CC) $(FLAGS) $^ -o $@$(EXT) $(LZ4DIR)/liblz4.a - --fullbench-dll: fullbench.c $(LIBDIR)/xxhash.c -- $(MAKE) -C $(LIBDIR) liblz4 -- $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LIBDIR)/dll/liblz4.dll -+fullbench-dll: fullbench.c $(LZ4DIR)/xxhash.c -+ $(MAKE) -C $(LZ4DIR) liblz4 -+ $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LZ4DIR)/dll/liblz4.dll - --fuzzer : $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/xxhash.o fuzzer.c -+fuzzer : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o fuzzer.c - $(CC) $(FLAGS) $^ -o $@$(EXT) - --frametest: $(LIBDIR)/lz4frame.o $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/xxhash.o frametest.c -+frametest: $(LZ4DIR)/lz4frame.o $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o frametest.c - $(CC) $(FLAGS) $^ -o $@$(EXT) - --fasttest: $(LIBDIR)/lz4.o fasttest.c -+fasttest: $(LZ4DIR)/lz4.o fasttest.c - $(CC) $(FLAGS) $^ -o $@$(EXT) - - datagen : $(PRGDIR)/datagen.c datagencli.c - $(CC) $(FLAGS) -I$(PRGDIR) $^ -o $@$(EXT) - - clean: -- @$(MAKE) -C $(LIBDIR) $@ > $(VOID) -+ @$(MAKE) -C $(LZ4DIR) $@ > $(VOID) - @$(MAKE) -C $(PRGDIR) $@ > $(VOID) - @$(RM) core *.o *.test tmp* \ - fullbench-dll$(EXT) fullbench-lib$(EXT) \ --- -2.1.4 - diff --git a/poky/meta/recipes-support/lz4/lz4_1.7.4.bb b/poky/meta/recipes-support/lz4/lz4_1.8.2.bb index 86a1ab9ab..5ad17e1f7 100644 --- a/poky/meta/recipes-support/lz4/lz4_1.7.4.bb +++ b/poky/meta/recipes-support/lz4/lz4_1.8.2.bb @@ -2,18 +2,18 @@ SUMMARY = "Extremely Fast Compression algorithm" DESCRIPTION = "LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems." LICENSE = "BSD | BSD-2-Clause | GPL-2.0" -LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc\ +LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \ file://programs/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE;md5=7f2857d58beff6d04137bf9b09e5ffb6" + file://LICENSE;md5=d57c0d21cb917fb4e0af2454aa48b956 \ + " PE = "1" -SRCREV = "7bb64ff2b69a9f8367de9ab483cdadf42b4c1b65" +SRCREV = "b3692db46d2b23a7c0af2d5e69988c94f126e10a" SRC_URI = "git://github.com/lz4/lz4.git \ - file://0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch \ file://run-ptest \ -" + " UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-support/mpfr/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch b/poky/meta/recipes-support/mpfr/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch new file mode 100644 index 000000000..59d1b0db6 --- /dev/null +++ b/poky/meta/recipes-support/mpfr/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch @@ -0,0 +1,45 @@ +mpfr-longlong.h: Fix obsolete ARC asm constraints + +This patch replaces obsolete ARC "J" asm constraint with +up-to-date "Cal" constraint. + +"J" constraint only existed in pre-upstream GCC port for ARC. +In current upstream port "Cal" constraint is used which leads +to compile-time error. + +Proposed fix is known to work in Buildroot, Crosstool-NG etc. + +[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=09cb6a17e71bd40d2fbfaf82a1502fc210e33c87 + +Signed-off-by: Claudiu Zissulescu <claziss@synopsys.com> +Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com> +Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> + +Upstream-Status: Backport [https://gforge.inria.fr/scm/viewvc.php/mpfr?view=revision&revision=13251] +--- +Index: src/mpfr-longlong.h +=================================================================== +--- a/src/mpfr-longlong.h (revision 10963) ++++ b/src/mpfr-longlong.h (working copy) +@@ -416,17 +416,17 @@ + : "=r" (sh), \ + "=&r" (sl) \ + : "r" ((USItype) (ah)), \ +- "rIJ" ((USItype) (bh)), \ ++ "rICal" ((USItype) (bh)), \ + "%r" ((USItype) (al)), \ +- "rIJ" ((USItype) (bl))) ++ "rICal" ((USItype) (bl))) + #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("sub.f\t%1, %4, %5\n\tsbc\t%0, %2, %3" \ + : "=r" (sh), \ + "=&r" (sl) \ + : "r" ((USItype) (ah)), \ +- "rIJ" ((USItype) (bh)), \ ++ "rICal" ((USItype) (bh)), \ + "r" ((USItype) (al)), \ +- "rIJ" ((USItype) (bl))) ++ "rICal" ((USItype) (bl))) + #endif + + #if defined (__arm__) && (defined (__thumb2__) || !defined (__thumb__)) \ diff --git a/poky/meta/recipes-support/mpfr/mpfr/long-long-thumb.patch b/poky/meta/recipes-support/mpfr/mpfr/long-long-thumb.patch deleted file mode 100644 index ca7100eb2..000000000 --- a/poky/meta/recipes-support/mpfr/mpfr/long-long-thumb.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 84021b1e236508169be65e802a9c0a25fc9a8827 Mon Sep 17 00:00:00 2001 -From: Phil Blundell <philb@gnu.org> -Date: Mon, 27 Oct 2008 22:26:35 +0000 -Subject: [PATCH] mpfr: crusade against inline assembler - -Without this, build fails for thumb: -| {standard input}: Assembler messages: -| {standard input}:199: Error: selected processor does not support Thumb mode `umull sl,r0,r2,r1' -| {standard input}:214: Error: selected processor does not support Thumb mode `umull sl,r2,r1,fp' -| {standard input}:219: Error: instruction not supported in Thumb16 mode -- `adds fp,r0,sl' -| {standard input}:220: Error: unshifted register required -- `adc r2,r2,#0' -| {standard input}:235: Error: selected processor does not support Thumb mode `umull r0,sl,r1,r3' -| {standard input}:244: Error: selected processor does not support Thumb mode `umull fp,ip,r1,r3' -| {standard input}:253: Error: instruction not supported in Thumb16 mode -- `adds r3,sl,fp' -| {standard input}:254: Error: unshifted register required -- `adc ip,ip,#0' -| {standard input}:259: Error: instruction not supported in Thumb16 mode -- `adds sl,r1,r0' -| {standard input}:642: Error: selected processor does not support Thumb mode `umull r0,r2,r3,r1' -| ../arm-oe-linux-gnueabi-libtool --tag=CC --mode=compile arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mthumb-interwork -mtune=xscale --sysroot=/OE/shr-core/tmp-eglibc/sysroots/spitz -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_LOCALE_H=1 -DHAVE_WCHAR_H=1 -DHAVE_STDARG=1 -DHAVE_SYS_TIME_H=1 -DHAVE_ALLOCA_H=1 -DHAVE_STDINT_H=1 -DHAVE_VA_COPY=1 -DHAVE_SETLOCALE=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_LONG_LONG=1 -DHAVE_INTMAX_T=1 -DMPFR_HAVE_INTMAX_MAX=1 -DMPFR_HAVE_FESETROUND=1 -DHAVE_ROUND=1 -DHAVE_TRUNC=1 -DHAVE_FLOOR=1 -DHAVE_CEIL=1 -DHAVE_NEARBYINT=1 -DLT_OBJDIR=\".libs/\" -DHAVE_ATTRIBUTE_MODE=1 -DHAVE___GMPN_ROOTREM=1 -DHAVE___GMPN_SBPI1_DIVAPPR_Q=1 -I. -O2 -pipe -g -feliminate-unused-debug-types -ffloat-store -c -o pow.lo pow.c -| {standard input}:1154: Error: selected processor does not support Thumb mode `umull r0,r1,sl,ip' -| {standard input}:1166: Error: selected processor does not support Thumb mode `umull r3,r2,ip,r0' -| {standard input}:1171: Error: instruction not supported in Thumb16 mode -- `adds r0,r1,r3' -| {standard input}:1172: Error: unshifted register required -- `adc r2,r2,#0' -| make[2]: *** [mul.lo] Error 1 - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - -Upstream-Status: Pending - ---- mpfr.old/src/mpfr-longlong.h 2008-01-01 03:29:09.000000000 +0000 -+++ mpfr/src/mpfr-longlong.h 2008-10-27 21:46:44.000000000 +0000 -@@ -406,7 +406,7 @@ - "rIJ" ((USItype) (bl))) - #endif - --#if defined (__arm__) && W_TYPE_SIZE == 32 -+#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__) - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ - __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3" \ - : "=r" (sh), "=&r" (sl) \ diff --git a/poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb b/poky/meta/recipes-support/mpfr/mpfr_4.0.1.bb index a78c0bd48..2eee76a35 100644 --- a/poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb +++ b/poky/meta/recipes-support/mpfr/mpfr_4.0.1.bb @@ -7,13 +7,12 @@ inherit autotools texinfo LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" -DEPENDS = "gmp" +DEPENDS = "gmp autoconf-archive" SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz \ - file://long-long-thumb.patch \ - " -SRC_URI[md5sum] = "c4ac246cf9795a4491e7766002cd528f" -SRC_URI[sha256sum] = "015fde82b3979fbe5f83501986d328331ba8ddf008c1ff3da3c238f49ca062bc" + file://0001-Fix-obsolete-ARC-asm-constraints.patch" +SRC_URI[md5sum] = "b8dd19bd9bb1ec8831a6a582a7308073" +SRC_URI[sha256sum] = "67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e" UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/" diff --git a/poky/meta/recipes-support/npth/npth_1.5.bb b/poky/meta/recipes-support/npth/npth_1.6.bb index e7db6ae1b..8310efb10 100644 --- a/poky/meta/recipes-support/npth/npth_1.5.bb +++ b/poky/meta/recipes-support/npth/npth_1.6.bb @@ -10,14 +10,18 @@ SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ file://pkgconfig.patch \ " -SRC_URI[md5sum] = "9ba2dc4302d2f32c66737c43ed191b1b" -SRC_URI[sha256sum] = "294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2" +SRC_URI[md5sum] = "375d1a15ad969f32d25f1a7630929854" +SRC_URI[sha256sum] = "1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1" BINCONFIG = "${bindir}/npth-config" -inherit autotools binconfig-disabled +inherit autotools binconfig-disabled multilib_header FILES_${PN} = "${libdir}/libnpth.so.*" FILES_${PN}-dev += "${bindir}/npth-config" +do_install_append() { + oe_multilib_header npth.h +} + BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch b/poky/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch new file mode 100644 index 000000000..47e1475e0 --- /dev/null +++ b/poky/meta/recipes-support/nspr/nspr/0003-Add-type-definitions-for-the-RISC-V-architecture.patch @@ -0,0 +1,150 @@ +# HG changeset patch +# User Karsten Merker <merker@debian.org> +# Date 1523974333 -7200 +# Node ID f47871e2aeb16b39d4f516690e25c81b04d6d05a +# Parent 776db96f834cb86e8863052201d55f60a2da91cb +Bug 1308584, Add type definitions for the RISC-V architecture, r=kaie + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +[ Changes by AF: + - Rebase on other Yocto patches +] +Upstream-Status: Backport [ https://hg.mozilla.org/projects/nspr/rev/f47871e2aeb1 ] + +diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg +@@ -1015,16 +1015,108 @@ + #define PR_ALIGN_OF_FLOAT 4 + #define PR_ALIGN_OF_DOUBLE 4 + #define PR_ALIGN_OF_POINTER 4 + #define PR_ALIGN_OF_WORD 4 + + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#elif defined(__riscv) && (__riscv_xlen == 32) ++ ++#undef IS_BIG_ENDIAN ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_64 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ ++#elif defined(__riscv) && (__riscv_xlen == 64) ++ ++#undef IS_BIG_ENDIAN ++#define IS_LITTLE_ENDIAN 1 ++#define IS_64 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 8 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 8 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 64 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 64 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 6 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 6 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 8 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 8 ++#define PR_ALIGN_OF_WORD 8 ++ ++#define PR_BYTES_PER_WORD_LOG2 3 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #else + + #error "Unknown CPU architecture" + + #endif + + #ifndef HAVE_LONG_LONG + #define HAVE_LONG_LONG +diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h +--- a/pr/include/md/_linux.h ++++ b/pr/include/md/_linux.h +@@ -54,16 +54,20 @@ + #elif defined(__avr32__) + #define _PR_SI_ARCHITECTURE "avr32" + #elif defined(__m32r__) + #define _PR_SI_ARCHITECTURE "m32r" + #elif defined(__nios2__) + #define _PR_SI_ARCHITECTURE "nios2" + #elif defined(__or1k__) + #define _PR_SI_ARCHITECTURE "or1k" ++#elif defined(__riscv) && (__riscv_xlen == 32) ++#define _PR_SI_ARCHITECTURE "riscv32" ++#elif defined(__riscv) && (__riscv_xlen == 64) ++#define _PR_SI_ARCHITECTURE "riscv64" + #else + #error "Unknown CPU architecture" + #endif + #define PR_DLL_SUFFIX ".so" + + #define _PR_VMBASE 0x30000000 + #define _PR_STACK_VMBASE 0x50000000 + #define _MD_DEFAULT_STACK_SIZE 65536L + diff --git a/poky/meta/recipes-support/nspr/nspr/0004-Add-ARC-support.patch b/poky/meta/recipes-support/nspr/nspr/0004-Add-ARC-support.patch new file mode 100644 index 000000000..9d686017d --- /dev/null +++ b/poky/meta/recipes-support/nspr/nspr/0004-Add-ARC-support.patch @@ -0,0 +1,88 @@ +From 6cb5b0be8837222a1e01745f2cf57cd0e593186d Mon Sep 17 00:00:00 2001 +From: Antoine Tenart <antoine.tenart@free-electrons.com> +Date: Mon, 23 Oct 2017 10:28:20 +0200 +Subject: [PATCH] Add ARC support + +[Alexey: Rebased on top of other patches like RiscV, NIOS2 etc]. + +Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> +Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> + +Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1492378 ] +--- + pr/include/md/_linux.cfg | 45 ++++++++++++++++++++++++++++++++++++++++ + pr/include/md/_linux.h | 2 ++ + 2 files changed, 47 insertions(+) + +diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +index fec8525378dc..5f4fa0eac783 100644 +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg +@@ -1157,6 +1157,51 @@ + #define PR_BYTES_PER_WORD_LOG2 3 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#elif defined(__arc__) ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 4 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 4 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #else + + #error "Unknown CPU architecture" +diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h +index 8e04fad479a1..628b1217e9c8 100644 +--- a/pr/include/md/_linux.h ++++ b/pr/include/md/_linux.h +@@ -63,6 +63,8 @@ + #define _PR_SI_ARCHITECTURE "riscv32" + #elif defined(__riscv) && (__riscv_xlen == 64) + #define _PR_SI_ARCHITECTURE "riscv64" ++#elif defined(__arc__) ++#define _PR_SI_ARCHITECTURE "arc" + #else + #error "Unknown CPU architecture" + #endif +-- +2.17.1 + diff --git a/poky/meta/recipes-support/nspr/nspr_4.19.bb b/poky/meta/recipes-support/nspr/nspr_4.19.bb index de2c87131..0212be7f4 100644 --- a/poky/meta/recipes-support/nspr/nspr_4.19.bb +++ b/poky/meta/recipes-support/nspr/nspr_4.19.bb @@ -11,6 +11,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz file://remove-srcdir-from-configure-in.patch \ file://0002-Add-nios2-support.patch \ file://0001-md-Fix-build-with-musl.patch \ + file://0003-Add-type-definitions-for-the-RISC-V-architecture.patch \ + file://0004-Add-ARC-support.patch \ file://nspr.pc.in \ " @@ -148,7 +150,9 @@ TESTS = " \ xnotify \ zerolen" -inherit autotools +inherit autotools multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch b/poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch deleted file mode 100644 index bc10f3385..000000000 --- a/poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 6f7d7be9997ba6727a5ad7c3800df9051160dc12 Mon Sep 17 00:00:00 2001 -From: Martin Thomson <martin.thomson@gmail.com> -Date: Tue, 13 Feb 2018 12:30:58 +1100 -Subject: [PATCH] Bug 1437734 - Use snprintf in sign.c, r=ttaubert - ---HG-- -extra : rebase_source : 97921ece71ff86b18d32b891591608290eed4d83 ---- -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport [https://github.com/nss-dev/nss/commit/0a9078b3cde97add7c825c9d13467a8401ad0c88#diff-b42512151dc137537091f823f7701804.patch] - - nss/cmd/signtool/sign.c | 58 ++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 48 insertions(+), 10 deletions(-) - -diff --git a/nss/cmd/signtool/sign.c b/nss/cmd/signtool/sign.c -index 6e776069a..6f8e43946 100644 ---- a/nss/cmd/signtool/sign.c -+++ b/nss/cmd/signtool/sign.c -@@ -43,6 +43,7 @@ SignArchive(char *tree, char *keyName, char *zip_file, int javascript, - int status; - char tempfn[FNSIZE], fullfn[FNSIZE]; - int keyType = rsaKey; -+ int count; - - metafile = meta_file; - optimize = _optimize; -@@ -81,9 +82,18 @@ SignArchive(char *tree, char *keyName, char *zip_file, int javascript, - } - - /* rsa/dsa to zip */ -- sprintf(tempfn, "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" -- : "rsa")); -- sprintf(fullfn, "%s/%s", tree, tempfn); -+ count = snprintf(tempfn, sizeof(tempfn), "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" : "rsa")); -+ if (count >= sizeof(tempfn)) { -+ PR_fprintf(errorFD, "unable to write key metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } -+ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); -+ if (count >= sizeof(fullfn)) { -+ PR_fprintf(errorFD, "unable to write key metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } - JzipAdd(fullfn, tempfn, zipfile, compression_level); - - /* Loop through all files & subdirectories, add to archive */ -@@ -93,20 +103,44 @@ SignArchive(char *tree, char *keyName, char *zip_file, int javascript, - } - /* mf to zip */ - strcpy(tempfn, "META-INF/manifest.mf"); -- sprintf(fullfn, "%s/%s", tree, tempfn); -+ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); -+ if (count >= sizeof(fullfn)) { -+ PR_fprintf(errorFD, "unable to write manifest\n"); -+ errorCount++; -+ exit(ERRX); -+ } - JzipAdd(fullfn, tempfn, zipfile, compression_level); - - /* sf to zip */ -- sprintf(tempfn, "META-INF/%s.sf", base); -- sprintf(fullfn, "%s/%s", tree, tempfn); -+ count = snprintf(tempfn, sizeof(tempfn), "META-INF/%s.sf", base); -+ if (count >= sizeof(tempfn)) { -+ PR_fprintf(errorFD, "unable to write sf metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } -+ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); -+ if (count >= sizeof(fullfn)) { -+ PR_fprintf(errorFD, "unable to write sf metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } - JzipAdd(fullfn, tempfn, zipfile, compression_level); - - /* Add the rsa/dsa file to the zip archive normally */ - if (!xpi_arc) { - /* rsa/dsa to zip */ -- sprintf(tempfn, "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" -- : "rsa")); -- sprintf(fullfn, "%s/%s", tree, tempfn); -+ count = snprintf(tempfn, sizeof(tempfn), "META-INF/%s.%s", base, (keyType == dsaKey ? "dsa" : "rsa")); -+ if (count >= sizeof(tempfn)) { -+ PR_fprintf(errorFD, "unable to write key metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } -+ count = snprintf(fullfn, sizeof(fullfn), "%s/%s", tree, tempfn); -+ if (count >= sizeof(fullfn)) { -+ PR_fprintf(errorFD, "unable to write key metadata\n"); -+ errorCount++; -+ exit(ERRX); -+ } - JzipAdd(fullfn, tempfn, zipfile, compression_level); - } - -@@ -408,6 +442,7 @@ static int - manifesto_xpi_fn(char *relpath, char *basedir, char *reldir, char *filename, void *arg) - { - char fullname[FNSIZE]; -+ int count; - - if (verbosity >= 0) { - PR_fprintf(outputFD, "--> %s\n", relpath); -@@ -421,7 +456,10 @@ manifesto_xpi_fn(char *relpath, char *basedir, char *reldir, char *filename, voi - if (!PL_HashTableLookup(extensions, ext)) - return 0; - } -- sprintf(fullname, "%s/%s", basedir, relpath); -+ count = snprintf(fullname, sizeof(fullname), "%s/%s", basedir, relpath); -+ if (count >= sizeof(fullname)) { -+ return 1; -+ } - JzipAdd(fullname, relpath, zipfile, compression_level); - - return 0; diff --git a/poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch b/poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch deleted file mode 100644 index 80b86908e..000000000 --- a/poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c8eadfcdfbc1d5a4799e9a264b0f859cb5954c05 Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Tue, 13 Dec 2016 11:40:47 -0700 -Subject: [PATCH 7/7] Fix compilation for X32 - -X32 uses 32-bit pointers, not 64-bit. - -Signed-off-by: Christopher Larson <chris_larson@mentor.com> - -Upstream-Status: Pending ---- - nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c b/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c -index 2a3301e..d4ade41 100644 ---- a/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c -+++ b/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c -@@ -87,7 +87,11 @@ static poly1305_state_internal INLINE - * - poly1305_aligned_state(poly1305_state *state) - { -+#ifdef __ILP32__ -+ return (poly1305_state_internal *)(((uint32_t)state + 63) & ~63); -+#else - return (poly1305_state_internal *)(((uint64_t)state + 63) & ~63); -+#endif - } - - /* copy 0-63 bytes */ --- -2.8.0 - diff --git a/poky/meta/recipes-support/nss/nss/blank-cert9.db b/poky/meta/recipes-support/nss/nss/blank-cert9.db Binary files differnew file mode 100644 index 000000000..7d4bcf258 --- /dev/null +++ b/poky/meta/recipes-support/nss/nss/blank-cert9.db diff --git a/poky/meta/recipes-support/nss/nss/blank-key4.db b/poky/meta/recipes-support/nss/nss/blank-key4.db Binary files differnew file mode 100644 index 000000000..d47f08d04 --- /dev/null +++ b/poky/meta/recipes-support/nss/nss/blank-key4.db diff --git a/poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch index 86b1b6055..de812d27b 100644 --- a/poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ b/poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch @@ -18,11 +18,11 @@ for more details Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: nss-3.24/nss/coreconf/Werror.mk +Index: nss-3.37.1/nss/coreconf/Werror.mk =================================================================== ---- nss-3.24.orig/nss/coreconf/Werror.mk -+++ nss-3.24/nss/coreconf/Werror.mk -@@ -54,7 +54,7 @@ ifndef WARNING_CFLAGS +--- nss-3.37.1.orig/nss/coreconf/Werror.mk ++++ nss-3.37.1/nss/coreconf/Werror.mk +@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS ifdef CC_IS_CLANG # -Qunused-arguments : clang objects to arguments that it doesn't understand # and fixing this would require rearchitecture diff --git a/poky/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch b/poky/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch deleted file mode 100644 index 8276f89e8..000000000 --- a/poky/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch +++ /dev/null @@ -1,30 +0,0 @@ -# HG changeset patch -# User Daiki Ueno <dueno@redhat.com> -# Date 1516710574 -3600 -# Tue Jan 23 13:29:34 2018 +0100 -# Node ID 27f27ce21c2c6ff5a47fa9e17c438b000366c9c9 -# Parent be1dca5ac80541d3b81a8da9d42854d8b1cceefb -Build Hacl_Poly1305_64.o on aarch64 even with make - -Upstream-Status: Backport -https://bug1432455.bmoattachments.org/attachment.cgi?id=8944691 -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Index: nss-3.35/nss/lib/freebl/Makefile -=================================================================== ---- nss-3.35.orig/nss/lib/freebl/Makefile -+++ nss-3.35/nss/lib/freebl/Makefile -@@ -533,7 +533,12 @@ ifndef NSS_DISABLE_CHACHAPOLY - EXTRA_SRCS += chacha20_vec.c - endif - else -- EXTRA_SRCS += poly1305.c -+ ifeq ($(CPU_ARCH),aarch64) -+ EXTRA_SRCS += Hacl_Poly1305_64.c -+ else -+ EXTRA_SRCS += poly1305.c -+ endif -+ - EXTRA_SRCS += chacha20.c - VERIFIED_SRCS += Hacl_Chacha20.c - endif # x86_64 diff --git a/poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch index 9942bf192..3a817faaa 100644 --- a/poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ b/poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch @@ -6,11 +6,11 @@ pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: nss-3.24/nss/lib/freebl/pqg.c +Index: nss-3.37.1/nss/lib/freebl/pqg.c =================================================================== ---- nss-3.24.orig/nss/lib/freebl/pqg.c -+++ nss-3.24/nss/lib/freebl/pqg.c -@@ -322,8 +322,8 @@ generate_h_candidate(SECItem *hit, mp_in +--- nss-3.37.1.orig/nss/lib/freebl/pqg.c ++++ nss-3.37.1/nss/lib/freebl/pqg.c +@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in static SECStatus addToSeed(const SECItem *seed, diff --git a/poky/meta/recipes-support/nss/nss/system-pkcs11.txt b/poky/meta/recipes-support/nss/nss/system-pkcs11.txt new file mode 100644 index 000000000..1a264e9cc --- /dev/null +++ b/poky/meta/recipes-support/nss/nss/system-pkcs11.txt @@ -0,0 +1,5 @@ +library= +name=NSS Internal PKCS #11 Module +parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' +NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) + diff --git a/poky/meta/recipes-support/nss/nss_3.35.bb b/poky/meta/recipes-support/nss/nss_3.39.bb index 84f1916f3..cdc95c621 100644 --- a/poky/meta/recipes-support/nss/nss_3.35.bb +++ b/poky/meta/recipes-support/nss/nss_3.39.bb @@ -25,13 +25,13 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://nss-fix-nsinstall-build.patch \ file://disable-Wvarargs-with-clang.patch \ file://pqg.c-ULL_addend.patch \ - file://Fix-compilation-for-X32.patch \ - file://nss-build-hacl-poly1305-aarch64.patch \ - file://0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch \ + file://blank-cert9.db \ + file://blank-key4.db \ + file://system-pkcs11.txt \ " -SRC_URI[md5sum] = "9467ec9e65c5aeb3254a50250490f5f7" -SRC_URI[sha256sum] = "f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa" +SRC_URI[md5sum] = "10720fc70fd483de1b085402fb10ed59" +SRC_URI[sha256sum] = "6be64dd76f212415cc8bc34343ac1e7389048db4db9a023a84873c411dc5864b" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" @@ -91,6 +91,8 @@ do_compile() { OS_TEST=ppc64 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + OS_TEST="aarch64" else OS_TEST="${TARGET_ARCH}" fi @@ -146,6 +148,9 @@ do_install() { OS_TEST=ppc64 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + CPU_ARCH=aarch64 + OS_TEST="aarch64" else OS_TEST="${TARGET_ARCH}" fi @@ -210,12 +215,16 @@ do_install_append() { } do_install_append_class-target() { - # Create a blank certificate - mkdir -p ${D}${sysconfdir}/pki/nssdb/ - touch ./empty_password - certutil -N -d ${D}${sysconfdir}/pki/nssdb/ -f ./empty_password - chmod 644 ${D}${sysconfdir}/pki/nssdb/*.db - rm ./empty_password + # It used to call certutil to create a blank certificate with empty password at + # build time, but the checksum of key4.db changes every time when certutil is called. + # It causes non-determinism issue, so provide databases with a blank certificate + # which are originally from output of nss in qemux86-64 build. You can get these + # databases by: + # certutil -N -d sql:/database/path/ --empty-password + install -d ${D}${sysconfdir}/pki/nssdb/ + install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db + install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db + install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt } PACKAGE_WRITE_DEPS += "nss-native" diff --git a/poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch b/poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch index 2fda9dfbb..e902b0b52 100644 --- a/poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch +++ b/poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch @@ -1,4 +1,4 @@ -From c3aa4aae5e9f4adafd9e10d9466f1bc481e0aae6 Mon Sep 17 00:00:00 2001 +From c6bb4b99af39daa3221c3bdc0686987ae0f31693 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 31 Jan 2018 16:47:44 +0200 Subject: [PATCH] LINGUAS: drop the languages for which upstream does not @@ -9,24 +9,21 @@ Upstream has been notified: https://github.com/p11-glue/p11-kit/issues/127 Upstream-Status: Inappropriate [missing upstream distribution files] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- po/LINGUAS | 2 -- 1 file changed, 2 deletions(-) diff --git a/po/LINGUAS b/po/LINGUAS -index 1fc4d53..e9cc5a7 100644 +index 767a806c2e20..6ab48001c409 100644 --- a/po/LINGUAS +++ b/po/LINGUAS -@@ -11,9 +11,7 @@ cy +@@ -12,8 +12,6 @@ cy da de el -en@boldquot - en_GB -en@quot + en_GB eo es - es_CL --- -2.15.1 - diff --git a/poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb b/poky/meta/recipes-support/p11-kit/p11-kit_0.23.14.bb index 57798f402..dd25c3813 100644 --- a/poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb +++ b/poky/meta/recipes-support/p11-kit/p11-kit_0.23.14.bb @@ -9,13 +9,13 @@ DEPENDS = "libtasn1 libffi" SRC_URI = "git://github.com/p11-glue/p11-kit \ file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \ " -SRCREV = "bfb3bd47aa48983f5349479bca598403097ff81c" +SRCREV = "3770793f026e46a000d2d8816d56122598289d5c" S = "${WORKDIR}/git" -# exclude odd minor versions, which are development releases -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" AUTOTOOLS_AUXDIR = "${S}/build/litter" -EXTRA_OECONF = "--without-trust-paths" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[trust-paths] = "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt,--without-trust-paths,,ca-certificates" # This recipe does not use the standard gtk-doc m4 macros, and so the ./configure flags # that control gtk-doc build are non-standard diff --git a/poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb b/poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb index 1eaa261f7..4116efc76 100644 --- a/poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb +++ b/poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb @@ -8,8 +8,6 @@ HOMEPAGE = "http://www.gnupg.org/related_software/pinentry/index.en.html" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" -inherit autotools pkgconfig - DEPENDS = "gettext-native libassuan libgpg-error" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" @@ -21,9 +19,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" -EXTRA_OECONF = "--disable-rpath --disable-dependency-tracking \ - --disable-pinentry-qt5 \ -" +inherit autotools pkgconfig PACKAGECONFIG ??= "ncurses libcap" @@ -35,4 +31,9 @@ PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ gli #To use libsecret, add meta-gnome PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" +EXTRA_OECONF = " \ + --disable-rpath \ + --disable-pinentry-qt5 \ +" + BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.1.bb b/poky/meta/recipes-support/ptest-runner/ptest-runner_2.2.bb index e5b71c0f0..622d23ba9 100644 --- a/poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.1.bb +++ b/poky/meta/recipes-support/ptest-runner/ptest-runner_2.2.bb @@ -7,8 +7,8 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "16413d71cc06b02a6d859c35a017cc49b88283f7" -PV = "2.1.1+git${SRCPV}" +SRCREV = "49956f65bb53ea2a2c1b394e5e59ffdfcdcc490f" +PV = "2.2+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-support/re2c/re2c/mkdir.patch b/poky/meta/recipes-support/re2c/re2c/mkdir.patch deleted file mode 100644 index d59f01b36..000000000 --- a/poky/meta/recipes-support/re2c/re2c/mkdir.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Submitted (https://github.com/skvadrik/re2c/pull/191) -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From bccc10c60523f88c8f81413151cdcd612eb16198 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Mon, 31 Jul 2017 15:43:41 +0100 -Subject: [PATCH] Makefile.am: create target directory before writing into it - -In some situations src/parse/ may not exist before a file is copied into the -directory. Ensure that this doesn't happen by creating the directory first. ---- - re2c/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/re2c/Makefile.am b/re2c/Makefile.am -index 3b3b2c5e..0707fc5a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -187,6 +187,7 @@ CLEANFILES = \ - $(DOC) - - $(AUTOGEN_PARSER): $(CUSTOM_PARSER) -+ $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN) if test $(BISON) = "no"; \ - then \ - cp $(top_srcdir)/$(BOOTSTRAP_PARSER) $@ && \ -@@ -211,6 +212,7 @@ $(BOOTSTRAP_PARSER): $(CUSTOM_PARSER) - $(top_srcdir)/$(CUSTOM_PARSER); - - .re.cc: -+ $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN) if test -x $(RE2C); \ - then \ - $(top_builddir)/$(RE2C) $(RE2CFLAGS) -o $@ $< && \ --- -2.11.0 diff --git a/poky/meta/recipes-support/re2c/re2c_0.16.bb b/poky/meta/recipes-support/re2c/re2c_1.0.1.bb index 50dd7b7d2..4ed8d257a 100644 --- a/poky/meta/recipes-support/re2c/re2c_0.16.bb +++ b/poky/meta/recipes-support/re2c/re2c_1.0.1.bb @@ -5,10 +5,9 @@ SECTION = "devel" LICENSE = "PD" LIC_FILES_CHKSUM = "file://README;beginline=146;md5=881056c9add17f8019ccd8c382ba963a" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://mkdir.patch" -SRC_URI[md5sum] = "3bf508fabd52ed7334647d0ccb956e8d" -SRC_URI[sha256sum] = "48c12564297641cceb5ff05aead57f28118db6277f31e2262437feba89069e84" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "e2c6cf52fc6a21595f21bc82db5324f8" +SRC_URI[sha256sum] = "605058d18a00e01bfc32aebf83af35ed5b13180b4e9f279c90843afab2c66c7c" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service b/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service index b94ad5020..cb8102442 100644 --- a/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service +++ b/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service @@ -1,5 +1,8 @@ [Unit] Description=Hardware RNG Entropy Gatherer Daemon +DefaultDependencies=no +After=systemd-udev-settle.service +Before=sysinit.target [Service] ExecStart=@SBINDIR@/rngd -f -r /dev/urandom diff --git a/poky/meta/recipes-support/rng-tools/rng-tools_5.bb b/poky/meta/recipes-support/rng-tools/rng-tools_5.bb index b3c9fd974..6765667a5 100644 --- a/poky/meta/recipes-support/rng-tools/rng-tools_5.bb +++ b/poky/meta/recipes-support/rng-tools/rng-tools_5.bb @@ -16,13 +16,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/${BP}.tar.gz \ 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 systemd PACKAGECONFIG = "libgcrypt" @@ -50,6 +43,6 @@ do_install_append() { } INITSCRIPT_NAME = "rng-tools" -INITSCRIPT_PARAMS = "start 30 2 3 4 5 . stop 30 0 6 1 ." +INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ." SYSTEMD_SERVICE_${PN} = "rngd.service" diff --git a/poky/meta/recipes-support/serf/serf/0003-gen_def.patch b/poky/meta/recipes-support/serf/serf/0003-gen_def.patch index e37e9034b..0ea2cca9d 100644 --- a/poky/meta/recipes-support/serf/serf/0003-gen_def.patch +++ b/poky/meta/recipes-support/serf/serf/0003-gen_def.patch @@ -3,6 +3,11 @@ From: Khem Raj <raj.khem@gmail.com> Date: Mon, 3 Sep 2018 11:12:27 -0700 Subject: [PATCH] gen_def +This is partial port because half of this patch is already present in our +patches + +Upstream-Status: Backport [https://github.com/apache/serf/commit/8f07c9626106873a594fd07e7c257e9080d8660b] +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- SConstruct | 2 ++ 1 file changed, 2 insertions(+) diff --git a/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb b/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb new file mode 100644 index 000000000..9fc210b71 --- /dev/null +++ b/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb @@ -0,0 +1,7 @@ +require shared-mime-info.inc + +SRC_URI += "file://parallelmake.patch \ + file://install-data-hook.patch" + +SRC_URI[md5sum] = "418c2ced9dc4dd5ca8b06a755e6d64e9" +SRC_URI[sha256sum] = "c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf" diff --git a/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.9.bb b/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.9.bb deleted file mode 100644 index f9b273edc..000000000 --- a/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.9.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] = "45103889b91242850aa47f09325e798b" -SRC_URI[sha256sum] = "5c0133ec4e228e41bdf52f726d271a2d821499c2ab97afd3aa3d6cf43efcdc83" diff --git a/poky/meta/recipes-support/sqlite/files/CVE-2018-8740.patch b/poky/meta/recipes-support/sqlite/files/CVE-2018-8740.patch deleted file mode 100644 index 5d95e37af..000000000 --- a/poky/meta/recipes-support/sqlite/files/CVE-2018-8740.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 19aed4d2be46c4516caf2bee31f79044bbd1d57d Mon Sep 17 00:00:00 2001 -From: Sinan Kaya <okaya@kernel.org> -Date: Fri, 21 Sep 2018 16:22:01 +0000 -Subject: [PATCH] Detect databases whose schema is corrupted using a CREATE TABLE AS statement and issue an appropriate error message - -Upstream-Status: Backport [ https://www.sqlite.org/cgi/src/vdiff?from=1774f1c3baf0bc3d&to=d75e67654aa9620b&diff=1&w] -Signed-off-by: Sinan Kaya <okaya@kernel.org> ---- - sqlite3.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 73c69ef..6863bc6 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -103474,8 +103474,6 @@ SQLITE_PRIVATE void sqlite3EndTable( - p = pParse->pNewTable; - if( p==0 ) return; - -- assert( !db->init.busy || !pSelect ); -- - /* If the db->init.busy is 1 it means we are reading the SQL off the - ** "sqlite_master" or "sqlite_temp_master" table on the disk. - ** So do not write to the disk again. Extract the root page number -@@ -103486,6 +103484,10 @@ SQLITE_PRIVATE void sqlite3EndTable( - ** table itself. So mark it read-only. - */ - if( db->init.busy ){ -+ if( pSelect ){ -+ sqlite3ErrorMsg(pParse, ""); -+ return; -+ } - p->tnum = db->init.newTnum; - if( p->tnum==1 ) p->tabFlags |= TF_Readonly; - } -@@ -117813,7 +117815,7 @@ static void corruptSchema( - char *z; - if( zObj==0 ) zObj = "?"; - z = sqlite3MPrintf(db, "malformed database schema (%s)", zObj); -- if( zExtra ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra); -+ if( zExtra && zExtra[0] ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra); - sqlite3DbFree(db, *pData->pzErrMsg); - *pData->pzErrMsg = z; - } --- -2.19.0 - diff --git a/poky/meta/recipes-support/sqlite/sqlite3.inc b/poky/meta/recipes-support/sqlite/sqlite3.inc index 30847b958..1834867d1 100644 --- a/poky/meta/recipes-support/sqlite/sqlite3.inc +++ b/poky/meta/recipes-support/sqlite/sqlite3.inc @@ -36,14 +36,10 @@ EXTRA_OECONF = " \ CFLAGS_append = " -fPIC" # pread() is in POSIX.1-2001 so any reasonable system must surely support it -BUILD_CFLAGS += "-DUSE_PREAD" -BUILDSDK_CFLAGS += "-DUSE_PREAD" -TARGET_CFLAGS += "-DUSE_PREAD" +CFLAGS += "-DUSE_PREAD" # Provide column meta-data API -BUILD_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" -BUILDSDK_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" -TARGET_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" +CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" diff --git a/poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb b/poky/meta/recipes-support/sqlite/sqlite3_3.23.1.bb index b90f89886..3755761d7 100644 --- a/poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb +++ b/poky/meta/recipes-support/sqlite/sqlite3_3.23.1.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed0 SRC_URI = "\ http://www.sqlite.org/2018/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - file://CVE-2018-8740.patch \ " -SRC_URI[md5sum] = "96b5648d542e8afa6ab7ffb8db8ddc3d" -SRC_URI[sha256sum] = "2824ab1238b706bc66127320afbdffb096361130e23291f26928a027b885c612" +SRC_URI[md5sum] = "99a51b40a66872872a91c92f6d0134fa" +SRC_URI[sha256sum] = "92842b283e5e744eff5da29ed3c69391de7368fccc4d0ee6bf62490ce555ef25" diff --git a/poky/meta/recipes-support/vte/vte_0.50.2.bb b/poky/meta/recipes-support/vte/vte_0.52.2.bb index 8b9ee33ec..7324c9c63 100644 --- a/poky/meta/recipes-support/vte/vte_0.50.2.bb +++ b/poky/meta/recipes-support/vte/vte_0.52.2.bb @@ -11,8 +11,8 @@ inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ " -SRC_URI[archive.md5sum] = "1912cfd1d9cdd30cebeb908507acadc5" -SRC_URI[archive.sha256sum] = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf" +SRC_URI[archive.md5sum] = "de8181350dccb010e915e366bdd06d18" +SRC_URI[archive.sha256sum] = "0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" @@ -38,8 +38,6 @@ PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" CFLAGS += "-D_GNU_SOURCE" -EXTRA_OECONF = "--disable-test-application" - # libtool adds "-nostdlib" when g++ is used. This breaks PIE builds. # Use libtool-cross (which has a hack to prevent that) instead. EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" |
