diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-05 18:10:57 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-05 18:11:45 +0300 |
commit | 00e122a7b3a839f5ce8b819cb1bfe92cf3781eda (patch) | |
tree | c0c5c46b2f5800ed27322d7da083f0cf438b243b /poky/meta/recipes-devtools/ruby | |
parent | 7fe5760ae59db49e4b8c350cbc192097ba4e5958 (diff) | |
download | openbmc-00e122a7b3a839f5ce8b819cb1bfe92cf3781eda.tar.xz |
poky: subtree update:81f9e815d3..03d4d9d68f
Adrian Bunk (1):
json-c: Don't --enable-rdrand
Alessio Igor Bogani (2):
wic: Using the right rootfs size during prepare_rootfs
rootfs-postcommands: Avoid use of an hard-coded value
Alexander Kanavin (1):
binutils: drop UPSTREAM_VERSION_UNKNOWN
Alexandre Bard (1):
systemd: Expose resolv-conf alternative only when resolved is built
Andre McCurdy (1):
ffmpeg: enable more verbose build logs
André Draszik (4):
ruby: drop long-merged CVE patches
ruby: configure mis-detects isnan/isinf on musl
ruby: fix non-IPv6 support
packagegroup: fix a comment regarding PACKAGE_ARCH
Bruce Ashfield (6):
linux-yocto/5.2: update to v5.2.13
linux-yocto/4.19: update to v4.19.72
linux-yocto/5.2: update to v5.2.14
linux-yocto/5.2: update to v5.2.16
linux-yocto/5.2: update to v5.2.17
yocto-bsps: update to v5.2.17
Böszörményi Zoltán via Openembedded-core (1):
classes/image-live.bbclass: Don't hardcode cpio.gz
Changqing Li (2):
devtool.py: change to do clean before remove-layer
devtool.py: fix buildclean test
Chen Qi (1):
systemd: fix NFS regression
Dan Tran (1):
unzip: Fix CVE-2019-13232
David Reyna (2):
bitbake: toaster: issues in import layer when clicking 'add layer'
bitbake: toaster: improve warnings when adding dependency to packages
Diego Rondini (2):
initramfs-framework: fix var name
initramfs-framework: support PARTLABEL option
Douglas Royds (1):
icecc: Don't use icecc when INHIBIT_DEFAULT_DEPS is set
He Zhe (1):
ltp: Fix hang of cve test cases
Heiko Schocher (1):
kernel.fitimage.bbclass: remove ramdisk_ctype
Jacob Kroon (1):
bitbake: tests/data: Test combinations of _append together with override
Joe Slater (1):
bash-completion: add image feature
Jonathan Marler (1):
package: Multiple shlib_providers for the same file should error
Joshua Watt (8):
classes/reproducible_build: Move SDE deploy to another directory
oeqa: Test multiconfig parsing
bitbake: cookerdata: Add mc conffiles hashes to cache hash
bitbake: hashserve: Add missing import
bitbake: siggen: Fix attribute error when hashserver fails
bitbake: hashserv: Don't daemonize server process
local.conf.sample: Add Hash Equivalence
classes/reproducible_build: Create SDE destination
Khem Raj (7):
musl: Fix riscv64 CAS functions
qemuriscv: Do not blacklist clang anymore
sdk: Install nativesdk locales for all TCLIBC variants
strace: Upgrade to 5.3
packagegroups: All groups are not allarch
musl: Fix __riscv_mc* containers to match glibc
core-image-sato-sdk-ptest: Remove valgrind ptests for riscv
Konrad Scherer (1):
gen-lockedsig-cache: Replace glob lookup with hash to filename lookup
Lei Maohui (1):
bluez5: update patch to fix do_patch error when PATCHTOOL = "patch".
Li Zhou (1):
shadow: use relaxed usernames for all
Limeng (1):
u-boot: add CVE patches for u-boot
Nathan Rossi (2):
oeqa/core/utils/concurrencytest.py: Handle exceptions and details
oeqa/core/case.py: Encode binary data of log
Niclas Svensson (1):
devtool: finish: Keep patches ordered when updating bbappend
Otavio Salvador (1):
mesa: Add freedreno PACKAGECONFIG option
Peter Kjellerstedt (3):
systemd: Make it build with hwdb disabled
devtool: finish: Add suppport for the --no-clean option
lib/oe/lsb: Make sure the distro ID is always lowercased
Randy MacLeod (1):
ffmpeg: update from 4.2 to 4.2.1
Richard Purdie (17):
Revert "meta-extsdk: Either an sstate task is a proper task or it isn't"
sstatesig: Fix hash equivlanency locked signature issues
oeqa/selftest/signing: Fix for hash equivlance server
lib/sstatesig: Fix class inheritance problems
populate_sdk_ext: Fix for hash equiv
bitbake: runqueue: Fix task migration problems
bitbake: siggen: Ensure setscenetasks list is available to worker context
bitbake: runqueue: Change task migration behaviour for rerunning setscene tasks
bitbake: siggen/runqueue: Fix signature mismatch issues
bitbake: siggen: Avoid writing misleading sigdata files
bitbake: runqueue: Save unihashes more frequently
bitbake: runqueue: Small performance optimisation
bitbake: siggen: Remove full path from unitaskhashes keys
bitbake: tests/runqueue: Fix hashserve shutdown race
base: Improve module import error message
sanity.conf: Bump minimum bitbake version
bitbake: bitbake: Bump verison 1.43.1 -> 1.43.2
Robert Yang (6):
cases/bbtests.py: test_bitbake_g(): Check base-files rather than busybox
expect: Fix configure error for nativesdk
net-tools: Fix installed-vs-shipped for nativesdk
expect: Fix buffer overflow error when build in long path
apr: Check for libtoolize rather than libtool
lttng-ust: Fix for --enable-python-agent
Ross Burton (12):
oeqa/selftest/reproducible: test ipkgs too
distcc: clean up the UI install logic
distcc: use --enable-tcp-insecure instead of --make-me-a-botnet
distcc: split into client and server packages
json-c: clean up recipe
json-c: use GitHub for upstream release checking
bitbake: fetch2/git: refactor check for git-lfs command
bitbake: tests/fetch: add test case for git-lfs handling
python3: move runpy to core
pango: fix the failing testiter test case
opkg: remove redundant systemd inherit
lttng-ust: update patch Signed-off-by
Trevor Gamblin (5):
python3-subunit: ensure runtime dependencies are present
python3-pip: ensure pickle is installed
lighttpd: remove fam as a PACKAGECONFIG option
tiff: fix CVE-2019-14973
opkg: remove pathfinder PACKAGECONFIG option
Wang Quanyang (1):
kexec-tools: fix arm kexec failure for __NR_kexec_file_load
Yi Zhao (1):
python: add tk-lib as runtime dependency for python-tkinter
Change-Id: I0570125d49f7e4bc3bbf70508cbfd7e10bdbc032
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/ruby')
4 files changed, 103 insertions, 74 deletions
diff --git a/poky/meta/recipes-devtools/ruby/ruby/0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch b/poky/meta/recipes-devtools/ruby/ruby/0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch new file mode 100644 index 000000000..4cc1fa027 --- /dev/null +++ b/poky/meta/recipes-devtools/ruby/ruby/0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch @@ -0,0 +1,101 @@ +From 3a8189530312e81d6c005c396565f985a47f3383 Mon Sep 17 00:00:00 2001 +From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> +Date: Fri, 8 Feb 2019 07:22:55 +0000 +Subject: [PATCH] configure.ac: check finite,isinf,isnan as macros first +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ruby-core:91487] [Bug #15595] + +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e + +--- +Upstream-Status: Backport [https://github.com/ruby/ruby/commit/74f94b3e6ebf15b76f3b357e754095412b006e94] +(modified so as to apply cleanly here) +Signed-off-by: André Draszik <andre.draszik@jci.com> +--- + aclocal.m4 | 1 + + configure.ac | 13 ++++--------- + tool/m4/ruby_replace_funcs.m4 | 13 +++++++++++++ + 3 files changed, 18 insertions(+), 9 deletions(-) + create mode 100644 tool/m4/ruby_replace_funcs.m4 + +diff --git a/aclocal.m4 b/aclocal.m4 +index 18ba297b05..2a907b3467 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -13,3 +13,4 @@ + + m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) + m4_include([acinclude.m4]) ++m4_include([tool/m4/ruby_replace_funcs.m4]) +diff --git a/configure.ac b/configure.ac +index 8a7cee55b8..b97c5b3cc9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1189,9 +1189,6 @@ main() + ac_cv_func_fsync=yes + ac_cv_func_seekdir=yes + ac_cv_func_telldir=yes +- ac_cv_func_isinf=yes +- ac_cv_func_isnan=yes +- ac_cv_func_finite=yes + ac_cv_func_lchown=yes + ac_cv_func_link=yes + ac_cv_func_readlink=yes +@@ -1239,9 +1236,6 @@ main() + [netbsd*], [ LIBS="-lm $LIBS" + ], + [dragonfly*], [ LIBS="-lm $LIBS" +- # isinf() and isnan() are macros on DragonFly. +- ac_cv_func_isinf=yes +- ac_cv_func_isnan=yes + ], + [aix*],[ LIBS="-lm $LIBS" + ac_cv_func_round=no +@@ -2213,11 +2207,8 @@ AC_REPLACE_FUNCS(dup2) + AC_REPLACE_FUNCS(erf) + AC_REPLACE_FUNCS(explicit_bzero) + AC_REPLACE_FUNCS(ffs) +-AC_REPLACE_FUNCS(finite) + AC_REPLACE_FUNCS(flock) + AC_REPLACE_FUNCS(hypot) +-AC_REPLACE_FUNCS(isinf) +-AC_REPLACE_FUNCS(isnan) + AC_REPLACE_FUNCS(lgamma_r) + AC_REPLACE_FUNCS(memmove) + AC_REPLACE_FUNCS(nextafter) +@@ -2229,6 +2220,10 @@ AC_REPLACE_FUNCS(strlcpy) + AC_REPLACE_FUNCS(strstr) + AC_REPLACE_FUNCS(tgamma) + ++RUBY_REPLACE_FUNC([finite], [@%:@include <math.h>]) ++RUBY_REPLACE_FUNC([isinf], [@%:@include <math.h>]) ++RUBY_REPLACE_FUNC([isnan], [@%:@include <math.h>]) ++ + # for missing/setproctitle.c + AS_CASE(["$target_os"], + [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)], +diff --git a/tool/m4/ruby_replace_funcs.m4 b/tool/m4/ruby_replace_funcs.m4 +new file mode 100644 +index 0000000000..d0612e29a0 +--- /dev/null ++++ b/tool/m4/ruby_replace_funcs.m4 +@@ -0,0 +1,13 @@ ++# -*- Autoconf -*- ++dnl RUBY_REPLACE_FUNC [func] [included] ++AC_DEFUN([RUBY_REPLACE_FUNC], [dnl ++ AC_CHECK_DECL([$1],dnl ++ [AC_DEFINE(AS_TR_CPP(HAVE_[$1]))],dnl ++ [AC_REPLACE_FUNCS($1)],dnl ++ [$2])dnl ++]) ++ ++dnl RUBY_REPLACE_FUNCS [funcs] [included] ++AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl ++ m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl ++]) +-- +2.23.0.rc1 + diff --git a/poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9226.patch b/poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9226.patch deleted file mode 100644 index 89437bba7..000000000 --- a/poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9226.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b4bf968ad52afe14e60a2dc8a95d3555c543353a Mon Sep 17 00:00:00 2001 -From: "K.Kosako" <kosako@sofnec.co.jp> -Date: Thu, 18 May 2017 17:05:27 +0900 -Subject: [PATCH] fix #55 : check too big code point value for single byte - value in next_state_val() - ---- - regparse.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- end of original header - -CVE: CVE-2017-9226 - -Add check for octal number bigger than 255. - -Upstream-Status: Pending -Signed-off-by: Joe Slater <joe.slater@windriver.com> - - ---- ruby-2.4.1.orig/regparse.c -+++ ruby-2.4.1/regparse.c -@@ -4450,6 +4450,9 @@ next_state_val(CClassNode* cc, CClassNod - switch (*state) { - case CCS_VALUE: - if (*type == CCV_SB) { -+ if (*from > 0xff) -+ return ONIGERR_INVALID_CODE_POINT_VALUE; -+ - BITSET_SET_BIT_CHKDUP(cc->bs, (int )(*from)); - if (IS_NOT_NULL(asc_cc)) - BITSET_SET_BIT(asc_cc->bs, (int )(*from)); diff --git a/poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch b/poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch deleted file mode 100644 index d8bfba486..000000000 --- a/poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3b63d12038c8d8fc278e81c942fa9bec7c704c8b Mon Sep 17 00:00:00 2001 -From: "K.Kosako" <kosako@sofnec.co.jp> -Date: Wed, 24 May 2017 13:43:25 +0900 -Subject: [PATCH] fix #60 : invalid state(CCS_VALUE) in parse_char_class() - ---- - regparse.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- end of original header - -CVE: CVE-2017-9228 - -Upstream-Status: Inappropriate [not author] -Signed-off-by: Joe Slater <joe.slater@windriver.com> - -diff --git a/regparse.c b/regparse.c -index 69875fa..1988747 100644 ---- a/regparse.c -+++ b/regparse.c -@@ -4081,7 +4081,9 @@ next_state_class(CClassNode* cc, OnigCodePoint* vs, enum CCVALTYPE* type, - } - } - -- *state = CCS_VALUE; -+ if (*state != CCS_START) -+ *state = CCS_VALUE; -+ - *type = CCV_CLASS; - return 0; - } --- -1.7.9.5 - diff --git a/poky/meta/recipes-devtools/ruby/ruby_2.5.5.bb b/poky/meta/recipes-devtools/ruby/ruby_2.5.5.bb index 8ad59a765..223b0371e 100644 --- a/poky/meta/recipes-devtools/ruby/ruby_2.5.5.bb +++ b/poky/meta/recipes-devtools/ruby/ruby_2.5.5.bb @@ -1,25 +1,19 @@ require ruby.inc SRC_URI += " \ - file://ruby-CVE-2017-9226.patch \ - file://ruby-CVE-2017-9228.patch \ + file://0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://run-ptest \ " SRC_URI[md5sum] = "7e156fb526b8f4bb1b30a3dd8a7ce400" SRC_URI[sha256sum] = "28a945fdf340e6ba04fc890b98648342e3cccfd6d223a48f3810572f11b2514c" -# it's unknown to configure script, but then passed to extconf.rb -# maybe it's not really needed as we're hardcoding the result with -# 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch -UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo" - PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind" PACKAGECONFIG[gmp] = "--with-gmp=yes, --with-gmp=no, gmp" -PACKAGECONFIG[ipv6] = ",--enable-wide-getaddrinfo," +PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6," EXTRA_AUTORECONF += "--exclude=aclocal" |