diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-03-06 00:25:55 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-03-15 14:02:06 +0300 |
| commit | 90fd73cb556c0db84e45514413a68f9c5e1aea22 (patch) | |
| tree | 6c7246c5c56fe53360bdcedf98b1331e5730fd34 /poky/meta/recipes-support/libssh2 | |
| parent | 97771a30474a164ca08efd09209692a1fb8a4574 (diff) | |
| download | openbmc-90fd73cb556c0db84e45514413a68f9c5e1aea22.tar.xz | |
poky: subtree update:488e39b623..c8075ed8f1
Alejandro Hernandez Samaniego (1):
bitbake: fetch2/wget: Avoid crashing when connection drops mid checkstatus
Alexander Kanavin (17):
webkit/wpe: only check even versions
syslinux: use NO_INLINE_FUNCS in CFLAGS
dosfstools: update 4.1 -> 4.2
e2fsprogs: update 1.45.7 -> 1.46.1
elfutils: update 0.182 -> 0.183
meson: update 0.56.2 -> 0.57.1
perl: update 5.32.0 -> 5.32.1
openssl: address ptest failures caused by perl 5.32.1
ptest-perl/run-ptest: address failures caused by perl 5.32.1
pango: update 1.48.0 -> 1.48.2
vulkan-samples: update to latest revision
webkitgtk: update 2.30.4 -> 2.30.5
libgcrypt: update 1.8.7 -> 1.9.2
pinentry: update 1.1.0 -> 1.1.1
libmd: add a recipe
libbsd: udpate 0.10.0 -> 0.11.3
scripts/lib/wic/partition.py: do not set FAT size
Charlie Davies (2):
bitbake: bitbake: providers: fix incorrect return type bug
bitbake: bitbake: providers: use pythonic empty list check
Colin Finck (1):
dosfstools: Build --without-iconv
Diego Santa Cruz (4):
packagegroup-base: use amixer instead of alsamixer
packagegroup-base: do not force hdparm and e2fsprogs
sysklogd: do not open any network sockets by default
createrepo-c: set path to magic database for native and nativesdk
Dorinda (7):
gdb-common.inc: add PACKAGECONFIG for debuginfod
meta/recipes-bsp: Add HOMEPAGE / DESCRIPTION
meta/recipes-connectivity: Add HOMEPAGE / DESCRIPTION
meta/recipes-devtools: Add HOMEPAGE / DESCRIPTION
meta/recipes-core: Add HOMEPAGE / DESCRIPTION
scripts/oe-debuginfod: script that fetches package manager directory
binutils: add PACKAGECONFIG for debuginfod
Florian Bezdeka (1):
wic: Warn if an ext filesystem affected by the Y2038 problem is used
He Zhe (1):
glibc: Disable CPU ISA level requirement check
Jan Brzezanski (1):
bitbake: Force parser shutdown after catching an exception
Jan-Simon Moeller (1):
Add core-image-weston to reproducible build tests
Jan-Simon Möller (2):
reproducible_builds: SOURCE_DATE_EPOCH should not be 0
oe-selftests: add rpm to reproducible build selftest
Jate Sujjavanich (1):
iputils: Fix cap_net_raw for installed binaries
Joel Stanley (1):
conf/machine-sdk: Add ppc64le SDK machine
Joshua Watt (2):
bitbake: event: Fix broken builds when multiconfig has a hyphen in the name
diffoscope: Add python3-rpm as dependency
Khem Raj (23):
nettle: Upgrade to 3.7.1
runqemu: Add new option to disable vga emulation
linuxloader: Deal with little-endian ppc64 ldso name
musl: Install /lib directory
goarch.bbclass: Fix ppc64le detection
bitbake.conf: Do not use lib64 for baselib on musl/ppc64
glibc: Build for power9 cpu when using powerpc64le tunes
tune-power9: Enable qemu-usermode
selftest: Replace building dep tool with direnv
goarch: Use softfloat instead of 387 for 386 goarch
go: Upgrade compiler to 1.16 major release
go: Enable CGO and pie buildmode on rv64
go-helloworld: Turn into a go module enabled build
binutils: Upgrade to 2.36.1 release
llvm: Upgrade to 11.1.0 release
oeqa/pam: Need shadow installed for the tests
glibc: Fix rawmemchr
rxvt-unicode: Do not use throw specifications
llvm: Fix build with c++17
dtc: Fix array-bounds error
puzzles: Fix stringop-overflow warning
igt-gpu-tools: Fix warnings with gcc 11
kea: Fix configure test error with gcc11
Klaus Heinrich Kiwi (1):
kernel-fitimage: Don't use unit addresses on FIT
Martin Jansa (3):
sstatesig.py: show an error instead of warning when sstate manifest isn't found
glib-2.0: replace THISDIR instead of COREBASE in find_meson_cross_files --cross-file paths
coreutils: use u-a for base32
Meh Mbeh Ida Delphine (7):
licenses: Update license file to match current SPDX names
recipes-gnome: Add missing HOMEPAGE and DESCRIPTION for recipes
recipes-graphics: Add missing HOMEPAGE and DESCRIPTION for recipes.
recipes-kernel: Add missing HOMEPAGE and DESCRIPTION for recipes.
recipes-multimedia: Add missing HOMEPAGE and DESCRIPTION for recipes.
recipes-sato: Add missing HOMEPAGE and DESCRIPTION for recipes
recipes-support: Add missing HOMEPAGE and DESCRIPTION for recipes
Michael Halstead (2):
releases: update to include 3.2.2
releases: update to include 3.1.6
Mike Crowe (2):
externalsrc: Pass through npmsw URIs in SRC_URI
gcc-sanitizers: Move content from gcclibdir into libdir
Milan Shah (1):
report-error.bbclass: Add layer and bitbake version info to error report
Mingli Yu (1):
python3: Fix python interpreter line length for nativesdk
Oleksandr Kravchuk (4):
python3: update to 3.9.2
ell: update to 0.38
net-tools: update to 2.10
busybox: update 1.33.0
Peter Kjellerstedt (1):
asciidoc: Switch to using the main branch
Randy MacLeod (3):
Add libgit2, libssh2 from meta-oe for rust
libssh2: pull in additional commits from meta-oe
libgit2: pull in updates from meta-oe
Richard Purdie (61):
maintainers: Update email address for Victor
figures/yp-how-it-works-new-diagram.png: Fix spelling error underline
recipes: Update common-licenses references to match new names
licenses.conf: Add missing 'or-later' mappings
licenses: Fix canonical license for 'or-later' handling
licenses: Update INCOMPATIBLE_LICENSE for 'or-later' handling
license_image: Don't canonicalise INCOMPATIBLE_LICENSE
selftest/incompatible_lic: Update the tests after the 'or-later' license handling changes
gma500-gfx-check: Update licence to match changes in OE-Core
diffoscope: Upgrade 166 -> 167
linux-firmware: upgrade 20201218 -> 20210208
python3-pycryptodome/pycryptodomex: upgrade 3.9.9 -> 3.10.1
apt: Upgrade 1.8.2.1 -> 1.8.2.2
python3-magic: upgrade 0.4.18 -> 0.4.20
libproxy: Avoid /etc/sysconfig determinism issue
rsync: Fix a file sorting determinism issue
rsync: Fix group name determinism issue
libcap-ng: Fix python bindings determinism issue
libcap-ng: Replace python patch with a better fix
libevdev: Update patch status to backport
ca-certificates: Clean up two patches and submit upstream
libpcre: Drop old/stale patch
diffoscope: Ensure the correct magic file is used
babeltrace2: Fix reproducibility
reproducible: Improve SOURCE_DATE_EPOCH_FALLBACK handling
selftest/reproducible: Remove exclusions for recipes which now reproduce
diffoscope: Ensure rpm is configured correctly
package/package_rpm: Disable font_provides configuration for reproducibilty
fonts: Bump HASHEQUIV_HASH_VERSION after rpmdeps change
reproduce: Fix exclusion list for rpm
maintainers: add entries libssh2 libgit2
cups: Fix reproducibility issues
gcr: Fix reproducibility issue
rsync: Update patch status
gtk-doc: Fix reproducibility issue
epiphany: Fix reproducibility issue
epiphany: Fix distributor contamination from /etc/os-release
gst-devtools: Fix reproducibility issue
parted: Fix reproducibility issue
libsecret: Improve determimism
libhandy: Fix reproducibility issue
selftest/reproducible: Don't call sync between each file compare
image: Add directories to PSEUDO_IGNORE_PATHS
populate_sdk: Add directories to PSEUDO_IGNORE_PATHS
bitbake.conf/image: Move image specific PSEUDO_IGNORE_PATHS to image class
bitbake.conf: Split PSEUDO_IGNORE_PATHS to be more readable
bootchart2: Fix manpage reproducibility issue
igt-gpu-tools: Fix reproducibility issue
libid3tag: Fix reproducibility issue
apr-util: Fix CFLAGS used in build
gstreamer1.0-python: Set internal python library path correcty
diffoscope: Upgrade 167 -> 168
syslinux: Fix reproducibility issues
swig: Fix reproducibility issue
efivar: Fix reproducibility issue
systemd-bootchart: Disable LTO to fix reproducibility
selftest/reproducible: Add ability to pull some objects from sstate
qemu: Determinism fixes
lttng: Fix reproducibility issues
ltp: Fixing determinism issues
python3-cython: Remove build paths from debug sources
Ross Burton (1):
grub: shuffle packaging for aarch64 builds
Scott Murray (1):
screen: fix CVE-2021-26937
Stefan Ghinea (2):
wpa-supplicant: fix CVE-2021-0326
cups: fix CVE-2020-10001
Tomasz Dziendzielski (1):
bitbake.conf: Introduce FAKEROOTLOGS variable used by bitbake to print pseudo.log
Vivien Didelot (1):
systemd: Fix importd requirements comment
Wang Mingyu (12):
util-linux: upgrade 2.36.1 -> 2.36.2
xkeyboard-config: upgrade 2.31 -> 2.32
liburcu: upgrade 0.12.1 -> 0.12.2
lttng-ust: upgrade 2.12.0 -> 2.12.1
openssl: upgrade 1.1.1i -> 1.1.1j
bluez5: upgrade 5.55 -> 5.56
libxcrypt: upgrade 4.4.17 -> 4.4.18
nfs-utils: upgrade 2.5.2 -> 2.5.3
ccache: upgrade 4.1 -> 4.2
eudev: upgrade 3.2.9 -> 3.2.10
glslang: upgrade 11.1.0 -> 11.2.0
iproute2: upgrade 5.10.0 -> 5.11.0
Yi Fan Yu (3):
libnl: add ptest support
gdb: Remove "ALLOW_EMPTY_gdbserver" on riscv
valgrind: Increase timeout duration 30 -> 90 s
zhengruoqin (8):
glibc-package.inc: Fix arm multlib header issue with struct_stat.h
glibc: Unify wordsize.h with arm multilibs
libxcrypt-compat: upgrade 4.4.17 -> 4.4.18
log4cplus: upgrade 2.0.5 -> 2.0.6
python3-cython: upgrade 0.29.21 -> 0.29.22
python3-git: upgrade 3.1.13 -> 3.1.14
sysvinit: upgrade 2.98 -> 2.99
python3-magic: upgrade 0.4.20 -> 0.4.22
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I69b5102d327da636a9c36642b46841e4341368d8
Diffstat (limited to 'poky/meta/recipes-support/libssh2')
5 files changed, 268 insertions, 0 deletions
diff --git a/poky/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch b/poky/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch new file mode 100644 index 000000000..5ff9bf846 --- /dev/null +++ b/poky/meta/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch @@ -0,0 +1,46 @@ +From f9e3e2ee7b18ba5bb8efe083171f3e701eb0a663 Mon Sep 17 00:00:00 2001 +From: Your Name <you@example.com> +Date: Mon, 28 Dec 2020 02:08:03 +0000 +Subject: [PATCH] Don't let host enviroment to decide if a test is build + +test ssh2.sh need sshd, for cross compile, we need it on target, so +don't use SSHD on host to decide weither to build a test + +Upstream-Status: Inappropriate[oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + tests/Makefile.am | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index dc0922f..6cbc35d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,16 +1,12 @@ + AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src + LDADD = ../src/libssh2.la + +-if SSHD + noinst_PROGRAMS = ssh2 + ssh2_SOURCES = ssh2.c +-endif + + ctests = simple$(EXEEXT) + TESTS = $(ctests) mansyntax.sh +-if SSHD + TESTS += ssh2.sh +-endif + check_PROGRAMS = $(ctests) + + TESTS_ENVIRONMENT = SSHD=$(SSHD) EXEEXT=$(EXEEXT) +@@ -38,4 +34,4 @@ if OPENSSL + # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c + # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c + EXTRA_DIST += test_public_key_auth_succeeds_with_correct_rsa_openssh_key.c +-endif +\ No newline at end of file ++endif +-- +2.20.1 + diff --git a/poky/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch b/poky/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch new file mode 100644 index 000000000..1128c7ea0 --- /dev/null +++ b/poky/meta/recipes-support/libssh2/files/0001-configure-Conditionally-undefine-backend-m4-macro.patch @@ -0,0 +1,30 @@ +From efe7101786193eaddb749c0583af6b54aec6f289 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Feb 2021 18:45:16 -0800 +Subject: [PATCH] configure: Conditionally undefine backend m4 macro + +Unlike the M4 builtin, this macro fails if macro is not defined +therefore recover the behavior of the builtin. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index fe5054a..758f8c2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -127,7 +127,7 @@ fi + m4_set_foreach([crypto_backends], [backend], + [AM_CONDITIONAL(m4_toupper(backend), test "$found_crypto" = "backend")] + ) +-m4_undefine([backend]) ++m4_ifdef([backend], [m4_undefine([backend])]) + + + # libz +-- +2.30.0 + diff --git a/poky/meta/recipes-support/libssh2/files/CVE-2019-17498.patch b/poky/meta/recipes-support/libssh2/files/CVE-2019-17498.patch new file mode 100644 index 000000000..001080072 --- /dev/null +++ b/poky/meta/recipes-support/libssh2/files/CVE-2019-17498.patch @@ -0,0 +1,131 @@ +From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001 +From: Will Cosgrove <will@panic.com> +Date: Fri, 30 Aug 2019 09:57:38 -0700 +Subject: [PATCH] packet.c: improve message parsing (#402) + +* packet.c: improve parsing of packets + +file: packet.c + +notes: +Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST. + +Upstream-Status: Backport +CVE: CVE-2019-17498 +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + src/packet.c | 68 ++++++++++++++++++++++------------------------------ + 1 file changed, 29 insertions(+), 39 deletions(-) + +diff --git a/src/packet.c b/src/packet.c +index 38ab629..2e01bfc 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + size_t datalen, int macstate) + { + int rc = 0; +- char *message = NULL; +- char *language = NULL; ++ unsigned char *message = NULL; ++ unsigned char *language = NULL; + size_t message_len = 0; + size_t language_len = 0; + LIBSSH2_CHANNEL *channelp = NULL; +@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + + case SSH_MSG_DISCONNECT: + if(datalen >= 5) { +- size_t reason = _libssh2_ntohu32(data + 1); ++ uint32_t reason = 0; ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr++; /* advance past type */ + +- if(datalen >= 9) { +- message_len = _libssh2_ntohu32(data + 5); ++ _libssh2_get_u32(&buf, &reason); ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + +- if(message_len < datalen-13) { +- /* 9 = packet_type(1) + reason(4) + message_len(4) */ +- message = (char *) data + 9; +- +- language_len = +- _libssh2_ntohu32(data + 9 + message_len); +- language = (char *) data + 9 + message_len + 4; +- +- if(language_len > (datalen-13-message_len)) { +- /* bad input, clear info */ +- language = message = NULL; +- language_len = message_len = 0; +- } +- } +- else +- /* bad size, clear it */ +- message_len = 0; +- } + if(session->ssh_msg_disconnect) { +- LIBSSH2_DISCONNECT(session, reason, message, +- message_len, language, language_len); ++ LIBSSH2_DISCONNECT(session, reason, (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } ++ + _libssh2_debug(session, LIBSSH2_TRACE_TRANS, + "Disconnect(%d): %s(%s)", reason, + message, language); +@@ -539,24 +529,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + int always_display = data[1]; + + if(datalen >= 6) { +- message_len = _libssh2_ntohu32(data + 2); +- +- if(message_len <= (datalen - 10)) { +- /* 6 = packet_type(1) + display(1) + message_len(4) */ +- message = (char *) data + 6; +- language_len = _libssh2_ntohu32(data + 6 + +- message_len); +- +- if(language_len <= (datalen - 10 - message_len)) +- language = (char *) data + 10 + message_len; +- } ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr += 2; /* advance past type & always display */ ++ ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + } + + if(session->ssh_msg_debug) { +- LIBSSH2_DEBUG(session, always_display, message, +- message_len, language, language_len); ++ LIBSSH2_DEBUG(session, always_display, ++ (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } + } ++ + /* + * _libssh2_debug will actually truncate this for us so + * that it's not an inordinate about of data +@@ -579,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + uint32_t len = 0; + unsigned char want_reply = 0; + len = _libssh2_ntohu32(data + 1); +- if(datalen >= (6 + len)) { ++ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { + want_reply = data[5 + len]; + _libssh2_debug(session, + LIBSSH2_TRACE_CONN, +-- +2.17.1 + diff --git a/poky/meta/recipes-support/libssh2/files/run-ptest b/poky/meta/recipes-support/libssh2/files/run-ptest new file mode 100644 index 000000000..5fd7ec65f --- /dev/null +++ b/poky/meta/recipes-support/libssh2/files/run-ptest @@ -0,0 +1,8 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd tests +for test in simple ssh2.sh mansyntax.sh +do + ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test +done diff --git a/poky/meta/recipes-support/libssh2/libssh2_1.9.0.bb b/poky/meta/recipes-support/libssh2/libssh2_1.9.0.bb new file mode 100644 index 000000000..0b8ccbd21 --- /dev/null +++ b/poky/meta/recipes-support/libssh2/libssh2_1.9.0.bb @@ -0,0 +1,53 @@ +SUMMARY = "A client-side C library implementing the SSH2 protocol" +HOMEPAGE = "http://www.libssh2.org/" +SECTION = "libs" + +DEPENDS = "zlib" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" + +SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ + file://CVE-2019-17498.patch \ + file://0001-configure-Conditionally-undefine-backend-m4-macro.patch \ + file://run-ptest \ +" + +SRC_URI_append_ptest = " file://0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch" + +SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" +SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" + +inherit autotools pkgconfig ptest + +EXTRA_OECONF += "\ + --with-libz \ + --with-libz-prefix=${STAGING_LIBDIR} \ + " + +# only one of openssl and gcrypt could be set +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[openssl] = "--with-crypto=openssl --with-libssl-prefix=${STAGING_LIBDIR}, , openssl" +PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR}, , libgcrypt" + +BBCLASSEXTEND = "native nativesdk" + +# required for ptest on documentation +RDEPENDS_${PN}-ptest = "man-db openssh" +RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-en-us" + +do_compile_ptest() { + sed -i "/\$(MAKE) \$(AM_MAKEFLAGS) check-TESTS/d" tests/Makefile + oe_runmake check +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ + cp -rf ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/ssh2.sh ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/etc ${D}${PTEST_PATH}/tests/ + mkdir -p ${D}${PTEST_PATH}/docs + cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/ +} |