Skip to contentSkip to conversation

Patch review

PATCH New Steve Sakoman 1 participant 36 messages Nov 19, 2022

lore
Share & tools
lore
#0 lore raw

cover Patch review

Please review this set of patches for langdale and have comments back by end of day Tuesday.

Passed a-full on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/4518

The following changes since commit 9237ffc4feee2dd6ff5bdd672072509ef9e82f6d:

build-appliance-image: Update to langdale head revision (2022-11-14 16:30:13 +0000)

are available in the Git repository at:

https://git.openembedded.org/openembedded-core-contrib stable/langdale-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/langdale-nut

Alex Kiernan (1):
cargo_common.bbclass: Fix typos

Alexander Kanavin (9):
go: submit patch upstream
go: update 1.19 -> 1.19.2
groff: submit patches upstream
tcl: correct patch status
lttng-tools: submit determinism.patch upstream
kea: submit patch upstream
ovmf: correct patches status
libffi: submit patch upstream
rust: submit a rewritten version of crossbeam_atomic.patch upstream

Diego Sueiro (1):
kernel.bbclass: Include randstruct seed assets in
STAGING_KERNEL_BUILDDIR

Jose Quaresma (1):
archiver: avoid using machine variable as it breaks multiconfig

Kai Kang (1):
libuv: fixup SRC_URI

Leon Anavi (1):
get_module_deps3.py: Check attribute '__file__'

Marek Vasut (1):
bluez5: Point hciattach bcm43xx firmware search path to /lib/firmware

Niko Mauno (1):
systemd: Consider PACKAGECONFIG in RRECOMMENDS

Peter Bergin (1):
gptfdisk: remove warning message from target system

Richard Purdie (6):
lttng-modules: upgrade 2.13.5 -> 2.13.7
bitbake.conf: Drop export of SOURCE_DATE_EPOCH_FALLBACK
gcc-shared-source: Fix source date epoch handling
gcc-source: Fix gengtypes race
gcc-source: Drop gengtype manipulation
gcc-source: Ensure deploy_source_date_epoch sstate hash doesn't change

Ross Burton (3):
expat: upgrade to 2.5.0
oeqa/runtime/dnf: rewrite test_dnf_installroot_usrmerge
insane: add codeload.github.com to src-uri-bad check

Sakib Sajal (1):
go: update 1.19.2 -> 1.19.3

Sergei Zhmylev (1):
wic: make ext2/3/4 images reproducible

Steve Sakoman (1):
Revert "sudo: backport fix for CVE-2022-43995"

Tim Orling (1):
python3-mako: upgrade 1.2.2 -> 1.2.3

Wang Mingyu (4):
bind: upgrade 9.18.7 -> 9.18.8
inetutils: upgrade 2.3 -> 2.4
socat: upgrade 1.7.4.3 -> 1.7.4.4
libxcrypt: upgrade 4.4.28 -> 4.4.30

Xiangyu Chen (1):
sudo: upgrade 1.9.11p3 -> 1.9.12p1

 meta/classes-global/insane.bbclass            |  2 +-
 meta/classes-recipe/cargo_common.bbclass      |  4 +-
 meta/classes-recipe/kernel.bbclass            | 16 ++++++
 meta/classes/archiver.bbclass                 |  2 +-
 meta/conf/bitbake.conf                        |  2 +-
 meta/lib/oeqa/runtime/cases/dnf.py            | 32 +++++------
 ...1-avoid-start-failure-with-bind-user.patch |  0
 ...d-V-and-start-log-hide-build-options.patch |  0
 ...ching-for-json-headers-searches-sysr.patch |  0
 .../bind/{bind-9.18.7 => bind-9.18.8}/bind9   |  0
 .../{bind-9.18.7 => bind-9.18.8}/conf.patch   |  0
 .../generate-rndc-key.sh                      |  0
 ...t.d-add-support-for-read-only-rootfs.patch |  0
 .../make-etc-initd-bind-stop-work.patch       |  0
 .../named.service                             |  0
 .../bind/{bind_9.18.7.bb => bind_9.18.8.bb}   |  2 +-
 meta/recipes-connectivity/bluez5/bluez5.inc   |  2 +
 .../inetutils/inetutils/CVE-2022-39028.patch  | 54 -------------------
 .../{inetutils_2.3.bb => inetutils_2.4.bb}    |  3 +-
 .../kea/files/fix-multilib-conflict.patch     |  2 +-
 .../libuv/libuv_1.44.2.bb                     |  2 +-
 ...ck-getprotobynumber_r-with-AC_TRY_LI.patch | 35 ------------
 .../{socat_1.7.4.3.bb => socat_1.7.4.4.bb}    |  6 +--
 .../expat/{expat_2.4.9.bb => expat_2.5.0.bb}  |  2 +-
 ...t_4.4.28.bb => libxcrypt-compat_4.4.30.bb} |  0
 meta/recipes-core/libxcrypt/libxcrypt.inc     |  2 +-
 ...ibxcrypt_4.4.28.bb => libxcrypt_4.4.30.bb} |  0
 ...ovmf-update-path-to-native-BaseTools.patch |  2 +-
 ...ile-adjust-to-build-in-under-bitbake.patch |  7 ++-
 meta/recipes-core/systemd/systemd_251.4.bb    |  4 +-
 ...to-deal-with-minor-change-in-libuuid.patch | 27 ++++++++++
 meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb |  1 +
 .../gcc/gcc-shared-source.inc                 | 10 ++++
 meta/recipes-devtools/gcc/gcc-source.inc      |  9 +++-
 .../go/{go-1.19.inc => go-1.19.3.inc}         |  3 +-
 ...ive_1.19.bb => go-binary-native_1.19.3.bb} |  5 +-
 ...an_1.19.bb => go-cross-canadian_1.19.3.bb} |  0
 .../{go-cross_1.19.bb => go-cross_1.19.3.bb}  |  0
 ...crosssdk_1.19.bb => go-crosssdk_1.19.3.bb} |  0
 ...{go-native_1.19.bb => go-native_1.19.3.bb} |  0
 ...o-runtime_1.19.bb => go-runtime_1.19.3.bb} |  0
 ...ent-based-hash-generation-less-pedan.patch |  8 +--
 .../go/go/filter-build-paths.patch            |  3 +-
 .../go/go/stack-protector.patch               | 32 -----------
 .../go/{go_1.19.bb => go_1.19.3.bb}           |  0
 ...n3-mako_1.2.2.bb => python3-mako_1.2.3.bb} |  2 +-
 .../python/python3/get_module_deps3.py        |  2 +-
 .../rust/rust/crossbeam_atomic.patch          |  2 +-
 .../tcl/fix_non_native_build_issue.patch      |  2 +-
 ...001-Make-manpages-mulitlib-identical.patch |  2 +-
 ...001-replace-perl-w-with-use-warnings.patch |  2 +-
 .../sudo/files/CVE-2022-43995.patch           | 54 -------------------
 meta/recipes-extended/sudo/sudo.inc           |  2 +-
 .../{sudo_1.9.11p3.bb => sudo_1.9.12p1.bb}    |  3 +-
 ...ules_2.13.5.bb => lttng-modules_2.13.7.bb} |  2 +-
 .../lttng/lttng-tools/determinism.patch       |  2 +-
 ...m-sysv-reverted-clang-VFP-mitigation.patch |  2 +-
 scripts/lib/wic/partition.py                  | 29 ++++++++--
 58 files changed, 142 insertions(+), 243 deletions(-)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/0001-avoid-start-failure-with-bind-user.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/bind9 (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/conf.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/generate-rndc-key.sh (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/init.d-add-support-for-read-only-rootfs.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/make-etc-initd-bind-stop-work.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/named.service (100%)
 rename meta/recipes-connectivity/bind/{bind_9.18.7.bb => bind_9.18.8.bb} (97%)
 delete mode 100644 meta/recipes-connectivity/inetutils/inetutils/CVE-2022-39028.patch
 rename meta/recipes-connectivity/inetutils/{inetutils_2.3.bb => inetutils_2.4.bb} (98%)
 delete mode 100644 meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch
 rename meta/recipes-connectivity/socat/{socat_1.7.4.3.bb => socat_1.7.4.4.bb} (89%)
 rename meta/recipes-core/expat/{expat_2.4.9.bb => expat_2.5.0.bb} (91%)
 rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.28.bb => libxcrypt-compat_4.4.30.bb} (100%)
 rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.28.bb => libxcrypt_4.4.30.bb} (100%)
 create mode 100644 meta/recipes-devtools/fdisk/gptfdisk/0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch
 rename meta/recipes-devtools/go/{go-1.19.inc => go-1.19.3.inc} (85%)
 rename meta/recipes-devtools/go/{go-binary-native_1.19.bb => go-binary-native_1.19.3.bb} (81%)
 rename meta/recipes-devtools/go/{go-cross-canadian_1.19.bb => go-cross-canadian_1.19.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-cross_1.19.bb => go-cross_1.19.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-crosssdk_1.19.bb => go-crosssdk_1.19.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-native_1.19.bb => go-native_1.19.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-runtime_1.19.bb => go-runtime_1.19.3.bb} (100%)
 delete mode 100644 meta/recipes-devtools/go/go/stack-protector.patch
 rename meta/recipes-devtools/go/{go_1.19.bb => go_1.19.3.bb} (100%)
 rename meta/recipes-devtools/python/{python3-mako_1.2.2.bb => python3-mako_1.2.3.bb} (85%)
 delete mode 100644 meta/recipes-extended/sudo/files/CVE-2022-43995.patch
 rename meta/recipes-extended/sudo/{sudo_1.9.11p3.bb => sudo_1.9.12p1.bb} (94%)
 rename meta/recipes-kernel/lttng/{lttng-modules_2.13.5.bb => lttng-modules_2.13.7.bb} (94%)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/35 expat: upgrade to 2.5.0

From: Ross Burton <[email protected]>

Release 2.5.0 Tue October 25 2022
Security fixes:
#616 #649 #650 CVE-2022-43680 -- Fix heap use-after-free after overeager
destruction of a shared DTD in function XML_ExternalEntityParserCreate in out-of-memory situations. Expected impact is denial of service or potentially arbitrary code execution.

Bug fixes:
#612 #645 Fix curruption from undefined entities
#613 #654 Fix case when parsing was suspended while processing nested
entities
#616 #652 #653 Stop leaking opening tag bindings after a closing tag
mismatch error where a parser is reset through XML_ParserReset and then reused to parse
#656 CMake: Fix generation of pkg-config file
#658 MinGW|CMake: Fix static library name

Other changes:
#663 Protect header expat_config.h from multiple inclusion #666 examples: Make use of XML_GetBuffer and be more
consistent across examples
#648 Address compiler warnings
#667 #668 Version info bumped from 9:9:8 to 9:10:8;
see https://verbump.de/ for what these numbers do

Includes a fix for CVE-2022-43680.

(cherry picked from commit a257a674272dc638f09167e9b9202adfb477ef1e)
---
 meta/recipes-core/expat/{expat_2.4.9.bb => expat_2.5.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/expat/{expat_2.4.9.bb => expat_2.5.0.bb} (91%)
meta/recipes-core/expat/expat_2.5.0.bb renamed from meta/recipes-core/expat/expat_2.4.9.bb +1 -1
similarity index 91%
rename from meta/recipes-core/expat/expat_2.4.9.bb
rename to meta/recipes-core/expat/expat_2.5.0.bb
index 9561edd84f..aa8d439d5f 100644
@@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2  \
 GITHUB_BASE_URI = "https://github.com/libexpat/libexpat/releases/"
 UPSTREAM_CHECK_REGEX = "releases/tag/R_(?P<pver>.+)"
 
-SRC_URI[sha256sum] = "7f44d1469b110773a94b0d5abeeeffaef79f8bd6406b07e52394bcf48126437a"
+SRC_URI[sha256sum] = "6f0e6e01f7b30025fa05c85fdad1e5d0ec7fd35d9f61b22f34998de11969ff67"
 
 EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF"
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/35 go: submit patch upstream

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 40d24b0b5c7a405bf9fd7ec7fa57ec61a6af3d01)
---
 meta/recipes-devtools/go/go/filter-build-paths.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/go/go/filter-build-paths.patch +2 -1
index a1aa37c2a4..280f911a21 100644
@@ -8,7 +8,8 @@ embedded in the go binary so that builds are reproducible regardless of build
 location. This codepath is hit for statically linked go binaries such as those
 on mips/ppc.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/golang/go/pull/56410]
+
 Signed-off-by: Richard Purdie <[email protected]>
 
 ---
Signature · 1 line
2.25.1
#3 lore raw

PATCH 3/35 go: update 1.19 -> 1.19.2

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

go1.19.2 (released 2022-10-04) includes security fixes to the archive/tar, net/http/httputil, and regexp packages, as well as bug fixes to the compiler, the linker, the runtime, and the go/types package.

Drop stack-protector.patch as issue fixed upstream.

(cherry picked from commit 1b79d63a0703deb341f7693bd7b7c080a553b876)
---
 .../go/{go-1.19.inc => go-1.19.2.inc}         |  3 +-
 ...ive_1.19.bb => go-binary-native_1.19.2.bb} |  5 +--
 ...an_1.19.bb => go-cross-canadian_1.19.2.bb} |  0
 .../{go-cross_1.19.bb => go-cross_1.19.2.bb}  |  0
 ...crosssdk_1.19.bb => go-crosssdk_1.19.2.bb} |  0
 ...{go-native_1.19.bb => go-native_1.19.2.bb} |  0
 ...o-runtime_1.19.bb => go-runtime_1.19.2.bb} |  0
 ...ent-based-hash-generation-less-pedan.patch |  8 ++---
 .../go/go/stack-protector.patch               | 32 -------------------
 .../go/{go_1.19.bb => go_1.19.2.bb}           |  0
 10 files changed, 8 insertions(+), 40 deletions(-)
 rename meta/recipes-devtools/go/{go-1.19.inc => go-1.19.2.inc} (85%)
 rename meta/recipes-devtools/go/{go-binary-native_1.19.bb => go-binary-native_1.19.2.bb} (81%)
 rename meta/recipes-devtools/go/{go-cross-canadian_1.19.bb => go-cross-canadian_1.19.2.bb} (100%)
 rename meta/recipes-devtools/go/{go-cross_1.19.bb => go-cross_1.19.2.bb} (100%)
 rename meta/recipes-devtools/go/{go-crosssdk_1.19.bb => go-crosssdk_1.19.2.bb} (100%)
 rename meta/recipes-devtools/go/{go-native_1.19.bb => go-native_1.19.2.bb} (100%)
 rename meta/recipes-devtools/go/{go-runtime_1.19.bb => go-runtime_1.19.2.bb} (100%)
 delete mode 100644 meta/recipes-devtools/go/go/stack-protector.patch
 rename meta/recipes-devtools/go/{go_1.19.bb => go_1.19.2.bb} (100%)
meta/recipes-devtools/go/go-1.19.2.inc renamed from meta/recipes-devtools/go/go-1.19.inc +1 -2
similarity index 85%
rename from meta/recipes-devtools/go/go-1.19.inc
rename to meta/recipes-devtools/go/go-1.19.2.inc
index f733a807b4..206ee3ca45 100644
@@ -14,6 +14,5 @@ SRC_URI += "\
     file://0001-exec.go-do-not-write-linker-flags-into-buildids.patch \
     file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
     file://filter-build-paths.patch \
-    file://stack-protector.patch \
 "
-SRC_URI[main.sha256sum] = "9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9"
+SRC_URI[main.sha256sum] = "2ce930d70a931de660fdaf271d70192793b1b240272645bf0275779f6704df6b"
meta/recipes-devtools/go/go-binary-native_1.19.2.bb renamed from meta/recipes-devtools/go/go-binary-native_1.19.bb +3 -2
similarity index 81%
rename from meta/recipes-devtools/go/go-binary-native_1.19.bb
rename to meta/recipes-devtools/go/go-binary-native_1.19.2.bb
index ca424a66b8..80c24095dd 100644
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
 
 PROVIDES = "go-native"
 
+# Checksums available at https://go.dev/dl/
 SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
-SRC_URI[go_linux_amd64.sha256sum] = "464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6"
-SRC_URI[go_linux_arm64.sha256sum] = "efa97fac9574fc6ef6c9ff3e3758fb85f1439b046573bf434cccb5e012bd00c8"
+SRC_URI[go_linux_amd64.sha256sum] = "5e8c5a74fe6470dd7e055a461acda8bb4050ead8c2df70f227e3ff7d8eb7eeb6"
+SRC_URI[go_linux_arm64.sha256sum] = "b62a8d9654436c67c14a0c91e931d50440541f09eb991a987536cb982903126d"
 
 UPSTREAM_CHECK_URI = "https://golang.org/dl/"
 UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.19.2.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.19.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.19.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.19.2.bb
meta/recipes-devtools/go/go-cross_1.19.2.bb renamed from meta/recipes-devtools/go/go-cross_1.19.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.19.bb
rename to meta/recipes-devtools/go/go-cross_1.19.2.bb
meta/recipes-devtools/go/go-crosssdk_1.19.2.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.19.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-crosssdk_1.19.bb
rename to meta/recipes-devtools/go/go-crosssdk_1.19.2.bb
meta/recipes-devtools/go/go-native_1.19.2.bb renamed from meta/recipes-devtools/go/go-native_1.19.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-native_1.19.bb
rename to meta/recipes-devtools/go/go-native_1.19.2.bb
meta/recipes-devtools/go/go-runtime_1.19.2.bb renamed from meta/recipes-devtools/go/go-runtime_1.19.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-runtime_1.19.bb
rename to meta/recipes-devtools/go/go-runtime_1.19.2.bb
meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch +4 -4
index 8cbed93017..17fa9d9831 100644
@@ -1,4 +1,4 @@
-From a3db4da51df37d163ff9e8c1e1057280c648c545 Mon Sep 17 00:00:00 2001
+From fb22e586871cc6be0b7041e86d2daceee06ea568 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Mon, 28 Mar 2022 10:59:03 -0700
 Subject: [PATCH] cmd/go: make content-based hash generation less pedantic
@@ -32,13 +32,13 @@ Signed-off-by: Khem Raj <[email protected]>
  2 files changed, 34 insertions(+), 10 deletions(-)
 
 diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go
-index 529351d..df791b0 100644
+index 81ee859..2db3898 100644
 --- a/src/cmd/go/internal/envcmd/env.go
 +++ b/src/cmd/go/internal/envcmd/env.go
 @@ -176,7 +176,7 @@ func ExtraEnvVars() []cfg.EnvVar {
  func ExtraEnvVarsCostly() []cfg.EnvVar {
- 	var b work.Builder
- 	b.Init()
+ 	b := work.NewBuilder("")
+ 
 -	cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{})
 +	cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}, false)
  	if err != nil {
meta/recipes-devtools/go/go/stack-protector.patch deleted +0 -32
deleted file mode 100644
index cc92a444a7..0000000000
@@ -1,32 +0,0 @@
-From c537b87782293fe222f2ef5eb1ae818092118e97 Mon Sep 17 00:00:00 2001
-From: Ian Lance Taylor <[email protected]>
-Date: Sun, 07 Aug 2022 19:21:15 -0700
-Subject: [PATCH] runtime/cgo: add -fno-stack-protector to CFLAGS
-
-Some compilers default to having -fstack-protector on, which breaks
-when using internal linking because the linker doesn't know how to
-find the support functions.
-
-Fixes #52919
-Fixes #54313
-
-Change-Id: I6f51d5e906503f61fc768ad8e30c163bad135087
-Upstream-Status: Submitted [https://github.com/golang/go/issues/54313]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
-
-diff --git a/src/runtime/cgo/cgo.go b/src/runtime/cgo/cgo.go
-index 298aa63..4b7046e 100644
---- a/src/runtime/cgo/cgo.go
-+++ b/src/runtime/cgo/cgo.go
-@@ -23,7 +23,9 @@
- #cgo solaris LDFLAGS: -lxnet
- #cgo solaris LDFLAGS: -lsocket
- 
--#cgo CFLAGS: -Wall -Werror
-+// We use -fno-stack-protector because internal linking won't find
-+// the support functions. See issues #52919 and #54313.
-+#cgo CFLAGS: -Wall -Werror -fno-stack-protector
- 
- #cgo solaris CPPFLAGS: -D_POSIX_PTHREAD_SEMANTICS
- 
meta/recipes-devtools/go/go_1.19.2.bb renamed from meta/recipes-devtools/go/go_1.19.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go_1.19.bb
rename to meta/recipes-devtools/go/go_1.19.2.bb
Signature · 1 line
2.25.1
#4 lore raw

PATCH 4/35 go: update 1.19.2 -> 1.19.3

In reply to Steve Sakoman

From: Sakib Sajal <[email protected]>

go1.19.3 (released 2022-11-01) includes security fixes to the os/exec and syscall packages, as well as bug fixes to the compiler and the runtime.

(cherry picked from commit fd33d169a5febb37eac03312c4014e35d29d06df)
---
 meta/recipes-devtools/go/{go-1.19.2.inc => go-1.19.3.inc}     | 2 +-
 ...{go-binary-native_1.19.2.bb => go-binary-native_1.19.3.bb} | 4 ++--
 ...o-cross-canadian_1.19.2.bb => go-cross-canadian_1.19.3.bb} | 0
 .../go/{go-cross_1.19.2.bb => go-cross_1.19.3.bb}             | 0
 .../go/{go-crosssdk_1.19.2.bb => go-crosssdk_1.19.3.bb}       | 0
 .../go/{go-native_1.19.2.bb => go-native_1.19.3.bb}           | 0
 .../go/{go-runtime_1.19.2.bb => go-runtime_1.19.3.bb}         | 0
 meta/recipes-devtools/go/{go_1.19.2.bb => go_1.19.3.bb}       | 0
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/go/{go-1.19.2.inc => go-1.19.3.inc} (89%)
 rename meta/recipes-devtools/go/{go-binary-native_1.19.2.bb => go-binary-native_1.19.3.bb} (84%)
 rename meta/recipes-devtools/go/{go-cross-canadian_1.19.2.bb => go-cross-canadian_1.19.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-cross_1.19.2.bb => go-cross_1.19.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-crosssdk_1.19.2.bb => go-crosssdk_1.19.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-native_1.19.2.bb => go-native_1.19.3.bb} (100%)
 rename meta/recipes-devtools/go/{go-runtime_1.19.2.bb => go-runtime_1.19.3.bb} (100%)
 rename meta/recipes-devtools/go/{go_1.19.2.bb => go_1.19.3.bb} (100%)
meta/recipes-devtools/go/go-1.19.3.inc renamed from meta/recipes-devtools/go/go-1.19.2.inc +1 -1
similarity index 89%
rename from meta/recipes-devtools/go/go-1.19.2.inc
rename to meta/recipes-devtools/go/go-1.19.3.inc
index 206ee3ca45..1245faba93 100644
@@ -15,4 +15,4 @@ SRC_URI += "\
     file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
     file://filter-build-paths.patch \
 "
-SRC_URI[main.sha256sum] = "2ce930d70a931de660fdaf271d70192793b1b240272645bf0275779f6704df6b"
+SRC_URI[main.sha256sum] = "18ac263e39210bcf68d85f4370e97fb1734166995a1f63fb38b4f6e07d90d212"
meta/recipes-devtools/go/go-binary-native_1.19.3.bb renamed from meta/recipes-devtools/go/go-binary-native_1.19.2.bb +2 -2
similarity index 84%
rename from meta/recipes-devtools/go/go-binary-native_1.19.2.bb
rename to meta/recipes-devtools/go/go-binary-native_1.19.3.bb
index 80c24095dd..334f63b30b 100644
@@ -9,8 +9,8 @@ PROVIDES = "go-native"
 
 # Checksums available at https://go.dev/dl/
 SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
-SRC_URI[go_linux_amd64.sha256sum] = "5e8c5a74fe6470dd7e055a461acda8bb4050ead8c2df70f227e3ff7d8eb7eeb6"
-SRC_URI[go_linux_arm64.sha256sum] = "b62a8d9654436c67c14a0c91e931d50440541f09eb991a987536cb982903126d"
+SRC_URI[go_linux_amd64.sha256sum] = "74b9640724fd4e6bb0ed2a1bc44ae813a03f1e72a4c76253e2d5c015494430ba"
+SRC_URI[go_linux_arm64.sha256sum] = "99de2fe112a52ab748fb175edea64b313a0c8d51d6157dba683a6be163fd5eab"
 
 UPSTREAM_CHECK_URI = "https://golang.org/dl/"
 UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.19.3.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.19.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.19.2.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.19.3.bb
meta/recipes-devtools/go/go-cross_1.19.3.bb renamed from meta/recipes-devtools/go/go-cross_1.19.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.19.2.bb
rename to meta/recipes-devtools/go/go-cross_1.19.3.bb
meta/recipes-devtools/go/go-crosssdk_1.19.3.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.19.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-crosssdk_1.19.2.bb
rename to meta/recipes-devtools/go/go-crosssdk_1.19.3.bb
meta/recipes-devtools/go/go-native_1.19.3.bb renamed from meta/recipes-devtools/go/go-native_1.19.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-native_1.19.2.bb
rename to meta/recipes-devtools/go/go-native_1.19.3.bb
meta/recipes-devtools/go/go-runtime_1.19.3.bb renamed from meta/recipes-devtools/go/go-runtime_1.19.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-runtime_1.19.2.bb
rename to meta/recipes-devtools/go/go-runtime_1.19.3.bb
meta/recipes-devtools/go/go_1.19.3.bb renamed from meta/recipes-devtools/go/go_1.19.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go_1.19.2.bb
rename to meta/recipes-devtools/go/go_1.19.3.bb
Signature · 1 line
2.25.1
#5 lore raw

PATCH 5/35 python3-mako: upgrade 1.2.2 -> 1.2.3

In reply to Steve Sakoman

From: Tim Orling <[email protected]>

Released: Thu Sep 22 2022
* bug

- [bug] [lexer]

* Fixed issue in lexer in the same category as that of #366 where the regexp used to match an end tag didn’t correctly organize for matching characters surrounded by whitespace, leading to high memory / interpreter hang if a closing tag incorrectly had a large amount of unterminated space in it. Credit to Sebastian Chnelik for locating the issue.

As Mako templates inherently render and directly invoke arbitrary Python code from the template source, it is never appropriate to create templates that contain untrusted input.

References: #367

[1] https://docs.makotemplates.org/en/latest/changelog.html#change-1.2.3
[2] https://github.com/sqlalchemy/mako/issues/366
[3] https://github.com/sqlalchemy/mako/issues/367

(cherry picked from commit 49ad6f031458e1f48f24547dc88e41abc4ec41a6)
---
 .../python/{python3-mako_1.2.2.bb => python3-mako_1.2.3.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-mako_1.2.2.bb => python3-mako_1.2.3.bb} (85%)
meta/recipes-devtools/python/python3-mako_1.2.3.bb renamed from meta/recipes-devtools/python/python3-mako_1.2.2.bb +1 -1
similarity index 85%
rename from meta/recipes-devtools/python/python3-mako_1.2.2.bb
rename to meta/recipes-devtools/python/python3-mako_1.2.3.bb
index e3774ee621..12acfee777 100644
@@ -8,7 +8,7 @@ PYPI_PACKAGE = "Mako"
 
 inherit pypi python_setuptools_build_meta
 
-SRC_URI[sha256sum] = "3724869b363ba630a272a5f89f68c070352137b8fd1757650017b7e06fda163f"
+SRC_URI[sha256sum] = "7fde96466fcfeedb0eed94f187f20b23d85e4cb41444be0e542e2c8c65c396cd"
 
 RDEPENDS:${PN} = "${PYTHON_PN}-html \
                   ${PYTHON_PN}-markupsafe \
Signature · 1 line
2.25.1
#6 lore raw

PATCH 6/35 lttng-modules: upgrade 2.13.5 -> 2.13.7

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

2022-09-30 (National Day for Truth and Reconciliation) LTTng modules 2.13.7
* Fix: handle integer capture page faults as skip field

2022-09-30 (National Day for Truth and Reconciliation) LTTng modules 2.13.6
* Fix: bytecode validator: reject specialized load field/context ref instructions
* Fix: bytecode validator: reject specialized load instructions
* Fix: honor "user" attribute for array/sequence of user integers
* wrapper: powerpc64: fix kernel crash caused by do_get_kallsyms
* Fix: event notification: Remove duplicate event enabled check
* Fix: event notification capture: validate buffer length
* Fix: handle capture page faults as skip field
* Fix: event notification capture error handling
* Fix: capture_sequence_element_{un,}signed: handle user-space input
* Fix: notification capture: handle userspace strings
* Implement lttng_msgpack_write_user_str
* Fix: bytecode interpreter: LOAD_FIELD: handle user fields
* Fix: move "user" attribute from field to type
* Introduce lttng_copy_from_user_check_nofault
* fix: adjust range v5.10.137 in block probe

(cherry picked from commit 1243d6afc075e3c89ca69af214e70c0d159cb832)
---
 .../lttng/{lttng-modules_2.13.5.bb => lttng-modules_2.13.7.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-kernel/lttng/{lttng-modules_2.13.5.bb => lttng-modules_2.13.7.bb} (94%)
meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb renamed from meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb +1 -1
similarity index 94%
rename from meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb
index 00095d6ab7..49c584dff4 100644
@@ -16,7 +16,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
 # Use :append here so that the patch is applied also when using devupstream
 SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch"
 
-SRC_URI[sha256sum] = "eceb3428d80e85a9f008425beb9526195c9f7f02b302f28add56df53aef3e708"
+SRC_URI[sha256sum] = "5a99679df7903160cbde3918fee5af90ffafc90fc96ccdefaa57cf230492b234"
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 
Signature · 1 line
2.25.1
#7 lore raw

PATCH 7/35 bind: upgrade 9.18.7 -> 9.18.8

In reply to Steve Sakoman

From: Wang Mingyu <[email protected]>

Changelog:
https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_18_8/CHANGES

	--- 9.18.7 released ---

5962. [security] Fix memory leak in EdDSA verify processing.

			(CVE-2022-38178) [GL #3487]

5960. [security] Fix serve-stale crash that could happen when
stale-answer-client-timeout was set to 0 and there was a stale CNAME in the cache for an incoming query. (CVE-2022-3080) [GL #3517]

5959. [security] Fix memory leaks in the DH code when using OpenSSL 3.0.0
and later versions. The openssldh_compare(), openssldh_paramcompare(), and openssldh_todns() functions were affected. (CVE-2022-2906) [GL #3491]

5958. [security] When an HTTP connection was reused to get
statistics from the stats channel, and zlib compression was in use, each successive response sent larger and larger blocks of memory, potentially reading past the end of the allocated buffer. (CVE-2022-2881) [GL #3493]

5957. [security] Prevent excessive resource use while processing large

			delegations. (CVE-2022-2795) [GL #3394]

5956. [func] Make RRL code treat all QNAMEs that are subject to

			wildcard processing within a given zone as the same
			name. [GL #3459]

5955. [port] The libxml2 library has deprecated the usage of
xmlInitThreads() and xmlCleanupThreads() functions. Use xmlInitParser() and xmlCleanupParser() instead. [GL #3518]

5954. [func] Fallback to IDNA2003 processing in dig when IDNA2008

			conversion fails. [GL #3485]

5953. [bug] Fix a crash on shutdown in delete_trace_entry(). Add
mctx attach/detach pair to make sure that the memory context used by a memory pool is not destroyed before the memory pool itself. [GL #3515]

5952. [bug] Use quotes around address strings in YAML output.

			[GL #3511]

5951. [bug] In some cases, the dnstap query_message field was

			erroneously set when logging response messages.
			[GL #3501]

5948. [bug] Fix nsec3.c:dns_nsec3_activex() function, add a missing

			dns_db_detachnode() call. [GL #3500]

5947. [func] Change dnssec-policy to allow graceful transition from
an NSEC only zone to NSEC3. [GL #3486]

5946. [bug] Fix statistics channel's handling of multiple HTTP

			requests in a single connection which have non-empty
			request bodies. [GL #3463]

5945. [bug] If parsing /etc/bind.key failed, delv could assert
when trying to parse the built in trust anchors as the parser hadn't been reset. [GL !6468]

5944. [bug] Fix +http-plain-get and +http-plain-post options
support in dig. Thanks to Marco Davids at SIDN for reporting the problem. [GL !6672]

5942. [bug] Fix tkey.c:buildquery() function's error handling by
adding the missing cleanup code. [GL #3492]

5941. [func] Zones with dnssec-policy now require dynamic DNS or
inline-siging to be configured explicitly. [GL #3381]

5938. [bug] An integer type overflow could cause an assertion
failure when freeing memory. [GL #3483]

5936. [bug] Don't enable serve-stale for lookups that error because

			it is a duplicate query or a query that would be
			dropped. [GL #2982]

5935. [bug] Fix DiG lookup reference counting bug, which could
be observed in NSSEARCH mode. [GL #3478]

(cherry picked from commit 1d87d2652f7f6640dda85e037c580c83f99a8ba8)
---
 .../0001-avoid-start-failure-with-bind-user.patch               | 0
 .../0001-named-lwresd-V-and-start-log-hide-build-options.patch  | 0
 .../bind-ensure-searching-for-json-headers-searches-sysr.patch  | 0
 .../bind/{bind-9.18.7 => bind-9.18.8}/bind9                     | 0
 .../bind/{bind-9.18.7 => bind-9.18.8}/conf.patch                | 0
 .../bind/{bind-9.18.7 => bind-9.18.8}/generate-rndc-key.sh      | 0
 .../init.d-add-support-for-read-only-rootfs.patch               | 0
 .../make-etc-initd-bind-stop-work.patch                         | 0
 .../bind/{bind-9.18.7 => bind-9.18.8}/named.service             | 0
 .../bind/{bind_9.18.7.bb => bind_9.18.8.bb}                     | 2 +-
 10 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/0001-avoid-start-failure-with-bind-user.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/bind9 (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/conf.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/generate-rndc-key.sh (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/init.d-add-support-for-read-only-rootfs.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/make-etc-initd-bind-stop-work.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/named.service (100%)
 rename meta/recipes-connectivity/bind/{bind_9.18.7.bb => bind_9.18.8.bb} (97%)
meta/recipes-connectivity/bind/bind-9.18.8/0001-avoid-start-failure-with-bind-user.patch renamed from meta/recipes-connectivity/bind/bind-9.18.7/0001-avoid-start-failure-with-bind-user.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/0001-avoid-start-failure-with-bind-user.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/0001-avoid-start-failure-with-bind-user.patch
meta/recipes-connectivity/bind/bind-9.18.8/0001-named-lwresd-V-and-start-log-hide-build-options.patch renamed from meta/recipes-connectivity/bind/bind-9.18.7/0001-named-lwresd-V-and-start-log-hide-build-options.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/0001-named-lwresd-V-and-start-log-hide-build-options.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/0001-named-lwresd-V-and-start-log-hide-build-options.patch
meta/recipes-connectivity/bind/bind-9.18.8/bind-ensure-searching-for-json-headers-searches-sysr.patch renamed from meta/recipes-connectivity/bind/bind-9.18.7/bind-ensure-searching-for-json-headers-searches-sysr.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/bind-ensure-searching-for-json-headers-searches-sysr.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/bind-ensure-searching-for-json-headers-searches-sysr.patch
meta/recipes-connectivity/bind/bind-9.18.8/bind9 renamed from meta/recipes-connectivity/bind/bind-9.18.7/bind9 +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/bind9
rename to meta/recipes-connectivity/bind/bind-9.18.8/bind9
meta/recipes-connectivity/bind/bind-9.18.8/conf.patch renamed from meta/recipes-connectivity/bind/bind-9.18.7/conf.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/conf.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/conf.patch
meta/recipes-connectivity/bind/bind-9.18.8/generate-rndc-key.sh renamed from meta/recipes-connectivity/bind/bind-9.18.7/generate-rndc-key.sh +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/generate-rndc-key.sh
rename to meta/recipes-connectivity/bind/bind-9.18.8/generate-rndc-key.sh
meta/recipes-connectivity/bind/bind-9.18.8/init.d-add-support-for-read-only-rootfs.patch renamed from meta/recipes-connectivity/bind/bind-9.18.7/init.d-add-support-for-read-only-rootfs.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/init.d-add-support-for-read-only-rootfs.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/init.d-add-support-for-read-only-rootfs.patch
meta/recipes-connectivity/bind/bind-9.18.8/make-etc-initd-bind-stop-work.patch renamed from meta/recipes-connectivity/bind/bind-9.18.7/make-etc-initd-bind-stop-work.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/make-etc-initd-bind-stop-work.patch
rename to meta/recipes-connectivity/bind/bind-9.18.8/make-etc-initd-bind-stop-work.patch
meta/recipes-connectivity/bind/bind-9.18.8/named.service renamed from meta/recipes-connectivity/bind/bind-9.18.7/named.service +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.7/named.service
rename to meta/recipes-connectivity/bind/bind-9.18.8/named.service
meta/recipes-connectivity/bind/bind_9.18.8.bb renamed from meta/recipes-connectivity/bind/bind_9.18.7.bb +1 -1
similarity index 97%
rename from meta/recipes-connectivity/bind/bind_9.18.7.bb
rename to meta/recipes-connectivity/bind/bind_9.18.8.bb
index 4ab11486bf..4925c092c7 100644
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
            file://0001-avoid-start-failure-with-bind-user.patch \
            "
 
-SRC_URI[sha256sum] = "9e2acf1698f49d70ad12ffbad39ec6716a7da524e9ebd98429c7c70ba1262981"
+SRC_URI[sha256sum] = "0e3c3ab9378db84ba0f37073d67ba125ae4f2ff8daf366c9db287e3f1b2c35f0"
 
 UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
 # follow the ESV versions divisible by 2
Signature · 1 line
2.25.1
#8 lore raw

PATCH 8/35 inetutils: upgrade 2.3 -> 2.4

In reply to Steve Sakoman

From: Wang Mingyu <[email protected]>

CVE-2022-39028.patch
removed since it's included in 2.4

Changelog:
==========
ifconfig
------------
Support specifying prefix netmask lengths in -A.
Hurd: tell pfinet translator interfaces to configure

ftp
----------
Avoid crash caused by signed integer overflow resulting in out-of-bounds buffer access. Avoid crash caused by heap buffer overflow.
Avoid crash caused by NULL pointer dereference.
Avoid crash caused by infinite macro recursion.

telnetd
-----------
Avoid crash on 0xff 0xf7 (IAC EC) or 0xff 0xf8 (IAC EL). CVE-2022-39028

telnet
-----------
Fix a buffer overflow problem. CVE-2019-0053

tftp
-----------
Avoid crashing when given unexpected or invalid commands from tty. Various bugs fixes, internal improvements and clean ups.

(cherry picked from commit fec6ec179b97b768d32fbd782338450edc1a5344)
---
 .../inetutils/inetutils/CVE-2022-39028.patch  | 54 -------------------
 .../{inetutils_2.3.bb => inetutils_2.4.bb}    |  3 +-
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 meta/recipes-connectivity/inetutils/inetutils/CVE-2022-39028.patch
 rename meta/recipes-connectivity/inetutils/{inetutils_2.3.bb => inetutils_2.4.bb} (98%)
meta/recipes-connectivity/inetutils/inetutils/CVE-2022-39028.patch deleted +0 -54
deleted file mode 100644
index 3b07515c7b..0000000000
@@ -1,54 +0,0 @@
-From d52349fa1b6baac77ffa2c74769636aa2ece2ec5 Mon Sep 17 00:00:00 2001
-From: Erik Auerswald <[email protected]>
-Date: Sat, 3 Sep 2022 16:58:16 +0200
-Subject: [PATCH] telnetd: Handle early IAC EC or IAC EL receipt
-
-Fix telnetd crash if the first two bytes of a new connection
-are 0xff 0xf7 (IAC EC) or 0xff 0xf8 (IAC EL).
-
-The problem was reported in:
-<https://pierrekim.github.io/blog/2022-08-24-2-byte-dos-freebsd-netbsd-telnetd-netkit-telnetd-inetutils-telnetd-kerberos-telnetd.html>.
-
-* NEWS: Mention fix.
-* telnetd/state.c (telrcv): Handle zero slctab[SLC_EC].sptr and
-zero slctab[SLC_EL].sptr.
-
-CVE: CVE-2022-39028
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=fae8263e467380483c28513c0e5fac143e46f94f]
-Signed-off-by: Khem Raj <[email protected]>
----
- telnetd/state.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/telnetd/state.c b/telnetd/state.c
-index ffc6cba..c2d760f 100644
---- a/telnetd/state.c
-+++ b/telnetd/state.c
-@@ -312,15 +312,21 @@ telrcv (void)
- 	    case EC:
- 	    case EL:
- 	      {
--		cc_t ch;
-+		cc_t ch = (cc_t) (_POSIX_VDISABLE);
- 
- 		DEBUG (debug_options, 1, printoption ("td: recv IAC", c));
- 		ptyflush ();	/* half-hearted */
- 		init_termbuf ();
- 		if (c == EC)
--		  ch = *slctab[SLC_EC].sptr;
-+		  {
-+		    if (slctab[SLC_EC].sptr)
-+		      ch = *slctab[SLC_EC].sptr;
-+		  }
- 		else
--		  ch = *slctab[SLC_EL].sptr;
-+		  {
-+		    if (slctab[SLC_EL].sptr)
-+		      ch = *slctab[SLC_EL].sptr;
-+		  }
- 		if (ch != (cc_t) (_POSIX_VDISABLE))
- 		  pty_output_byte ((unsigned char) ch);
- 		break;
--- 
-2.37.3
-
meta/recipes-connectivity/inetutils/inetutils_2.4.bb renamed from meta/recipes-connectivity/inetutils/inetutils_2.3.bb +1 -2
similarity index 98%
rename from meta/recipes-connectivity/inetutils/inetutils_2.3.bb
rename to meta/recipes-connectivity/inetutils/inetutils_2.4.bb
index 2fce84374d..6519331141 100644
@@ -10,7 +10,7 @@ LICENSE = "GPL-3.0-only"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7"
 
-SRC_URI[sha256sum] = "0b01bb08e29623c4e3b940f233c961451d9af8c5066301add76a52a95d51772c"
+SRC_URI[sha256sum] = "1789d6b1b1a57dfe2a7ab7b533ee9f5dfd9cbf5b59bb1bb3c2612ed08d0f68b2"
 SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \
            file://inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch \
            file://inetutils-1.8-0003-wchar.patch \
@@ -21,7 +21,6 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \
            file://tftpd.xinetd.inetutils \
            file://inetutils-1.9-PATH_PROCNET_DEV.patch \
            file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \
-           file://CVE-2022-39028.patch \
 "
 
 inherit autotools gettext update-alternatives texinfo
Signature · 1 line
2.25.1
#9 lore raw

PATCH 9/35 socat: upgrade 1.7.4.3 -> 1.7.4.4

In reply to Steve Sakoman

From: Wang Mingyu <[email protected]>

1.7.4.4 is a bug fix release

0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch removed since it's included in 1.7.4.4

(cherry picked from commit c00e9d66f0b8449ff1bf24546f232345eb6feebd)
---
 ...ck-getprotobynumber_r-with-AC_TRY_LI.patch | 35 -------------------
 .../{socat_1.7.4.3.bb => socat_1.7.4.4.bb}    |  6 ++--
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch
 rename meta/recipes-connectivity/socat/{socat_1.7.4.3.bb => socat_1.7.4.4.bb} (89%)
meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch deleted +0 -35
deleted file mode 100644
index fbfb0816dd..0000000000
@@ -1,35 +0,0 @@
-From d67d6b4f981db9612d808bd723176a1d2996d53a Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Mon, 17 Jan 2022 13:21:32 +0100
-Subject: [PATCH] configure.ac: check getprotobynumber_r with AC_TRY_LINK
-
-AC_TRY_COMPILE won't error out if the function is altogether absent
-(e.g. on linux musl C library), the test needs to link all the way.
-
-Upstream-Status: Submitted [via email to [email protected]]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d4acc9e..973a7f2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror)
- # getprotobynumber_r() is not standardized
- AC_MSG_CHECKING(for getprotobynumber_r() variant)
- AC_CACHE_VAL(sc_cv_getprotobynumber_r,
--[AC_TRY_COMPILE([#include <stddef.h>
-+[AC_TRY_LINK([#include <stddef.h>
- #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024,NULL);],
- [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux],
-- [AC_TRY_COMPILE([#include <stddef.h>
-+ [AC_TRY_LINK([#include <stddef.h>
-  #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024);],
-  [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris],
--  [AC_TRY_COMPILE([#include <stddef.h>
-+  [AC_TRY_LINK([#include <stddef.h>
-   #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL);],
-   [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX],
- 
meta/recipes-connectivity/socat/socat_1.7.4.4.bb renamed from meta/recipes-connectivity/socat/socat_1.7.4.3.bb +2 -4
similarity index 89%
rename from meta/recipes-connectivity/socat/socat_1.7.4.3.bb
rename to meta/recipes-connectivity/socat/socat_1.7.4.4.bb
index a4a0a8933e..5a379380d1 100644
@@ -9,11 +9,9 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86"
 
-SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
-           file://0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch \
-           "
+SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2"
 
-SRC_URI[sha256sum] = "d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007"
+SRC_URI[sha256sum] = "fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac"
 
 inherit autotools
 
Signature · 1 line
2.25.1
#10 lore raw

PATCH 10/35 libxcrypt: upgrade 4.4.28 -> 4.4.30

In reply to Steve Sakoman

From: Wang Mingyu <[email protected]>

Changelog:
==========
* configure: Restore ucontext api functionality check.
In c3f01c72b303cbbb0cc8983120677edee2f3fa4b the use of the ucontext api in the main program was removed, and with it the configure check for it. However, the ucontext api is still used in the "explicit_bzero" test and thus this test still needs to be in place.
See also: https://bugs.gentoo.org/838172
* configure: Restore the functionality of the '--disable-symvers' switch. Without this fix the build was simply broken, if symbol versioning was disabled for any reason, e.g. whether the compiler nor the linker supporting it, or if disabled on purpose by the user (issue #142).
* Fix variable name in crypt(3) for a datamember of 'struct crypt_data' (issue #153).
* Add glibc-on-loongarch-lp64 (Loongson LA464 / LA664) entry to libcrypt.minver. This was added in GNU libc 2.36.

(cherry picked from commit 7da5dd3b43718b876645602b1a23c739cbe8016d)
---
 .../{libxcrypt-compat_4.4.28.bb => libxcrypt-compat_4.4.30.bb}  | 0
 meta/recipes-core/libxcrypt/libxcrypt.inc                       | 2 +-
 .../libxcrypt/{libxcrypt_4.4.28.bb => libxcrypt_4.4.30.bb}      | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.28.bb => libxcrypt-compat_4.4.30.bb} (100%)
 rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.28.bb => libxcrypt_4.4.30.bb} (100%)
meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb renamed from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.28.bb +0 -0
similarity index 100%
rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.28.bb
rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb
meta/recipes-core/libxcrypt/libxcrypt.inc +1 -1
index 39ba2636ff..2bdedcba6d 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
 inherit autotools pkgconfig
 
 SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
-SRCREV = "50cf2b6dd4fdf04309445f2eec8de7051d953abf"
+SRCREV = "fee2687bad66e351a3dcc963a34ae80125923ff8"
 SRCBRANCH ?= "develop"
 
 SRC_URI += "file://fix_cflags_handling.patch"
meta/recipes-core/libxcrypt/libxcrypt_4.4.30.bb renamed from meta/recipes-core/libxcrypt/libxcrypt_4.4.28.bb +0 -0
similarity index 100%
rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.28.bb
rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.30.bb
Signature · 1 line
2.25.1
#11 lore raw

PATCH 11/35 Revert "sudo: backport fix for CVE-2022-43995"

In reply to Steve Sakoman

Prepare for version bump

This reverts commit a41a5f310246dcd9dbdb4537d59bc0579c3b1052.

---
 .../sudo/files/CVE-2022-43995.patch           | 54 -------------------
 meta/recipes-extended/sudo/sudo_1.9.11p3.bb   |  1 -
 2 files changed, 55 deletions(-)
 delete mode 100644 meta/recipes-extended/sudo/files/CVE-2022-43995.patch
meta/recipes-extended/sudo/files/CVE-2022-43995.patch deleted +0 -54
deleted file mode 100644
index 64dca8c9c6..0000000000
@@ -1,54 +0,0 @@
-CVE: CVE-2022-43995
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From bd209b9f16fcd1270c13db27ae3329c677d48050 Mon Sep 17 00:00:00 2001
-From: "Todd C. Miller" <[email protected]>
-Date: Fri, 28 Oct 2022 07:29:55 -0600
-Subject: [PATCH] Fix CVE-2022-43995, potential heap overflow for passwords < 8
- characters. Starting with sudo 1.8.0 the plaintext password buffer is
- dynamically sized so it is not safe to assume that it is at least 9 bytes in
- size. Found by Hugo Lefeuvre (University of Manchester) with ConfFuzz.
-
----
- plugins/sudoers/auth/passwd.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c
-index b2046eca2..0416861e9 100644
---- a/plugins/sudoers/auth/passwd.c
-+++ b/plugins/sudoers/auth/passwd.c
-@@ -63,7 +63,7 @@ sudo_passwd_init(struct passwd *pw, sudo_auth *auth)
- int
- sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_conv_callback *callback)
- {
--    char sav, *epass;
-+    char des_pass[9], *epass;
-     char *pw_epasswd = auth->data;
-     size_t pw_len;
-     int matched = 0;
-@@ -75,12 +75,12 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c
- 
-     /*
-      * Truncate to 8 chars if standard DES since not all crypt()'s do this.
--     * If this turns out not to be safe we will have to use OS #ifdef's (sigh).
-      */
--    sav = pass[8];
-     pw_len = strlen(pw_epasswd);
--    if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len))
--	pass[8] = '\0';
-+    if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) {
-+	strlcpy(des_pass, pass, sizeof(des_pass));
-+	pass = des_pass;
-+    }
- 
-     /*
-      * Normal UN*X password check.
-@@ -88,7 +88,6 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c
-      * only compare the first DESLEN characters in that case.
-      */
-     epass = (char *) crypt(pass, pw_epasswd);
--    pass[8] = sav;
-     if (epass != NULL) {
- 	if (HAS_AGEINFO(pw_epasswd, pw_len) && strlen(epass) == DESLEN)
- 	    matched = !strncmp(pw_epasswd, epass, DESLEN);
meta/recipes-extended/sudo/sudo_1.9.11p3.bb +0 -1
index fa9cf48196..ba610ee2e7 100644
@@ -4,7 +4,6 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
            ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
            file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \
            file://0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch \
-           file://CVE-2022-43995.patch \
            "
 
 PAM_SRC_URI = "file://sudo.pam"
Signature · 1 line
2.25.1
#12 lore raw

PATCH 12/35 sudo: upgrade 1.9.11p3 -> 1.9.12p1

In reply to Steve Sakoman

From: Xiangyu Chen <[email protected]>

---
 meta/recipes-extended/sudo/sudo.inc                             | 2 +-
 .../sudo/{sudo_1.9.11p3.bb => sudo_1.9.12p1.bb}                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/sudo/{sudo_1.9.11p3.bb => sudo_1.9.12p1.bb} (96%)
meta/recipes-extended/sudo/sudo.inc +1 -1
index 8947c46129..fd5bbf103d 100644
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws"
 BUGTRACKER = "http://www.sudo.ws/bugs/"
 SECTION = "admin"
 LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=16cf60b466f3a0606427a7b624a3a670 \
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7aacba499777b719416b293d16f29c8c \
                     file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \
                     file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \
                     file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \
meta/recipes-extended/sudo/sudo_1.9.12p1.bb renamed from meta/recipes-extended/sudo/sudo_1.9.11p3.bb +1 -1
similarity index 96%
rename from meta/recipes-extended/sudo/sudo_1.9.11p3.bb
rename to meta/recipes-extended/sudo/sudo_1.9.12p1.bb
index ba610ee2e7..1495b67b8b 100644
@@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
 
 PAM_SRC_URI = "file://sudo.pam"
 
-SRC_URI[sha256sum] = "4687e7d2f56721708f59cca2e1352c056cb23de526c22725615a42bb094f1f70"
+SRC_URI[sha256sum] = "475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8"
 
 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
Signature · 1 line
2.25.1
#13 lore raw

PATCH 13/35 cargo_common.bbclass: Fix typos

In reply to Steve Sakoman

From: Alex Kiernan <[email protected]>

(cherry picked from commit c7a92180b21e75a84f632e4c16e63dc1f4861a00)
---
 meta/classes-recipe/cargo_common.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes-recipe/cargo_common.bbclass +2 -2
index dea0fbe2f6..f503a001dd 100644
@@ -56,7 +56,7 @@ cargo_common_do_configure () {
 
 		[source.crates-io]
 		replace-with = "bitbake"
-		local-registry = "/nonexistant"
+		local-registry = "/nonexistent"
 		EOF
 	fi
 
@@ -103,7 +103,7 @@ cargo_common_do_configure () {
 		cat <<- EOF >> ${CARGO_HOME}/config
 
 		[build]
-		# Use out of tree build destination to avoid poluting the source tree
+		# Use out of tree build destination to avoid polluting the source tree
 		target-dir = "${B}/target"
 		EOF
 	fi
Signature · 1 line
2.25.1
#14 lore raw

PATCH 14/35 groff: submit patches upstream

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 4269cfcd6c29be05964010d0406584b80822d1d1)
---
 .../groff/files/0001-Make-manpages-mulitlib-identical.patch     | 2 +-
 .../groff/files/0001-replace-perl-w-with-use-warnings.patch     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch +1 -1
index 9105da6457..c3cfc7cea8 100644
@@ -3,7 +3,7 @@ From: Jeremy Puhlman <[email protected]>
 Date: Sat, 7 Mar 2020 00:59:13 +0000
 Subject: [PATCH] Make manpages mulitlib identical
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [by email to [email protected]]
 Signed-off-by: Jeremy Puhlman <[email protected]>
 ---
  Makefile.am | 2 +-
meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch +1 -1
index eda6a40f51..b028fa20aa 100644
@@ -15,7 +15,7 @@ doesn't work:
 
 So replace "perl -w" with "use warnings" to make it work.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [by email to [email protected]]
 
 Signed-off-by: Robert Yang <[email protected]>
 
Signature · 1 line
2.25.1
#15 lore raw

PATCH 15/35 tcl: correct patch status

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 9f37e5b83db662bba92605c8741516108aad3c5e)
---
 .../recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch +1 -1
index 44b2ce0a30..5a10c93a31 100644
@@ -1,4 +1,4 @@
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [upstream does not support installed tests]
 
 Index: unix/Makefile.in
 ===================================================================
Signature · 1 line
2.25.1
#16 lore raw

PATCH 16/35 lttng-tools: submit determinism.patch upstream

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit bec62455d900a0d3e18a62ea7053c214bc545fb6)
---
 meta/recipes-kernel/lttng/lttng-tools/determinism.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/lttng/lttng-tools/determinism.patch +1 -1
index b2ab880bd6..0a897a8e13 100644
@@ -13,7 +13,7 @@ to me whether the tests need that or not.
 
 Fixes reproducibility issues for lttng-tools.
 
-Upstream-Status: Pending [needs discussion with upstream about the correct solution]
+Upstream-Status: Submitted [https://bugs.lttng.org/issues/1361 - needs discussion with upstream about the correct solution]
 RP 2021/3/1
 
 Index: lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am
Signature · 1 line
2.25.1
#17 lore raw

PATCH 17/35 kea: submit patch upstream

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit e8f0e3a01262ecb83185ec5e84e6f359d7d64d1d)
---
 meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +1 -1
index 78f475a495..451b409c88 100644
@@ -12,7 +12,7 @@ Subject: [PATCH] There are conflict of config files between kea and lib32-kea:
 Because they are all commented out, replace the expanded libdir path with
 '$libdir' in the config files to avoid conflict.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602]
 Signed-off-by: Kai Kang <[email protected]>
 
 ---
Signature · 1 line
2.25.1
#18 lore raw

PATCH 18/35 ovmf: correct patches status

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 0f758719ad26fd7b23bbf21a37375f8de7068f0e)
---
 .../ovmf/0001-ovmf-update-path-to-native-BaseTools.patch   | 2 +-
 ...seTools-makefile-adjust-to-build-in-under-bitbake.patch | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch +1 -1
index 89d9ffab5e..0c3df4fc44 100644
@@ -10,7 +10,7 @@ tools. The BBAKE_EDK_TOOLS_PATH string is used as a pattern to be replaced
 with the appropriate location before building.
 
 Signed-off-by: Ricardo Neri <[email protected]>
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [oe-core cross compile specific]
 ---
  OvmfPkg/build.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +6 -1
index f6141c8af5..2293d7e938 100644
@@ -6,8 +6,13 @@ Subject: [PATCH 2/6] BaseTools: makefile: adjust to build in under bitbake
 Prepend the build flags with those of bitbake. This is to build
 using the bitbake native sysroot include and library directories.
 
+Note from Alex: this is not appropriate for upstream submission as
+the recipe already does lots of similar in-place fixups elsewhere, so
+this patch shold be converted to follow that pattern. We're not going
+to fight against how upstream wants to configure the build.
+
 Signed-off-by: Ricardo Neri <[email protected]>
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups]
 ---
  BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++--------
  1 file changed, 9 insertions(+), 8 deletions(-)
Signature · 1 line
2.25.1
#19 lore raw

PATCH 19/35 libffi: submit patch upstream

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 9555a7dc768c32a009333232e25cef041054b7f7)
---
 .../libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch +1 -1
index 5e529d1ce7..4233799501 100644
@@ -11,7 +11,7 @@ https://github.com/libffi/libffi/issues/607. Now that
 clang supports the LDC and SDC instructions, this mitigation
 has been reverted.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/747]
 Signed-off-by: Brett Warren <[email protected]>
 ---
  src/arm/sysv.S | 33 ---------------------------------
Signature · 1 line
2.25.1
#20 lore raw

PATCH 20/35 gptfdisk: remove warning message from target system

In reply to Steve Sakoman

From: Peter Bergin <[email protected]>

A recent change in libuuid made warning when running sgdisk. Backport patch from upstream to silent warning.

The warning:
"Warning! Unable to generate a proper UUID! Creating an improper one as a last
resort! Windows 7 may crash if you save this partition table!"

(cherry picked from commit ce6491b900e509a776eddaf6bd57251628393fa3)
---
 ...to-deal-with-minor-change-in-libuuid.patch | 27 +++++++++++++++++++
 meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 meta/recipes-devtools/fdisk/gptfdisk/0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch
meta/recipes-devtools/fdisk/gptfdisk/0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch new file +27 -0
new file mode 100644
index 0000000000..f358081092
@@ -0,0 +1,27 @@
+From c640d9011a8330ebaad501784fb0ee1ce5e7a5ef Mon Sep 17 00:00:00 2001
+From: Rod Smith <[email protected]>
+Date: Sat, 16 Apr 2022 09:32:04 -0400
+Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid
+
+Upstream-Status: Backport [https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f/]
+Signed-off-by: Peter Bergin <[email protected]>
+---
+ guid.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/guid.cc b/guid.cc
+index 1e73ab7..d3e4fd5 100644
+--- a/guid.cc
++++ b/guid.cc
+@@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
+ void GUIDData::Randomize(void) {
+    int i, uuidGenerated = 0;
+ 
+-#ifdef _UUID_UUID_H
++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
+    uuid_generate(uuidData);
+    ReverseBytes(&uuidData[0], 4);
+    ReverseBytes(&uuidData[4], 2);
+-- 
+2.34.1
+
meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb +1 -0
index e473b9cd55..2c093c20ae 100644
@@ -9,6 +9,7 @@ DEPENDS = "util-linux"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \
            file://0001-gptcurses-correctly-include-curses.h.patch \
+           file://0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch \
            "
 SRC_URI[sha256sum] = "dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2"
 
Signature · 1 line
2.25.1
#21 lore raw

PATCH 21/35 oeqa/runtime/dnf: rewrite test_dnf_installroot_usrmerge

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

This test doesn't get exercised on the autobuilder and so it was broken:
specifically some of the ln commands silently fail and the chroot isn't usable.

Rewrite the test case to correctly construct a chroot so the test can pass.

(cherry picked from commit bb6ebb9956a42df3ed8681aec9aedf340b12f934)
---
 meta/lib/oeqa/runtime/cases/dnf.py | 32 +++++++++++-------------------
 1 file changed, 12 insertions(+), 20 deletions(-)
meta/lib/oeqa/runtime/cases/dnf.py +12 -20
index 410d456bdf..3ccb18ce83 100644
@@ -147,29 +147,21 @@ class DnfRepoTest(DnfTest):
         rootpath = '/home/root/chroot/test'
         #Copy necessary files to avoid errors with not yet installed tools on
         #installroot directory.
-        self.target.run('mkdir -p %s/etc' % rootpath, 1500)
-        self.target.run('mkdir -p %s/usr/bin %s/usr/sbin' % (rootpath, rootpath), 1500)
-        self.target.run('ln -sf -r %s/usr/bin %s/bin'  % (rootpath, rootpath), 1500)
-        self.target.run('ln -sf -r %s/usr/sbin %s/sbin'  % (rootpath, rootpath), 1500)
-        self.target.run('mkdir -p %s/dev' % rootpath, 1500)
+        self.target.run('mkdir -p %s/etc' % rootpath)
+        self.target.run('mkdir -p %s/usr/bin %s/usr/sbin' % (rootpath, rootpath))
+        self.target.run('ln -sf usr/bin %s/bin'  % (rootpath))
+        self.target.run('ln -sf usr/sbin %s/sbin'  % (rootpath))
+        self.target.run('mkdir -p %s/dev' % rootpath)
         #Handle different architectures lib dirs
-        self.target.run('mkdir -p %s/usr/lib' % rootpath, 1500)
-        self.target.run('mkdir -p %s/usr/libx32' % rootpath, 1500)
-        self.target.run('mkdir -p %s/usr/lib64' % rootpath, 1500)
-        self.target.run('cp /lib/libtinfo.so.5 %s/usr/lib' % rootpath, 1500)
-        self.target.run('cp /libx32/libtinfo.so.5 %s/usr/libx32' % rootpath, 1500)
-        self.target.run('cp /lib64/libtinfo.so.5 %s/usr/lib64' % rootpath, 1500)
-        self.target.run('ln -sf -r %s/lib %s/usr/lib' % (rootpath,rootpath), 1500)
-        self.target.run('ln -sf -r %s/libx32 %s/usr/libx32' % (rootpath,rootpath), 1500)
-        self.target.run('ln -sf -r %s/lib64 %s/usr/lib64' % (rootpath,rootpath), 1500)
-        self.target.run('cp -r /etc/rpm %s/etc' % rootpath, 1500)
-        self.target.run('cp -r /etc/dnf %s/etc' % rootpath, 1500)
-        self.target.run('cp /bin/sh %s/bin' % rootpath, 1500)
-        self.target.run('mount -o bind /dev %s/dev/' % rootpath, 1500)
+        self.target.run("for l in /lib*; do mkdir -p %s/usr/$l; ln -s usr/$l %s/$l; done" % (rootpath, rootpath))
+        self.target.run('cp -r /etc/rpm %s/etc' % rootpath)
+        self.target.run('cp -r /etc/dnf %s/etc' % rootpath)
+        self.target.run('cp /bin/busybox %s/bin/sh' % rootpath)
+        self.target.run('mount -o bind /dev %s/dev/' % rootpath)
         self.dnf_with_repo('install --installroot=%s -v -y --rpmverbosity=debug busybox' % rootpath)
-        status, output = self.target.run('test -e %s/var/cache/dnf' % rootpath, 1500)
+        status, output = self.target.run('test -e %s/var/cache/dnf' % rootpath)
         self.assertEqual(0, status, output)
-        status, output = self.target.run('test -e %s/bin/busybox' % rootpath, 1500)
+        status, output = self.target.run('test -e %s/bin/busybox' % rootpath)
         self.assertEqual(0, status, output)
 
     @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache'])
Signature · 1 line
2.25.1
#22 lore raw

PATCH 22/35 archiver: avoid using machine variable as it breaks multiconfig

In reply to Steve Sakoman

From: Jose Quaresma <[email protected]>

STAGING_KERNEL_DIR uses the MACHINE name so it breaks the multiconfig and in this cases it will run the shared recipes twice, one for each machine.

STAGING_KERNEL_DIR it's been introduced in commit 5487dee2e1

(cherry picked from commit 6050d1f74c02495490d982ead2993b6b3c9cc04a)
---
 meta/classes/archiver.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/archiver.bbclass +1 -1
index 0710c1ec5e..4049694d85 100644
@@ -465,7 +465,7 @@ def is_work_shared(d):
     pn = d.getVar('PN')
     return pn.startswith('gcc-source') or \
         bb.data.inherits_class('kernel', d) or \
-        (bb.data.inherits_class('kernelsrc', d) and d.getVar('S') == d.getVar('STAGING_KERNEL_DIR'))
+        (bb.data.inherits_class('kernelsrc', d) and d.expand("${TMPDIR}/work-shared") in d.getVar('S'))
 
 # Run do_unpack and do_patch
 python do_unpack_and_patch() {
Signature · 1 line
2.25.1
#23 lore raw

PATCH 23/35 rust: submit a rewritten version of crossbeam_atomic.patch upstream

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 4bbfd7427092063dd612d2ca9e466cb819f5a3e3)
---
 meta/recipes-devtools/rust/rust/crossbeam_atomic.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/rust/rust/crossbeam_atomic.patch +1 -1
index 7097bb9087..31a76d9bb4 100644
@@ -14,7 +14,7 @@ Someone with more rust knowledge could split up the triplets in no_atmoics.rs
 and compare against the architecture/processor, or replace -unknown with a glob
 to create a patch that upstream might accept.
 
-Upstream-Status: Inappropriate [OE Specific tweak  but could be rewritten]
+Upstream-Status: Submitted [https://github.com/crossbeam-rs/crossbeam/pull/922]
 Signed-off-by: Richard Purdie <[email protected]>
 
 Index: rustc-1.63.0-src/vendor/crossbeam-utils/build.rs
Signature · 1 line
2.25.1
#24 lore raw

PATCH 24/35 bluez5: Point hciattach bcm43xx firmware search path to /lib/firmware

In reply to Steve Sakoman

From: Marek Vasut <[email protected]>

Currently the hciattach bcm43xx firmware loader looks up the firmware blob in /etc/firmware . Change this to /lib/firmware instead, so that the path is consistent with Linux kernel which also looks up firmware for the WiFi part in /lib/firmware .

(cherry picked from commit 72b3b79ad8b980e8dd9470d16b72c2c70072bbc0)
---
 meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-connectivity/bluez5/bluez5.inc +2 -0
index f07e318897..a8eaba1dd6 100644
@@ -68,6 +68,8 @@ EXTRA_OECONF = "\
   --without-zsh-completion-dir \
 "
 
+CFLAGS += "-DFIRMWARE_DIR=\\"${nonarch_base_libdir}/firmware\\""
+
 # bluez5 builds a large number of useful utilities but does not
 # install them.  Specify which ones we want put into ${PN}-noinst-tools.
 NOINST_TOOLS_READLINE ??= ""
Signature · 1 line
2.25.1
#25 lore raw

PATCH 25/35 get_module_deps3.py: Check attribute '__file__'

In reply to Steve Sakoman

From: Leon Anavi <[email protected]>

Check if the module object has attribute '__file__' to fix and avoid errors like:

AttributeError: module '_abc' has no attribute '__file__'. Did you mean: '__name__'?

(cherry picked from commit 8acce12c1a4cf37ac312c92d62a6ae93a349dddf)
---
 meta/recipes-devtools/python/python3/get_module_deps3.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python3/get_module_deps3.py +1 -1
index 1f4c982aed..0ca687d2eb 100644
@@ -56,7 +56,7 @@ if debug == True:
 try:
     m = importlib.import_module(current_module)
     # handle python packages which may not include all modules in the __init__
-    if os.path.basename(m.__file__) == "__init__.py":
+    if hasattr(m, '__file__') and os.path.basename(m.__file__) == "__init__.py":
         modulepath = os.path.dirname(m.__file__)
         for i in os.listdir(modulepath):
             if i.startswith("_") or not(i.endswith(".py")):
Signature · 1 line
2.25.1
#26 lore raw

PATCH 26/35 bitbake.conf: Drop export of SOURCE_DATE_EPOCH_FALLBACK

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Whilst SDE definitely needs to be exported, the fallback does not as it is only used in our python code via the datastore.

It was introduced as an export in 9a1dde74e794362399193dc3f81c9685a83d0776 but even then it doesn't look like it needed to be, likely just a copy and paste mistake.

Drop the export.

(cherry picked from commit 74fb6539dd06acb0dd6a9af4809152975e8473e6)
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
index 62cdd9aa9c..a1f0f624e9 100644
@@ -676,7 +676,7 @@ export PYTHONHASHSEED = "0"
 export PERL_HASH_SEED = "0"
 export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}"
 # A SOURCE_DATE_EPOCH of '0' might be misinterpreted as no SDE
-export SOURCE_DATE_EPOCH_FALLBACK ??= "1302044400"
+SOURCE_DATE_EPOCH_FALLBACK ??= "1302044400"
 REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896"
 
 ##################################################################
Signature · 1 line
2.25.1
#27 lore raw

PATCH 27/35 libuv: fixup SRC_URI

In reply to Steve Sakoman

From: Kai Kang <[email protected]>

Add the trailing '.git' to git repo uri in SRC_URI then it could share source code repo on premirror with grpc which uses libuv as a git submodule with fixed revision.

(cherry picked from commit cecdf616e7cf192cdc723a446be1d14c197c980d)
---
 meta/recipes-connectivity/libuv/libuv_1.44.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/libuv/libuv_1.44.2.bb +1 -1
index 4c1b8eed56..27e79276b5 100644
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d"
 
 SRCREV = "0c1fa696aa502eb749c2c4735005f41ba00a27b8"
-SRC_URI = "git://github.com/libuv/libuv;branch=v1.x;protocol=https"
+SRC_URI = "git://github.com/libuv/libuv.git;branch=v1.x;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.25.1
#28 lore raw

PATCH 28/35 systemd: Consider PACKAGECONFIG in RRECOMMENDS

In reply to Steve Sakoman

From: Niko Mauno <[email protected]>

Since RRECOMMENDS declaration implictly induces building the recipes that provide the runtime recommended packages, conditionalize adding such values according to associated PACKAGECONFIG settings in order to avoid redundant building.

(cherry picked from commit a1989add927f7805378fe4d5afbde780b747ba77)
---
 meta/recipes-core/systemd/systemd_251.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/systemd/systemd_251.4.bb +2 -2
index 87668cadc7..1b771a7b86 100644
@@ -437,9 +437,9 @@ FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
                       ${rootlibexecdir}/systemd/systemd-binfmt \
                       ${systemd_system_unitdir}/proc-sys-fs-binfmt_misc.* \
                       ${systemd_system_unitdir}/systemd-binfmt.service"
-RRECOMMENDS:${PN}-binfmt = "kernel-module-binfmt-misc"
+RRECOMMENDS:${PN}-binfmt = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', 'kernel-module-binfmt-misc', '', d)}"
 
-RRECOMMENDS:${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
+RRECOMMENDS:${PN}-vconsole-setup = "${@bb.utils.contains('PACKAGECONFIG', 'vconsole', 'kbd kbd-consolefonts kbd-keymaps', '', d)}"
 
 
 FILES:${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \
Signature · 1 line
2.25.1
#29 lore raw

PATCH 29/35 kernel.bbclass: Include randstruct seed assets in STAGING_KERNEL_BUILDDIR

In reply to Steve Sakoman

From: Diego Sueiro <[email protected]>

When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need to copy the build assets generated for the randstrutc seed to STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will generate those assets which will result in a different RANDSTRUCT_HASHED_SEED.

(cherry picked from commit b36303158b2e0273ff415bdedefb379f680b30fc)
---
 meta/classes-recipe/kernel.bbclass | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
meta/classes-recipe/kernel.bbclass +16 -0
index 7bb3449223..3834a42fb9 100644
@@ -591,6 +591,22 @@ do_shared_workdir () {
 			cp tools/objtool/objtool ${kerneldir}/tools/objtool/
 		fi
 	fi
+
+	# When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need
+	# to copy the build assets generated for the randstruct seed to
+	# STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will
+	# generate those assets which will result in a different
+	# RANDSTRUCT_HASHED_SEED
+	if [ -d scripts/basic ]; then
+		mkdir -p ${kerneldir}/scripts
+		cp -r scripts/basic ${kerneldir}/scripts
+	fi
+
+	if [ -d scripts/gcc-plugins ]; then
+		mkdir -p ${kerneldir}/scripts
+		cp -r scripts/gcc-plugins ${kerneldir}/scripts
+	fi
+
 }
 
 # We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware
Signature · 1 line
2.25.1
#30 lore raw

PATCH 30/35 insane: add codeload.github.com to src-uri-bad check

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

GitHub redirects /archive/ URLs to codeload.github.com, a dedicated service for caching git archives:

$ wget -v https://github.com/unicode-org/icu/archive/refs/tags/release-72-1.zip
HTTP request sent, awaiting response... 302 Found
Location: https://codeload.github.com/unicode-org/icu/zip/refs/tags/release-72-1 [following]

This is not the case for uploaded artifacts:

$ wget -v https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-data-bin-l.zip.asc
HTTP request sent, awaiting response... 302 Found
Location: https://objects.githubusercontent.com/github-production-release-asset-2e65be/49244766/... [following]

Check for codeload.github.com URLs in the src-uri-bad check in case the SRC_URI contains this final URL, and not the public URI.

(cherry picked from commit a3b4575259fa304c596ed227ed60769b5f72f0a8)
---
 meta/classes-global/insane.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-global/insane.bbclass +1 -1
index dc46857a19..df2c40c3c5 100644
@@ -1346,7 +1346,7 @@ def unpack_check_src_uri(pn, d):
 
     for url in d.getVar("SRC_URI").split():
         # Search for github and gitlab URLs that pull unstable archives (comment for future greppers)
-        if re.search(r"git(hu|la)b\.com/.+/.+/archive/.+", url):
+        if re.search(r"git(hu|la)b\.com/.+/.+/archive/.+", url) or "//codeload.github.com/" in url:
             oe.qa.handle_error("src-uri-bad", "%s: SRC_URI uses unstable GitHub/GitLab archives, convert recipe to use git protocol" % pn, d)
 
 python do_qa_unpack() {
Signature · 1 line
2.25.1
#31 lore raw

PATCH 31/35 gcc-shared-source: Fix source date epoch handling

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

The source date epoch for gcc isn't being transferred from the shared workdir to the current WORKDIR for the specific recipe. This results in the clamping code within sstate.bbclass using a value from 2011 which changes the timestamps of many files. Since this happens part way through the build, if pieces of gcc haven't built, or build/rebuild later, we see things rebuilding when they should not and for generated files, races are possible.

Fix this by copying the SDE from the shared workdir into the recipe workdir.

[YOCTO #14953]

(cherry picked from commit b996293b4c8ab7ff3ed852045d17290df29205df)
---
 meta/recipes-devtools/gcc/gcc-shared-source.inc | 10 ++++++++++
 1 file changed, 10 insertions(+)
meta/recipes-devtools/gcc/gcc-shared-source.inc +10 -0
index aac4b49313..cd2e341099 100644
@@ -9,3 +9,13 @@ SRC_URI = ""
 
 do_configure[depends] += "gcc-source-${PV}:do_preconfigure"
 do_populate_lic[depends] += "gcc-source-${PV}:do_unpack"
+do_deploy_source_date_epoch[depends] += "gcc-source-${PV}:do_deploy_source_date_epoch"
+
+# Copy the SDE from the shared workdir to the recipe workdir
+do_deploy_source_date_epoch () {
+	sde_file=${SDE_FILE}
+	sde_file=${sde_file#${WORKDIR}/}
+	mkdir -p ${SDE_DEPLOYDIR} $(dirname ${SDE_FILE})
+	cp -p ${S}/../$sde_file ${SDE_DEPLOYDIR}
+	cp -p ${S}/../$sde_file ${SDE_FILE}
+}
Signature · 1 line
2.25.1
#32 lore raw

PATCH 32/35 gcc-source: Fix gengtypes race

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

gcc renamed .c files to .cc files:

https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=5c69acb32329d49e58c26fa41ae74229a52b9106

but we didn't fix this reference which meant we re-introduced a race around gengtypes-lex.c. This lead to the race reappearing on the autobuilder. Fix the naming to avoid the problem again.

[YOCTO #14953]

(cherry picked from commit dbca40ed399405b663dbc3894e35596a2615f47d)
---
 meta/recipes-devtools/gcc/gcc-source.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-source.inc +1 -1
index 224b7778ef..03837f4381 100644
@@ -26,7 +26,7 @@ python do_preconfigure () {
     cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize')
     subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
     # See 0044-gengtypes.patch, we need to regenerate this file
-    bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c"))
+    bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.cc"))
     cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure")
     subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
 
Signature · 1 line
2.25.1
#33 lore raw

PATCH 33/35 gcc-source: Drop gengtype manipulation

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Whilst we patch gengtype.cc, we don't patch gengtype-lex.cc which would be the file which would trigger regeneration of files.

The real bug that was likely the cause for this fix is probably SDE issues with gcc shared workdir so this code can now be dropped.

(cherry picked from commit 7ab82b5db2a737c2a0266280b15d343a27c0e1d5)
---
 meta/recipes-devtools/gcc/gcc-source.inc | 2 --
 1 file changed, 2 deletions(-)
meta/recipes-devtools/gcc/gcc-source.inc +0 -2
index 03837f4381..bf33a4b31f 100644
@@ -25,8 +25,6 @@ python do_preconfigure () {
     import subprocess
     cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize')
     subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
-    # See 0044-gengtypes.patch, we need to regenerate this file
-    bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.cc"))
     cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure")
     subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
 
Signature · 1 line
2.25.1
#34 lore raw

PATCH 34/35 gcc-source: Ensure deploy_source_date_epoch sstate hash doesn't change

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Currently if you switch machines, gcc-source do_deploy_source_date_epoch would re-run as the stamps are tune specific. This hasn't caused much of an issue until now, however if we fix the gcc recipes to reuse the timestamp from this task, it does then create problems.

Copy code from allarch to ensure this task hash doesn't change between machines/tunes.

(cherry picked from commit 7e052d03464ba5e880a6c5a0e45ff2f467ef97e8)
---
 meta/recipes-devtools/gcc/gcc-source.inc | 7 +++++++
 1 file changed, 7 insertions(+)
meta/recipes-devtools/gcc/gcc-source.inc +7 -0
index bf33a4b31f..265bcf4bef 100644
@@ -17,6 +17,13 @@ STAMPCLEAN = "${STAMPS_DIR}/work-shared/gcc-${PV}-*"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = ""
 PACKAGES = ""
+TARGET_ARCH = "allarch"
+TARGET_AS_ARCH = "none"
+TARGET_CC_ARCH = "none"
+TARGET_LD_ARCH = "none"
+TARGET_OS = "linux"
+baselib = "lib"
+PACKAGE_ARCH = "all"
 
 B = "${WORKDIR}/build"
 
Signature · 1 line
2.25.1
#35 lore raw

PATCH 35/35 wic: make ext2/3/4 images reproducible

In reply to Steve Sakoman

From: Sergei Zhmylev <[email protected]>

Ext2/3/4 FS contains not only mtime, but also ctime, atime and crtime. Currently, all the files are being added into the rootfs image using mkfs -d functionality which affects all the timestamps excluding mtime. This patch ensures these timestamps inside the FS image equal to the SOURCE_DATE_EPOCH if it is set.

(cherry picked from commit 75d2dd0ea7790db2e8ee921784ca373abff2df65)
---
 scripts/lib/wic/partition.py | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)
scripts/lib/wic/partition.py +24 -5
index bc889bdeb9..2a916e077c 100644
@@ -294,17 +294,36 @@ class Partition():
                 f.write("cd etc\n")
                 f.write("rm fstab\n")
                 f.write("write %s fstab\n" % (self.updated_fstab_path))
-                if os.getenv('SOURCE_DATE_EPOCH'):
-                    fstab_time = int(os.getenv('SOURCE_DATE_EPOCH'))
-                    for time in ["atime", "mtime", "ctime"]:
-                        f.write("set_inode_field fstab %s %s\n" % (time, hex(fstab_time)))
-                        f.write("set_inode_field fstab %s_extra 0\n" % (time))
             debugfs_cmd = "debugfs -w -f %s %s" % (debugfs_script_path, rootfs)
             exec_native_cmd(debugfs_cmd, native_sysroot)
 
         mkfs_cmd = "fsck.%s -pvfD %s" % (self.fstype, rootfs)
         exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo)
 
+        if os.getenv('SOURCE_DATE_EPOCH'):
+            sde_time = hex(int(os.getenv('SOURCE_DATE_EPOCH')))
+            debugfs_script_path = os.path.join(cr_workdir, "debugfs_script")
+            files = []
+            for root, dirs, others in os.walk(rootfs_dir):
+                base = root.replace(rootfs_dir, "").rstrip(os.sep)
+                files += [ "/" if base == "" else base ]
+                files += [ base + "/" + n for n in dirs + others ]
+            with open(debugfs_script_path, "w") as f:
+                f.write("set_current_time %s\n" % (sde_time))
+                if self.updated_fstab_path and self.has_fstab and not self.no_fstab_update:
+                    f.write("set_inode_field /etc/fstab mtime %s\n" % (sde_time))
+                    f.write("set_inode_field /etc/fstab mtime_extra 0\n")
+                for file in set(files):
+                    for time in ["atime", "ctime", "crtime"]:
+                        f.write("set_inode_field \"%s\" %s %s\n" % (file, time, sde_time))
+                        f.write("set_inode_field \"%s\" %s_extra 0\n" % (file, time))
+                for time in ["wtime", "mkfs_time", "lastcheck"]:
+                    f.write("set_super_value %s %s\n" % (time, sde_time))
+                for time in ["mtime", "first_error_time", "last_error_time"]:
+                    f.write("set_super_value %s 0\n" % (time))
+            debugfs_cmd = "debugfs -w -f %s %s" % (debugfs_script_path, rootfs)
+            exec_native_cmd(debugfs_cmd, native_sysroot)
+
         self.check_for_Y2038_problem(rootfs, native_sysroot)
 
     def prepare_rootfs_btrfs(self, rootfs, cr_workdir, oe_builddir, rootfs_dir,
Signature · 1 line
2.25.1