Skip to contentSkip to conversation

Patch review

PATCH In review Steve Sakoman 2 participants 11 messages Apr 4, 2022

lore
Share & tools
lore
#0 lore raw

cover Patch review

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

Passed a-full on autobuilder:

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

The following changes since commit aa2bb4f62dd7e5c6fdf220264c3d62fbf2cc7d16:

xserver-xorg: update to 1.20.14 (2022-03-29 11:43:54 -1000)

are available in the Git repository at:

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

Davide Gardenal (1):
go: backport patch fix for CVE-2021-38297

Martin Jansa (1):
boost: fix native build with glibc-2.34

Oleksandr Kravchuk (1):
tzdata: update to 2022a

Peter Kjellerstedt (1):
python3-jinja2: Correct HOMEPAGE

Ralph Siemsen (2):
bluez5: fix CVE-2022-0204
bind: update to 9.11.37

Richard Purdie (1):
mirrors: Add missing gitsm entries for yocto/oe mirrors

Ross Burton (1):
grub: ignore CVE-2021-46705

 meta/classes/mirrors.bbclass                  |  2 +
 meta/recipes-bsp/grub/grub2.inc               |  2 +
 .../bind/{bind_9.11.36.bb => bind_9.11.37.bb} |  4 +-
 meta/recipes-connectivity/bluez5/bluez5.inc   |  1 +
 .../bluez5/bluez5/CVE-2022-0204.patch         | 66 +++++++++++++
 meta/recipes-devtools/go/go-1.14.inc          |  4 +
 .../go/go-1.14/CVE-2021-38297.patch           | 97 +++++++++++++++++++
 .../python/python3-jinja2_2.11.3.bb           |  2 +-
 meta/recipes-extended/timezone/timezone.inc   |  6 +-
 ...e-warning-with-glibc-2.34-on-Linux-p.patch | 32 ++++++
 ...-elide-a-warning-that-caused-Solaris.patch | 24 +++++
 meta/recipes-support/boost/boost_1.72.0.bb    |  2 +
 12 files changed, 236 insertions(+), 6 deletions(-)
 rename meta/recipes-connectivity/bind/{bind_9.11.36.bb => bind_9.11.37.bb} (97%)
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2022-0204.patch
 create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch
 create mode 100644 meta/recipes-support/boost/boost/0001-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux-p.patch
 create mode 100644 meta/recipes-support/boost/boost/0001-Revert-change-to-elide-a-warning-that-caused-Solaris.patch
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/8 grub: ignore CVE-2021-46705

From: Ross Burton <[email protected]>

This is specific to SUSE Linux.

(cherry picked from commit 594baef3b08d40fbbf1899f4cadeb9931c035c1a)
---
 meta/recipes-bsp/grub/grub2.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-bsp/grub/grub2.inc +2 -0
index 75ef31f249..0d3f6d05da 100644
@@ -15,6 +15,8 @@ CVE_PRODUCT = "grub2"
 
 # Applies only to RHEL
 CVE_CHECK_WHITELIST += "CVE-2019-14865"
+# Applies only to SUSE
+CVE_CHECK_WHITELIST += "CVE-2021-46705"
 
 SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \
            file://0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch \
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/8 go: backport patch fix for CVE-2021-38297

In reply to Steve Sakoman

From: Davide Gardenal <[email protected]>

Patch taken from
https://github.com/golang/go/commit/4548fcc8dfd933c237f29bba6f90040a85922564
from the following issue
https://github.com/golang/go/issues/48797

Original repo
https://go.googlesource.com/go/+/77f2750f4398990eed972186706f160631d7dae4

---
 meta/recipes-devtools/go/go-1.14.inc          |  4 +
 .../go/go-1.14/CVE-2021-38297.patch           | 97 +++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch
meta/recipes-devtools/go/go-1.14.inc +4 -0
index 9b3c3b30a8..f98757d10d 100644
@@ -19,9 +19,13 @@ SRC_URI += "\
     file://CVE-2021-34558.patch \
     file://CVE-2021-33196.patch \
     file://CVE-2021-33197.patch \
+    file://CVE-2021-38297.patch \
     file://CVE-2022-23806.patch \
     file://CVE-2022-23772.patch \
 "
+
+# file://CVE-2021-38297.patch
+
 SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
 SRC_URI[main.sha256sum] = "7ed13b2209e54a451835997f78035530b331c5b6943cdcd68a3d815fdc009149"
 
meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +97 -0

98 lines not on this page · raw message

Signature · 1 line
2.25.1
#3 lore raw

Re: [OE-core][dunfell 2/8] go: backport patch fix for CVE-2021-38297

Hi Steve,

There is one commented out line present. Is that really needed?

Thanks,
Ranjitsinh Rathod

Quoted 172 lines · Steve Sakoman,

From: Davide Gardenal <[email protected]>

Patch taken from

https://github.com/golang/go/commit/4548fcc8dfd933c237f29bba6f90040a85922564
from the following issue
https://github.com/golang/go/issues/48797

Original repo
https://go.googlesource.com/go/+/77f2750f4398990eed972186706f160631d7dae4

---
 meta/recipes-devtools/go/go-1.14.inc          |  4 +
 .../go/go-1.14/CVE-2021-38297.patch           | 97 +++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch
meta/recipes-devtools/go/go-1.14.inc +4 -0
index 9b3c3b30a8..f98757d10d 100644
@@ -19,9 +19,13 @@ SRC_URI += "\
     file://CVE-2021-34558.patch \
     file://CVE-2021-33196.patch \
     file://CVE-2021-33197.patch \
+    file://CVE-2021-38297.patch \
     file://CVE-2022-23806.patch \
     file://CVE-2022-23772.patch \
 "
+
+# file://CVE-2021-38297.patch
+
 SRC_URI_append_libc-musl = "

file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
SRC_URI[main.sha256sum] =
"7ed13b2209e54a451835997f78035530b331c5b6943cdcd68a3d815fdc009149"

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +26 -0
new file mode 100644
index 0000000000..24ceabf808
@@ -0,0 +1,97 @@
+From 4548fcc8dfd933c237f29bba6f90040a85922564 Mon Sep 17 00:00:00 2001
+From: Michael Knyszek <[email protected]>
+Date: Thu, 2 Sep 2021 16:51:59 -0400
+Subject: [PATCH] [release-branch.go1.16] misc/wasm, cmd/link: do not let
+ command line args overwrite global data
+
+On Wasm, wasm_exec.js puts command line arguments at the beginning
+of the linear memory (following the "zero page"). Currently there
+is no limit for this, and a very long command line can overwrite
+the program's data section. Prevent this by limiting the command
+line to 4096 bytes, and in the linker ensuring the data section
+starts at a high enough address (8192).
+
+(Arguably our address assignment on Wasm is a bit confusing. This
+is the minimum fix I can come up with.)
+
+Thanks to Ben Lubar for reporting this issue.
+
+Change by Cherry Mui <[email protected]>.
+
+For #48797
+Fixes #48799
+Fixes CVE-2021-38297
+
+Change-Id: I0f50fbb2a5b6d0d047e3c134a88988d9133e4ab3
+Reviewed-on:

https://team-review.git.corp.google.com/c/golang/go-private/+/1205933
+Reviewed-by
<https://team-review.git.corp.google.com/c/golang/go-private/+/1205933+Reviewed-by>:
Roland Shoemaker <[email protected]>

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +9 -0
+Reviewed-by: Than McIntosh <[email protected]>
+Reviewed-on: https://go-review.googlesource.com/c/go/+/354591
+Trust: Michael Knyszek <[email protected]>
+Reviewed-by: Heschi Kreinick <[email protected]>
+
+CVE: CVE-2021-38297
+
+Upstream-Status: Backport:
+

https://github.com/golang/go/commit/4548fcc8dfd933c237f29bba6f90040a85922564

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +3 -0
+
+Inline of ctxt.isWAsm followin this implemetation:
+

https://github.com/golang/go/blob/4548fcc8dfd933c237f29bba6f90040a85922564/src/cmd/link/internal/ld/target.go#L127

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +16 -0
+
+Signed-off-by: Davide Gardenal <[email protected]>
+---
+ misc/wasm/wasm_exec.js           |  7 +++++++
+ src/cmd/link/internal/ld/data.go | 11 ++++++++++-
+ 2 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/misc/wasm/wasm_exec.js b/misc/wasm/wasm_exec.js
+index 82041e6bb901..a0a264278b1b 100644
+--- a/misc/wasm/wasm_exec.js
++++ b/misc/wasm/wasm_exec.js
+@@ -564,6 +564,13 @@
+                               offset += 8;
+                       });
+
++                      // The linker guarantees global data starts from

at least wasmMinDataAddr.
++ // Keep in sync with
cmd/link/internal/ld/data.go:wasmMinDataAddr.
++ const wasmMinDataAddr = 4096 + 4096;
++ if (offset >= wasmMinDataAddr) {
++ throw new Error("command line too long");
++ }
++

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +4 -0
+                       this._inst.exports.run(argc, argv);
+                       if (this.exited) {
+                               this._resolveExitPromise();
+diff --git a/src/cmd/link/internal/ld/data.go

b/src/cmd/link/internal/ld/data.go
+index 52035e96301c..54a1d188cdb9 100644
+--- a/src/cmd/link/internal/ld/data.go
++++ b/src/cmd/link/internal/ld/data.go
+@@ -2330,6 +2330,11 @@ func assignAddress(ctxt *Link, sect *sym.Section, n int, s loader.Sym, va uint64

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +4 -0
+       return sect, n, va
+ }
+
++// On Wasm, we reserve 4096 bytes for zero page, then 4096 bytes for

wasm_exec.js
++// to store command line args. Data sections starts from at least address 8192.
++// Keep in sync with wasm_exec.js.
++const wasmMinDataAddr = 4096 + 4096
++
+ // address assigns virtual addresses to all segments and sections and
+ // returns all segments in file order.
+ func (ctxt *Link) address() []*sym.Segment {
+@@ -2339,10 +2344,14 @@ func (ctxt *Link) address() []*sym.Segment {

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +10 -0
+       order = append(order, &Segtext)
+       Segtext.Rwx = 05
+       Segtext.Vaddr = va
+-      for _, s := range Segtext.Sections {
++      for i, s := range Segtext.Sections {
+               va = uint64(Rnd(int64(va), int64(s.Align)))
+               s.Vaddr = va
+               va += s.Length
++
++              if ctxt.Arch.Family == sys.Wasm && i == 0 && va <

wasmMinDataAddr {
++ va = wasmMinDataAddr
++ }

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +4 -1
+       }
+
+       Segtext.Length = va - uint64(*FlagTextAddr)
+
\ No newline at end of file
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#163974):
https://lists.openembedded.org/g/openembedded-core/message/163974
Mute This Topic: https://lists.openembedded.org/mt/90233348/6360406
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#4 lore raw

Re: [OE-core][dunfell 2/8] go: backport patch fix for CVE-2021-38297

Quoted 4 lines · Ranjitsinh Rathod

Hi Steve,

There is one commented out line present. Is that really needed?

Good catch! I'll remove that prior to the pull request.

Steve

Quoted 177 lines

Thanks,
Ranjitsinh Rathod

Quoted 172 lines · Steve Sakoman,

From: Davide Gardenal <[email protected]>

Patch taken from

https://github.com/golang/go/commit/4548fcc8dfd933c237f29bba6f90040a85922564
from the following issue
https://github.com/golang/go/issues/48797

Original repo
https://go.googlesource.com/go/+/77f2750f4398990eed972186706f160631d7dae4

---
 meta/recipes-devtools/go/go-1.14.inc          |  4 +
 .../go/go-1.14/CVE-2021-38297.patch           | 97 +++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch
meta/recipes-devtools/go/go-1.14.inc +4 -0
index 9b3c3b30a8..f98757d10d 100644
@@ -19,9 +19,13 @@ SRC_URI += "\
     file://CVE-2021-34558.patch \
     file://CVE-2021-33196.patch \
     file://CVE-2021-33197.patch \
+    file://CVE-2021-38297.patch \
     file://CVE-2022-23806.patch \
     file://CVE-2022-23772.patch \
 "
+
+# file://CVE-2021-38297.patch
+
 SRC_URI_append_libc-musl = "

file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
SRC_URI[main.sha256sum] =
"7ed13b2209e54a451835997f78035530b331c5b6943cdcd68a3d815fdc009149"

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +26 -0
new file mode 100644
index 0000000000..24ceabf808
@@ -0,0 +1,97 @@
+From 4548fcc8dfd933c237f29bba6f90040a85922564 Mon Sep 17 00:00:00 2001
+From: Michael Knyszek <[email protected]>
+Date: Thu, 2 Sep 2021 16:51:59 -0400
+Subject: [PATCH] [release-branch.go1.16] misc/wasm, cmd/link: do not let
+ command line args overwrite global data
+
+On Wasm, wasm_exec.js puts command line arguments at the beginning
+of the linear memory (following the "zero page"). Currently there
+is no limit for this, and a very long command line can overwrite
+the program's data section. Prevent this by limiting the command
+line to 4096 bytes, and in the linker ensuring the data section
+starts at a high enough address (8192).
+
+(Arguably our address assignment on Wasm is a bit confusing. This
+is the minimum fix I can come up with.)
+
+Thanks to Ben Lubar for reporting this issue.
+
+Change by Cherry Mui <[email protected]>.
+
+For #48797
+Fixes #48799
+Fixes CVE-2021-38297
+
+Change-Id: I0f50fbb2a5b6d0d047e3c134a88988d9133e4ab3
+Reviewed-on:

https://team-review.git.corp.google.com/c/golang/go-private/+/1205933
+Reviewed-by
<https://team-review.git.corp.google.com/c/golang/go-private/+/1205933+Reviewed-by>:
Roland Shoemaker <[email protected]>

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +9 -0
+Reviewed-by: Than McIntosh <[email protected]>
+Reviewed-on: https://go-review.googlesource.com/c/go/+/354591
+Trust: Michael Knyszek <[email protected]>
+Reviewed-by: Heschi Kreinick <[email protected]>
+
+CVE: CVE-2021-38297
+
+Upstream-Status: Backport:
+

https://github.com/golang/go/commit/4548fcc8dfd933c237f29bba6f90040a85922564

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +3 -0
+
+Inline of ctxt.isWAsm followin this implemetation:
+

https://github.com/golang/go/blob/4548fcc8dfd933c237f29bba6f90040a85922564/src/cmd/link/internal/ld/target.go#L127

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +16 -0
+
+Signed-off-by: Davide Gardenal <[email protected]>
+---
+ misc/wasm/wasm_exec.js           |  7 +++++++
+ src/cmd/link/internal/ld/data.go | 11 ++++++++++-
+ 2 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/misc/wasm/wasm_exec.js b/misc/wasm/wasm_exec.js
+index 82041e6bb901..a0a264278b1b 100644
+--- a/misc/wasm/wasm_exec.js
++++ b/misc/wasm/wasm_exec.js
+@@ -564,6 +564,13 @@
+                               offset += 8;
+                       });
+
++                      // The linker guarantees global data starts from

at least wasmMinDataAddr.
++ // Keep in sync with
cmd/link/internal/ld/data.go:wasmMinDataAddr.
++ const wasmMinDataAddr = 4096 + 4096;
++ if (offset >= wasmMinDataAddr) {
++ throw new Error("command line too long");
++ }
++

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +4 -0
+                       this._inst.exports.run(argc, argv);
+                       if (this.exited) {
+                               this._resolveExitPromise();
+diff --git a/src/cmd/link/internal/ld/data.go

b/src/cmd/link/internal/ld/data.go
+index 52035e96301c..54a1d188cdb9 100644
+--- a/src/cmd/link/internal/ld/data.go
++++ b/src/cmd/link/internal/ld/data.go
+@@ -2330,6 +2330,11 @@ func assignAddress(ctxt *Link, sect *sym.Section, n int, s loader.Sym, va uint64

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +4 -0
+       return sect, n, va
+ }
+
++// On Wasm, we reserve 4096 bytes for zero page, then 4096 bytes for

wasm_exec.js
++// to store command line args. Data sections starts from at least address 8192.
++// Keep in sync with wasm_exec.js.
++const wasmMinDataAddr = 4096 + 4096
++
+ // address assigns virtual addresses to all segments and sections and
+ // returns all segments in file order.
+ func (ctxt *Link) address() []*sym.Segment {
+@@ -2339,10 +2344,14 @@ func (ctxt *Link) address() []*sym.Segment {

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +10 -0
+       order = append(order, &Segtext)
+       Segtext.Rwx = 05
+       Segtext.Vaddr = va
+-      for _, s := range Segtext.Sections {
++      for i, s := range Segtext.Sections {
+               va = uint64(Rnd(int64(va), int64(s.Align)))
+               s.Vaddr = va
+               va += s.Length
++
++              if ctxt.Arch.Family == sys.Wasm && i == 0 && va <

wasmMinDataAddr {
++ va = wasmMinDataAddr
++ }

meta/recipes-devtools/go/go-1.14/CVE-2021-38297.patch new file +4 -1
+       }
+
+       Segtext.Length = va - uint64(*FlagTextAddr)
+
\ No newline at end of file
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#163974):
https://lists.openembedded.org/g/openembedded-core/message/163974
Mute This Topic: https://lists.openembedded.org/mt/90233348/6360406
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#5 lore raw

PATCH 3/8 bluez5: fix CVE-2022-0204

In reply to Steve Sakoman

From: Ralph Siemsen <[email protected]>

Fix heap overflow when appending prepare writes

The code shall check if the prepare writes would append more the allowed maximum attribute length.

Upstream-Status: Backport [https://github.com/bluez/bluez/commit/591c546c536b42bef696d027f64aa22434f8c3f0]
CVE: CVE-2022-0204

---
 meta/recipes-connectivity/bluez5/bluez5.inc   |  1 +
 .../bluez5/bluez5/CVE-2022-0204.patch         | 66 +++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2022-0204.patch
meta/recipes-connectivity/bluez5/bluez5.inc +1 -0
index 7cf061dcf6..4d4348898a 100644
@@ -55,6 +55,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
            file://CVE-2021-0129.patch \
            file://CVE-2021-3588.patch \
           file://CVE-2021-3658.patch \
+           file://CVE-2022-0204.patch \
            "
 S = "${WORKDIR}/bluez-${PV}"
 
meta/recipes-connectivity/bluez5/bluez5/CVE-2022-0204.patch new file +66 -0

66 lines not on this page · raw message

Signature · 1 line
2.25.1
#6 lore raw

PATCH 4/8 bind: update to 9.11.37

In reply to Steve Sakoman

From: Ralph Siemsen <[email protected]>

Security Fixes

The rules for acceptance of records into the cache have been tightened to prevent the possibility of poisoning if forwarders send records outside the configured bailiwick. (CVE-2021-25220)

License-Update: copyright years

---
 .../bind/{bind_9.11.36.bb => bind_9.11.37.bb}                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/bind/{bind_9.11.36.bb => bind_9.11.37.bb} (97%)
meta/recipes-connectivity/bind/bind_9.11.37.bb renamed from meta/recipes-connectivity/bind/bind_9.11.36.bb +2 -2
similarity index 97%
rename from meta/recipes-connectivity/bind/bind_9.11.36.bb
rename to meta/recipes-connectivity/bind/bind_9.11.37.bb
index 872baf6d2f..afc8cf0b3b 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "BIND 9 provides a full-featured Domain Name Server system"
 SECTION = "console/network"
 
 LICENSE = "ISC & BSD"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b88e7ca5f21908e1b2720169f6807cf6"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=89a97ebbf713f7125fe5c02223d3ae95"
 
 DEPENDS = "openssl libcap zlib"
 
@@ -21,7 +21,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
            file://0001-avoid-start-failure-with-bind-user.patch \
            "
 
-SRC_URI[sha256sum] = "c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681"
+SRC_URI[sha256sum] = "0d8efbe7ec166ada90e46add4267b7e7c934790cba9bd5af6b8380a4fbfb5aff"
 
 UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
 # stay at 9.11 until 9.16, from 9.16 follow the ESV versions divisible by 4
Signature · 1 line
2.25.1
#7 lore raw

PATCH 5/8 mirrors: Add missing gitsm entries for yocto/oe mirrors

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

The missing gitsm:// mappings looks like an oversight, add them.

(cherry picked from commit 6600b9fca7888fb41647cd000b9efb7f0762dfde)
---
 meta/classes/mirrors.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/mirrors.bbclass +2 -0
index a36236df9f..669d0cc8ff 100644
@@ -42,6 +42,7 @@ ftp://sourceware.org/pub http://ftp.gwdg.de/pub/linux/sources.redhat.com/sourcew
 cvs://.*/.*     http://downloads.yoctoproject.org/mirror/sources/ \n \
 svn://.*/.*     http://downloads.yoctoproject.org/mirror/sources/ \n \
 git://.*/.*     http://downloads.yoctoproject.org/mirror/sources/ \n \
+gitsm://.*/.*     http://downloads.yoctoproject.org/mirror/sources/ \n \
 hg://.*/.*      http://downloads.yoctoproject.org/mirror/sources/ \n \
 bzr://.*/.*     http://downloads.yoctoproject.org/mirror/sources/ \n \
 p4://.*/.*      http://downloads.yoctoproject.org/mirror/sources/ \n \
@@ -52,6 +53,7 @@ npm://.*/?.*    http://downloads.yoctoproject.org/mirror/sources/ \n \
 cvs://.*/.*     http://sources.openembedded.org/ \n \
 svn://.*/.*     http://sources.openembedded.org/ \n \
 git://.*/.*     http://sources.openembedded.org/ \n \
+gitsm://.*/.*     http://sources.openembedded.org/ \n \
 hg://.*/.*      http://sources.openembedded.org/ \n \
 bzr://.*/.*     http://sources.openembedded.org/ \n \
 p4://.*/.*      http://sources.openembedded.org/ \n \
Signature · 1 line
2.25.1
#8 lore raw

PATCH 6/8 boost: fix native build with glibc-2.34

In reply to Steve Sakoman

From: Martin Jansa <[email protected]>

---
 ...e-warning-with-glibc-2.34-on-Linux-p.patch | 32 +++++++++++++++++++
 ...-elide-a-warning-that-caused-Solaris.patch | 24 ++++++++++++++
 meta/recipes-support/boost/boost_1.72.0.bb    |  2 ++
 3 files changed, 58 insertions(+)
 create mode 100644 meta/recipes-support/boost/boost/0001-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux-p.patch
 create mode 100644 meta/recipes-support/boost/boost/0001-Revert-change-to-elide-a-warning-that-caused-Solaris.patch
meta/recipes-support/boost/boost/0001-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux-p.patch new file +32 -0
new file mode 100644
index 0000000000..46c706931b
@@ -0,0 +1,32 @@
+From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001
+From: Romain Geissler <[email protected]>
+Date: Tue, 10 Aug 2021 14:22:28 +0000
+Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux
+ platforms.
+
+In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17,
+                 from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12,
+                 from src/GetTest.cpp:12:
+/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)':
+/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare]
+   61 |           if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
+      |                   ^
+
+Upstream-Status: Backport [1.78.0 https://github.com/boostorg/thread/commit/f9d0e594d43afcb4ab0043117249feb266ba4515]
+---
+ boost/thread/pthread/thread_data.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/boost/thread/pthread/thread_data.hpp b/boost/thread/pthread/thread_data.hpp
+index bc9b1367..c43b276d 100644
+--- a/boost/thread/pthread/thread_data.hpp
++++ b/boost/thread/pthread/thread_data.hpp
+@@ -58,7 +58,7 @@ namespace boost
+           std::size_t page_size = ::sysconf( _SC_PAGESIZE);
+ #endif
+ #ifdef PTHREAD_STACK_MIN
+-          if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
++          if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
+ #endif
+           size = ((size+page_size-1)/page_size)*page_size;
+           int res = pthread_attr_setstacksize(&val_, size);
meta/recipes-support/boost/boost/0001-Revert-change-to-elide-a-warning-that-caused-Solaris.patch new file +24 -0
new file mode 100644
index 0000000000..3784cf9165
@@ -0,0 +1,24 @@
+From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
+From: Rob Boehne <[email protected]>
+Date: Wed, 20 Nov 2019 11:25:20 -0600
+Subject: [PATCH] Revert change to elide a warning that caused Solaris builds
+ to fail.
+
+Upstream-Status: Backport [1.73.0 https://github.com/boostorg/thread/commit/74fb0a26099bc51d717f5f154b37231ce7df3e98]
+---
+ boost/thread/pthread/thread_data.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/boost/thread/pthread/thread_data.hpp b/boost/thread/pthread/thread_data.hpp
+index aefbeb43..bc9b1367 100644
+--- a/boost/thread/pthread/thread_data.hpp
++++ b/boost/thread/pthread/thread_data.hpp
+@@ -57,7 +57,7 @@ namespace boost
+ #else
+           std::size_t page_size = ::sysconf( _SC_PAGESIZE);
+ #endif
+-#if PTHREAD_STACK_MIN > 0
++#ifdef PTHREAD_STACK_MIN
+           if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
+ #endif
+           size = ((size+page_size-1)/page_size)*page_size;
meta/recipes-support/boost/boost_1.72.0.bb +2 -0
index df1cc16937..b3ec11933c 100644
@@ -9,4 +9,6 @@ SRC_URI += " \
            file://0001-dont-setup-compiler-flags-m32-m64.patch \
            file://0001-revert-cease-dependence-on-range.patch \
            file://0001-added-typedef-executor_type.patch \
+           file://0001-Revert-change-to-elide-a-warning-that-caused-Solaris.patch \
+           file://0001-Fix-Wsign-compare-warning-with-glibc-2.34-on-Linux-p.patch \
            "
Signature · 1 line
2.25.1
#9 lore raw

PATCH 7/8 python3-jinja2: Correct HOMEPAGE

In reply to Steve Sakoman

From: Peter Kjellerstedt <[email protected]>

(cherry picked from commit 261778c1e3665b34c0d4e49bda63b520d5335587)
---
 meta/recipes-devtools/python/python3-jinja2_2.11.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python3-jinja2_2.11.3.bb +1 -1
index dbdf563f87..9f054c6024 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "Python Jinja2: A small but fast and easy to use stand-alone template engine written in pure python."
-HOMEPAGE = "https://pypi.org/project/Jinja/"
+HOMEPAGE = "https://pypi.org/project/Jinja2/"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462"
Signature · 1 line
2.25.1
#10 lore raw

PATCH 8/8 tzdata: update to 2022a

In reply to Steve Sakoman

From: Oleksandr Kravchuk <[email protected]>

(cherry picked from commit b280aecd79e95811f8baec6c4479c5752c54d9e5)
---
 meta/recipes-extended/timezone/timezone.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-extended/timezone/timezone.inc +3 -3
index 43d14d7f12..cdd1a2ac3c 100644
@@ -6,7 +6,7 @@ SECTION = "base"
 LICENSE = "PD & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba"
 
-PV = "2021e"
+PV = "2022a"
 
 SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \
            http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \
@@ -14,6 +14,6 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz
 
 UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"
 
-SRC_URI[tzcode.sha256sum] = "584666393a5424d13d27ec01183da17703273664742e049d4f62f62dab631775"
-SRC_URI[tzdata.sha256sum] = "07ec42b737d0d3c6be9c337f8abb5f00554a0f9cc4fcf01a703d69403b6bb2b1"
+SRC_URI[tzcode.sha256sum] = "f8575e7e33be9ee265df2081092526b81c80abac3f4a04399ae9d4d91cdadac7"
+SRC_URI[tzdata.sha256sum] = "ef7fffd9f4f50f4f58328b35022a32a5a056b245c5cb3d6791dddb342f871664"
 
Signature · 1 line
2.25.1