[oe] [meta-filesystems][PATCH] zfs: update to 2.2.2

2023-12-29 Thread Bruce Ashfield
From: Bruce Ashfield 

In addition to the zfs upstream commits:

  - This fixes the build against libc-headers/kernel 6.6+
  - adds bash-completion packaging, as 2.2.2 has support

Bumping zfs to version zfs-2.2.2, which comprises the following commits:

494aaaed8 Tag zfs-2.2.2
522414da3 FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot are NFS 
visible
a8c256046 ZIL: Call brt_pending_add() replaying TX_CLONE_RANGE
eb34de04d zdb: fix printf() length for uint64_t devid
d813aa853 Linux 6.6 compat: fix configure error with clang (#15558)
3b267e72d zfs-dkms: fix shell-init error message
349fb77f1 FreeBSD: Fix the build on FreeBSD 12
2a953e0ac dmu_buf_will_clone: fix race in transition back to NOFILL
e4985bf5a zdb: Fix zdb '-O|-r' options with -e/exported zpool
e96675a7b zdb: show BRT statistics and dump its contents
d702f86ea brt: lift internal definitions into _impl header
41c4599cb ZTS: Fix zfs_load-key failures on F39
56a2a0981 ZIL: Do not encrypt block pointers in lr_clone_range_t
9b9b09f45 dnode_is_dirty: check dnode and its data for dirtiness
89fcb8c6f Revert "Tune zio buffer caches and their alignments"
55dd24c4c Tag zfs-2.2.1
78287023c ZTS: Fix 'could not unmount datasets' on Alma 9
479dca51c zfs-2.2.1: Disable block cloning by default
87e9e8286 Add a tunable to disable BRT support.
0733fe2aa Packaging: Auto-generate changelog during configure (#15528)
fd836dfe2 Linux 6.6 compat: META
e92a680c7 Workaround UBSAN errors for variable arrays
f1659cc78 ZTS: Test for all known zpool feature sets
f863ac3d0 Update zpool-features.7 for grub2 compatibility list updates
f6d2e5c07 Workaround to allow openzfs-zfs-dkms install on Ubuntu
f2fe4d51a Linux: reject read/write mapping to immutable file only on 
VM_SHARED
76663fe37 Fix accounting error for pending sync IO ops in zpool iostat
44c8ff9b0 Linux 6.6 compat: fix implicit conversion error with debug build
f0ffcc3ad Remove obsolete_counts from grub2 compatibility list
e534ba5ce Fix dkms installation of deb packages created with Alien.
1c7048357 Add all read-only compatible zpool features to grub2 compatibility
3ec4ea68d Unify arc_prune_async() code
bd7a02c25 Tune zio buffer caches and their alignments
e82e68400 DMU: Do not pre-read holes during write
3f67e012e Linux 6.6 compat: fsync_bdev() has been removed in favor of 
sync_blockdev()
21875dd09 Linux 6.6 compat: generic_fillattr has a new u32 request_mask 
added at arg2
fe9d409e9 Linux 6.6 compat: use inode_get/set_ctime*(...)
7aef672b7 Read prefetched buffers from L2ARC
f9a9aea12 Add mutex_enter_interruptible() for interruptible sleeping IOCTLs
8ba748d41 Revert "zvol: Temporally disable blk-mq"
e860cb020 zvol: Remove broken blk-mq optimization
86c3ed40e "ARC prefetch metadata accesses:" appears twice in the output.
6e41aca51 Trust ARC_BUF_SHARED() more
79f7de575 Remove lock from dsl_pool_need_dirty_delay()
0ef1964c7 run-zts test procfs/pool_state failed with uncorrectable I/O 
failure
eaa62d995 Properly pad struct tx_cpu to cache line
8ca95d78c Fix typo in  
tests/zfs-tests/tests/functional/cli_user/misc/misc.cfg
edebca5df FreeBSD: taskq: Remove unused declaration
1cc1bf4fa Set spa_ccw_fail_time=0 when expanding a vdev.
0bcd1151f Fix ZED auto-replace for VDEVs using by-id paths
78fd79eac Add zfs_prepare_disk script for disk firmware install
6d693e20a Large sync writes perform worse with slog
b76724ae4 FreeBSD: Improve taskq wrapper
459c99ff2 Fix block cloning between unencrypted and encrypted datasets

Signed-off-by: Bruce Ashfield 
---
 .../recipes-filesystems/zfs/{zfs_2.2.0.bb => zfs_2.2.2.bb}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-filesystems/recipes-filesystems/zfs/{zfs_2.2.0.bb => zfs_2.2.2.bb} 
(96%)

diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb 
b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb
similarity index 96%
rename from meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb
rename to meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb
index db6f725b6..d3ea6797e 100644
--- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb
+++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb
@@ -4,7 +4,7 @@ LICENSE = "CDDL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa"
 HOMEPAGE ="https://github.com/openzfs/zfs";
 
-SRCREV = "229ca7d738ccbf4c55076977467ee93e20b6f01b"
+SRCREV = "494aaaed89cb9fe9f2da3b6c6f465a4bc9f6a7e1"
 SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release \
file://0001-Define-strndupa-if-it-does-not-exist.patch \
file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
 # Using both 'module' and 'autotools' classes seems a bit odd, they both
 # define a do_compile function.
 # That's why we 

[oe] [meta-python][PATCH 5/5] python3-cantools: update to version 39.4.1

2023-12-29 Thread Derek Straka
Signed-off-by: Derek Straka 
---
 .../{python3-cantools_39.4.0.bb => python3-cantools_39.4.1.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-python/recipes-devtools/python/{python3-cantools_39.4.0.bb => 
python3-cantools_39.4.1.bb} (85%)

diff --git a/meta-python/recipes-devtools/python/python3-cantools_39.4.0.bb 
b/meta-python/recipes-devtools/python/python3-cantools_39.4.1.bb
similarity index 85%
rename from meta-python/recipes-devtools/python/python3-cantools_39.4.0.bb
rename to meta-python/recipes-devtools/python/python3-cantools_39.4.1.bb
index e7cafe14b..e26405dd7 100644
--- a/meta-python/recipes-devtools/python/python3-cantools_39.4.0.bb
+++ b/meta-python/recipes-devtools/python/python3-cantools_39.4.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools";
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd"
 
-SRC_URI[sha256sum] = 
"e38cf3972388436aa8e19ab985bfb19c2cb400d9ba882a5c070c3497629674cb"
+SRC_URI[sha256sum] = 
"98c4d007a6d9803c6433c743c0240e73de930530f8255e1e21d2e20e8991a30b"
 
 PYPI_PACKAGE = "cantools"
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107904): 
https://lists.openembedded.org/g/openembedded-devel/message/107904
Mute This Topic: https://lists.openembedded.org/mt/103421831/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-python][PATCH 4/5] python3-pdm-backend: update to version 2.1.8

2023-12-29 Thread Derek Straka
Signed-off-by: Derek Straka 
---
 ...ython3-pdm-backend_2.1.7.bb => python3-pdm-backend_2.1.8.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-python/recipes-devtools/python/{python3-pdm-backend_2.1.7.bb => 
python3-pdm-backend_2.1.8.bb} (80%)

diff --git a/meta-python/recipes-devtools/python/python3-pdm-backend_2.1.7.bb 
b/meta-python/recipes-devtools/python/python3-pdm-backend_2.1.8.bb
similarity index 80%
rename from meta-python/recipes-devtools/python/python3-pdm-backend_2.1.7.bb
rename to meta-python/recipes-devtools/python/python3-pdm-backend_2.1.8.bb
index 679ecb0d4..f1f507243 100644
--- a/meta-python/recipes-devtools/python/python3-pdm-backend_2.1.7.bb
+++ b/meta-python/recipes-devtools/python/python3-pdm-backend_2.1.8.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 SECTION = "devel/python"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4a564297b3c5b629a528b92fd8ff61ea"
 
-SRC_URI[sha256sum] = 
"d3b50ab6374557c1edc348135e0da5decef228ddf8c973a58e40f437cf3595ba"
+SRC_URI[sha256sum] = 
"2487dfbd13f69d80fb4e6a08006a3ee68272833970813047dc5fcfacdfdc0151"
 
 inherit pypi python_setuptools_build_meta
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107903): 
https://lists.openembedded.org/g/openembedded-devel/message/107903
Mute This Topic: https://lists.openembedded.org/mt/103421830/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-python][PATCH 3/5] python3-sqlalchemy: update to version 2.0.24

2023-12-29 Thread Derek Straka
Signed-off-by: Derek Straka 
---
 ...ython3-sqlalchemy_2.0.23.bb => python3-sqlalchemy_2.0.24.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-python/recipes-devtools/python/{python3-sqlalchemy_2.0.23.bb => 
python3-sqlalchemy_2.0.24.bb} (87%)

diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.23.bb 
b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.24.bb
similarity index 87%
rename from meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.23.bb
rename to meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.24.bb
index ce216b016..91ab762eb 100644
--- a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.23.bb
+++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.24.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sqlalchemy.org/";
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b707d50badb798e1d897f2c8f649382d"
 
-SRC_URI[sha256sum] = 
"c1bda93cbbe4aa2aa0aa8655c5aeda505cd219ff3e8da91d1d329e143e4aff69"
+SRC_URI[sha256sum] = 
"6db97656fd3fe3f7e5b077f12fa6adb5feb6e0b567a3e99f47ecf5f7ea0a09e3"
 
 PYPI_PACKAGE = "SQLAlchemy"
 inherit pypi setuptools3
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107902): 
https://lists.openembedded.org/g/openembedded-devel/message/107902
Mute This Topic: https://lists.openembedded.org/mt/103421829/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-python][PATCH 2/5] python3-engineio: update to version 4.8.1

2023-12-29 Thread Derek Straka
Signed-off-by: Derek Straka 
---
 .../{python3-engineio_4.8.0.bb => python3-engineio_4.8.1.bb}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-python/recipes-devtools/python/{python3-engineio_4.8.0.bb => 
python3-engineio_4.8.1.bb} (82%)

diff --git a/meta-python/recipes-devtools/python/python3-engineio_4.8.0.bb 
b/meta-python/recipes-devtools/python/python3-engineio_4.8.1.bb
similarity index 82%
rename from meta-python/recipes-devtools/python/python3-engineio_4.8.0.bb
rename to meta-python/recipes-devtools/python/python3-engineio_4.8.1.bb
index 1cc79f1a9..f88a3acf1 100644
--- a/meta-python/recipes-devtools/python/python3-engineio_4.8.0.bb
+++ b/meta-python/recipes-devtools/python/python3-engineio_4.8.1.bb
@@ -17,4 +17,4 @@ RDEPENDS:${PN} += " \
python3-asyncio \
 "
 
-SRC_URI[sha256sum] = 
"2a32585d8fecd0118264fe0c39788670456ca9aa466d7c026d995cfff68af164"
+SRC_URI[sha256sum] = 
"fadc39c66348f96476d8dc2d7aaee7ea0a39d96e333217f5321300677b980121"
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107901): 
https://lists.openembedded.org/g/openembedded-devel/message/107901
Mute This Topic: https://lists.openembedded.org/mt/103421828/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-python][PATCH 1/5] python3-kmod: add comment about update to version 0.9.2

2023-12-29 Thread Derek Straka
Signed-off-by: Derek Straka 
---
 meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb 
b/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb
index 2ec4d474b..52e1cf6af 100644
--- a/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb
+++ b/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=6d62c2454850386a2ffe44f72db83d74"
 
 inherit pypi setuptools3
 
+RECIPE_NO_UPDATE_REASON = "Version 0.9.2 is broken when using latest build 
machinery for C extensions"
 SRC_URI[sha256sum] = 
"f3bf829059bf88eca22f4f549e17aa316cdaa14302bf2ba49ddeee60cea109ff"
 
 DEPENDS += " \
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107900): 
https://lists.openembedded.org/g/openembedded-devel/message/107900
Mute This Topic: https://lists.openembedded.org/mt/103421827/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 17/17] apache2: v2.4.57 to v2.4.58 to fix CVE-2023-43622

2023-12-29 Thread Armin Kuster
From: Dylan Turner 

Note that patch 0011-modules... is no longer needed as it's included in
the upgrade as well.

CVE: CVE-2023-43622

Signed-off-by: Dylan Turner 
Signed-off-by: Khem Raj 
(cherry picked from commit 9f0b5053410d5958e089351b93199efd3473d3de)
Signed-off-by: Armin Kuster 
---
 ...config9.m4-Add-server-directory-to-i.patch | 31 ---
 .../{apache2_2.4.57.bb => apache2_2.4.58.bb}  |  3 +-
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 
meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
 rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.57.bb => 
apache2_2.4.58.bb} (98%)

diff --git 
a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
 
b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
deleted file mode 100644
index 9accbf18a1..00
--- 
a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00 2001
-From: Valeria Petrov 
-Date: Tue, 18 Apr 2023 15:38:53 +0200
-Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory to
- include path if mod_rewrite is enabled.
-
-Upstream-Status: Backport 
[https://svn.apache.org/viewvc?view=revision&revision=1909241]
-

- modules/mappers/config9.m4 | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
-index 55a97ab993..7120b729b7 100644
 a/modules/mappers/config9.m4
-+++ b/modules/mappers/config9.m4
-@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to user-specific 
directories, , , mos
- APACHE_MODULE(alias, mapping of requests to different filesystem parts, , , 
yes)
- APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
- 
-+if test "x$enable_rewrite" != "xno"; then
-+# mod_rewrite needs test_char.h
-+APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server])
-+fi
-+
- APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
- 
- APACHE_MODPATH_FINISH
--- 
-2.25.1
-
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb 
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb
similarity index 98%
rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb
index bbc1c6c48a..e4f7e1ceb8 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb
@@ -16,7 +16,6 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
file://0008-Fix-perl-install-directory-to-usr-bin.patch \
file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
file://0001-make_exports.awk-not-expose-the-path.patch \
-   
file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch \
   "
 
 SRC_URI:append:class-target = " \
@@ -28,7 +27,7 @@ SRC_URI:append:class-target = " \
"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
-SRC_URI[sha256sum] = 
"dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
+SRC_URI[sha256sum] = 
"fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5"
 
 S = "${WORKDIR}/httpd-${PV}"
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107899): 
https://lists.openembedded.org/g/openembedded-devel/message/107899
Mute This Topic: https://lists.openembedded.org/mt/103421505/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 16/17] frr: fix CVEs CVE-2023-4675{2,3} and CVE-2023-4723{4,5}

2023-12-29 Thread Armin Kuster
From: Jonas Gorski 

Add patches fixing CVE CVE-2023-46752, CVE-2023-46753, CVE-2023-47234,
and CVE-2023-47235 to FRR 9.0.

Patch order is commit order, not CVE numerical order, to avoid fuzz /
need for rebasing of the patches.

References:
https://nvd.nist.gov/vuln/detail/CVE-2023-46752
https://nvd.nist.gov/vuln/detail/CVE-2023-46753
https://nvd.nist.gov/vuln/detail/CVE-2023-47234
https://nvd.nist.gov/vuln/detail/CVE-2023-47235

Signed-off-by: Jonas Gorski 
Signed-off-by: Khem Raj 
(cherry picked from commit 00e928bcb7e933ada8e67f3bfa887988d1ca9d61)
Signed-off-by: Armin Kuster 
---
 .../frr/frr/CVE-2023-46752.patch  | 125 ++
 .../frr/frr/CVE-2023-46753.patch  | 117 
 .../frr/frr/CVE-2023-47234.patch  |  95 +
 .../frr/frr/CVE-2023-47235.patch  | 112 
 .../recipes-protocols/frr/frr_9.0.1.bb|   6 +
 5 files changed, 455 insertions(+)
 create mode 100644 
meta-networking/recipes-protocols/frr/frr/CVE-2023-46752.patch
 create mode 100644 
meta-networking/recipes-protocols/frr/frr/CVE-2023-46753.patch
 create mode 100644 
meta-networking/recipes-protocols/frr/frr/CVE-2023-47234.patch
 create mode 100644 
meta-networking/recipes-protocols/frr/frr/CVE-2023-47235.patch

diff --git a/meta-networking/recipes-protocols/frr/frr/CVE-2023-46752.patch 
b/meta-networking/recipes-protocols/frr/frr/CVE-2023-46752.patch
new file mode 100644
index 00..e1f30248ca
--- /dev/null
+++ b/meta-networking/recipes-protocols/frr/frr/CVE-2023-46752.patch
@@ -0,0 +1,125 @@
+From b08afc81c60607a4f736f418f2e3eb06087f1a35 Mon Sep 17 00:00:00 2001
+From: Donatas Abraitis 
+Date: Fri, 20 Oct 2023 17:49:18 +0300
+Subject: [PATCH] bgpd: Handle MP_REACH_NLRI malformed packets with session
+ reset
+
+Avoid crashing bgpd.
+
+```
+(gdb)
+bgp_mp_reach_parse (args=, mp_update=0x7fffe140) at 
bgpd/bgp_attr.c:2341
+2341   stream_get(&attr->mp_nexthop_global, s, 
IPV6_MAX_BYTELEN);
+(gdb)
+stream_get (dst=0x7fffe1ac, s=0x70006e80, size=16) at lib/stream.c:320
+320{
+(gdb)
+321STREAM_VERIFY_SANE(s);
+(gdb)
+323if (STREAM_READABLE(s) < size) {
+(gdb)
+34   return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
+(gdb)
+
+Thread 1 "bgpd" received signal SIGSEGV, Segmentation fault.
+0x556e37be in route_set_aspath_prepend (rule=0x55aac0d0, 
prefix=0x7fffe050,
+object=0x7fffdb00) at bgpd/bgp_routemap.c:2282
+2282   if (path->attr->aspath->refcnt)
+(gdb)
+```
+
+With the configuration:
+
+```
+ neighbor 127.0.0.1 remote-as external
+ neighbor 127.0.0.1 passive
+ neighbor 127.0.0.1 ebgp-multihop
+ neighbor 127.0.0.1 disable-connected-check
+ neighbor 127.0.0.1 update-source 127.0.0.2
+ neighbor 127.0.0.1 timers 3 90
+ neighbor 127.0.0.1 timers connect 1
+ address-family ipv4 unicast
+  redistribute connected
+  neighbor 127.0.0.1 default-originate
+  neighbor 127.0.0.1 route-map RM_IN in
+ exit-address-family
+!
+route-map RM_IN permit 10
+ set as-path prepend 200
+exit
+```
+
+Reported-by: Iggy Frankovic 
+Signed-off-by: Donatas Abraitis 
+Upstream-Status: Backport 
[https://github.com/FRRouting/frr/commit/b08afc81c60607a4f736f418f2e3eb06087f1a35]
+CVE: CVE-2023-46752
+Signed-off-by: Jonas Gorski 
+---
+ bgpd/bgp_attr.c   | 6 +-
+ bgpd/bgp_attr.h   | 1 -
+ bgpd/bgp_packet.c | 6 +-
+ 3 files changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
+index 6925aff727e2..e7bb42a5d989 100644
+--- a/bgpd/bgp_attr.c
 b/bgpd/bgp_attr.c
+@@ -2421,7 +2421,7 @@ int bgp_mp_reach_parse(struct bgp_attr_parser_args *args,
+ 
+   mp_update->afi = afi;
+   mp_update->safi = safi;
+-  return BGP_ATTR_PARSE_EOR;
++  return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_MAL_ATTR, 0);
+   }
+ 
+   mp_update->afi = afi;
+@@ -3759,10 +3759,6 @@ enum bgp_attr_parse_ret bgp_attr_parse(struct peer 
*peer, struct attr *attr,
+   goto done;
+   }
+ 
+-  if (ret == BGP_ATTR_PARSE_EOR) {
+-  goto done;
+-  }
+-
+   if (ret == BGP_ATTR_PARSE_ERROR) {
+   flog_warn(EC_BGP_ATTRIBUTE_PARSE_ERROR,
+ "%s: Attribute %s, parse error", peer->host,
+diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h
+index 961e5f122470..fc347e7a1b4b 100644
+--- a/bgpd/bgp_attr.h
 b/bgpd/bgp_attr.h
+@@ -364,7 +364,6 @@ enum bgp_attr_parse_ret {
+   /* only used internally, send notify + convert to BGP_ATTR_PARSE_ERROR
+*/
+   BGP_ATTR_PARSE_ERROR_NOTIFYPLS = -3,
+-  BGP_ATTR_PARSE_EOR = -4,
+ };
+ 
+ struct bpacket_attr_vec_arr;
+diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
+index b585591e2f69..5ecf343b6657 100644
+--- a/bgpd/bgp_packet.c
 b/bgpd/bgp_packet.c
+@@ -2397,8 +2397,7 @@ static int bgp_update_receive(struct peer_co

[oe] [meta-oe][nanbield][PATCH 15/17] strongswan: upgrade 5.9.11 -> 5.9.12

2023-12-29 Thread Armin Kuster
From: Wang Mingyu 

Changelog:
==
- Fixed a vulnerability in charon-tkm related to processing DH public values
  that can lead to a buffer overflow and potentially remote code execution.
- The new `pki --ocsp` command produces OCSP responses based on certificate
  status information provided by plugins.
- The cert-enroll script handles the initial enrollment of an X.509 host
  certificate with a PKI server via the EST or SCEP protocols.
- The --priv argument for charon-cmd allows using any type of private key.
- Support for nameConstraints of type iPAddress has been added (the openssl
  plugin previously didn't support nameConstraints at all).
- SANs of type uniformResourceIdentifier can now be encoded in certificates.
- Password-less PKCS#12 and PKCS#8 files are supported.
- A new global option allows preventing peers from authenticating with trusted
  end-entity certificates (i.e. local certificates).
- ECDSA public keys that encode curve parameters explicitly are now rejected by
  all plugins that support ECDSA.
- charon-nm now actually uses the XFRM interfaces added with 5.9.10, it can
  also use the name in connection.interface-name.
- The resolve plugin tries to maintain the order of installed DNS servers.
- The kernel-libipsec plugin always installs routes even if no address is found
  in the local traffic selectors.
- Increased the default receive buffer size for Netlink sockets to 8 MiB and
  simplified its configuration.
- Copy the issuer's subjectKeyIdentifier as authorityKeyIdentifier instead of
  always generating a hash of the subjectPublicKey.
- Fixed issues while reestablishing multiple CHILD_SAs (e.g. after a DPD
  timeout) that could cause a reqid to get assigned to multiple CHILD_SAs with
  unrelated traffic selectors.
- Fixed a possible infinite loop issue in watcher_t and removed WATCHER_EXCEPT,
  instead callbacks are always invoked even if only errors are signaled.
- Fixed a regression in the IKE_SA_INIT tracking code added with 5.9.6 when
  handling invalid messages.
- Fixed adding the XFRMA_REPLAY_ESN_VAL attribute twice when updating SAs.
- Correctly encode SPI from REKEY_SA notify in CHILD_SA_NOT_FOUND notify if
  CHILD_SA is not found during rekeying.
- The testing environment is now based on Debian 12 (bookworm), by default.

Signed-off-by: Wang Mingyu 
Signed-off-by: Khem Raj 
(cherry picked from commit 077489fda8f27336942457da1eaa022804f327c2)
Signed-off-by: Armin Kuster 
---
 .../strongswan/{strongswan_5.9.11.bb => strongswan_5.9.12.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-networking/recipes-support/strongswan/{strongswan_5.9.11.bb => 
strongswan_5.9.12.bb} (99%)

diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.11.bb 
b/meta-networking/recipes-support/strongswan/strongswan_5.9.12.bb
similarity index 99%
rename from meta-networking/recipes-support/strongswan/strongswan_5.9.11.bb
rename to meta-networking/recipes-support/strongswan/strongswan_5.9.12.bb
index fb1bea2d87..87d12bc6c8 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.9.11.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.12.bb
@@ -11,7 +11,7 @@ DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 
'tpm2', '  tpm2-tss',
 SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2 \
   "
 
-SRC_URI[sha256sum] = 
"ddf53f1f26ad26979d5f55e8da95bd389552f5de3682e35593f9a70b2584ed2d"
+SRC_URI[sha256sum] = 
"5e6018b07cbe9f72c044c129955a13be3e2f799ceb53f53a4459da6a922b95e5"
 
 UPSTREAM_CHECK_REGEX = "strongswan-(?P\d+(\.\d+)+)\.tar"
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107897): 
https://lists.openembedded.org/g/openembedded-devel/message/107897
Mute This Topic: https://lists.openembedded.org/mt/103421502/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 13/17] geos: Fix packaging

2023-12-29 Thread Armin Kuster
From: Zoltán Böszörményi 

Due to the library file name change, the subpackage "geoslib"
does not get generated, and the main geos package has unsatisfied
dependencies.

Signed-off-by: Zoltán Böszörményi 
Signed-off-by: Khem Raj 
(cherry picked from commit 405ee461078cfed493bd6ca06f922860be5081d0)
Signed-off-by: Armin Kuster 
---
 meta-oe/recipes-navigation/geos/geos_3.12.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/geos/geos_3.12.0.bb 
b/meta-oe/recipes-navigation/geos/geos_3.12.0.bb
index 95cb29775a..0382e6bdfe 100644
--- a/meta-oe/recipes-navigation/geos/geos_3.12.0.bb
+++ b/meta-oe/recipes-navigation/geos/geos_3.12.0.bb
@@ -13,7 +13,7 @@ inherit cmake pkgconfig binconfig
 PACKAGES =+ "geoslib ${PN}-c1"
 
 DESCRIPTION:${PN}lib = "Geometry engine for Geographic Information Systems - 
C++ Library"
-FILES:${PN}lib += "${libdir}/libgeos-${PV}.so"
+FILES:${PN}lib += "${libdir}/libgeos.so.*"
 
 DESCRIPTION:${PN}-c1 = "Geometry engine for Geographic Information Systems - C 
Library"
 FILES:${PN}-c1 += "${libdir}/libgeos_c.so.*"
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107895): 
https://lists.openembedded.org/g/openembedded-devel/message/107895
Mute This Topic: https://lists.openembedded.org/mt/103421500/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 14/17] apache2: add vendor to product name used for CVE checking

2023-12-29 Thread Armin Kuster
From: Jeffrey Pautler 

This recipe sets the product name used for CVE checking to
"http_server". However, the cve-check logic matches that name to all
products in the CVE database regardless of vendor. Currently, it is
matching to products from vendors other than apache. As a result,
CVE checking incorrectly reports CVEs for those vendors' products for
this package.

Signed-off-by: Jeffrey Pautler 
Signed-off-by: Khem Raj 
(cherry picked from commit 51f70eaaa5973e385645f574093ee860f5648f88)
Signed-off-by: Armin Kuster 
---
 meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb 
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
index 00f8aaa415..bbc1c6c48a 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
@@ -36,7 +36,7 @@ inherit autotools update-rc.d pkgconfig systemd 
update-alternatives
 
 DEPENDS = "openssl expat pcre apr apr-util apache2-native "
 
-CVE_PRODUCT = "http_server"
+CVE_PRODUCT = "apache:http_server"
 
 SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice"
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107896): 
https://lists.openembedded.org/g/openembedded-devel/message/107896
Mute This Topic: https://lists.openembedded.org/mt/103421501/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 12/17] libbytesize: update SRC_URI

2023-12-29 Thread Armin Kuster
From: Edi Feschiyan 

GitHub has been redirecting for a while, so switch SRC_URI from
github.com/rhinstaller/libbytesize to
github.com/storaged-project/libbytesize instead without redirects.

Signed-off-by: Edi Feschiyan 
Signed-off-by: Khem Raj 
(cherry picked from commit 75bb23b3b03e225aa012be8bd5998223ae8f9b2f)
Signed-off-by: Armin Kuster 
---
 meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb 
b/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb
index 926a603b81..28e40f66e3 100644
--- a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb
+++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/git"
 B = "${S}"
 
 SRCREV = "6e83cc6f6dff4f126fc79284e0c3c1c50123380d"
-SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=main;protocol=https"
+SRC_URI = 
"git://github.com/storaged-project/libbytesize;branch=main;protocol=https"
 
 inherit gettext autotools pkgconfig python3native
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107894): 
https://lists.openembedded.org/g/openembedded-devel/message/107894
Mute This Topic: https://lists.openembedded.org/mt/103421498/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 11/17] dnf-plugin-tui: Recover BBCLASSEXTEND variants

2023-12-29 Thread Armin Kuster
From: Wang Mingyu 

dnf-plugin-tui must work on nativesdk environment.
Now there's no warning when run the command "bitbake universe -c fetch".

Signed-off-by: Wang Mingyu 
Signed-off-by: Khem Raj 
(cherry picked from commit 5211242d3f9d4a03cbe9e8af9beed4096a344958)
Signed-off-by: Armin Kuster 
---
 meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb 
b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
index a5d614961a..8db456b99c 100644
--- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
+++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb
@@ -42,4 +42,6 @@ RDEPENDS:${PN} += " \
 dnf \
 libnewt-python \
 "
+BBCLASSEXTEND = "nativesdk"
+
 SKIP_RECIPE[dnf-plugin-tui] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 
'package_rpm', '', 'does not build correctly without package_rpm in 
PACKAGE_CLASSES', d)}"
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107893): 
https://lists.openembedded.org/g/openembedded-devel/message/107893
Mute This Topic: https://lists.openembedded.org/mt/103421497/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 10/17] yajl: fix CVE-2017-16516, CVE-2022-24795, CVE-2023-33460

2023-12-29 Thread Armin Kuster
From: Ross Burton 

Take three CVE fixes from Fedora, as the upstream repository is now
dead.

Signed-off-by: Ross Burton 
Signed-off-by: Khem Raj 
(cherry picked from commit 458fd00233a73d75d43b21b86b1425d75947b154)
Signed-off-by: Armin Kuster 
---
 .../yajl/yajl/CVE-2017-16516.patch| 37 
 .../yajl/yajl/CVE-2022-24795.patch| 59 +++
 .../yajl/yajl/CVE-2023-33460.patch| 35 +++
 meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb   |  6 +-
 4 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-devtools/yajl/yajl/CVE-2017-16516.patch
 create mode 100644 meta-oe/recipes-devtools/yajl/yajl/CVE-2022-24795.patch
 create mode 100644 meta-oe/recipes-devtools/yajl/yajl/CVE-2023-33460.patch

diff --git a/meta-oe/recipes-devtools/yajl/yajl/CVE-2017-16516.patch 
b/meta-oe/recipes-devtools/yajl/yajl/CVE-2017-16516.patch
new file mode 100644
index 00..1241ff9e31
--- /dev/null
+++ b/meta-oe/recipes-devtools/yajl/yajl/CVE-2017-16516.patch
@@ -0,0 +1,37 @@
+From 0b5e73c4321de0ba1d495fdc0967054b2a77931c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= 
+Date: Mon, 10 Jul 2023 13:36:10 +0100
+Subject: [PATCH] Fix for CVE-2017-16516
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Description: Fix for CVE-2017-16516
+ Potential buffer overread: A JSON file can cause denial of service.
+Origin: 
https://github.com/brianmario/yajl-ruby/commit/a8ca8f476655adaa187eedc60bdc770fff3c51ce
+
+CVE: CVE-2017-16516
+Upstream-Status: Submitted [https://github.com/lloyd/yajl/issues/248]
+Signed-off-by: Ross Burton 
+---
+ src/yajl_encode.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/yajl_encode.c b/src/yajl_encode.c
+index fd08258..0d97cc5 100644
+--- a/src/yajl_encode.c
 b/src/yajl_encode.c
+@@ -139,8 +139,8 @@ void yajl_string_decode(yajl_buf buf, const unsigned char 
* str,
+ end+=3;
+ /* check if this is a surrogate */
+ if ((codepoint & 0xFC00) == 0xD800) {
+-end++;
+-if (str[end] == '\\' && str[end + 1] == 'u') {
++if (end + 2 < len && str[end + 1] == '\\' && str[end 
+ 2] == 'u') {
++end++;
+ unsigned int surrogate = 0;
+ hexToDigit(&surrogate, str + end + 2);
+ codepoint =
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-devtools/yajl/yajl/CVE-2022-24795.patch 
b/meta-oe/recipes-devtools/yajl/yajl/CVE-2022-24795.patch
new file mode 100644
index 00..0dc859099d
--- /dev/null
+++ b/meta-oe/recipes-devtools/yajl/yajl/CVE-2022-24795.patch
@@ -0,0 +1,59 @@
+From 17de4d15687aa30c49660dc4b792b1fb4d38b569 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= 
+Date: Thu, 7 Apr 2022 17:29:54 +0200
+Subject: [PATCH] Fix CVE-2022-24795
+
+There was an integer overflow in yajl_buf_ensure_available() leading
+to allocating less memory than requested. Then data were written past
+the allocated heap buffer in yajl_buf_append(), the only caller of
+yajl_buf_ensure_available(). Another result of the overflow was an
+infinite loop without a return from yajl_buf_ensure_available().
+
+yajl-ruby project, which bundles yajl, fixed it
+ by checking for the
+integer overflow, fortifying buffer allocations, and report the
+failures to a caller. But then the caller yajl_buf_append() skips
+a memory write if yajl_buf_ensure_available() failed leading to a data
+corruption.
+
+A yajl fork mainter recommended calling memory allocation callbacks with
+the large memory request and let them to handle it. But that has the
+problem that it's not possible pass the overely large size to the
+callbacks.
+
+This patch catches the integer overflow and terminates the process
+with abort().
+
+CVE: CVE-2022-24795
+Upstream-Status: Submitted [https://github.com/lloyd/yajl/issues/239]
+Signed-off-by: Ross Burton 
+---
+ src/yajl_buf.c | 12 +++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/yajl_buf.c b/src/yajl_buf.c
+index 1aeafde..55c11ad 100644
+--- a/src/yajl_buf.c
 b/src/yajl_buf.c
+@@ -45,7 +45,17 @@ void yajl_buf_ensure_available(yajl_buf buf, size_t want)
+ 
+ need = buf->len;
+ 
+-while (want >= (need - buf->used)) need <<= 1;
++if (((buf->used > want) ? buf->used : want) > (size_t)(buf->used + want)) 
{
++/* We cannot allocate more memory than SIZE_MAX. */
++abort();
++}
++while (want >= (need - buf->used)) {
++if (need >= (size_t)((size_t)(-1)<<1)>>1) {
++/* need would overflow. */
++abort();
++}
++need <<= 1;
++}
+ 
+ if (need != buf->len) {
+ buf->data = (unsigned char *) YA_REALLOC(buf->alloc, buf->data, need);
+

[oe] [meta-oe][nanbield][PATCH 08/17] python3-ninja-syntax: Set BBCLASSEXTEND = "native nativesdk"

2023-12-29 Thread Armin Kuster
From: Zoltán Böszörményi 

python3-ninja is used as a build dependency by other modules.
For that, python3-ninja and all its dependencies must be built
in native mode.

Signed-off-by: Zoltán Böszörményi 
Signed-off-by: Khem Raj 
(cherry picked from commit 0010c0c0553acb8a360b9743cec655950009d6b6)
Signed-off-by: Armin Kuster 
---
 .../recipes-devtools/python/python3-ninja-syntax_1.7.2.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb 
b/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb
index ec7747307d..2f94f7a6a5 100644
--- a/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb
+++ b/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb
@@ -9,4 +9,6 @@ inherit pypi setuptools3
 
 PYPI_PACKAGE = "ninja_syntax"
 UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/ninja_syntax/";
-UPSTREAM_CHECK_REGEX = "/ninja_syntax/(?P(\d+[\.\-_]*)+)"
\ No newline at end of file
+UPSTREAM_CHECK_REGEX = "/ninja_syntax/(?P(\d+[\.\-_]*)+)"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107890): 
https://lists.openembedded.org/g/openembedded-devel/message/107890
Mute This Topic: https://lists.openembedded.org/mt/103421494/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 09/17] python3-ninja: Set BBCLASSEXTEND = "native nativesdk"

2023-12-29 Thread Armin Kuster
From: Zoltán Böszörményi 

python3-ninja is a build dependency for other python modules.
For this, python3-ninja must be built for native mode.

This partially reverts d4aa17dc436beb96a804860bc6d18cf72283709e
("meta-python: Drop broken BBCLASSEXTEND variants")

Signed-off-by: Zoltán Böszörményi 
Signed-off-by: Khem Raj 
(cherry picked from commit 9b5ee4b0b2bf1a2abb181983a960a3802bca688f)
Signed-off-by: Armin Kuster 
---
 meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb 
b/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb
index dd07968f03..3b9077f326 100644
--- a/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb
+++ b/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb
@@ -22,3 +22,4 @@ RDEPENDS:${PN} = " \
 python3-ninja-syntax \
 "
 
+BBCLASSEXTEND = "native nativesdk"
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107891): 
https://lists.openembedded.org/g/openembedded-devel/message/107891
Mute This Topic: https://lists.openembedded.org/mt/103421495/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 07/17] hdf5: Fix install conflict when enable multilib.

2023-12-29 Thread Armin Kuster
From: Wang Mingyu 

Error: Transaction test error:
  file /usr/bin/h5cc conflicts between attempted installs of 
lib32-hdf5-1.14.2-r0.armv7ahf_neon and hdf5-1.14.2-r0.cortexa57
  file /usr/bin/h5hlcc conflicts between attempted installs of 
lib32-hdf5-1.14.2-r0.armv7ahf_neon and hdf5-1.14.2-r0.cortexa57

The differences of h5cc are as follows:
@@ -44,7 +44,7 @@
   exit $status
   ;;
 *)
-  
/usr/bin/arm-pokymllib32-linux-gnueabi/arm-pokymllib32-linux-gnueabi-clang $@ 
`pkg-config --define-variable=prefix=$dir --cflags --libs hdf5`
+  /usr/bin/aarch64-poky-linux/aarch64-poky-linux-clang $@ `pkg-config 
--define-variable=prefix=$dir --cflags --libs hdf5`
   status=$?
   exit $status
   ;;

The differences of h5hlcc are as follows:
@@ -44,7 +44,7 @@
   exit $status
   ;;
 *)
-  
/usr/bin/arm-pokymllib32-linux-gnueabi/arm-pokymllib32-linux-gnueabi-clang $@ 
`pkg-config --define-variable=prefix=$dir --cflags --libs hdf5_hl`
+  /usr/bin/aarch64-poky-linux/aarch64-poky-linux-clang $@ `pkg-config 
--define-variable=prefix=$dir --cflags --libs hdf5_hl`
   status=$?
   exit $status
   ;;

Signed-off-by: Wang Mingyu 
Signed-off-by: Khem Raj 
(cherry picked from commit fc7666e5bc01ddcdc16d9d3b838be5c35d84fda2)
Signed-off-by: Armin Kuster 
---
 meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb 
b/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb
index 68b91c0b0c..e716430673 100644
--- a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb
+++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
 LICENSE = "HDF5"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998"
 
-inherit cmake siteinfo qemu multilib_header
+inherit cmake siteinfo qemu multilib_header multilib_script
 
 DEPENDS += "qemu-native zlib"
 
@@ -40,6 +40,10 @@ EOF
 
 do_unpack[postfuncs] += "gen_emu"
 
+MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \
+ ${PN}:${bindir}/h5hlcc \
+"
+
 do_install:append() {
 # Used for generating config files on target
 install -m 755 ${B}/bin/H5detect ${D}${bindir}
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107889): 
https://lists.openembedded.org/g/openembedded-devel/message/107889
Mute This Topic: https://lists.openembedded.org/mt/103421493/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 06/17] python3-scapy: upgrade to latest revision

2023-12-29 Thread Armin Kuster
From: Khem Raj 

Signed-off-by: Khem Raj 
(cherry picked from commit ca49f2025e65713811e73e894c60cb78be1ed34c)
Signed-off-by: Armin Kuster 
---
 meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb 
b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb
index cc3f2ee1dd..4858e4e579 100644
--- a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb
+++ b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = 
"file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 # If you want ptest support, use the git repo
 # UTscapy does not exist in the pypi pkg
 #
-SRCREV = "9473f77d8b548c8e478e52838bdd4c12f5d4f4ff"
+SRCREV = "0474c37bf1d147c969173d52ab3ac76d2404d981"
 SRC_URI = "git://github.com/secdev/scapy.git;branch=master;protocol=https \
file://run-ptest"
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107888): 
https://lists.openembedded.org/g/openembedded-devel/message/107888
Mute This Topic: https://lists.openembedded.org/mt/103421492/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 04/17] hwdata: upgrade 0.370 -> 0.375

2023-12-29 Thread Armin Kuster
From: Khem Raj 

Signed-off-by: Khem Raj 
(cherry picked from commit 730a12716efce66263da55045eac69554c24bc1b)
Signed-off-by: Armin Kuster 
---
 .../recipes-support/hwdata/{hwdata_0.370.bb => hwdata_0.375.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/hwdata/{hwdata_0.370.bb => hwdata_0.375.bb} 
(91%)

diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.370.bb 
b/meta-oe/recipes-support/hwdata/hwdata_0.375.bb
similarity index 91%
rename from meta-oe/recipes-support/hwdata/hwdata_0.370.bb
rename to meta-oe/recipes-support/hwdata/hwdata_0.375.bb
index 56d4253772..b834069733 100644
--- a/meta-oe/recipes-support/hwdata/hwdata_0.370.bb
+++ b/meta-oe/recipes-support/hwdata/hwdata_0.375.bb
@@ -5,7 +5,7 @@ SECTION = "System/Base"
 LICENSE = "GPL-2.0-or-later | XFree86-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
 
-SRCREV = "21cb47beb1716545b25dfe8ae1b9e079c73b85d9"
+SRCREV = "b9ba5bc9eecbeeff441806695b227c3c3de4755c"
 SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107886): 
https://lists.openembedded.org/g/openembedded-devel/message/107886
Mute This Topic: https://lists.openembedded.org/mt/103421489/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 05/17] openvpn: upgrade 2.6.3 -> 2.6.6

2023-12-29 Thread Armin Kuster
From: Khem Raj 

License-Update: Added Apache2 linking exception

Signed-off-by: Khem Raj 
(cherry picked from commit 45ad525348569f8f5f694a88bb311dbf83998304)
Signed-off-by: Armin Kuster 
---
 .../openvpn/{openvpn_2.6.3.bb => openvpn_2.6.6.bb}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-support/openvpn/{openvpn_2.6.3.bb => 
openvpn_2.6.6.bb} (95%)

diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.6.3.bb 
b/meta-networking/recipes-support/openvpn/openvpn_2.6.6.bb
similarity index 95%
rename from meta-networking/recipes-support/openvpn/openvpn_2.6.3.bb
rename to meta-networking/recipes-support/openvpn/openvpn_2.6.6.bb
index a5fc158749..3688ce4091 100644
--- a/meta-networking/recipes-support/openvpn/openvpn_2.6.3.bb
+++ b/meta-networking/recipes-support/openvpn/openvpn_2.6.6.bb
@@ -2,7 +2,7 @@ SUMMARY = "A full-featured SSL VPN solution via tun device."
 HOMEPAGE = "https://openvpn.net/";
 SECTION = "net"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3170e982baae61dbb8de963317d1ac94"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d8d34ce6390552676e4ce8279f13c48a"
 DEPENDS = "lzo lz4 openssl iproute2 libcap-ng 
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 inherit autotools systemd update-rc.d pkgconfig
@@ -14,7 +14,7 @@ SRC_URI = 
"http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \
 
 UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads";
 
-SRC_URI[sha256sum] = 
"13b207a376d8880507c74ff78aabc3778a9da47c89f1e247dcee3c7237138ff6"
+SRC_URI[sha256sum] = 
"3b074f392818b31aa529b84f76e8b5e4ad03fca764924f46d906bceaaf421034"
 
 CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix 
OpenVPN client, not openvpn"
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107887): 
https://lists.openembedded.org/g/openembedded-devel/message/107887
Mute This Topic: https://lists.openembedded.org/mt/103421491/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 03/17] multipath-tools: Use https for github

2023-12-29 Thread Armin Kuster
From: Fabio Estevam 

Per convert-srcuri.py script, github repos should be accessed
via https.

Change it accordingly.

Signed-off-by: Fabio Estevam 
Signed-off-by: Khem Raj 
(cherry picked from commit 4cef1e68ea59510d85b778e11179a2dac47c658b)
Signed-off-by: Armin Kuster 
---
 .../recipes-support/multipath-tools/multipath-tools_0.9.3.bb| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb 
b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb
index ae4b3b9bf6..a7a9019e33 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb
@@ -29,7 +29,7 @@ DEPENDS = "libdevmapper \
 
 LICENSE = "GPL-2.0-only"
 
-SRC_URI = 
"git://github.com/opensvc/multipath-tools.git;protocol=http;branch=master \
+SRC_URI = 
"git://github.com/opensvc/multipath-tools.git;protocol=https;branch=master \
file://multipathd.oe \
file://multipath.conf.example \
file://0021-RH-fixup-udev-rules-for-redhat.patch \
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107885): 
https://lists.openembedded.org/g/openembedded-devel/message/107885
Mute This Topic: https://lists.openembedded.org/mt/103421488/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 02/17] python3-piccata: Use https for github

2023-12-29 Thread Armin Kuster
From: Fabio Estevam 

Per convert-srcuri.py script, github repos should be accessed
via https.

Change it accordingly.

Signed-off-by: Fabio Estevam 
Signed-off-by: Khem Raj 
(cherry picked from commit 240b95417e0c3dc6b9a22179c73ed318fee36419)
Signed-off-by: Armin Kuster 
---
 .../recipes-devtools/python3-piccata/python3-piccata_2.0.3.bb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/meta-python/recipes-devtools/python3-piccata/python3-piccata_2.0.3.bb 
b/meta-python/recipes-devtools/python3-piccata/python3-piccata_2.0.3.bb
index b72589368d..fadcc32c24 100644
--- a/meta-python/recipes-devtools/python3-piccata/python3-piccata_2.0.3.bb
+++ b/meta-python/recipes-devtools/python3-piccata/python3-piccata_2.0.3.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e664eb75e2791c2e505e6e1c274e6d4f"
 
 SRCREV = "218d310e3d840715b1c8e67cefd5b6d71a2d7a1a"
-SRC_URI = 
"git://github.com/NordicSemiconductor/piccata.git;protocol=http;branch=master"
+SRC_URI = 
"git://github.com/NordicSemiconductor/piccata.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107884): 
https://lists.openembedded.org/g/openembedded-devel/message/107884
Mute This Topic: https://lists.openembedded.org/mt/103421487/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 01/17] openocd: Use https for github

2023-12-29 Thread Armin Kuster
From: Fabio Estevam 

Per convert-srcuri.py script, github repos should be accessed
via https.

Change it accordingly.

Signed-off-by: Fabio Estevam 
Signed-off-by: Khem Raj 
(cherry picked from commit 4f69d8c19880dc5e8d078c68206eebbc8781e49b)
Signed-off-by: Armin Kuster 
---
 meta-oe/recipes-devtools/openocd/openocd_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb 
b/meta-oe/recipes-devtools/openocd/openocd_git.bb
index d30d9c3466..19ef987387 100644
--- a/meta-oe/recipes-devtools/openocd/openocd_git.bb
+++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb
@@ -7,7 +7,7 @@ RDEPENDS:${PN} = "libusb1"
 SRC_URI = " \
 git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \
 
git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master
 \
-
git://github.com/msteveb/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl;branch=master
 \
+
git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=git/jimtcl;name=jimtcl;branch=master
 \
 
git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master
 \
 "
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107883): 
https://lists.openembedded.org/g/openembedded-devel/message/107883
Mute This Topic: https://lists.openembedded.org/mt/103421486/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][nanbield][PATCH 00/17] Patch review

2023-12-29 Thread Armin Kuster
Please have comments back by Dec 31, 2023

Dylan Turner (1):
  apache2: v2.4.57 to v2.4.58 to fix CVE-2023-43622

Edi Feschiyan (1):
  libbytesize: update SRC_URI

Fabio Estevam (3):
  openocd: Use https for github
  python3-piccata: Use https for github
  multipath-tools: Use https for github

Jeffrey Pautler (1):
  apache2: add vendor to product name used for CVE checking

Jonas Gorski (1):
  frr: fix CVEs CVE-2023-4675{2,3} and CVE-2023-4723{4,5}

Khem Raj (3):
  hwdata: upgrade 0.370 -> 0.375
  openvpn: upgrade 2.6.3 -> 2.6.6
  python3-scapy: upgrade to latest revision

Ross Burton (1):
  yajl: fix CVE-2017-16516, CVE-2022-24795, CVE-2023-33460

Wang Mingyu (3):
  hdf5: Fix install conflict when enable multilib.
  dnf-plugin-tui: Recover BBCLASSEXTEND variants
  strongswan: upgrade 5.9.11 -> 5.9.12

Zoltán Böszörményi (3):
  python3-ninja-syntax: Set BBCLASSEXTEND = "native nativesdk"
  python3-ninja: Set BBCLASSEXTEND = "native nativesdk"
  geos: Fix packaging

 .../python/python3-scapy_2.5.0.bb |   2 +-
 .../frr/frr/CVE-2023-46752.patch  | 125 ++
 .../frr/frr/CVE-2023-46753.patch  | 117 
 .../frr/frr/CVE-2023-47234.patch  |  95 +
 .../frr/frr/CVE-2023-47235.patch  | 112 
 .../recipes-protocols/frr/frr_9.0.1.bb|   6 +
 .../{openvpn_2.6.3.bb => openvpn_2.6.6.bb}|   4 +-
 ...ongswan_5.9.11.bb => strongswan_5.9.12.bb} |   2 +-
 .../dnf-plugin-tui/dnf-plugin-tui_git.bb  |   2 +
 .../recipes-devtools/openocd/openocd_git.bb   |   2 +-
 .../yajl/yajl/CVE-2017-16516.patch|  37 ++
 .../yajl/yajl/CVE-2022-24795.patch|  59 +
 .../yajl/yajl/CVE-2023-33460.patch|  35 +
 meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb   |   6 +-
 .../recipes-navigation/geos/geos_3.12.0.bb|   2 +-
 meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb   |   6 +-
 .../{hwdata_0.370.bb => hwdata_0.375.bb}  |   2 +-
 .../libbytesize/libbytesize_2.10.bb   |   2 +-
 .../multipath-tools/multipath-tools_0.9.3.bb  |   2 +-
 .../python/python3-ninja-syntax_1.7.2.bb  |   4 +-
 .../python/python3-ninja_1.11.1.bb|   1 +
 .../python3-piccata/python3-piccata_2.0.3.bb  |   2 +-
 ...config9.m4-Add-server-directory-to-i.patch |  31 -
 .../{apache2_2.4.57.bb => apache2_2.4.58.bb}  |   5 +-
 24 files changed, 614 insertions(+), 47 deletions(-)
 create mode 100644 
meta-networking/recipes-protocols/frr/frr/CVE-2023-46752.patch
 create mode 100644 
meta-networking/recipes-protocols/frr/frr/CVE-2023-46753.patch
 create mode 100644 
meta-networking/recipes-protocols/frr/frr/CVE-2023-47234.patch
 create mode 100644 
meta-networking/recipes-protocols/frr/frr/CVE-2023-47235.patch
 rename meta-networking/recipes-support/openvpn/{openvpn_2.6.3.bb => 
openvpn_2.6.6.bb} (95%)
 rename meta-networking/recipes-support/strongswan/{strongswan_5.9.11.bb => 
strongswan_5.9.12.bb} (99%)
 create mode 100644 meta-oe/recipes-devtools/yajl/yajl/CVE-2017-16516.patch
 create mode 100644 meta-oe/recipes-devtools/yajl/yajl/CVE-2022-24795.patch
 create mode 100644 meta-oe/recipes-devtools/yajl/yajl/CVE-2023-33460.patch
 rename meta-oe/recipes-support/hwdata/{hwdata_0.370.bb => hwdata_0.375.bb} 
(91%)
 delete mode 100644 
meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
 rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.57.bb => 
apache2_2.4.58.bb} (98%)

-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107882): 
https://lists.openembedded.org/g/openembedded-devel/message/107882
Mute This Topic: https://lists.openembedded.org/mt/103421484/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-python][PATCH] python3-argh: update to version 0.30.5

2023-12-29 Thread Derek Straka
Signed-off-by: Derek Straka 
---
 .../python/{python3-argh_0.30.4.bb => python3-argh_0.30.5.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-python/recipes-devtools/python/{python3-argh_0.30.4.bb => 
python3-argh_0.30.5.bb} (90%)

diff --git a/meta-python/recipes-devtools/python/python3-argh_0.30.4.bb 
b/meta-python/recipes-devtools/python/python3-argh_0.30.5.bb
similarity index 90%
rename from meta-python/recipes-devtools/python/python3-argh_0.30.4.bb
rename to meta-python/recipes-devtools/python/python3-argh_0.30.5.bb
index 82cfa3b8e..78e614964 100644
--- a/meta-python/recipes-devtools/python/python3-argh_0.30.4.bb
+++ b/meta-python/recipes-devtools/python/python3-argh_0.30.5.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = 
"file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \
 
file://README.rst;beginline=261;endline=275;md5=39ec83a704aed9f33618c5d04e478a08
 \
 "
 
-SRC_URI[sha256sum] = 
"9fca8e69c4dad4f8d2a7bdfbdd80b0754462b53510a03e1b5cf2b43a87e6e960"
+SRC_URI[sha256sum] = 
"b37dfd617a09d19a4a7bcaed0e060b288bc7ac8dfdc0facf886a49a25ff33728"
 
 inherit pypi python_flit_core
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107881): 
https://lists.openembedded.org/g/openembedded-devel/message/107881
Mute This Topic: https://lists.openembedded.org/mt/103419854/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-python][PATCH] python3-dominate: update to version 2.9.1

2023-12-29 Thread Derek Straka
Signed-off-by: Derek Straka 
---
 .../{python3-dominate_2.9.0.bb => python3-dominate_2.9.1.bb}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-python/recipes-devtools/python/{python3-dominate_2.9.0.bb => 
python3-dominate_2.9.1.bb} (86%)

diff --git a/meta-python/recipes-devtools/python/python3-dominate_2.9.0.bb 
b/meta-python/recipes-devtools/python/python3-dominate_2.9.1.bb
similarity index 86%
rename from meta-python/recipes-devtools/python/python3-dominate_2.9.0.bb
rename to meta-python/recipes-devtools/python/python3-dominate_2.9.1.bb
index 2234e541b..3bd9d8754 100644
--- a/meta-python/recipes-devtools/python/python3-dominate_2.9.0.bb
+++ b/meta-python/recipes-devtools/python/python3-dominate_2.9.1.bb
@@ -2,7 +2,7 @@ SUMMARY = "Dominate is a Python library for creating and 
manipulating HTML docum
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b52f2d57d10c4f7ee67a7eb9615d5d24"
 
-SRC_URI[sha256sum] = 
"b15791ebea432218543a1702d76ae45d2ff95ff994e52014b8686a69dad772fd"
+SRC_URI[sha256sum] = 
"558284687d9b8aae1904e3d6051ad132dd4a8c0cf551b37ea4e7e42a31d19dc4"
 
 inherit pypi ptest python_setuptools_build_meta
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107880): 
https://lists.openembedded.org/g/openembedded-devel/message/107880
Mute This Topic: https://lists.openembedded.org/mt/103419821/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [oe] [meta-networking][PATCH] vsomeip: upgrade 3.3.8 -> 3.4.10

2023-12-29 Thread Khem Raj
This fails to build when distro is using lld linker from llvm project.

https://errors.yoctoproject.org/Errors/Details/748404/

The error it finds are valid, perhaps its using some sort of version
definitions in linker script which
is being detected.

On Sun, Dec 24, 2023 at 5:51 AM Yi Zhao  wrote:
>
> ChangeLog:
> https://github.com/COVESA/vsomeip/releases/tag/3.4.10
>
> * Refresh patches
>
> Signed-off-by: Yi Zhao 
> ---
>  .../0001-Fix-pkgconfig-dir-for-multilib.patch |  6 +-
>  ...e-configuration-files-to-etc-vsomeip.patch |  6 +-
>  .../0003-Do-not-build-external-gtest.patch| 59 ++-
>  ...4-Do-not-specify-PIE-flag-explicitly.patch |  8 +--
>  .../{vsomeip_3.3.8.bb => vsomeip_3.4.10.bb}   |  4 +-
>  5 files changed, 56 insertions(+), 27 deletions(-)
>  rename meta-networking/recipes-protocols/vsomeip/{vsomeip_3.3.8.bb => 
> vsomeip_3.4.10.bb} (93%)
>
> diff --git 
> a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch
>  
> b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch
> index 1c7eb17b2..0ddcb642b 100644
> --- 
> a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch
> +++ 
> b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch
> @@ -1,4 +1,4 @@
> -From e8a1b7a176398c2a9b5969f1b48ae0e1aa30f4ec Mon Sep 17 00:00:00 2001
> +From 2f931baf290477b586309189445bf87e3bc5d5ba Mon Sep 17 00:00:00 2001
>  From: Yi Zhao 
>  Date: Wed, 2 Mar 2022 14:51:13 +0800
>  Subject: [PATCH] Fix pkgconfig dir for multilib
> @@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao 
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index add3edda..fea80b4a 100644
> +index ab399a69..beae6eaf 100644
>  --- a/CMakeLists.txt
>  +++ b/CMakeLists.txt
> -@@ -602,7 +602,7 @@ endif()
> +@@ -637,7 +637,7 @@ endif()
>   # create pkg-config file
>   if(NOT WIN32)
>   configure_file(${VSOMEIP_NAME}.pc.in 
> ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc @ONLY)
> diff --git 
> a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch
>  
> b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch
> index c22ef697b..bdaf34360 100644
> --- 
> a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch
> +++ 
> b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch
> @@ -1,4 +1,4 @@
> -From aea4c06ee2a0661d0c7b4773e846276a4f10e2e8 Mon Sep 17 00:00:00 2001
> +From ebaa3206ee125741314272cddafa04fa71bd2d1e Mon Sep 17 00:00:00 2001
>  From: Yi Zhao 
>  Date: Wed, 9 Mar 2022 11:48:44 +0800
>  Subject: [PATCH] Install example configuration files to /etc/vsomeip
> @@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao 
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
>  diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index fea80b4a..e7a92ec6 100644
> +index beae6eaf..d791c12e 100644
>  --- a/CMakeLists.txt
>  +++ b/CMakeLists.txt
> -@@ -501,7 +501,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc 
> DESTINATION lib/pkgconfig)
> +@@ -536,7 +536,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc 
> DESTINATION lib/pkgconfig)
>   endif ()
>
>   install (
> diff --git 
> a/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch
>  
> b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch
> index 370d8a0fe..09dab9a8b 100644
> --- 
> a/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch
> +++ 
> b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch
> @@ -1,4 +1,4 @@
> -From e012f91a73af7469ef6f660c3a6a752430a4d649 Mon Sep 17 00:00:00 2001
> +From b1bf398015bc090020459954e5cd1ec3b51b8ac3 Mon Sep 17 00:00:00 2001
>  From: Yi Zhao 
>  Date: Tue, 11 Jul 2023 16:53:46 +0800
>  Subject: [PATCH] Do not build external gtest
> @@ -10,15 +10,16 @@ Upstream-Status: Inappropriate [embedded specific]
>
>  Signed-off-by: Yi Zhao 
>  ---
> - CMakeLists.txt| 30 ++--
> - test/network_tests/CMakeLists.txt | 80 ---
> - 2 files changed, 3 insertions(+), 107 deletions(-)
> + CMakeLists.txt| 11 
> + test/CMakeLists.txt   | 22 +--
> + test/network_tests/CMakeLists.txt | 99 ---
> + 3 files changed, 3 insertions(+), 129 deletions(-)
>
>  diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index e7a92ec6..f6c680d4 100644
> +index d791c12e..f1bcba27 100644
>  --- a/CMakeLists.txt
>  +++ b/CMakeLists.txt
> -@@ -18,14 +18,6 @@ set (VSOMEIP_VERSION 
> ${VSOMEIP_MAJOR_VERSION}.${VSOMEIP_MINOR_VERSION}.${VSOMEIP
> +@@ -18,17 +18,6 @@ set (VSOMEIP_VERSION 
> ${VSOMEIP_MAJOR_VERSION}.${VSOMEIP

Re: [oe] [meta-oe][PATCH v2] bonnie++: New recipe for version 2.0

2023-12-29 Thread Khem Raj
Here are some build issues seen while building for x86

https://errors.yoctoproject.org/Errors/Details/748405/

On Fri, Dec 29, 2023 at 2:19 AM Jörg Sommer via lists.openembedded.org
 wrote:
>
> From: Jörg Sommer 
>
> Newer versions of bonnie get published on
> . Unfortunately, the new version
> doesn't compile with g++ 11 which requires *fix-csv2html-data.patch* and
> configure fails due to cross compilation which gets fixed
> with *fix-configure-lfs.patch*
>
> Signed-off-by: Jörg Sommer 
> ---
>  .../bonnie/bonnie++/fix-configure-lfs.patch   |  39 
>  .../bonnie/bonnie++/fix-csv2html-data.patch   | 183 ++
>  .../bonnie/bonnie++_2.00a.bb  |  26 +++
>  3 files changed, 248 insertions(+)
>  create mode 100644 
> meta-oe/recipes-benchmark/bonnie/bonnie++/fix-configure-lfs.patch
>  create mode 100644 
> meta-oe/recipes-benchmark/bonnie/bonnie++/fix-csv2html-data.patch
>  create mode 100644 meta-oe/recipes-benchmark/bonnie/bonnie++_2.00a.bb
>
> diff --git 
> a/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-configure-lfs.patch 
> b/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-configure-lfs.patch
> new file mode 100644
> index 0..af20acdcd
> --- /dev/null
> +++ b/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-configure-lfs.patch
> @@ -0,0 +1,39 @@
> +Upstream-Status: Submitted 
> [https://salsa.debian.org/etbe/bonnie/-/merge_requests/3/diffs?commit_id=4ffece51791ba75ddca2e664cdce726cc40c92d3]
> +
> +diff --git i/configure.in w/configure.in
> +index 080e40c..f2a2bbe 100644
> +--- i/configure.in
>  w/configure.in
> +@@ -82,8 +82,15 @@ void * thread_func(void * param) { return NULL; }
> +   , thread_ldflags="-lpthread"
> +   , thread_ldflags="-pthread")
> +
> +-AC_SUBST(large_file)
> +-AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE
> ++AC_ARG_ENABLE(lfs,
> ++  [  --disable-lfs  disable large file support],
> ++  LFS_CHOICE=$enableval, LFS_CHOICE=check)
> ++
> ++if test "$LFS_CHOICE" = yes; then
> ++   bonniepp_cv_large_file=yes
> ++elif test "$LFS_CHOICE" = check; then
> ++   AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], 
> bonniepp_cv_large_file,
> ++  AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE
> + #define _LARGEFILE64_SOURCE
> + #endif
> + #include 
> +@@ -118,8 +125,12 @@ int main () {
> +   }
> +   close(fd);
> +   return 0;
> +-}], large_file="yes")
> +-if [[ -n "$large_file" ]]; then
> ++}], bonniepp_cv_large_file="yes"))
> ++fi
> ++
> ++AC_SUBST(large_file)
> ++
> ++if [[ -n "$bonniepp_cv_large_file" ]]; then
> +large_file="#define _LARGEFILE64_SOURCE"
> + fi
> +
> diff --git 
> a/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-csv2html-data.patch 
> b/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-csv2html-data.patch
> new file mode 100644
> index 0..4b37b8d65
> --- /dev/null
> +++ b/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-csv2html-data.patch
> @@ -0,0 +1,183 @@
> +commit 7e9433a56f22426b11cbc9bd80e0debca67c893b
> +Author: Jörg Sommer 
> +Date:   Mon Jun 26 12:38:30 2023 +0200
> +
> +csv2html: Explicitly reference data in top level
> +
> +With g++ 11 *data* became ambiguous with [std::data][1]. Therefore it's
> +needed to explicitly address the variable from the top level scope.
> +
> +[1] https://en.cppreference.com/w/cpp/iterator/data
> +
> +Upstream-Status: Submitted 
> [https://salsa.debian.org/etbe/bonnie/-/merge_requests/3/diffs?commit_id=fb13a71d56dab8aaa39233fcaaedfb0ba4ad647d]
> +
> +diff --git a/bon_csv2html.cpp b/bon_csv2html.cpp
> +index e9d9c50..652e330 100644
> +--- a/bon_csv2html.cpp
>  b/bon_csv2html.cpp
> +@@ -87,8 +87,8 @@ int main(int argc, char **argv)
> + read_in(buf);
> +   }
> +
> +-  props = new PPCCHAR[data.size()];
> +-  for(i = 0; i < data.size(); i++)
> ++  props = new PPCCHAR[::data.size()];
> ++  for(i = 0; i < ::data.size(); i++)
> +   {
> + props[i] = new PCCHAR[MAX_ITEMS];
> + props[i][0] = NULL;
> +@@ -109,7 +109,7 @@ int main(int argc, char **argv)
> +   }
> +   calc_vals();
> +   int mid_width = header();
> +-  for(i = 0; i < data.size(); i++)
> ++  for(i = 0; i < ::data.size(); i++)
> +   {
> + // First print the average speed line
> + printf("");
> +@@ -171,23 +171,23 @@ int compar(const void *a, const void *b)
> +
> + void calc_vals()
> + {
> +-  ITEM *arr = new ITEM[data.size()];
> ++  ITEM *arr = new ITEM[::data.size()];
> +   for(unsigned int column_ind = 0; column_ind < MAX_ITEMS; column_ind++)
> +   {
> + switch(vals[column_ind])
> + {
> + case eNoCols:
> + {
> +-  for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
> ++  for(unsigned int row_ind = 0; row_ind < ::data.size(); row_ind++)
> +   {
> + if(column_ind == COL_CONCURRENCY)
> + {
> +-  if(data[row_ind][column_ind] && strcmp("1", 
> data[row_ind][column_ind]))
> ++  if(::data[row_ind][column_ind] && strcmp("1", 
> ::data[row_ind][column_ind]))
> + col_used[column_ind] = tr

[oe] [meta-oe][PATCH] driverctl: fix installed-vs-shipped

2023-12-29 Thread Martin Jansa
* introduced in upgrade to 0.115 version:
  
https://git.openembedded.org/meta-openembedded/commit/?id=1f2c2ebcbcf5944225462f530e0d56b20f1b4630

* fixes:
ERROR: driverctl-0.115-r0 do_package: QA Issue: driverctl: Files/directories 
were installed but not shipped in any package:
  /usr/lib/systemd
  /usr/lib/systemd/system
  /usr/lib/systemd/system/driverctl@.service
Please set FILES such that these items are packaged. Alternatively if they are 
unneeded, avoid installing them or delete them within do_install.
driverctl: 3 installed and not shipped files. [installed-vs-shipped]

  when systemd_system_unitdir isn't subdirectory of libdir, e.g. with multilib 
using:
  export libdir="/usr/lib64"
  export systemd_system_unitdir="/usr/lib/systemd/system"

Signed-off-by: Martin Jansa 
---
 meta-oe/recipes-support/driverctl/driverctl_0.115.bb | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb 
b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb
index d37563eda9..970844f982 100644
--- a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb
+++ b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb
@@ -18,6 +18,9 @@ do_install () {
oe_runmake install DESTDIR=${D}
 }
 
-FILES:${PN} += "${libdir}"
-FILES:${PN} += "${datadir}"
+FILES:${PN} += " \
+${libdir} \
+${datadir} \
+${systemd_system_unitdir} \
+"
 
-- 
2.43.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#107877): 
https://lists.openembedded.org/g/openembedded-devel/message/107877
Mute This Topic: https://lists.openembedded.org/mt/103415285/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[oe] [meta-oe][PATCH v2] bonnie++: New recipe for version 2.0

2023-12-29 Thread Jörg Sommer via lists . openembedded . org
From: Jörg Sommer 

Newer versions of bonnie get published on
. Unfortunately, the new version
doesn't compile with g++ 11 which requires *fix-csv2html-data.patch* and
configure fails due to cross compilation which gets fixed
with *fix-configure-lfs.patch*

Signed-off-by: Jörg Sommer 
---
 .../bonnie/bonnie++/fix-configure-lfs.patch   |  39 
 .../bonnie/bonnie++/fix-csv2html-data.patch   | 183 ++
 .../bonnie/bonnie++_2.00a.bb  |  26 +++
 3 files changed, 248 insertions(+)
 create mode 100644 
meta-oe/recipes-benchmark/bonnie/bonnie++/fix-configure-lfs.patch
 create mode 100644 
meta-oe/recipes-benchmark/bonnie/bonnie++/fix-csv2html-data.patch
 create mode 100644 meta-oe/recipes-benchmark/bonnie/bonnie++_2.00a.bb

diff --git a/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-configure-lfs.patch 
b/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-configure-lfs.patch
new file mode 100644
index 0..af20acdcd
--- /dev/null
+++ b/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-configure-lfs.patch
@@ -0,0 +1,39 @@
+Upstream-Status: Submitted 
[https://salsa.debian.org/etbe/bonnie/-/merge_requests/3/diffs?commit_id=4ffece51791ba75ddca2e664cdce726cc40c92d3]
+
+diff --git i/configure.in w/configure.in
+index 080e40c..f2a2bbe 100644
+--- i/configure.in
 w/configure.in
+@@ -82,8 +82,15 @@ void * thread_func(void * param) { return NULL; }
+   , thread_ldflags="-lpthread"
+   , thread_ldflags="-pthread")
+ 
+-AC_SUBST(large_file)
+-AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE
++AC_ARG_ENABLE(lfs,
++  [  --disable-lfs  disable large file support],
++  LFS_CHOICE=$enableval, LFS_CHOICE=check)
++
++if test "$LFS_CHOICE" = yes; then
++   bonniepp_cv_large_file=yes
++elif test "$LFS_CHOICE" = check; then
++   AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], 
bonniepp_cv_large_file,
++  AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE
+ #define _LARGEFILE64_SOURCE
+ #endif
+ #include 
+@@ -118,8 +125,12 @@ int main () {
+   }
+   close(fd);
+   return 0;
+-}], large_file="yes")
+-if [[ -n "$large_file" ]]; then
++}], bonniepp_cv_large_file="yes"))
++fi
++
++AC_SUBST(large_file)
++
++if [[ -n "$bonniepp_cv_large_file" ]]; then
+large_file="#define _LARGEFILE64_SOURCE"
+ fi
+ 
diff --git a/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-csv2html-data.patch 
b/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-csv2html-data.patch
new file mode 100644
index 0..4b37b8d65
--- /dev/null
+++ b/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-csv2html-data.patch
@@ -0,0 +1,183 @@
+commit 7e9433a56f22426b11cbc9bd80e0debca67c893b
+Author: Jörg Sommer 
+Date:   Mon Jun 26 12:38:30 2023 +0200
+
+csv2html: Explicitly reference data in top level
+
+With g++ 11 *data* became ambiguous with [std::data][1]. Therefore it's
+needed to explicitly address the variable from the top level scope.
+
+[1] https://en.cppreference.com/w/cpp/iterator/data
+
+Upstream-Status: Submitted 
[https://salsa.debian.org/etbe/bonnie/-/merge_requests/3/diffs?commit_id=fb13a71d56dab8aaa39233fcaaedfb0ba4ad647d]
+
+diff --git a/bon_csv2html.cpp b/bon_csv2html.cpp
+index e9d9c50..652e330 100644
+--- a/bon_csv2html.cpp
 b/bon_csv2html.cpp
+@@ -87,8 +87,8 @@ int main(int argc, char **argv)
+ read_in(buf);
+   }
+ 
+-  props = new PPCCHAR[data.size()];
+-  for(i = 0; i < data.size(); i++)
++  props = new PPCCHAR[::data.size()];
++  for(i = 0; i < ::data.size(); i++)
+   {
+ props[i] = new PCCHAR[MAX_ITEMS];
+ props[i][0] = NULL;
+@@ -109,7 +109,7 @@ int main(int argc, char **argv)
+   }
+   calc_vals();
+   int mid_width = header();
+-  for(i = 0; i < data.size(); i++)
++  for(i = 0; i < ::data.size(); i++)
+   {
+ // First print the average speed line
+ printf("");
+@@ -171,23 +171,23 @@ int compar(const void *a, const void *b)
+ 
+ void calc_vals()
+ {
+-  ITEM *arr = new ITEM[data.size()];
++  ITEM *arr = new ITEM[::data.size()];
+   for(unsigned int column_ind = 0; column_ind < MAX_ITEMS; column_ind++)
+   {
+ switch(vals[column_ind])
+ {
+ case eNoCols:
+ {
+-  for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
++  for(unsigned int row_ind = 0; row_ind < ::data.size(); row_ind++)
+   {
+ if(column_ind == COL_CONCURRENCY)
+ {
+-  if(data[row_ind][column_ind] && strcmp("1", 
data[row_ind][column_ind]))
++  if(::data[row_ind][column_ind] && strcmp("1", 
::data[row_ind][column_ind]))
+ col_used[column_ind] = true;
+ }
+ else
+ {
+-  if(data[row_ind][column_ind] && strlen(data[row_ind][column_ind]))
++  if(::data[row_ind][column_ind] && 
strlen(::data[row_ind][column_ind]))
+ col_used[column_ind] = true;
+ }
+   }
+@@ -195,22 +195,22 @@ void calc_vals()
+ break;
+ case eCPU:
+ {
+-  for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++)
++  for(unsigned int row_ind