On 1/12/25 10:54 PM, Khem Raj wrote:
Hi Armin, This is not merging into styhead without conflicts CONFLICT (content): Merge conflict in meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb Can you take a look and perhaps update your baseline ?
Hmm.. rebase and pushed again. - armin
On Sun, Jan 12, 2025 at 5:02 PM akuster808 <[email protected]> wrote:The following changes since commit 7cd38212e73e0e9f42f4d92defb16dd81f71221d: lvm2: Remove the lvm2-udevrules package (2024-11-25 15:32:56 -0500) are available in the Git repository at: https://git.openembedded.org/meta-openembedded styhead-next for you to fetch changes up to 31a24ab044a24936f50a80828ecd7048bf5b1f5e: libmodule-build-tiny-perl: fix QA Issue: TMPDIR [buildpaths] (2025-01-12 19:57:19 -0500) ---------------------------------------------------------------- Benjamin Bouvier (1): bridge-utils: add CVE_PRODUCT Derek Straka (1): nginx: Upgrade mainline release version 1.27.1 -> 1.27.3 Ghislain Mangé (1): wireshark: use inherit_defer for conditional cases Hongxu Jia (1): ntfs-3g-ntfsprogs: fix CVE-2023-52890 J. S. (4): libhtml-tree-perl: Drop unnecessary SRC_URI md5sum libhtml-tree-perl: update HOMEPAGE libhtml-tree-perl: fix QA Issue: TMPDIR [buildpaths] libmodule-build-tiny-perl: fix QA Issue: TMPDIR [buildpaths] Khem Raj (3): mariadb: Fix build with clang-20/trunk ghex,gnome-chess,gnome-photos: Add missing dep on itstool-native mpd: Fix build with icu 76+ Markus Volk (2): geary: add itstool-native dependency eog: add itstool-native dependency Peter Kjellerstedt (1): abseil-cpp: Do not leak -Wnon-virtual-dtor into the .pc files Peter Marko (15): proftpd: set status of CVE-2001-0027 dash: set CVE_PRODUCT ace: ignore CVE-2009-1147 apache2: ignore CVE-1999-0678 and CVE-1999-1412 apache2: remove old version references from CVEs spice: ignore CVE-2016-0749 gattlib: mark CVE-2019-6498 as fixed monkey: ignore CVE-2013-1771 redis: ignore CVE-2022-0543 spice-gtk: mark CVE-2012-4425 as fixed apache2: ignore disputed CVE CVE-2007-0086 memcached: ignore disputed CVE-2022-26635 emlog: set CVE_PRODUCT php: upgrade 8.2.20 -> 8.2.26 wireshark: upgrade 4.2.8 -> 4.2.9 Ruiqiang Hao (1): mariadb: Ensure compatibility with ARMv9 by updating .arch directive Yoann Congal (1): gimp: fix gimptool buildpaths errors Yogita Urade (1): postgresql: upgrade 16.4 -> 16.5 ...0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch | 42 ++++++++++++++ .../ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb | 1 + meta-gnome/recipes-connectivity/geary/geary_46.0.bb | 1 + .../gimp/gimp/0001-gimptool-allow-default-CC-override.patch | 85 +++++++++++++++++++++++++++++ meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb | 21 +++++++ meta-gnome/recipes-gnome/eog/eog_47.0.bb | 1 + meta-gnome/recipes-gnome/ghex/ghex_46.0.bb | 1 + meta-gnome/recipes-gnome/gnome-chess/gnome-chess_47.0.bb | 2 +- meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb | 1 + .../mpd/0001-meson.build-support-building-with-ICU-76.patch | 52 ++++++++++++++++++ meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb | 1 + meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb | 2 + .../recipes-support/bridge-utils/bridge-utils_1.7.1.bb | 2 + meta-networking/recipes-support/memcached/memcached_1.6.17.bb | 2 + meta-networking/recipes-support/spice/spice-gtk_0.42.bb | 2 + meta-networking/recipes-support/spice/spice_git.bb | 1 + .../wireshark/{wireshark_4.2.7.bb => wireshark_4.2.9.bb} | 4 +- meta-oe/recipes-connectivity/ace/ace_6.5.19.bb | 2 + meta-oe/recipes-connectivity/gattlib/gattlib_git.bb | 2 + meta-oe/recipes-core/emlog/emlog.inc | 2 + meta-oe/recipes-dbs/mysql/mariadb.inc | 2 + ...1-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch | 44 +++++++++++++++ ...1-Use-a-lambda-function-as-deleter-prototype-in-unique.patch | 26 +++++++++ .../0003-configure.ac-bypass-autoconf-2.69-version-check.patch | 6 +- .../postgresql/{postgresql_16.4.bb => postgresql_16.5.bb} | 2 +- ...5-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch | 30 ++++++++++ meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb | 1 + .../php/php/0001-ext-opcache-config.m4-enable-opcache.patch | 4 +- .../php/php/0002-build-php.m4-don-t-unset-cache-variables.patch | 2 +- .../0003-php-remove-host-specific-info-from-header-file.patch | 2 +- .../php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch | 4 +- .../php/php/0008-ext-imap-config.m4-fix-include-paths.patch | 4 +- .../php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch | 3 +- meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch | 2 +- meta-oe/recipes-devtools/php/{php_8.2.20.bb => php_8.2.26.bb} | 2 +- meta-oe/recipes-extended/redis/redis_7.2.5.bb | 1 + meta-oe/recipes-shells/dash/dash_0.5.12.bb | 2 + meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb | 10 +++- .../recipes-perl/libmodule/libmodule-build-tiny-perl_0.048.bb | 7 +++ meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb | 17 +++--- meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb | 1 + .../recipes-httpd/nginx/{nginx_1.27.1.bb => nginx_1.27.3.bb} | 4 +- 42 files changed, 374 insertions(+), 29 deletions(-) create mode 100644 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch create mode 100644 meta-gnome/recipes-gimp/gimp/gimp/0001-gimptool-allow-default-CC-override.patch create mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd/0001-meson.build-support-building-with-ICU-76.patch rename meta-networking/recipes-support/wireshark/{wireshark_4.2.7.bb => wireshark_4.2.9.bb} (95%) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch rename meta-oe/recipes-dbs/postgresql/{postgresql_16.4.bb => postgresql_16.5.bb} (86%) create mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch rename meta-oe/recipes-devtools/php/{php_8.2.20.bb => php_8.2.26.bb} (99%) rename meta-webserver/recipes-httpd/nginx/{nginx_1.27.1.bb => nginx_1.27.3.bb} (53%)
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#114915): https://lists.openembedded.org/g/openembedded-devel/message/114915 Mute This Topic: https://lists.openembedded.org/mt/110579553/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
